Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2025-12-18 16:20:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Jul 03 2008] - Rumble

Browse source 
Fixed lib/messages to properly display skill, spell, and damage messages. (thanks T
ink)
[Jun 28 2008] - Rumble
  Added player ability to cancel queued commands. i.e. player spammed kick while figh
ting but needs to flee so they type '--' to cancel so they can flee. (thanks Jamdog)
This commit is contained in:
Rumble 2008-07-02 22:55:56 +00:00
parent 66d4a9d3eb
commit 2053b2d4a8
8 changed files with 81 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog
View file

@ -3,6 +3,10 @@ help, find any bugs, or have ideas for improvement please stop by TBA at
telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble telnet://tbamud.com:9091 or email rumble@tbamud.com --Rumble
tbaMUD 3.56 tbaMUD 3.56
[Jul 03 2008] - Rumble
Fixed lib/messages to properly display skill, spell, and damage messages. (thanks Tink)
[Jun 28 2008] - Rumble
Added player ability to cancel queued commands. i.e. player spammed kick while fighting but needs to flee so they type '--' to cancel so they can flee. (thanks Jamdog)
[Jun 28 2008] - Fizban [Jun 28 2008] - Fizban
Merged Jamdog's moblist code into the pre-existing mlist command. (thanks Jamdog) Merged Jamdog's moblist code into the pre-existing mlist command. (thanks Jamdog)
[Jun 14 2008] - Rumble [Jun 14 2008] - Rumble

114
lib/misc/messages
View file

@ -25,7 +25,7 @@
*************************************************************************** ***************************************************************************
* Burning Hands * Burning Hands
M
5 5
You have burned $N to death! You have burned $N to death!
You have been burned to death by $n! You have been burned to death by $n!
@ -41,7 +41,7 @@ The pitiful creature before you tries to burn you.
Unaware of the risks, $n tries to burn $N. Unaware of the risks, $n tries to burn $N.
* Call Lightning * Call Lightning
M
6 6
Your lightning bolt kills $N! Your lightning bolt kills $N!
You are electrocuted to death by a lightning bolt sent by $n! You are electrocuted to death by a lightning bolt sent by $n!
@ -57,7 +57,7 @@ You stop $n's lightning with a sure hand, no time for children's games...
$n's lightning disappears as $N makes a simple gesture. $n's lightning disappears as $N makes a simple gesture.
* Chill Touch * Chill Touch
M
8 8
You chill $N, remember to put flowers on $S grave... You chill $N, remember to put flowers on $S grave...
You feel chilled by $n and then you feel no more -- R.I.P. You feel chilled by $n and then you feel no more -- R.I.P.
@ -73,7 +73,7 @@ $n tries to chill you, what a laugh...
$N starts to laugh as $n turns chilly! $N starts to laugh as $n turns chilly!
* Color Spray * Color Spray
M
10 10
YOU KILLED $N!!! -- don't you feel ashamed... YOU KILLED $N!!! -- don't you feel ashamed...
Your head is filled with all the colors of the rainbow before it bursts! Your head is filled with all the colors of the rainbow before it bursts!
@ -89,7 +89,7 @@ Your frown is enough to turn $n's color spray into little butterflies.
The air is filled with butterflies as $N frowns at $n's color spray. The air is filled with butterflies as $N frowns at $n's color spray.
* Dispel Evil * Dispel Evil
M
22 22
$N is dissolved by your goodness. $N is dissolved by your goodness.
$n dissolves you, you regret having been so evil, and die... $n dissolves you, you regret having been so evil, and die...
@ -105,7 +105,7 @@ $n unfruitfully tries to dispell you.
$n is stupid... $n is stupid...
* Earthquake * Earthquake
M
23 23
The earth opens beneath $N's feet and swallows $M whole! The earth opens beneath $N's feet and swallows $M whole!
The earth opens beneath your feet and swallows you whole! The earth opens beneath your feet and swallows you whole!
@ -121,7 +121,7 @@ You gracefully levitate as the earth shifts underneath you.
$N gracefully levitates as the earth shifts beneath $S feet under $M. $N gracefully levitates as the earth shifts beneath $S feet under $M.
* Energy Drain * Energy Drain
M
25 25
$N crumples as you kill $M by draining $S energy! $N crumples as you kill $M by draining $S energy!
As $n drains your last energy you look forward to the peace of the graveyard... As $n drains your last energy you look forward to the peace of the graveyard...
@ -137,7 +137,7 @@ How amusing -- $n tries to drain you!
$N's eyes twinkle with laughter as $n tries to drain $M. $N's eyes twinkle with laughter as $n tries to drain $M.
* Fireball * Fireball
M
26 26
Your fireball hits $N with full force, causing an immediate death! Your fireball hits $N with full force, causing an immediate death!
As you burst into flames of death $n grins evilly... As you burst into flames of death $n grins evilly...
@ -153,7 +153,7 @@ You choose to ignore $n's shameful attempt to fireball you.
$n's fireball is tactfully ignored by $N. $n's fireball is tactfully ignored by $N.
* Harm * Harm
M
27 27
As you finish the incantation of the spell, $N falls dead due to the amount of harm $E takes! As you finish the incantation of the spell, $N falls dead due to the amount of harm $E takes!
You feel light headed as $n completes a spell which causes you so much harm that you just snuff it. You feel light headed as $n completes a spell which causes you so much harm that you just snuff it.
@ -169,7 +169,7 @@ $n tries to harm you. Poor sod.
What a buffoon! $n looks somewhat perturbed as $N ignores the recently cast harm spell. What a buffoon! $n looks somewhat perturbed as $N ignores the recently cast harm spell.
* Lightning Bolt * Lightning Bolt
M
30 30
Your lightning bolt shatters $N to pieces! Your lightning bolt shatters $N to pieces!
You feel enlightened by the lightning bolt $n sends, and then all is darkness -- R.I.P.! You feel enlightened by the lightning bolt $n sends, and then all is darkness -- R.I.P.!
@ -185,7 +185,7 @@ You move your ears to extinguish $n's lightning bolt.
$N moves $S ears and $n's lightning bolt is extinguished! $N moves $S ears and $n's lightning bolt is extinguished!
* Magic Missile * Magic Missile
M
32 32
The magic missile tears away the remaining life of $N! The magic missile tears away the remaining life of $N!
You only have time to notice $n uttering strange sounds before everything is dark! You only have time to notice $n uttering strange sounds before everything is dark!
@ -201,7 +201,7 @@ You can't help laughing as $n sends a magic missile at you.
$N starts to roar with laughter as $n sends a magic missile at $M. $N starts to roar with laughter as $n sends a magic missile at $M.
* Shocking Grasp * Shocking Grasp
M
37 37
$N dies while looking rather shocked! $N dies while looking rather shocked!
$n shocks you. Unfortunately your heart can't stand it... $n shocks you. Unfortunately your heart can't stand it...
@ -217,7 +217,7 @@ These puny creatures are shocking at times...
The atmosphere gets loaded as $n tries to shock $N! The atmosphere gets loaded as $n tries to shock $N!
* Dispel Good * Dispel Good
M
46 46
$N is dissolved by your evil. $N is dissolved by your evil.
$n dissolves you -- the price paid for leading a good life -- you die... $n dissolves you -- the price paid for leading a good life -- you die...
@ -237,7 +237,7 @@ $n is stupid...
*************************************************************************** ***************************************************************************
* Backstab * Backstab
M
131 131
$N makes a strange sound but is suddenly very silent as you place $p in $S back. $N makes a strange sound but is suddenly very silent as you place $p in $S back.
Suddenly $n stabs you in the back, R.I.P.... Suddenly $n stabs you in the back, R.I.P....
@ -253,7 +253,7 @@ $n tries to backstab you, but changes $s mind.
$n tries to backstab $N, but changes $s mind. $n tries to backstab $N, but changes $s mind.
* Bash * Bash
M
132 132
$N doesn't recover from your bash! -- $E is dead. $N doesn't recover from your bash! -- $E is dead.
As $n bashes at you, you give up living and die... As $n bashes at you, you give up living and die...
@ -269,7 +269,7 @@ $n fruitlessly tries to bash you and is sent sprawling.
$n dares a bash at $N and is sent sprawling without touching $M. $n dares a bash at $N and is sent sprawling without touching $M.
* Kick * Kick
M
134 134
Your kick at $N's kidneys made $M die. Your kick at $N's kidneys made $M die.
$n kills you by kicking your kidneys in! $n kills you by kicking your kidneys in!
@ -283,7 +283,7 @@ $n wipes $s boots in the face of $N!
$N makes you kick at a huge stone appearing from nowhere -- OUCH! $N makes you kick at a huge stone appearing from nowhere -- OUCH!
You make $n kick a huge stone appearing from nowhere -- *giggle* You make $n kick a huge stone appearing from nowhere -- *giggle*
$n starts kicking a huge stone which suddenly appears. $n starts kicking a huge stone which suddenly appears.
M
134 134
Your kick at $N's face splits $S head open -- yummy! Your kick at $N's face splits $S head open -- yummy!
$n aims a kick at your face which splits your head in two! $n aims a kick at your face which splits your head in two!
@ -303,7 +303,7 @@ $n falls face down in some mud created by $N.
*************************************************************************** ***************************************************************************
* Hit * Hit
M
300 300
You punch $N's head with a blow that crushes $S skull! You punch $N's head with a blow that crushes $S skull!
$n punches your head with a blow that crushes your skull! $n punches your head with a blow that crushes your skull!
@ -317,7 +317,7 @@ $N barely avoids a blow from $n!
Your fist flops as your body refuses to fight the mighty $N. Your fist flops as your body refuses to fight the mighty $N.
$n seems to be having trouble getting $s body to fight you!! $n seems to be having trouble getting $s body to fight you!!
$n's body rebels against $m when $e tries to punch $N. $n's body rebels against $m when $e tries to punch $N.
M
300 300
You punch $N in $S kidneys resulting in $S immediate death! You punch $N in $S kidneys resulting in $S immediate death!
You recieve a punch in your kidneys which ends your worldly misery -- R.I.P.! You recieve a punch in your kidneys which ends your worldly misery -- R.I.P.!
@ -331,7 +331,7 @@ $n practices shadow-boxing while $N takes a break.
Instead of letting you punch $M, $N forces you to play Punch and Judy!!! Instead of letting you punch $M, $N forces you to play Punch and Judy!!!
You convince $n of playing Punch and Judy instead of punching you. You convince $n of playing Punch and Judy instead of punching you.
$N convinces $n that no punching is necessary. $N convinces $n that no punching is necessary.
M
300 300
You hit $N with such force that $S neck snaps in two! You hit $N with such force that $S neck snaps in two!
$n hits you with such force that your neck snaps in two! $n hits you with such force that your neck snaps in two!
@ -345,7 +345,7 @@ $n tries to hit $N who easily avoids the blow.
You try to hit $N but hit yourself instead! You try to hit $N but hit yourself instead!
$n tries to hit you but you hits $mself instead! $n tries to hit you but you hits $mself instead!
$n tries to hit $N but hits $mself instead! $n tries to hit $N but hits $mself instead!
M
300 300
You hit $N with a blow that breaks $S spine! You hit $N with a blow that breaks $S spine!
$n hits you with a blow that breaks your spine! $n hits you with a blow that breaks your spine!
@ -361,7 +361,7 @@ $n tries to take a swing at you -- how pathetic!
$n pathetically tries to take a swing at $N - ha! $n pathetically tries to take a swing at $N - ha!
* Sting * Sting
M
301 301
You drive a sting directly into the heart of $N, killing $M! You drive a sting directly into the heart of $N, killing $M!
With a powerful driving force, $n's sting tears right through your chest causing instant death! With a powerful driving force, $n's sting tears right through your chest causing instant death!
@ -375,7 +375,7 @@ You watch in fright as $n stings at $N, missing by mere inches!
Sting -- God... What are you thinking? Sting -- God... What are you thinking?
$n tries to sting you, somewhat comical to tell the truth. $n tries to sting you, somewhat comical to tell the truth.
$n stings at $N, then looks horrified as $N grins at $m! $n stings at $N, then looks horrified as $N grins at $m!
M
301 301
You violently sting $N repeatedly, causing $S death! You violently sting $N repeatedly, causing $S death!
You die a horrid death as $n stings you repeatedly all over your body! You die a horrid death as $n stings you repeatedly all over your body!
@ -391,7 +391,7 @@ Was that a bee you just felt? Oh.. wait, it was just $n.
$N begins to slap at $Mself as $n tries to sting $M. $N begins to slap at $Mself as $n tries to sting $M.
* Whip * Whip
M
302 302
You whip $N's head right off of $S body! You whip $N's head right off of $S body!
$n whips your head right off of your body! $n whips your head right off of your body!
@ -405,7 +405,7 @@ $n cracks $s whip at $N but only hits $mself in the face!
You'd better stop before $N whips your butt. You'd better stop before $N whips your butt.
Pathetic little $n is trying to whip you... how cute. Pathetic little $n is trying to whip you... how cute.
$n tries to whip $N - isn't he cute? $n tries to whip $N - isn't he cute?
M
302 302
Your dextrous whip messily tears $N's torso right off! Your dextrous whip messily tears $N's torso right off!
$n's whip messily tears you right in half! $n's whip messily tears you right in half!
@ -421,7 +421,7 @@ $n is trying to whip you. Yawn.
$n tries to whip $N - yawn. $n tries to whip $N - yawn.
* Slash * Slash
M
303 303
You beautifully slash $N into two parts -- both dead. You beautifully slash $N into two parts -- both dead.
Your upper body is disconnected from your legs as $n slashes at you -- R.I.P.! Your upper body is disconnected from your legs as $n slashes at you -- R.I.P.!
@ -435,7 +435,7 @@ $N nimbly avoids $n's slash.
Your cunning slash at $N is fruitless. Your cunning slash at $N is fruitless.
You nimbly stop a slash from $n. You nimbly stop a slash from $n.
$N stops a cunning slash from $n who looks disappointed. $N stops a cunning slash from $n who looks disappointed.
M
303 303
Your slash at $N results in a pool of blood and $S immediate death! Your slash at $N results in a pool of blood and $S immediate death!
Blood spurts all over as $n slashes at you. You die... Blood spurts all over as $n slashes at you. You die...
@ -449,7 +449,7 @@ $n's slash misses $N who laughs in sheer delight, HA!
Come on, what makes you think you can slash at a GOD?! Come on, what makes you think you can slash at a GOD?!
You barely register the puny creature before you... You barely register the puny creature before you...
The great $N seems to ignore $n's slashes. The great $N seems to ignore $n's slashes.
M
303 303
$N cries out in agony as you slash $S ribcage open! $N cries out in agony as you slash $S ribcage open!
Your ribcage is slashed open by $n -- R.I.P.! Your ribcage is slashed open by $n -- R.I.P.!
@ -463,7 +463,7 @@ $n's slash at $N misses $M by a mile.
It's rude to try to slash a GOD, you know. It's rude to try to slash a GOD, you know.
$n tries to slash you -- how rude! $n tries to slash you -- how rude!
$n tries to slash $N -- how rude! $n tries to slash $N -- how rude!
M
303 303
Your powerful slash cleanly cuts off $N's head, which rolls away with a look of horror on it. Your powerful slash cleanly cuts off $N's head, which rolls away with a look of horror on it.
You briefly feel the sensation of flight as $n slices your head cleanly off! You briefly feel the sensation of flight as $n slices your head cleanly off!
@ -479,7 +479,7 @@ $n tries to slash you... yeah, right.
$n tries to slash $N... yeah, right. $n tries to slash $N... yeah, right.
* Bite * Bite
M
304 304
You sink your teeth deep into $N's neck -- blood sprays everywhere! You sink your teeth deep into $N's neck -- blood sprays everywhere!
$n sinks $s teeth deep into your neck, tearing your jugular vein to bits! $n sinks $s teeth deep into your neck, tearing your jugular vein to bits!
@ -493,7 +493,7 @@ $n fiercely snaps $s teeth at $N but misses the mark.
You attempt to bite $N. Ouch! That hurt! You attempt to bite $N. Ouch! That hurt!
$n tries to bite you, how funny. $n tries to bite you, how funny.
$n tries to bite $N - funny, huh? $n tries to bite $N - funny, huh?
M
304 304
You bite $N through $S ribcage and into $S heart -- $e falls to the ground in agony. You bite $N through $S ribcage and into $S heart -- $e falls to the ground in agony.
$n bites you right through your ribcage and into your heart -- you fall to the ground writhing in agony... $n bites you right through your ribcage and into your heart -- you fall to the ground writhing in agony...
@ -509,7 +509,7 @@ $n snaps at you but realizes $e is biting off more than $e can chew.
$n stupidly tries to bite off more than $e can chew by snapping at $N. $n stupidly tries to bite off more than $e can chew by snapping at $N.
* Bludgeon * Bludgeon
M
305 305
You forcefully bludgeon $N whose head suddenly cracks open like a walnut! You forcefully bludgeon $N whose head suddenly cracks open like a walnut!
$n bludgeons your head which cracks open like a walnut! $n bludgeons your head which cracks open like a walnut!
@ -523,7 +523,7 @@ $n tries to bludgeon $N who easily avoids the blow.
Your attempt to bludgeon $N fails, luckily for you $N has a good sense of humor! Your attempt to bludgeon $N fails, luckily for you $N has a good sense of humor!
Your patience is tried when $n tries to clobber you. Your patience is tried when $n tries to clobber you.
$N restrains $Mself from zapping $n when $e attempts to bludgeon the mighty one. $N restrains $Mself from zapping $n when $e attempts to bludgeon the mighty one.
M
305 305
Your relentless bludgeoning of $N finally results in $S broken neck! Your relentless bludgeoning of $N finally results in $S broken neck!
$n's relentless bludgeoning of you finally results in your broken neck! $n's relentless bludgeoning of you finally results in your broken neck!
@ -539,7 +539,7 @@ Your patience is tried when $n tries to clobber you.
$N restrains $Mself from zapping $n when $e attempts to bludgeon the mighty one. $N restrains $Mself from zapping $n when $e attempts to bludgeon the mighty one.
* Crush * Crush
M
306 306
You crush $N right out of existence! You crush $N right out of existence!
$n crushes you right out of existence! $n crushes you right out of existence!
@ -553,7 +553,7 @@ $n tries to crush $N who jumps out of the way!
A pox on thee and thy pitiful crush on $N! A pox on thee and thy pitiful crush on $N!
$n seems to have a crush on you... $n seems to have a crush on you...
$n seems to have a crush on $N... $n seems to have a crush on $N...
M
306 306
You crush $N's entire body, making a terrible mess! You crush $N's entire body, making a terrible mess!
$n crushes your entire body, making a terrible mess! $n crushes your entire body, making a terrible mess!
@ -569,7 +569,7 @@ $n seems to have a crush on you...
$n seems to have a crush on $N... $n seems to have a crush on $N...
* Pound * Pound
M
307 307
You pound $N right into the ground! You pound $N right into the ground!
$n pounds you six feet under. $n pounds you six feet under.
@ -583,7 +583,7 @@ $n looks perturbed as $s pound misses $N!
You pound $N! And $E thanks you for it? *boggle* You pound $N! And $E thanks you for it? *boggle*
$n gives you a pound. Wonder what the exchange rate is... $n gives you a pound. Wonder what the exchange rate is...
$n starts giving pounds to $N who begins to count the money. $n starts giving pounds to $N who begins to count the money.
M
307 307
You pound on $N with reckless abandon when you realize that $E is dead. You pound on $N with reckless abandon when you realize that $E is dead.
With $s reckless pounding attacks, you succomb to death. With $s reckless pounding attacks, you succomb to death.
@ -599,7 +599,7 @@ Hmmm... I think you missed the joke that $n was trying to tell you.
$N looks somewhat perplexed as $n tries to pound him! $N looks somewhat perplexed as $n tries to pound him!
* Claw * Claw
M
308 308
You claw $N's face right off! You claw $N's face right off!
$n claws your face right off! $n claws your face right off!
@ -613,7 +613,7 @@ $n tries to claw at $N, missing by a hair!
You dummy! Not the claw, the claw! You dummy! Not the claw, the claw!
$n must be crazy - trying to claw at you! $n must be crazy - trying to claw at you!
$n must be crazy - trying to claw at $N! $n must be crazy - trying to claw at $N!
M
308 308
Your razor-sharp claws rip $N wide open! Your razor-sharp claws rip $N wide open!
$n's razor-sharp claws rip you wide open! $n's razor-sharp claws rip you wide open!
@ -629,7 +629,7 @@ $n must be crazy - trying to claw at you!
$n must be crazy - trying to claw at $N! $n must be crazy - trying to claw at $N!
* Maul * Maul
M
309 309
You maul $N across the chest and $E screams in pain as $E falls lifeless to the ground. You maul $N across the chest and $E screams in pain as $E falls lifeless to the ground.
As $n mauls you in the chest, you feel a searing pain... then nothing. As $n mauls you in the chest, you feel a searing pain... then nothing.
@ -640,12 +640,12 @@ $n mauls at $N, missing wildly!
# #
# #
# #
auling a God? What would your poor mother think? Of course, you probably wouldn't hesitate to maul her too. Mauling a God? What would your poor mother think? Of course, you probably wouldn't hesitate to maul her too.
$n tries to maul you, and as $e fails, looks quite horrified. How pleasant. $n tries to maul you, and as $e fails, looks quite horrified. How pleasant.
$N laughs as $n tries to maul $M. How comical. $N laughs as $n tries to maul $M. How comical.
* Thrash * Thrash
M
310 310
You bring $N within the thrashing of $S life, and then thrash $M one last time, killing $M. You bring $N within the thrashing of $S life, and then thrash $M one last time, killing $M.
$n thrashes you violently, and you die. $n thrashes you violently, and you die.
@ -661,7 +661,7 @@ What a fool, $n tried to thrash you. *sigh*
Looking rather silly, $n tries to thrash at $N. Looking rather silly, $n tries to thrash at $N.
* Pierce * Pierce
M
311 311
You succesfully pierce $N and $S dead body falls to the ground in a lifeless heap. You succesfully pierce $N and $S dead body falls to the ground in a lifeless heap.
$n pierces you. You are no longer a living member of this world -- R.I.P.! $n pierces you. You are no longer a living member of this world -- R.I.P.!
@ -675,7 +675,7 @@ $n tries to pierce air instead of fighting $N.
The mighty $N begins to think you a nuisance!!! The mighty $N begins to think you a nuisance!!!
Your patience is almost gone when you stare back at $n. Your patience is almost gone when you stare back at $n.
The air is loaded when $N angrily wards off a piercing attack from $n. The air is loaded when $N angrily wards off a piercing attack from $n.
M
311 311
You pierce $N's heart, you heartbreaker you... You pierce $N's heart, you heartbreaker you...
$n breaks your heart, goodbye cruel world... $n breaks your heart, goodbye cruel world...
@ -691,7 +691,7 @@ You return $n's pierce with a piercing look, hmmm...
$N returns $n's pierce with a piercing look, hmmm... $N returns $n's pierce with a piercing look, hmmm...
* Blast * Blast
M
312 312
You blast $N with all of your might, killing $M! You blast $N with all of your might, killing $M!
With $s powerful blast, $n tears your life from your body! With $s powerful blast, $n tears your life from your body!
@ -707,7 +707,7 @@ $n tried to blast you. Good thing you have blastproof armour.
$n looks afraid of the consequences as $e tries fruitlessly to blast $N. $n looks afraid of the consequences as $e tries fruitlessly to blast $N.
* Punch * Punch
M
313 313
You punch at $N causing $S face to collapse under the blow, blood everywhere. Doesn't look like $N will recover. Ever. You punch at $N causing $S face to collapse under the blow, blood everywhere. Doesn't look like $N will recover. Ever.
$n's forceful punch causes you to see red, until you die shortly thereafter. $n's forceful punch causes you to see red, until you die shortly thereafter.
@ -723,7 +723,7 @@ Is that a quiet whistling noise you hear as $n is swinging $s fist about?
$n looks like $e would prefer to have punched a wall rather than trying to punch $N. $n looks like $e would prefer to have punched a wall rather than trying to punch $N.
* Stab * Stab
M
314 314
You stab $N through the heart! Instant death! You stab $N through the heart! Instant death!
$n drives a stab at you, it pierces your heart! RIP! $n drives a stab at you, it pierces your heart! RIP!
@ -737,11 +737,11 @@ $n stabs at $N! $e misses!
You stab at $N! Too bad $E's a god, huh? You stab at $N! Too bad $E's a god, huh?
$n stabs at you! Lucky for you that you are immune to this kind of thing. $n stabs at you! Lucky for you that you are immune to this kind of thing.
You watch in pity as $n stabs towards $N missing in the most futile way possible! You watch in pity as $n stabs towards $N missing in the most futile way possible!
M
314 314
You stab forth towards $N, hitting $M in the abdomen causing a messy but mortal wound! You stab forth towards $N, hitting $M in the abdomen causing a messy but mortal wound!
$n stabs you in the stomach, and you watch your insides fall out as you die. $n stabs you in the stomach, and you watch your insides fall out as you die.
aking a mess of $N, $n kills $M with a stab to the midsection. Making a mess of $N, $n kills $M with a stab to the midsection.
You stab at $N, barely missing $M! You stab at $N, barely missing $M!
$n stabs at you, missing by a good mile or so! $n stabs at you, missing by a good mile or so!
$N grins at $n as the stab sent by $n goes wide! $N grins at $n as the stab sent by $n goes wide!
@ -753,7 +753,7 @@ It sure is nice being a god isn't it... especially since $n can't hit you with $
$n stabs at $N only to discover $N's immunity to stabbing weapons. $n stabs at $N only to discover $N's immunity to stabbing weapons.
* Suffering * Suffering
M
399 399
# #
You feel wounded -- too wounded -- you die... You feel wounded -- too wounded -- you die...
@ -767,7 +767,7 @@ $N lies helplessly on the ground and suffers...
# #
Suffer god victim - should never see. Suffer god victim - should never see.
Suffer god room - should never see. Suffer god room - should never see.
M
399 399
# #
You can only lie still as your last heartbeat ebbs... You can only lie still as your last heartbeat ebbs...
@ -783,7 +783,7 @@ Suffer god victim -- should never see.
Suffer god room -- should never see. Suffer god room -- should never see.
* Poison * Poison
M
33 33
# #
Poison burns intensely in your veins... you shiver... you die. Poison burns intensely in your veins... you shiver... you die.
@ -804,7 +804,7 @@ $N has somehow become poisioned.
*************************************************************************** ***************************************************************************
* Fire Breath * Fire Breath
M
202 202
$N is killed by fire breath. $N is killed by fire breath.
You are burned to ash, as $n breathes on you. You are burned to ash, as $n breathes on you.
@ -820,7 +820,7 @@ $n warms you.
$n warms $N. $n warms $N.
* Gas Breath * Gas Breath
M
203 203
$N is killed by gas breath. $N is killed by gas breath.
You die from the gas $n breathes on you. You die from the gas $n breathes on you.
@ -836,7 +836,7 @@ $n wants to gas you, but can't.
$n tries to gas $N, but can't. $n tries to gas $N, but can't.
* Frost Breath * Frost Breath
M
204 204
$N is killed by frost breath. $N is killed by frost breath.
You are frozen to ice, as $n breathes on you. You are frozen to ice, as $n breathes on you.
@ -852,7 +852,7 @@ $n supplies you with air conditioning.
$n supplies $N with air conditioning. $n supplies $N with air conditioning.
* Acid Breath * Acid Breath
M
205 205
$N is killed by your acid breath. $N is killed by your acid breath.
You are corroded to nothing, as $n breathes on you. You are corroded to nothing, as $n breathes on you.
@ -868,7 +868,7 @@ $n helps you clean your hands with a little acid.
$n helps $N cleaning. $n helps $N cleaning.
* Lightning Breath * Lightning Breath
M
206 206
$N is killed by your lightning breath. $N is killed by your lightning breath.
You are killed by $n's lightning breath. You are killed by $n's lightning breath.

4
lib/text/news
View file

@ -7,6 +7,10 @@ NEW COMMANDS AND NEW MUD BEHAVIOR:
** Check out the latest news and information on the tbaMUD codebase at ** Check out the latest news and information on the tbaMUD codebase at
@Chttp://tbamud.com@n. @Chttp://tbamud.com@n.
** Added a new command to cancel all pending (queued) commands. For example
a fighting player that has spammed 10 kick or spell commands can type
'--' to cancel them all so they can instead flee.
** New automap shows a small ascii map to the right of room descriptions. ** New automap shows a small ascii map to the right of room descriptions.
Toggle automap on to enable. There is also a new map command that can Toggle automap on to enable. There is also a new map command that can
show a larger map area. show a larger map area.

5
lib/world/wld/300.wld
View file

@ -840,13 +840,12 @@ There is a strange hole in the rock wall, circular in shape.
E E
sign signpost~ sign signpost~
The signpost reads in ancient runic script: The signpost reads in ancient runic script:
@n
The Penultimate Tower of Wizardry was rumored to exist, once, just The Penultimate Tower of Wizardry was rumored to exist, once, just
down this road... who knows if this is true? For though many have down this road... who knows if this is true? For though many have
went on to see, none have returned to claim it true... went on to see, none have returned to claim it true...
@n
--Mercutio the Bard of the Realm --Mercutio the Bard of the Realm
~ ~
E E
plot device~ plot device~

22
lib/world/wld/301.wld
View file

@ -33,7 +33,7 @@ class range. Remove the extra '0' if you don't need/want it.
Here are some recommended specials for the mobs: Here are some recommended specials for the mobs:
#04 should be given a sleep spell to cast #04 should be given a sleep spell to cast
#47 should be given an undead process. #47 should be given an undead process.
@n
Zone 301 is linked to the following zones: Zone 301 is linked to the following zones:
302 Campus at 30123 (south) ---> 30236 302 Campus at 30123 (south) ---> 30236
302 Campus at 30124 (north) ---> 30250 302 Campus at 30124 (north) ---> 30250
@ -50,7 +50,6 @@ Zone 301 is linked to the following zones:
302 Campus at 30136 (east ) ---> 30266 302 Campus at 30136 (east ) ---> 30266
302 Campus at 30140 (south) ---> 30260 302 Campus at 30140 (south) ---> 30260
302 Campus at 30142 (north) ---> 30201 302 Campus at 30142 (north) ---> 30201
302 Campus at 30142 (east ) ---> 30203 302 Campus at 30142 (east ) ---> 30203
302 Campus at 30199 (up ) ---> 30200 302 Campus at 30199 (up ) ---> 30200
~ ~
@ -321,7 +320,6 @@ World Dictionary)
E E
cobblestone stone cobble~ cobblestone stone cobble~
It's a dirt road. There are NO cobblestones here, although to the north... It's a dirt road. There are NO cobblestones here, although to the north...
~ ~
S S
#30109 #30109
@ -388,7 +386,6 @@ World Dictionary)
E E
cobblestone stone cobble~ cobblestone stone cobble~
It's a dirt road. There are NO cobblestones here, although to the south... It's a dirt road. There are NO cobblestones here, although to the south...
~ ~
S S
#30111 #30111
@ -484,12 +481,11 @@ E
sign warning~ sign warning~
The sign says: The sign says:
Welcome to the Student Ghetto! Welcome to the Student Ghetto!
@n
Fine $103.50 for carrying open alcohol in the streets. Fine $103.50 for carrying open alcohol in the streets.
Fine $ 53.75 for excessively loud noises. Fine $ 53.75 for excessively loud noises.
@n
ENTER AT YOUR OWN RISK! ENTER AT YOUR OWN RISK!
~ ~
E E
dirt~ dirt~
@ -1207,12 +1203,11 @@ A long hallway lies to the west.
E E
sign~ sign~
The sign says: The sign says:
@n
Gym -> North Gym -> North
Arena -> East Arena -> East
Locker Rooms -> West Locker Rooms -> West
Exit -> South Exit -> South
~ ~
E E
plaque plaques~ plaque plaques~
@ -1261,7 +1256,6 @@ E
sweatshirt sweatshirts pants t-shirt t-shirts books~ sweatshirt sweatshirts pants t-shirt t-shirts books~
There is absolutely no point in looking at anything because the prices are There is absolutely no point in looking at anything because the prices are
almost like paying two or three arms and legs to buy something to cover them... almost like paying two or three arms and legs to buy something to cover them...
~ ~
S S
#30142 #30142
@ -1548,7 +1542,6 @@ S
#30153 #30153
Hallway~ Hallway~
The hallway leads off west into the locker room, and east into the lobby. The hallway leads off west into the locker room, and east into the lobby.
~ ~
301 9 0 0 0 0 301 9 0 0 0 0
D1 D1
@ -1727,7 +1720,6 @@ S
#30162 #30162
Jock Hardy Arena~ Jock Hardy Arena~
The arena is about as big as the gym, but it is covered in ICE! Wheeeee! The arena is about as big as the gym, but it is covered in ICE! Wheeeee!
~ ~
301 8 0 0 0 0 301 8 0 0 0 0
D1 D1
@ -1748,7 +1740,6 @@ S
#30163 #30163
Jock Hardy Arena~ Jock Hardy Arena~
The arena is about as big as the gym, but it is covered in ICE! Wheeeee! The arena is about as big as the gym, but it is covered in ICE! Wheeeee!
~ ~
301 8 0 0 0 0 301 8 0 0 0 0
D2 D2
@ -1769,7 +1760,6 @@ S
#30164 #30164
Jock Hardy Arena~ Jock Hardy Arena~
The arena is about as big as the gym, but it is covered in ICE! Wheeeee! The arena is about as big as the gym, but it is covered in ICE! Wheeeee!
~ ~
301 8 0 0 0 0 301 8 0 0 0 0
D0 D0
@ -1861,10 +1851,8 @@ plank~
E E
list~ list~
The list reads: The list reads:
<name scratched out> President <name scratched out> President
<name scratched out> Vice-President <name scratched out> Vice-President
Seems as though everyone is claiming ignorance today. Seems as though everyone is claiming ignorance today.
~ ~
E E
@ -1968,7 +1956,6 @@ De-Tox Unit~
smells pretty bad, it wouldn't be a bad idea to remember where this is so that smells pretty bad, it wouldn't be a bad idea to remember where this is so that
you can rest here later. You find it rather difficult to manoeuvre in here you can rest here later. You find it rather difficult to manoeuvre in here
because of the large number of drunks on the floor. The only exit is north. because of the large number of drunks on the floor. The only exit is north.
~ ~
301 12 0 0 0 0 301 12 0 0 0 0
D0 D0
@ -2055,7 +2042,6 @@ The hallway you probably entered from is handily located to the west.
E E
goalie~ goalie~
How did you know it was a goalie stick? Have you been reading the keywords? How did you know it was a goalie stick? Have you been reading the keywords?
~ ~
E E
crest~ crest~

8
src/comm.c
View file

@ -1963,6 +1963,14 @@ static int process_input(struct descriptor_data *t)
t->history_pos = 0; t->history_pos = 0;
} }
/* The '--' command flushes the queue. */
if ( (*tmp == '-') && (*(tmp+1) == '-') && !(*(tmp+2)) )
{
write_to_output(t, "All queued commands cancelled.\r\n");
flush_queues(t); /* Flush the command queue */
return (1); /* No need to process the -- command any further, so quit back out */
}
if (!failed_subst) if (!failed_subst)
write_to_q(tmp, &t->input, 0); write_to_q(tmp, &t->input, 0);

2
src/dg_variables.c
View file

@ -854,7 +854,7 @@ void find_replacement(void *go, struct script_data *sc, trig_data *trig,
} }
snprintf(str, slen, "%d", GET_PRACTICES(c)); snprintf(str, slen, "%d", GET_PRACTICES(c));
} }
else if (!str_cmp(field, "pref")) { else if (!str_cmp(field, "pref") && IS_NPC(c)) {
if (subfield && *subfield) { if (subfield && *subfield) {
int pref = get_flag_by_name(preference_bits, subfield); int pref = get_flag_by_name(preference_bits, subfield);
if (pref != NOFLAG && PRF_FLAGGED(c, pref)) if (pref != NOFLAG && PRF_FLAGGED(c, pref))

2
src/oasis_list.c
View file

@ -69,7 +69,7 @@ void perform_mob_level_list(struct char_data * ch, char *arg)
mob_level = atoi(arg); mob_level = atoi(arg);
if (mob_level < 0 || mob_level >= LVL_IMMORT) { if (mob_level < 0 || mob_level > 99) {
send_to_char(ch, "Invalid mob level!\r\n"); send_to_char(ch, "Invalid mob level!\r\n");
return; return;
} }