Remove some possibly broken stuff. Hopefully now only shops/magic/warps broken

8 files changed, 57 insertions, 98 deletions

diff --git a/db/constants.conf b/db/constants.conf
index caf20faf..f73ee858 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -5785,8 +5785,14 @@ more than one separator can be used in a row (so 12_3___456 is illegal).
 	NPC345:345
 	NPC346:346
 	NPC351:351
+	NPC354:354
 	NPC355:355
 	NPC356:356
+	NPC357:357
+	NPC358:358
+	NPC359:359
+	NPC360:360
+	NPC361:361
 	NPC362:362
 	NPC363:363
 	NPC365:365
diff --git a/npc/001-1/tinris.txt b/npc/001-1/tinris.txt
index 2f5fcc0f..1e23ad51 100755
--- a/npc/001-1/tinris.txt
+++ b/npc/001-1/tinris.txt
@@ -25,7 +25,7 @@
     mes "\"This is a magic school. I'm a student here and focus on ways to magically enhance growth of plants.";
     mes "That topic is very important in a desert area.\"";
     if (.@q != 1)
-        goto L_Close;
+        goto L_close;
     menu
         "The farmer Anwar sent me to ask for exactly that! Can you give me something for his field?",L_Next;
 
@@ -38,14 +38,14 @@ L_Next:
     next;
     mes "\"When I have a present for her I can focus on creating some magic fertilizer.\"";
     .@q = 2;
-    goto L_Close;
+    goto L_close;
 
 L_Annual: // .@q == 2
     mesn;
     mes "\"Hello, did you get the Chocolate Cake for my girlfriend? After that I can focus on creating some magic fertilizer for you.\"";
     menu
         "Fresh from the bakery!",L_FreshFrom,
-        "I didn't get it yet.",L_Close;
+        "I didn't get it yet.",L_close;
 
 L_FreshFrom:
     if (countitem("ChocolateCake") < 1)
@@ -66,7 +66,7 @@ L_FirstTry:
     mes "The ingredients are " + @slime_amount1 + " Maggot Slimes, " + @bugleg_amount1 + " Bug Legs, " + @stinger_amount1 + " Scorpion Stingers and " + @ash_amount1 + " Piles of Ash.\"";
     menu
         "I have it.",L_Continue,
-        "Ok, I'll go and get it.",L_Close;
+        "Ok, I'll go and get it.",L_close;
 
 L_Continue:
     if ((countitem("MaggotSlime") < @slime_amount1) || (countitem("BugLeg") < @bugleg_amount1) || (countitem("ScorpionStinger") < @stinger_amount1) || (countitem("PileOfAsh") < @ash_amount1))
@@ -83,13 +83,13 @@ L_Continue:
     mes "\"Ok. This should do it. But I'm not sure. I'm still researching this topic.";
     mes "Here, bring this to Anwar.\"";
     mes "He gives you a bottle with the magic fertilizer. You put it away in a separate pocket, so it doesn't get mixed with your inventory.";
-    goto L_Close;
+    goto L_close;
 
 L_FirstTryDone: // .@q >= 4 but below 6
     mesn;
     mes "\"Bring the fertilizer to Anwar and let me know if it worked.\"";
     if (.@q != 5)
-        goto L_Close;
+        goto L_close;
     menu
         "I did, the plants went brown and shriveled.",L_More;
 
@@ -104,7 +104,7 @@ L_SecondTry:
     mes "Bring me " + @slime_amount2 + " Maggot Slimes, " + @bugleg_amount2 + " Bug Legs, " + @stinger_amount2 + " Scorpion Stingers, " + @ash_amount2 + " Piles of Ash and " + @cactusp_amount + " Cactus Potion.\"";
     menu
         "Here it is.",L_HereItIs,
-        "Ok, I'll go and get it.",L_Close;
+        "Ok, I'll go and get it.",L_close;
 
 L_HereItIs:
     if ((countitem("MaggotSlime") < @slime_amount2) || (countitem("BugLeg") < @bugleg_amount2) || (countitem("ScorpionStinger") < @stinger_amount2) || (countitem("PileOfAsh") < @ash_amount2) || (countitem("CactusPotion") < @cactusp_amount))
@@ -126,19 +126,19 @@ L_HereItIs:
     mesn;
     mes "\"Mh, I think the mixture itself is good. But I can't get the spells right. Maybe you should ask Professor Eomie to cast it; she's a genius with nature magic.\"";
     mes "He gives you the bottle with the magic fertilizer.";
-    goto L_Close;
+    goto L_close;
 
 L_Eomie:
     // .@q >= 7 but below 9
     mesn;
     mes "\"I did the best I could, but it seems I'm not experienced enough to cast the spells correctly. Better ask Professor Eomie for help.\"";
-    goto L_Close;
+    goto L_close;
 
 L_FertilizerDone:
     // .@q == 9
     mesn;
     mes "\"I heard Eomie cast the spell? I really hope it'll work this time. Bring the magic fertilizer to Anwar now.\"";
-    goto L_Close;
+    goto L_close;
 
 L_GiveGift:
     // .@q == 11
@@ -146,7 +146,7 @@ L_GiveGift:
     mes "\"Ah, did Anwar try the new fertilizer?\"";
     menu
         "Yes, it works great and he asked me to give you this Green V-Neck Sweater he made.",L_ItWorksGreat,
-        "Not yet.",L_Close;
+        "Not yet.",L_close;
 
 L_ItWorksGreat:
     if (countitem("GreenVNeckSweater") < 1)
@@ -156,7 +156,7 @@ L_ItWorksGreat:
     .@q = 12;
     mesn;
     mes "\"Hey, that's really nice. Tell him my thanks.\"";
-    goto L_Close;
+    goto L_close;
 
 L_Done:
     // .@q >= 12
@@ -165,14 +165,14 @@ L_Done:
     mes "He twinkles.";
     mesn;
     mes "\"We're a good team.\"";
-    goto L_Close;
+    goto L_close;
 
 L_NoItem:
     mesn;
     mes "\"You don't have it!\"";
-    goto L_Close;
+    goto L_close;
 
-L_Close:
+L_close:
     @slime_amount1 = 0;
     @slime_amount2 = 0;
     @bugleg_amount1 = 0;
diff --git a/npc/002-1/anwar.txt b/npc/002-1/anwar.txt
index 37def423..3797c736 100755
--- a/npc/002-1/anwar.txt
+++ b/npc/002-1/anwar.txt
@@ -19,7 +19,7 @@
     mes "Would you be interested in doing some small errand for me?\"";
     menu
         "Sure!",L_Sure,
-        "I'm busy, sorry.",L_Close;
+        "I'm busy, sorry.",L_close;
 
 L_Sure:
     mesn;
@@ -29,13 +29,13 @@ L_Sure:
     next;
     mes "\"To find the school just follow the street north back into town. The school is the castle at the north end of town.\"";
     .@q = 1;
-    goto L_Close;
+    goto L_close;
 
 L_FirstTry: // .@q >= 1 but below 5
     mesn;
     mes "\"I hope the wizards at the magic school can help me with the field. I'd really like to have more free time. I want to make clothing, but I'm not experienced enough to make a living out of that.\"";
     if (.@q != 4)
-        goto L_Close;
+        goto L_close;
     menu
         "Tinris gave me a magic fertilizer for your field, but he isn't sure if it works.",L_Next;
 
@@ -49,13 +49,13 @@ L_Next:
     mes "\"Oh no! What is this? It's damaging my plants! Go back to Tinris and tell him it doesn't work!\"";
     getexp @firstTry_exp, 0;
     .@q = 5;
-    goto L_Close;
+    goto L_close;
 
 L_SecondTry: // .@q >= 5 but below 10
     mesn;
     mes "\"I hope Tinris can come up with a better fertilizer. My plants are suffering from the first try.\"";
     if (.@q != 9)
-        goto L_Close;
+        goto L_close;
     menu
         "Here is another one. Eomie cast a spell on it.",L_Continue;
 
@@ -78,7 +78,7 @@ L_GiftMaterial: // .@q == 10
     menu
         "I have it.",L_GiveGiftStuff,
         "Where can I get that?",L_Hint,
-        "I'll see what I can do.",L_Close;
+        "I'll see what I can do.",L_close;
 
 L_GiveGiftStuff:
     getinventorylist;
@@ -98,7 +98,7 @@ L_GiveGiftStuff:
     next;
     mesn;
     mes "\"Wonderful! Could you please bring this to Tinris to show him my gratitude?\"";
-    goto L_Close;
+    goto L_close;
 
 L_Hint:
     mesn;
@@ -106,14 +106,14 @@ L_Hint:
     next;
     mes "\"Otherwise Cotton Cloth can be sheared from Mouboo and silk cocoons come from Silkworms.";
     mes "They live in the woodland area around Hurnscald. You can get there by taking the ferry.\"";
-    goto L_Close;
+    goto L_close;
 
 L_GiveTinris: // .@q >= 11 but below 13
     mesn;
     mes "\"Did you already bring the Green V-Neck Sweater to Tinris?\"";
     if (.@q != 12)
         menu
-            "Not yet.",L_Close;
+            "Not yet.",L_close;
     menu
         "Yes, he was very happy.",L_Happy;
 
@@ -125,7 +125,7 @@ L_Happy:
     mes "\"Wonderful! I also finished the present for Eomie. Can you bring it to her?\"";
     getitem "SilkHeadband", 1;
     .@q = 13;
-    goto L_Close;
+    goto L_close;
 
 L_GiveEomie: // .@q >= 13 but below 15
     getinventorylist;
@@ -135,7 +135,7 @@ L_GiveEomie: // .@q >= 13 but below 15
     mes "\"Did you give the Silk Headband to Eomie?\"";
     if (.@q != 14)
         menu
-            "Not yet.",L_Close;
+            "Not yet.",L_close;
     menu
         "Yes. She asked me to thank you.",L_ThankYou;
 
@@ -146,25 +146,25 @@ L_ThankYou:
     getexp @final_exp, 0;
     getitem "DarkGreenCottonTrousers", 1;
     .@q = 15;
-    goto L_Close;
+    goto L_close;
 
 L_Done: // .@q == 15
     mesn;
     mes "\"Thank you so much for your help. The plants are growing much better now. I don't have to spend all my time working in the field any more.";
     mes "Finally I can do what I'm really interested in and work on getting better at sewing clothes.\"";
-    goto L_Close;
+    goto L_close;
 
 L_NoItem:
     mesn;
     mes "\"You don't have it!\"";
-    goto L_Close;
+    goto L_close;
 
 L_Full_Inv:
     mesn;
     mes "\"You carry a lot of stuff. Come back when you have more room.\"";
-    goto L_Close;
+    goto L_close;
 
-L_Close:
+L_close:
     @cloth_amount = 0;
     @silk_amount = 0;
     @inventorylist_count = 0;
diff --git a/npc/008-1/annualeaster.txt b/npc/008-1/annualeaster.txt
index 9e9d73a2..618a0956 100755
--- a/npc/008-1/annualeaster.txt
+++ b/npc/008-1/annualeaster.txt
@@ -79,7 +79,7 @@ L_Reward_End:
     end;
 
 L_Destroy:
-    set .eggs, get(.eggs, "Easter Eggs") - 1, "Easter Eggs"; // tell the puppeteer we lost an egg
+    set(getvariableofnpc(.eggs, "Easter Eggs"), get(.eggs, "Easter Eggs") - 1); // tell the puppeteer we lost an egg
     destroy;
 
 L_EndTooYoung:
diff --git a/npc/009-7/eventHandler.txt b/npc/009-7/eventHandler.txt
index 3f2df68a..0ddf96d2 100755
--- a/npc/009-7/eventHandler.txt
+++ b/npc/009-7/eventHandler.txt
@@ -80,53 +80,9 @@ OnInit:
     $@fightclub_y1 = 42;
     $@fightclub_x2 = 38;
     $@fightclub_y2 = 48;
-    callfunc "fightclub_StartUp";
-    callfunc "fightclub_CleanStage";
-    goto L_StartTimer;
-
-L_StartTimer:
-    if($SANGUINE & $@SV_FCDBit != 0) end;
-    if(debug >= 2) end;
-    setnpctimer 0;
-    initnpctimer;
     end;
 
 OnTimer2000:
     // this events checks who is on stage every 2 seconds
-    set $@areausers, getareausers("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2); // get the number of players on stage
-    if (($@areausers > 2) || (($@Duel_CurrentDuel < 1) && ($@areausers >= 1))) goto L_Intrusion; // too many players on the stage
-    if (($@Duel_CurrentDuel < 1) && ($@Duel_Started != 1)) goto L_Request; // start the next duel
-    if ($@Duel_Started != 1) goto L_StartTimer; // no intrusion and no duel ongoing so loop again
-    if (attachrid($@Duel_BluePlayer) == 0) goto L_BlueMissing;
-    if (isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_BlueMissing;
-    if (ispcdead() == 1) goto L_IAmACorpse;
-    if (attachrid($@Duel_RedPlayer) == 0) goto L_RedMissing;
-    if (isin("009-7", $@fightclub_x1, $@fightclub_y1, $@fightclub_x2, $@fightclub_y2) == 0) goto L_RedMissing;
-    if (ispcdead() == 1) goto L_IAmACorpse;
-    detachrid;
-    goto L_StartTimer;
-
-L_Request:
-    callfunc "fightclub_NextBattle";
-    goto L_StartTimer;
-
-L_IAmACorpse:
-    $@duel_loser = getcharid(3);
-    callfunc "fightclub_death";
-    goto L_StartTimer;
-
-L_RedMissing:
-    $@Duel_Missing = 1;
-    callfunc "fightclub_Missing";
-    goto L_StartTimer;
-
-L_BlueMissing:
-    $@Duel_Missing = 2;
-    callfunc "fightclub_Missing";
-    goto L_StartTimer;
-
-L_Intrusion:
-    donpcevent "#FightClubUtils::OnCommandIntrusion"; // we can not attach a second timer to this npc so we use another one
-    callfunc "fightclub_Intrusion";
-    goto L_StartTimer;
+    end;
 }
diff --git a/npc/016-1/gwendolyn.txt b/npc/016-1/gwendolyn.txt
index 619a22e2..b01ab292 100755
--- a/npc/016-1/gwendolyn.txt
+++ b/npc/016-1/gwendolyn.txt
@@ -59,7 +59,7 @@ L_Next:
     mes "\"The first thing you need is, obviously, a bow. You should not use any you come across, but a high quality one. I think it would be best to go to Alan in Hurnscald. He is my cousin, and knows how to make Forest Bows of exquisite quality. \"";
 
     if (countitem("ForestBow") < 1)
-        goto L_Close;
+        goto L_close;
     next;
     menu
         "I already have a Forest Bow.",L_state2;
@@ -101,7 +101,7 @@ L_state3:
     next;
     menu
         "Can you please repeat your lesson?",L_lesson,
-        "I will go and hunt some snakes.",L_Close,
+        "I will go and hunt some snakes.",L_close,
         "I have what you want.",L_Next1;
 
 L_Next1:
@@ -171,7 +171,7 @@ L_state5:
     menu
         "Can you please explain the task again?",L_Game_explain,
         "I'm ready, let's start!",L_Game,
-        "I'm sorry, I will come back later.",L_Close;
+        "I'm sorry, I will come back later.",L_close;
 
 L_Game:
     if (countitem("ForestBow") < 1)
@@ -252,7 +252,7 @@ L_choose_start_pos:
         "I want to move left.",L_step_left,
         "I go right.",L_step_right,
         "I stay.",L_step_no,
-        "I will try it later.",L_Close;
+        "I will try it later.",L_close;
 
 L_step_no:
     .@spX = 0;
@@ -425,7 +425,7 @@ L_target_hit:
     mes "\"You proved that you are worthy to call yourself a graduate of the School of Archery.\"";
     next;
     mes "\"But remember, there is always something new to learn. And you should not let your training down in order to keep and improve your abilities.\"";
-    goto L_Close;
+    goto L_close;
 
 L_target_nohit:
     mes "\"Ohh! Half a fingerbreadth aside.\"";
@@ -437,7 +437,7 @@ L_target_nohit:
 L_state6:
     mesn "Gwendolyn Bowmaker";
     mes "\"You really have a reason to be proud.\"";
-    goto L_Close;
+    goto L_close;
 
 L_state1:
     mes "[Gwendoly Bowmaker]";
@@ -451,17 +451,17 @@ L_No_student:
     mes "\"That's a pity. Well, if you change your mind, come back any time.\"";
     .@Q_hawkseye = 1;
     callsub S_Update_Var;
-    goto L_Close;
+    goto L_close;
 
 L_No_Money:
     mes "\"I am sorry, but it seems that you don't have enough money. Come back when you have reorganized your finances.\"";
     .@Q_hawkseye = 1;
     callsub S_Update_Var;
-    goto L_Close;
+    goto L_close;
 
 L_No_bow:
     mes "\"As an archer, you should always carry your bow with you. Go and get it.\"";
-    goto L_Close;
+    goto L_close;
 
 L_bow_bought:
     mes "\"You just bought it? You won't learn anything from that. To understand the nature of this bow, you have to collect the needed material by yourself. Only this way will you get a feeling of what it means to use such a weapon. \"";
@@ -469,23 +469,23 @@ L_bow_bought:
     mes "\"The best thing would be to let you make the bow by yourself. But I guess, that would go to far. And it would take ages to get a high quality bow.\"";
     next;
     mes "\"Ok, go to Alan and come back with a bow made out of the logs you collected.\"";
-    goto L_Close;
+    goto L_close;
 
 L_Not_enough_eggs:
     mes "\"Maybe I should also give you a lesson in how to count? You haven't enough.\"";
-    goto L_Close;
+    goto L_close;
 
 L_Not_Ready:
     mes "\"I am pleased about your progrees, but you are not ready for the next step yet. Go and do some more training, before you come back. Remember also: It is wise to speak with people you meet on your journey, there is always something new to learn.\"";
-    goto L_Close;
+    goto L_close;
 
 L_No_arrows:
     mes "Gwendolyn sighs and shake her head.";
     next;
     mes "\"Another lecture: Take always enough arrows with you. Go and come back when you are equipped adequately.\"";
-    goto L_Close;
+    goto L_close;
 
-L_Close:
+L_close:
     close;
 
 S_Update_Var:
diff --git a/npc/017-9/npcs.txt b/npc/017-9/npcs.txt
index b1257a7d..53d50682 100755
--- a/npc/017-9/npcs.txt
+++ b/npc/017-9/npcs.txt
@@ -12,14 +12,14 @@
     end;
 }
 
-001-1,54,118,0	script	#SecretDoor3	NPC32767,0,0,{
+001-1,54,119,0	script	#SecretDoor3	NPC32767,0,0,{
     if (GM < MAP_LOUNGE && GM < G_SYSOP && !debug) end;
     gmlog "@warp 017-9";
     warp "017-9", 21, 21;
     end;
 }
 
-027-2,118,111,0	script	#SecretDoor4	NPC32767,0,0,{
+027-2,46,111,0	script	#SecretDoor4	NPC32767,0,0,{
     if (GM < MAP_LOUNGE && GM < G_SYSOP && !debug) end;
     gmlog "@warp 017-9";
     warp "017-9", 31, 21;
diff --git a/npc/055-1/pumpkins.txt b/npc/055-1/pumpkins.txt
index 8fc25eb3..d4c6150a 100755
--- a/npc/055-1/pumpkins.txt
+++ b/npc/055-1/pumpkins.txt
@@ -66,11 +66,8 @@ OnAppear:
 
 L_Destroy:
     disablenpc strnpcinfo(0); // makes the npc invisible, unclickable
-    addnpctimer .death_t, strnpcinfo(0) + "::OnReallyDestroy"; // schedule a respawn
-    end;
-
-OnReallyDestroy:
-    set .nodes[.i], get(.nodes[.i], "_N-Pumpkin") - 1, "_N-Pumpkin"; // tell the puppeteer we lost an egg
+    sleep(.death_t);
+    set(getvariableofnpc(.nodes[.i], "_N-Pumpkin"), get(.nodes[.i], "_N-Pumpkin") - 1); // tell the puppeteer we lost an egg
     destroy;