Commits for the 3.63 release --Rumble

lib/world/trg/0.trg

@@ -1440,7 +1440,7 @@ if %self.worn_by%
     * This double barrel shotgun, only has 2 rounds.
     if %shotgun_rounds% > 2
       * Detaching trig since gun is out of ammo.
-      detach 1361 %self.id%
+      detach 45 %self.id%
       halt
     end  
     * We also have to define the victim.

lib/world/trg/1.trg

@@ -725,6 +725,9 @@ Questmaster Quest Assignment - 3~
 *~
 * By Rumble of The Builder Academy    builderacademy.net 9091 
 * Part of a timed quest to kill a mob or find an object. Trigs 138-144. 
+if %actor% == %self%
+  halt
+end
 if %actor.varexists(on_quest_zone_1)% 
   *get the values from the player variable 
   extract day 1 %actor.on_quest_zone_1% 
@@ -784,8 +787,8 @@ while %word%
   end 
   * End of the loop we need to take the next word in the string and save the 
   * remainder for the next pass. 
-  eval word %rest.car% 
-  eval rest %rest.cdr% 
+  set word %rest.car% 
+  set rest %rest.cdr% 
 done
 ~
 #140
@@ -2260,12 +2263,13 @@ TBA Welcome - 18~
 ~
 * By Rumble of The Builder Academy    tbamud.com 9091
 * TBA mortal greet to fill out the application.
-if %actor.admin% < 1
+wait 1 sec
+if %actor.level% <= 1
   wait 3 sec
   if %actor.varexists(TBA_mortal_greeting)%
-    %echo% Friedrich Nietzsche says, 'Welcome back %actor.name%. Tell someone level 32 or above when you complete the application.'
+    %echo% Friedrich Nietzsche says, 'Welcome back %actor.name%. Tell a God, Great God, or Implementor when you complete the application.'
   else
-    %echo% Friedrich Nietzsche says, 'Welcome to The Builder Academy %actor.name%.' 
+    %echo% Friedrich Nietzsche says, 'Welcome to The Builder Academy %actor.name%.'
     wait 2 sec
     %echo% Friedrich Nietzsche says, 'If you are interested in learning how to build, or want to teach others, then you have come to the right place.'
     wait 2 sec

lib/world/trg/12.trg

@@ -1137,22 +1137,6 @@ else
   %send% %actor% The switch says, 'Fine... fine.'
 end
 ~
-#1279
-OSET test trigger~
-0 j 100
-~
-wait 2 sec
-say Yeah, I can sharpen this.
-wait 2 sec
-emote chips away at %object.shortdesc%.
-set short %object.shortdesc% sharpened by '%self.name%'
-nop %object.oset(apply damroll 1)%
-nop %object.oset(shortdesc %short%)%
-wait 2 sec
-give %object.name.car% %actor.name%
-wait 1 sec
-say There ya go!
-~
 #1280
 Mob Raid~
 2 b 100
@@ -1624,52 +1608,14 @@ if %actor.inventory(14911)%
 end
 ~
 #1295
-free~
-0 d 100
+Login Christmas~
+2 s 100
 ~
 * By Rumble of The Builder Academy    tbamud.com 9091
-if %actor.level% > 31
-  switch %speech.car%
-    case christmas
-      %at% 1204 %load% obj 1299
-      %at% 1204 %load% obj 1318
-      %at% 1204 %load% obj 1319
-      %at% 1204 %load% obj 1236
-      %at% 1204 %load% obj 1237
-      %at% 1204 %load% obj 1238
-      %at% 1204 %load% obj 1239
-      %at% 1204 %load% obj 1240
-      %at% 1204 %load% obj 1241
-      %at% 1204 %load% obj 1397
-      %at% 1204 %load% mob 1308
-      %at% 2 %load% obj 1299
-      %at% 2 %load% obj 1318
-      %at% 2 %load% obj 1319
-      %at% 2 %load% obj 1236
-      %at% 2 %load% obj 1237
-      %at% 2 %load% obj 1238
-      %at% 2 %load% obj 1239
-      %at% 2 %load% obj 1240
-      %at% 2 %load% obj 1241
-      %at% 2 %load% obj 1397
-      %at% 1204 %load% mob 1308
-    break
-    case new years
-    break
-    case valentines
-    break
-    case Easter
-    break
-    case 4th
-    break
-    case Halloween
-    break
-    case thanksgiving
-    break
-    default
-      * nothing is going to happen
-    break
-  done
+if !%actor.has_item(222)%
+  wait 1 s
+  %echo% Santa bellows, 'Merry Christmas'
+  %load% obj 222 %actor% inv
 end
 ~
 #1296

lib/world/trg/2.trg

@@ -279,6 +279,21 @@ bug test~
 detach 214 %self.id%
 say test crash!
 ~
+#215
+Christmas Greet~
+0 h 100
+~
+* By Rumble of The Builder Academy    tbamud.com 9091
+if %actor.is_pc%
+  wait 1 sec
+  if !%actor.has_item(222)%
+    say Merry Christmas!
+    %load% obj 222 %actor% inv
+    %echoaround% %actor% Santa gives %actor.name% a wrapped present.
+    %send% %actor% Santa gives you a wrapped present.
+  end
+end
+~
 #218
 Holiday Decorations by Interior Design - M218~
 0 d 100

lib/world/trg/27.trg

@@ -1590,7 +1590,7 @@ xxtestxx
 test~
 2 c 100
 xxhealxx~
-if %actor.admin%
+if %actor.level% > 30
   return 0
   halt
 else

lib/world/trg/30.trg

@@ -58,11 +58,9 @@ end
 Dump - 3030~
 2 h 100
 ~
-%echo% %object.shortdesc% vanishes in a puff of smoke!
 %send% %actor% You are awarded for outstanding performance.
 %echoaround% %actor% %actor.name% has been awarded for being a good citizen.
 eval value %object.cost% / 10
-%purge% %object%
 if %value% > 50
   set value 50
 elseif %value% < 1
@@ -73,6 +71,7 @@ if %actor.level% < 3
 else
   nop %actor.gold(%value%)%
 end
+return 0
 ~
 #3005
 Stock Thief~
@@ -565,11 +564,11 @@ if %actor.level% == 0
     %load% obj 3021 %actor% wield
     %load% obj 3055 %actor% hold
   end
+  if !%actor.has_item(3006)%
+    %load% obj 3006 %actor% inv
+  end
 end
 wait 3 sec
 %zoneecho% 3001 A booming voice announces, 'Welcome %actor.name% to the realm!'
-if !%actor.has_item(3006)%
-  %load% obj 3006 %actor% inv
-end
 ~
 $~