[May 17 2007] - Rumble

Added AFF_FLYING/SCUBA and appropriate checks in act.movement.c. Room sector ty pes IN FLIGHT and UNDERWATER are finally being used! Removed all of the Dragon_Breathes. Removed context help system. Added invis level on reconnect. [May 15 2007] - Rumble Fixed object stacking to match s-desc and item_number. Added wizupdate command. Added valid_dg_target check to object remove trigs.
2007-05-17 20:51:06 +00:00
parent 2f24e37bb8
commit 8315bc5da8
29 changed files with 191 additions and 1330 deletions
--- a/lib/world/obj/0.obj
+++ b/lib/world/obj/0.obj
@@ -40,6 +40,10 @@ The email listing of the gods is pinned against the wall.~
 0 0 0 0
 1 1 0 30
 E
+emails listing~
+   HELP CONTACT
+~
+E
 wizlist~
                                 Implementors
                                 ~~~~~~~~~~~ 
@@ -56,10 +60,6 @@ wizlist~
    Santa   Shamra   Shimmer   Silvanos   Smaug   Snowlock   Talgard   Taylor
       Theophilus   Tocamat   Torpidai   Treestump   Tuskony   Zizazat   
 ~
-E
-emails listing~
-   HELP CONTACT
-~
 #5
 foraged berries~
 some foraged berries~
@@ -135,7 +135,7 @@ waybread bread~
 a waybread~
 Some waybread has been put here.~
 ~
-19 0 0 0 0 a 0 0 0 0 0 0 0
+19 0 0 0 0 a 0 0 0 rs 0 0 0
 24 0 0 0
 1 50 0 0
 E
@@ -693,19 +693,6 @@ runestone Sanctum church~
   This is one of the runestones used by the priests of Sanctum in their duties.

 ~
-#41
-Bell sanctum freedom~
-the bell of Sanctum's freedom~
-The symbol of Sanctum's freedom waits to be returned to its city.~
-Nothing.
-~
-4 b 0 0 0 ao 0 0 0 0 0 0 0
-30 1 1 39
-1 1000 0 0
-E
-bell sanctum's freedom~
-   This is the bell that represents the freedom of the city of Sanctum.  
-~
 #42
 hammer Sanctum~
 the hammer of Sanctum~
@@ -755,20 +742,6 @@ An immortal device to set questpoints.~
 0 0 0 0
 1 1 0 31
 T 168
-#45
-pile coins gold~
-a pile of gold coins~
-A pile of gold coins is half-buried in the mud and muck.~
-~
-20 0 0 0 0 a 0 0 0 0 0 0 0
-1000000 0 0 0
-0 0 0 0
-T 193
-E
-pile coins gold~
-   The glittering gold catches your eye. Though covered in dirt and grime money
-is money. 
-~
 #46
 key gateguard~
 the gateguard key~
@@ -803,19 +776,6 @@ comfy bed~
   This bed is beckoning you to lay down and get some much needed sleep.
 Just "sleep bed"
 ~
-#50
-generic light~
-a generic light~
-A generic light is lying here.~
-~
-1 0 0 0 0 ao 0 0 0 0 0 0 0
-0 0 -1 0
-1 1 0 0
-E
-generic light~
-   Since this light is completely generic there are no distinctive features
-worth noticing.    
-~
 #51
 generic ring rfinger~
 a generic ring~
--- a/lib/world/obj/12.obj
+++ b/lib/world/obj/12.obj
@@ -1,46 +1,3 @@
-#1200
-email list staff~
-a list of the staff's emails~
-A list of the staff's emails has been left here.~
-~
-14 0 0 0 0 ao 0 0 0 0 0 0 0
-0 0 0 0
-1 1 0 0
-E
-list email staff~
-@RHELP CONTACT@n for the most recent listing or:
-
-Name     Email                      ICQ #      AIM             MSN 
-Welcor   welcor@@builderacademy.net  18755607
-Rumble   rumble@@builderacademy.net  100121659  admwint         wintersn
-Ferret   ferret@@builderacademy.net                             radiax01
-Elaseth  elaseth@@builderacademy.net            ParaVox3
-Relsqui  relsqui@@builderacademy.net 72136407   spiritethereal
-Heiach   heiach@@builderacademy.net             heiach          heiach
-Detta    detta@@builderacademy.net 
-Shamra   shamra@@builderacademy.net             BlackdemonRahl
-Elorien  elorien@@builderacademy.net
-Random   random@@builderacademy.net  219948345
-Fyre     fyre@@builderacademy.net 
-Fizban   mudaddict4life@@gmail.com              Fizban1216      Fizban1216
-~
-#1201
-pamphlet trigedit~
-a pamphlet advertising the wonderful world of triggers~
-A small pamphlet advertising the wonderful world of Trigedit.~
-~
-12 0 0 0 0 an 0 0 0 0 0 0 0
-0 0 0 0
-1 1 0 0
-E
-pamphlet trigedit~
-Are you looking to pour in life into your mobs? To enliven your rooms? Or just
-make your objects special? Well then, come and read to your hearts content
-through the trigedit tutorial hallway starting in room 13. It will describe
-what trigedit is, what it can do, and of course, how to make them. Dont forget,
-for optimal results, Use the pages in conjuction with TSTAT. Have fun with the
-power of (minor)coding! 
-~
 #1202
 scroll~
 a scroll~
@@ -57,15 +14,6 @@ This is a @Rred@n test object~
 1 0 0 0 0 a 0 0 0 0 0 0 0
 0 0 23 0
 1 1 0 0
-#1204
-wand~
-the wand~
-A test wand~
-~
-3 0 0 0 0 a 0 0 0 0 0 0 0
-1 1 1 31
-1 1 0 0
-T 1284
 #1205
 staff~
 staff~
@@ -74,23 +22,6 @@ Staff~
 4 0 0 0 0 a 0 0 0 0 0 0 0
 1 3 3 31
 1 1 0 0
-#1209
-squishy armchair chair~
-a squishy armchair~
-A large squishy armchair sits in front of the fireplace.~
-~
-12 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0
-0 0 0 0
-T 1209
-T 1286
-E
-chair armchair squishy~
-   This chair has large red leather cushions, on the seat and back.  Strange
-patterens are sewn into the seat and back.  The arms are made of the same
-material as the rest of the chair, and they seem to be stuffed to a point where
-they look to be almost exploding.
-~
 #1210
 Straight Jacket~
 a straight jacket~
@@ -99,24 +30,6 @@ You can't see it...it isn't here.~
 9 0 0 0 0 ad 0 0 0 0 0 0 0
 0 0 0 0
 1 1 0 0
-#1212
-game console~
-a game console~
-A game console sits in one corner of the room~
-~
-12 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0
-0 0 0 0
-T 1212
-T 1213
-E
-game console~
-To start a game type: go
-To move around type: go <up | down | left | right>
- 
-You must collect the prizes and avoid the animal to obtain maximum points.
-Each prize is worth 500 * game_level in experience.
-~
 #1218
 spring fountain water~
 a spring well~
@@ -222,23 +135,11 @@ A Gigantic Black Staff rests here.~
 4 b 0 0 0 ao 0 0 0 0 0 0 0
 1 10 10 23
 5 1 0 30
+T 87
 E
 staff black~
   A Huge staff sits here eminating a tremendous power.  
 ~
-#1269
-switch~
-a switch from a willow tree~
-A magical switch from a willow tree has carelessly been discarded here.~
-~
-5 b 0 0 0 an 0 0 0 0 0 0 0
-7 10 5 2
-2 1000 0 0
-T 1270
-E
-switch willow~
-   It's a stick.  It's magical.  It also hurts when you beat people with it.  
-~
 #1275
 uniform~
 a Builder Academy uniform~
@@ -303,24 +204,6 @@ A large blackened desk~
 15 0 0 0 0 0 0 0 0 0 0 0 0
 20000 3 0 0
 0 0 0 0
-#1298
-firework new year piece~
-a piece of fireworks~
-A piece of fireworks is planted in a champagne bottle.~
-~
-12 0 0 0 0 0 0 0 0 0 0 0 0
-0 0 0 0
-0 0 0 0
-T 1297
-E
-bottle champagne~
-   The bottle is filled partially with water so it doesn't tilt over.  Someone
-has obviously drunk the champagne first.  
-~
-E
-firework new year piece~
-   This large rocket is about to go up!  Strange colours will fill the sky!  
-~
 #1299
 christmas tree~
 a christmas tree~
--- a/lib/world/obj/30.obj
+++ b/lib/world/obj/30.obj
@@ -22,14 +22,6 @@ A dark bottle of ale has been left here.~
 17 0 0 0 0 a 0 0 0 0 0 0 0
 8 8 3 0
 10 10 3 0
-#3003
-bottle firebreather~
-a bottle~
-A bottle of firebreather has been left here.~
-~
-17 0 0 0 0 a 0 0 0 0 0 0 0
-8 8 7 0
-10 50 17 0
 #3004
 bottle local~
 a bottle~
@@ -135,13 +127,13 @@ A small sword lies here.~
 0 1 6 11
 3 60 10 0
 E
-sword small~
-   The small sword seems to have an inscription of some sort.
-~
-E
 inscription~
   It says: 'May this sword be a good companion.  '
 ~
+E
+sword small~
+   The small sword seems to have an inscription of some sort.
+~
 #3022
 sword long~
 a long sword~
@@ -289,14 +281,6 @@ E
 pot~
   It is a nice pot.  You could use it, if you ever settled down.  
 ~
-#3040
-plate breast~
-a breast plate~
-A breast plate is lying on the ground.~
-~
-9 0 0 0 0 ad 0 0 0 0 0 0 0
-7 0 0 0
-50 180 15 0
 #3041
 shirt chain mail~
 a chain mail shirt~
@@ -535,13 +519,13 @@ A large, sociable bulletin board is mounted on a wall here.~
 0 0 0 0
 0 0 0 0
 E
-board~
-   If you can read this, the board is not working.  
-~
-E
 social bulletin~
   Use 'look board' to read the board.  
 ~
+E
+board~
+   If you can read this, the board is not working.  
+~
 #3097
 boards frozen bulletin gen_boards~
 a frozen bulletin board~
@@ -551,13 +535,13 @@ A large bulletin board is here, carved from a block of ice.~
 0 0 0 0
 0 0 0 0
 E
-board~
-   If you can read this, the board is not working.  
-~
-E
 freeze bulletin~
   Use 'look board' to read the board.  
 ~
+E
+board~
+   If you can read this, the board is not working.  
+~
 #3098
 boards holy bulletin gen_boards~
 a holy bulletin board~
@@ -567,13 +551,13 @@ A large bulletin board is mounted on a wall here.  It glows with a faint aura.~
 0 0 0 0
 0 0 0 0
 E
-board~
-   If you can read this, the board is not working.  
-~
-E
 holy bulletin~
   Use 'look board' to read the board.  
 ~
+E
+board~
+   If you can read this, the board is not working.  
+~
 #3099
 boards bulletin gen_boards~
 a bulletin board~
@@ -583,11 +567,11 @@ A large bulletin board is mounted on a wall here.~
 0 0 0 0
 0 0 0 0
 E
-board~
-   If you can read this, the board is not working.  
-~
-E
 bulletin~
   Use 'look board' to read the board.  
 ~
+E
+board~
+   If you can read this, the board is not working.  
+~
 $~