Misc fixes

7 files changed, 26 insertions, 21 deletions

diff --git a/npc/001-1/eomie.txt b/npc/001-1/eomie.txt
index 1ab21846..44424d26 100755
--- a/npc/001-1/eomie.txt
+++ b/npc/001-1/eomie.txt
@@ -12,7 +12,7 @@
     mesn;
     mes "\"I maintain this little oasis in the desert.\"";
     if (.@q != 7)
-        goto L_Close;
+        goto L_close;
     menu
         "I need to learn a spell to use Tinris' magic fertilizer. Can you help me out?",L_Next;
 
@@ -39,7 +39,7 @@ L_GetStuff:
         "I've got everything.",L_More,
         "Where can I get Grass Seeds?",L_Hurnscald,
         "How can I get Ice Cubes? We're in the middle of the desert!",L_Mine,
-        "Ok. I'll go and get them.",L_Close;
+        "Ok. I'll go and get them.",L_close;
 L_More:
     if ((countitem("GrassSeed") < @grass_amount) || (countitem("BottleOfWater") < @water_amount) || (countitem("IceCube") < @ice_amount))
         goto L_NoItem;
@@ -59,28 +59,28 @@ L_More:
     mes "She takes the fertilizer and casts some invocations. After a minute, she hands the now-glowing substance back to you.";
     mesn;
     mes "\"That should work now. I'm glad you're taking care of the plants! Not enough people do that nowadays.\" %%1";
-    goto L_Close;
+    goto L_close;
 
 L_Hurnscald: // player asked how to get Grass Seeds
     mesn;
     mes "\"Squirrels tend to pick up " + getitemlink("GrassSeed") + " as they gather food. You can find them around Hurnscald if you ride the ferry over.\"";
-    goto L_Close;
+    goto L_close;
 
 L_Mine: // player asked how to get Ice Cubes
     mesn;
     mes "\"Quite the quandary – isn't it? Naturally, you can easily find them on the continent of Kaizei, which is far up north and covered with snow most time of the year. But it might be a bit difficult to get there.\"";
     next;
     mes "\"I heard that Ice Goblins were seen in the caves surrounding Nivalis. Maybe you can find " + getitemlink("IceCube") + " there.\"";
-    goto L_Close;
+    goto L_close;
 
 L_CastedSpell: // .@q >= 9 but below 14
     mesn;
     mes "\"Thankfully, the grass wasn't damaged. I hope Anwar finds the magic fertilizer to be useful.\"";
     if (.@q != 13)
-        goto L_Close;
+        goto L_close;
     menu
         "It was. He even created this Silk Headband as a present for you!",L_Present,
-        "(Mumble something and leave)",L_Close;
+        "(Mumble something and leave)",L_close;
 
 L_Present:
     if (countitem("SilkHeadband") < 1)
@@ -91,19 +91,19 @@ L_Present:
     mesn;
     mes "\"Oh, that's so nice of him! Please tell him that I really like it!\"";
     mes "She smiles.";
-    goto L_Close;
+    goto L_close;
 
 L_Done: // .@q >= 14
     mesn;
     mes "\"Hello! I'm happy to see someone like you so dedicated to the environment.\" %%8";
-    goto L_Close;
+    goto L_close;
 
 L_NoItem:
     mesn;
     mes "\"Where is it?\" %%3";
-    goto L_Close;
+    goto L_close;
 
-L_Close:
+L_close:
     @grass_amount = 0;
     @water_amount = 0;
     @ice_amount = 0;
diff --git a/npc/001-2/government_building.txt b/npc/001-2/government_building.txt
index cf5c551f..d4a73df0 100755
--- a/npc/001-2/government_building.txt
+++ b/npc/001-2/government_building.txt
@@ -3,7 +3,7 @@
     mes "[Estard]";
     mes "\"Hello. What can I do for you?\"";
     next;
-    if (PARTNER)
+    if (getpartnerid())
         goto L_Main_married;
 
     menu
@@ -90,8 +90,8 @@ L_do_divorce:
     if (Zeny < @divorce_cost)
         goto L_Not_enough_money;
 
-    set PARTNER, 0, PARTNER; // divorce the partner first, which will also divorce the rid if succesful
-    if (PARTNER < 1) goto L_divorce_done;
+    divorce();
+    if (getpartnerid() < 1) goto L_divorce_done;
 
     mes "";
     mes "[Estard]";
diff --git a/npc/001-2/wizards.txt b/npc/001-2/wizards.txt
index 754f1bf4..e69aab4a 100755
--- a/npc/001-2/wizards.txt
+++ b/npc/001-2/wizards.txt
@@ -2,7 +2,7 @@
 -	script	Magic Council	NPC32767,{
     explode .@n, strnpcinfo(0), "#";
     if   (.@n[1] == 9) mes "The arch wizard seems to be busy.";
-    elif (.@n[1])      mes "The wizard seems to ignore you.";
+    else if (.@n[1])   mes "The wizard seems to ignore you.";
     else               mes "Strangely, you feel nothing – as if its membrane is closed to you.";
     next;
     mes "Perhaps you should come back later.";
diff --git a/npc/008-1/annualeaster.txt b/npc/008-1/annualeaster.txt
index 358769a7..9e9d73a2 100755
--- a/npc/008-1/annualeaster.txt
+++ b/npc/008-1/annualeaster.txt
@@ -32,7 +32,7 @@
     .@random = rand(.@size+2);
     if (.@random < .@size)
         getitem get(.small_rewards$[.@random], "Easter Eggs"), rand(1, 2);
-    elif (.@random == .@size)
+    else if (.@random == .@size)
         getexp rand(200), 0;
     else
         Zeny = Zeny + rand(50);
@@ -194,14 +194,15 @@ L_Menu:
         "Disable eggs.", L_Disable;
 
 L_Enable:
-    .disabled = 0, "Easter Eggs";
+    set(getvariableofnpc(.disabled, "Easter Eggs"), 0);
     clear;
     mes "Easter Eggs enabled.";
     next;
     goto L_Menu;
 
 L_Disable:
-    set .disabled, 1, "Easter Eggs"; // TODO: (tmwa) automatically destroy puppets when using @disablenpc & also discard timers
+    set(getvariableofnpc(.disabled, "Easter Eggs"), 1);
+    // TODO: Destroy puppets/timers/etc
     clear;
     mes "Easter Eggs disabled.";
     next;
diff --git a/npc/009-2/selim.txt b/npc/009-2/selim.txt
index f7f41b72..9f757c2a 100755
--- a/npc/009-2/selim.txt
+++ b/npc/009-2/selim.txt
@@ -10,10 +10,10 @@ L_Main:
         "Can you dye something for me?", L_clothes_choice,
         "Can you also remove color from clothing?", L_Ask_bleach,
         "About these sorcerer robes...", L_Asksorcererrobe,
-        "Can you change my appearance?", L_barber,
+        "Can you change my appearance?", L_Barber,
         "Never mind.", L_close;
 
-L_barber:
+L_Barber:
     callfunc "Barber";
     goto L_Main;
 
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index d4fef57f..c6b90043 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -583,6 +583,10 @@ function	script	get	{
     return getvariableofnpc(getarg(0), getarg(1));
 }
 
+function	script	sc_check	{
+    return getstatus(getarg(0), getarg(1, 0));
+}
+
 function	script	wgm	{
     charcommand("@request "+getarg(0));
     return;
diff --git a/npc/items/pickled_beets.txt b/npc/items/pickled_beets.txt
index acce584d..a1a418c6 100755
--- a/npc/items/pickled_beets.txt
+++ b/npc/items/pickled_beets.txt
@@ -2,7 +2,7 @@ function	script	usePickledBeets	{
     heal 50, 0;
     if   (Class == 1)
         setlook LOOK_HAIR_COLOR, HC_PURPLE;
-    elif (Class == 2)
+    else if (Class == 2)
         setlook LOOK_HAIR_COLOR, 18;
     // add more here for races that have purple
     return;