Meh

2 files changed, 62 insertions, 79 deletions

diff --git a/npc/001-4/mushroom.txt b/npc/001-4/mushroom.txt
index 659882574..ecb3302c2 100644
--- a/npc/001-4/mushroom.txt
+++ b/npc/001-4/mushroom.txt
@@ -23,8 +23,9 @@ function	script	mushroomWarp	{
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -33,8 +34,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -43,8 +45,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -53,8 +56,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -63,8 +67,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -73,8 +78,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -83,8 +89,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -93,8 +100,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -103,8 +111,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -113,8 +122,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -123,8 +133,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -133,8 +144,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -143,8 +155,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
@@ -153,8 +166,9 @@ OnTouch:
     mes l("Only getting closer to find out what kind this one is.");
     close;
 
+OnTouchNPC:
 OnTouch:
-    callfunc "mushroomWarp";
+    mushroomWarp();
     close;
 }
 
diff --git a/npc/001-4/traps.txt b/npc/001-4/traps.txt
index 2b71d5184..4280748cc 100644
--- a/npc/001-4/traps.txt
+++ b/npc/001-4/traps.txt
@@ -9,13 +9,13 @@ function	script	SteelTrap	{
     if (getnpctimer(0) == 0)
     {
         initnpctimer;
-        setnpcdisplay @object_name$, NPC_TRAP_ONLINE;
+        setnpcdisplay strnpcinfo(0), NPC_TRAP_ONLINE;
         return;
     }
 
     // Fire!!
     setnpctimer 9000;
-    setnpcdisplay @object_name$, NPC_TRAP_TRIGGERED;
+    setnpcdisplay strnpcinfo(0), NPC_TRAP_TRIGGERED;
 
     // Boom - Hurt players and/or stun monsters
     // This means you can - and SHOULD - lead Forains into these traps
@@ -42,8 +42,7 @@ function	script	SteelTrap	{
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -60,8 +59,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -78,8 +76,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -96,8 +93,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -115,7 +111,7 @@ OnTimer10000:
 OnTouchNPC:
 OnTouch:
     @object_name = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -133,8 +129,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -151,8 +146,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -169,8 +163,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -187,8 +180,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -205,8 +197,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -223,8 +214,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer5000:
@@ -247,8 +237,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -265,8 +254,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -283,8 +271,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -301,8 +288,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -319,8 +305,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -337,8 +322,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -355,8 +339,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -373,8 +356,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -391,8 +373,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -409,8 +390,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -427,8 +407,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -445,8 +424,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -463,8 +441,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -481,8 +458,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -499,8 +475,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -517,8 +492,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -535,8 +509,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -553,8 +526,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -571,8 +543,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -589,8 +560,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000:
@@ -607,8 +577,7 @@ OnTimer10000:
 
 OnTouchNPC:
 OnTouch:
-    @object_name$ = .name$;
-    callfunc "SteelTrap";
+    SteelTrap();
     close;
 
 OnTimer10000: