move hween10 to hween16

1 files changed, 87 insertions, 87 deletions

diff --git a/world/map/npc/annuals/halloween/gak.txt b/world/map/npc/annuals/halloween/gak.txt
index 3c85852f..6d7f96ed 100644
--- a/world/map/npc/annuals/halloween/gak.txt
+++ b/world/map/npc/annuals/halloween/gak.txt
@@ -1,23 +1,23 @@
 010-1.gat,29,48,0|script|Gak|188

 {

 

-        if ($hween10 == 2) goto L_Event_Over;

+        if ($hween16 == 2) goto L_Event_Over;

 

-        if (hween10 > 4 && hween10 < 9) goto L_Collecting_Sweets;

-        if (hween10 == 9) goto L_Hunger_Sated;

-        if (hween10 == 10) goto L_Reward_Returning;

-        if (hween10 == 11) goto L_Miscount_Bugfix;

-        if (hween10 == 12) goto L_Gaks_Little_Shop;

+        if (hween16 > 4 && hween16 < 9) goto L_Collecting_Sweets;

+        if (hween16 == 9) goto L_Hunger_Sated;

+        if (hween16 == 10) goto L_Reward_Returning;

+        if (hween16 == 11) goto L_Miscount_Bugfix;

+        if (hween16 == 12) goto L_Gaks_Little_Shop;

 

-        if ($hween10 == 1) goto L_Event_Over_2;

+        if ($hween16 == 1) goto L_Event_Over_2;

 

-        if (hween10 == 1) goto L_Knows_Gak;

-        if (hween10 == 2) goto L_Gak_Has_Tongue;

-        if (hween10 == 3) goto L_Bones_Check;

-        if (hween10 == 4) goto L_Request_Sweets;

+        if (hween16 == 1) goto L_Knows_Gak;

+        if (hween16 == 2) goto L_Gak_Has_Tongue;

+        if (hween16 == 3) goto L_Bones_Check;

+        if (hween16 == 4) goto L_Request_Sweets;

 

         mes "[Broken Skeleton]";

-        set hween10, 1;

+        set hween16, 1;

         mes "";

         mes "\"Gak... gak, gak! Gak gak gak gak!\"";

         close;

@@ -46,7 +46,7 @@ L_Has_Tongue:
 L_Give_Tongue:

         if (countitem("Tongue") < 1) goto L_Tongue_Gone_Die;

         delitem "Tongue", 1;

-        set hween10, 2;

+        set hween16, 2;

         mes "[Gak]";

         mes "";

         mes "The skeleton grabs the tongue from you and shoves it into his mouth. After stretching his jaw for some moments, he grins at you unpleasantly.";

@@ -76,7 +76,7 @@ L_Give_Tongue_Die:
         mes "[Gak]";

         mes "";

         mes "As you fall, he takes the tongue from you anyway.";

-        set hween10, 2;

+        set hween16, 2;

         goto L_Die;

 

 L_Die:

@@ -122,7 +122,7 @@ L_Sure:
                 "Nah, that sounds a bit boring.", L_Close;

 

 L_Bones:

-        set hween10, 3;

+        set hween16, 3;

         mes "[Gak]";

         mes "";

         mes "\"Wonderful! I can't wait until I can properly walk around attacking thingsss again.\"";

@@ -201,7 +201,7 @@ L_bones_menu_select:
 

         delitem "Bone", @bonecount;

         set @bonecount, @bonecount + 1;

-        set @hween10_givebones, 0;

+        set @hween16_givebones, 0;

         goto L_Bone_Loop;

 // in a rush, raising and then lowering is the best thing I can think of to make the loop work properly.

 

@@ -210,7 +210,7 @@ L_Bone_Loop:
         if @bonecount < 1 goto L_Bones_Feedback;

         set @temp1, rand(@bonecount + 5);

         if @temp1 > @bonecount goto L_Bone_Loop;

-        set @hween10_givebones, @hween10_givebones + 1;

+        set @hween16_givebones, @hween16_givebones + 1;

         goto L_Bone_Loop;

 

 L_Not_Enough_Bones:

@@ -226,13 +226,13 @@ L_offer_no_items:
         close;

 

 L_Bones_Feedback:

-        if (@hween10_givebones == 0) goto L_Bones_Feedback_None;

+        if (@hween16_givebones == 0) goto L_Bones_Feedback_None;

         mes "[Gak]";

         mes "";

-        mes "\"Hmm... I think I can ussse " + @hween10_givebones + " of thessse bonesss.\"";

+        mes "\"Hmm... I think I can ussse " + @hween16_givebones + " of thessse bonesss.\"";

         next;

-        set hween10_bonecount, hween10_bonecount + @hween10_givebones;

-        if (hween10_bonecount > 7) goto L_Enough_Bones;

+        set hween16_bonecount, hween16_bonecount + @hween16_givebones;

+        if (hween16_bonecount > 7) goto L_Enough_Bones;

         mes "[Gak]";

         mes "";

         mes "\"But I ssstill need more! Pleassse bring them to me.\"";

@@ -245,7 +245,7 @@ L_Bones_Feedback_None:
         close;

 

 L_Enough_Bones:

-        set hween10, 4;

+        set hween16, 4;

         mes "[Gak]";

         mes "";

         mes "\"And that should be enough for my dark purposssesss.\"";

@@ -314,7 +314,7 @@ L_Leftover_Sweets:
                 "Wait, free sweets!? Why did no one tell me?", L_Close;

 

 L_Confirm_Sweethunting:

-        set hween10, 5;

+        set hween16, 5;

         mes "[Gak]";

         mes "";

         mes "\"My ssstomach groansss with anticipa - uh, well, my bonesss creak with anticipation. Tell all your little friendsss to bring my any sssweetsss they find, too: I really am VERY hungry!\"";

@@ -408,33 +408,33 @@ L_Nb_Sweets_Menu_Select:
         if (@menu > 6) close;

         if (countitem(@giveitem$) < @givecounter) goto L_Not_Enough_Sweeties;

         delitem @giveitem$, @givecounter;

-        if ($hween10 == 1) set hween10, hween10 + 1;

-        if (@giveitem$ == "TonoriDelight") set $hween10_tondel, $hween10_tondel + @givecounter;

-        if (@giveitem$ == "Marshmallow") set $hween10_mmallow, $hween10_mmallow + @givecounter;

-        if (@giveitem$ == "JellySkull") set $hween10_jelskul, $hween10_jelskul + @givecounter;

-        if (@giveitem$ == "CandyPumpkin") set $hween10_canpump, $hween10_canpump + @givecounter;

-        if (@giveitem$ == "TonoriDelight") set hween10_collect_tondel, hween10_collect_tondel + @givecounter;

-        if (@giveitem$ == "Marshmallow") set hween10_collect_mmallow, hween10_collect_mmallow + @givecounter;

-        if (@giveitem$ == "JellySkull") set hween10_collect_jelskul, hween10_collect_jelskul + @givecounter;

-        if (@giveitem$ == "CandyPumpkin") set hween10_collect_canpump, hween10_collect_canpump + @givecounter;

+        if ($hween16 == 1) set hween16, hween16 + 1;

+        if (@giveitem$ == "TonoriDelight") set $hween16_tondel, $hween16_tondel + @givecounter;

+        if (@giveitem$ == "Marshmallow") set $hween16_mmallow, $hween16_mmallow + @givecounter;

+        if (@giveitem$ == "JellySkull") set $hween16_jelskul, $hween16_jelskul + @givecounter;

+        if (@giveitem$ == "CandyPumpkin") set $hween16_canpump, $hween16_canpump + @givecounter;

+        if (@giveitem$ == "TonoriDelight") set hween16_collect_tondel, hween16_collect_tondel + @givecounter;

+        if (@giveitem$ == "Marshmallow") set hween16_collect_mmallow, hween16_collect_mmallow + @givecounter;

+        if (@giveitem$ == "JellySkull") set hween16_collect_jelskul, hween16_collect_jelskul + @givecounter;

+        if (@giveitem$ == "CandyPumpkin") set hween16_collect_canpump, hween16_collect_canpump + @givecounter;

 

-        set hween10_collect, hween10_collect + @givecounter;

+        set hween16_collect, hween16_collect + @givecounter;

 

         mes "[Gak]";

         mes "";

-        mes "\"Thank you for your generousss donation to my caussse. Ssso far, you and your friendsss have brought me " + $hween10_tondel + " Tonori Delightsss, " + $hween10_mmallow + " Marshmallowsss, " + $hween10_jelskul + " Jelly Ssskullsss, and " + $hween10_canpump + " Candy Pumpkinsss.\"";

+        mes "\"Thank you for your generousss donation to my caussse. Ssso far, you and your friendsss have brought me " + $hween16_tondel + " Tonori Delightsss, " + $hween16_mmallow + " Marshmallowsss, " + $hween16_jelskul + " Jelly Ssskullsss, and " + $hween16_canpump + " Candy Pumpkinsss.\"";

         next;

         mes "[Gak]";

         mes "";

-        mes "\"You persssonally have brought me " + hween10_collect + " sssweetsss.\"";

+        mes "\"You persssonally have brought me " + hween16_collect + " sssweetsss.\"";

         next;

-        if (hween10 > 8) goto L_Hunger_Sated;

+        if (hween16 > 8) goto L_Hunger_Sated;

         mes "[Gak]";

         mes "";

-        if (hween10 == 5) mes "\"But I ssstill need more! I'm ssstill HUNGRY!\"";

-        if (hween10 == 6) mes "\"I ssstill need a few more, however... I'm ssstill HUNGRY!\"";

-        if (hween10 == 7) mes "\"I'd like more, though. I'm ssstill hungry.\"";

-        if (hween10 == 8) mes "\"Hmm... what a meal! Although, jussst a couple more sssweetsss wouldn't hurt. I'm ssstill a bit peckish.\"";

+        if (hween16 == 5) mes "\"But I ssstill need more! I'm ssstill HUNGRY!\"";

+        if (hween16 == 6) mes "\"I ssstill need a few more, however... I'm ssstill HUNGRY!\"";

+        if (hween16 == 7) mes "\"I'd like more, though. I'm ssstill hungry.\"";

+        if (hween16 == 8) mes "\"Hmm... what a meal! Although, jussst a couple more sssweetsss wouldn't hurt. I'm ssstill a bit peckish.\"";

         close;

 

 L_Not_Enough_Sweeties:

@@ -444,7 +444,7 @@ L_Not_Enough_Sweeties:
         close;

 

 L_Hunger_Sated:

-        set hween10, 10;

+        set hween16, 10;

         mes "[Gak]";

         mes "";

         mes "The last of the sweets falls out the bottom of the skeleton's skull, bouncing down between his ribs before tumbling out to join the countless thousands that lie in a vast mound of them beside him.";

@@ -491,7 +491,7 @@ L_Reward:
         next;

         mes "[Gak]";

         mes "";

-        mes "\"I can let you have sssome thingsss out of thisss collection. You brought me " + hween10_collect + " sssweetsss, ssso I will give you itemsss worth twice that amount of gold piecesss.\"";

+        mes "\"I can let you have sssome thingsss out of thisss collection. You brought me " + hween16_collect + " sssweetsss, ssso I will give you itemsss worth twice that amount of gold piecesss.\"";

         next;

         mes "[Gak]";

         mes "";

@@ -501,20 +501,20 @@ L_Reward:
         mes "";

         mes "\"Not to say that I'm sure of your currencccy here... but it sssshould give you an idea, yessss?\"";

         next;

-        set hween10, 12;

-        set hween10_credits, hween10_collect_tondel + hween10_collect_jelskul + hween10_collect_canpump;

-        set hween10_credits, hween10_credits * 2;

-        set hween10_credits, hween10_credits + hween10_collect_mmallow;

+        set hween16, 12;

+        set hween16_credits, hween16_collect_tondel + hween16_collect_jelskul + hween16_collect_canpump;

+        set hween16_credits, hween16_credits * 2;

+        set hween16_credits, hween16_credits + hween16_collect_mmallow;

         mes "[Gak]";

         mes "";

-        mes "\"Looksss like you have " + hween10_credits + " ... 'creditsss', shall we call them? Now, let'ss have a look at my waresss.\"";

+        mes "\"Looksss like you have " + hween16_credits + " ... 'creditsss', shall we call them? Now, let'ss have a look at my waresss.\"";

         next;

         goto L_Shop_Inventory;

 

 L_Gaks_Little_Shop:

         mes "[Gak]";

         mes "";

-        mes "\"You have " + hween10_credits + " creditsss. Tell me what you'd like to buy - or asssk me about it. Sssome of thessse itemsss have very interesssting ssstories attached to them.\"";

+        mes "\"You have " + hween16_credits + " creditsss. Tell me what you'd like to buy - or asssk me about it. Sssome of thessse itemsss have very interesssting ssstories attached to them.\"";

         next;

         goto L_Shop_Inventory;

 

@@ -539,7 +539,7 @@ L_Shop_Inventory:
                 "Nothing today, thanks.", L_Close;

 

 L_Buy_OperaMask:

-        if (hween10_credits < 9000) goto L_Too_Few_Credits;

+        if (hween16_credits < 9000) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"Ah, yesss! A friend of mine usssed to wear that masssk. He wasss very famousss in hisss time - had quite a fandom.\"";

@@ -555,9 +555,9 @@ L_Buy_OperaMask:
 L_Buy_OperaMask_Yes:

         getinventorylist;

         if (@inventorylist_count == 100) goto L_Full_Inventory;

-        if (hween10_credits < 9000) goto L_Too_Few_Credits;

-        set hween10_credits, hween10_credits - 9000;

-        set hween10_paid, hween10_paid + 9000;

+        if (hween16_credits < 9000) goto L_Too_Few_Credits;

+        set hween16_credits, hween16_credits - 9000;

+        set hween16_paid, hween16_paid + 9000;

         getitem "OperaMask", 1;

         mes "[Gak]";

         mes "";

@@ -566,7 +566,7 @@ L_Buy_OperaMask_Yes:
         goto L_Gaks_Little_Shop;

 

 L_Buy_JesterMask:

-        if (hween10_credits < 7000) goto L_Too_Few_Credits;

+        if (hween16_credits < 7000) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"I'm sssure you'll have fun with thisss masssk. 'Fun', get it?\"";

@@ -582,9 +582,9 @@ L_Buy_JesterMask:
 L_Buy_JesterMask_Yes:

         getinventorylist;

         if (@inventorylist_count == 100) goto L_Full_Inventory;

-        if (hween10_credits < 7000) goto L_Too_Few_Credits;

-        set hween10_credits, hween10_credits - 7000;

-        set hween10_paid, hween10_paid + 7000;

+        if (hween16_credits < 7000) goto L_Too_Few_Credits;

+        set hween16_credits, hween16_credits - 7000;

+        set hween16_paid, hween16_paid + 7000;

         getitem "JesterMask", 1;

         mes "[Gak]";

         mes "";

@@ -593,7 +593,7 @@ L_Buy_JesterMask_Yes:
         goto L_Gaks_Little_Shop;

 

 L_Buy_WitchsHat:

-        if (hween10_credits < 4500) goto L_Too_Few_Credits;

+        if (hween16_credits < 4500) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"I was wondering witch one you would take.\"";

@@ -609,9 +609,9 @@ L_Buy_WitchsHat:
 L_Buy_WitchsHat_Yes:

         getinventorylist;

         if (@inventorylist_count == 100) goto L_Full_Inventory;

-        if (hween10_credits < 4500) goto L_Too_Few_Credits;

-        set hween10_credits, hween10_credits - 4500;

-        set hween10_paid, hween10_paid + 4500;

+        if (hween16_credits < 4500) goto L_Too_Few_Credits;

+        set hween16_credits, hween16_credits - 4500;

+        set hween16_paid, hween16_paid + 4500;

         getitem "WitchHat", 1;

         mes "[Gak]";

         mes "";

@@ -620,7 +620,7 @@ L_Buy_WitchsHat_Yes:
         goto L_Gaks_Little_Shop;

 

 L_Buy_GoblinMask:

-        if (hween10_credits < 2500) goto L_Too_Few_Credits;

+        if (hween16_credits < 2500) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"Hmm, I never much liked that one myssself.\"";

@@ -636,9 +636,9 @@ L_Buy_GoblinMask:
 L_Buy_GoblinMask_Yes:

         getinventorylist;

         if (@inventorylist_count == 100) goto L_Full_Inventory;

-        if (hween10_credits < 2500) goto L_Too_Few_Credits;

-        set hween10_credits, hween10_credits - 2500;

-        set hween10_paid, hween10_paid + 2500;

+        if (hween16_credits < 2500) goto L_Too_Few_Credits;

+        set hween16_credits, hween16_credits - 2500;

+        set hween16_paid, hween16_paid + 2500;

         getitem "GoblinMask", 1;

         mes "[Gak]";

         mes "";

@@ -647,7 +647,7 @@ L_Buy_GoblinMask_Yes:
         goto L_Gaks_Little_Shop;

 

 L_Buy_GuyFawkesMask:

-        if (hween10_credits < 800) goto L_Too_Few_Credits;

+        if (hween16_credits < 800) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"Cheap, huh? Barely more than a penny for thisss guy.\"";

@@ -663,9 +663,9 @@ L_Buy_GuyFawkesMask:
 L_Buy_GuyFawkesMask_Yes:

         getinventorylist;

         if (@inventorylist_count == 100) goto L_Full_Inventory;

-        if (hween10_credits < 800) goto L_Too_Few_Credits;

-        set hween10_credits, hween10_credits - 800;

-        set hween10_paid, hween10_paid + 800;

+        if (hween16_credits < 800) goto L_Too_Few_Credits;

+        set hween16_credits, hween16_credits - 800;

+        set hween16_paid, hween16_paid + 800;

         getitem "GuyFawkesMask", 1;

         mes "[Gak]";

         mes "";

@@ -674,7 +674,7 @@ L_Buy_GuyFawkesMask_Yes:
         goto L_Gaks_Little_Shop;

 

 L_Buy_Scissors:

-        if (hween10_credits < 500) goto L_Too_Few_Credits;

+        if (hween16_credits < 500) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"My own pair of ssscissssorsss! But I haven't been needing them lately asss much asss I usssed to.\"";

@@ -690,9 +690,9 @@ L_Buy_Scissors:
 L_Buy_Scissors_Yes:

         getinventorylist;

         if (@inventorylist_count == 100) goto L_Full_Inventory;

-        if (hween10_credits < 500) goto L_Too_Few_Credits;

-        set hween10_credits, hween10_credits - 500;

-        set hween10_paid, hween10_paid + 500;

+        if (hween16_credits < 500) goto L_Too_Few_Credits;

+        set hween16_credits, hween16_credits - 500;

+        set hween16_paid, hween16_paid + 500;

         getitem "Scissors", 1;

         mes "[Gak]";

         mes "";

@@ -701,7 +701,7 @@ L_Buy_Scissors_Yes:
         goto L_Gaks_Little_Shop;

 

 L_Buy_ShockSweet:

-        if (hween10_credits < 200) goto L_Too_Few_Credits;

+        if (hween16_credits < 200) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"I'll be glad to be rid of sssome of thessse terrifying sssweetsss...\"";

@@ -723,11 +723,11 @@ L_Buy_Nb_ShockSweet:
         if (@menu == 6) goto L_Gaks_Little_Shop;

         set @shocksweets, @menu;

         set @cost, @shocksweets * 200;

-        if (hween10_credits < @cost) goto L_Too_Few_Credits;

+        if (hween16_credits < @cost) goto L_Too_Few_Credits;

         getinventorylist;

         if (@inventorylist_count == 100 && countitem("ShockSweet") < 1) goto L_Full_Inventory;

-        set hween10_credits, hween10_credits - @cost;

-        set hween10_paid, hween10_paid + @cost;

+        set hween16_credits, hween16_credits - @cost;

+        set hween16_paid, hween16_paid + @cost;

         getitem "ShockSweet", @shocksweets;

         mes "[Gak]";

         mes "";

@@ -736,7 +736,7 @@ L_Buy_Nb_ShockSweet:
         goto L_Gaks_Little_Shop;

 

 L_Buy_BoneArrow:

-        if (hween10_credits < 1) goto L_Too_Few_Credits;

+        if (hween16_credits < 1) goto L_Too_Few_Credits;

         mes "[Gak]";

         mes "";

         mes "\"Deadly, but nearly weightlessss. A good choice!\"";

@@ -765,11 +765,11 @@ L_Buy_Nb_BoneArrow:
         if (@menu == 6) set @bonearrows, 500;

         if (@menu == 7) set @bonearrows, 1000;

         if (@menu == 8) goto L_Gaks_Little_Shop;

-        if (hween10_credits < @bonearrows) goto L_Too_Few_Credits;

+        if (hween16_credits < @bonearrows) goto L_Too_Few_Credits;

         getinventorylist;

         if (@inventorylist_count == 100 && countitem("BoneArrows") < 1) goto L_Full_Inventory;

-        set hween10_credits, hween10_credits - @bonearrows;

-        set hween10_paid, hween10_paid + @bonearrows;

+        set hween16_credits, hween16_credits - @bonearrows;

+        set hween16_paid, hween16_paid + @bonearrows;

         getitem "BoneArrows", @bonearrows;

         mes "[Gak]";

         mes "";

@@ -1216,8 +1216,8 @@ L_Info_BoneArrow:
         goto L_Gaks_Little_Shop;

 

 L_Event_Over:

-        if (hween10 < 5) goto L_Event_Over_1;

-        if (hween10 < 13) goto L_Event_Over_2;

+        if (hween16 < 5) goto L_Event_Over_1;

+        if (hween16 < 13) goto L_Event_Over_2;

         mes "[Gak]";

         mes "";

         mes "\"Well, it'sss been very nice meeting you, friend, but I think I'll be heading off sssoon. I hear the Northern farmsss are pleasssant at this time of year.\"";

@@ -1242,8 +1242,8 @@ L_Full_Inventory:
         close;

 

 L_Miscount_Bugfix:

-        if (hween10_collect_canpump != 0) goto L_Do_Miscount_Bugfix;

-        set hween10, 12;

+        if (hween16_collect_canpump != 0) goto L_Do_Miscount_Bugfix;

+        set hween16, 12;

         goto L_Gaks_Little_Shop;

 

 L_Do_Miscount_Bugfix:

@@ -1253,7 +1253,7 @@ L_Do_Miscount_Bugfix:
         next;

         mes "[Gak]";

         mes "";

-        mes "\"Seems I forgot some thingsss earlier... you should actually have " + (hween10_collect_canpump << 1) + " more creditsss than I calculated before.\"";

+        mes "\"Seems I forgot some thingsss earlier... you should actually have " + (hween16_collect_canpump << 1) + " more creditsss than I calculated before.\"";

         next;

         mes "[Gak]";

         mes "";

@@ -1267,8 +1267,8 @@ L_Do_Miscount_Bugfix_Continue:
         mes "[Gak]";

         mes "";

         mes "\"Of courssse. It is done. Sssorry about that\"";

-        set hween10_credits, hween10_credits + (hween10_collect_canpump << 1);

-        set hween10, 12;

+        set hween16_credits, hween16_credits + (hween16_collect_canpump << 1);

+        set hween16, 12;

         next;

         goto L_Gaks_Little_Shop;