From 206c3720a29b0db6c73ea534bd3f34bacaef17de Mon Sep 17 00:00:00 2001 From: Erik Schilling Date: Tue, 15 Nov 2011 21:06:07 +0100 Subject: Made Constants case-sensitive --- world/map/npc/009-2/airlia.txt | 8 ++++---- world/map/npc/009-2/alan.txt | 4 ++-- world/map/npc/009-2/kfahr.txt | 6 +++--- world/map/npc/009-2/lena.txt | 2 +- world/map/npc/009-2/nicholas.txt | 20 ++++++++++---------- world/map/npc/009-2/nurse.txt | 2 +- world/map/npc/009-2/olana.txt | 8 ++++---- world/map/npc/009-2/peter.txt | 12 ++++++------ world/map/npc/009-2/waitress.txt | 12 ++++++------ 9 files changed, 37 insertions(+), 37 deletions(-) (limited to 'world/map/npc/009-2') diff --git a/world/map/npc/009-2/airlia.txt b/world/map/npc/009-2/airlia.txt index 568582cc..3bc92277 100644 --- a/world/map/npc/009-2/airlia.txt +++ b/world/map/npc/009-2/airlia.txt @@ -72,7 +72,7 @@ L_Caretaker_first_reward: mes "[" + @LETTER_REWARD_GOLD_INITIAL + " GP]"; if (@LETTER_REWARD_EXP_INITIAL > 0) mes "[" + @LETTER_REWARD_EXP_INITIAL + " experience points]"; - set zeny, zeny + @LETTER_REWARD_GOLD_INITIAL; + set Zeny, Zeny + @LETTER_REWARD_GOLD_INITIAL; getexp @LETTER_REWARD_EXP_INITIAL, 0; set QUEST_Graveyard_Caretaker, @Q_STATUS_DELIVERED_FIRST_LETTER; close; @@ -84,7 +84,7 @@ L_Caretaker_later_rewards: mes "[" + @LETTER_REWARD_GOLD + " GP]"; if (@LETTER_REWARD_EXP > 0) mes "[" + @LETTER_REWARD_EXP + " experience points]"; - set zeny, zeny + @LETTER_REWARD_GOLD; + set Zeny, Zeny + @LETTER_REWARD_GOLD; getexp @LETTER_REWARD_EXP, 0; set QUEST_Graveyard_Caretaker, @Q_STATUS_HAS_NO_NEW_LETTER; close; @@ -204,7 +204,7 @@ L_Fetch_initial_reward: if (@FETCH_REWARD_EXP_INITIAL > 0) mes "[" + @FETCH_REWARD_EXP_INITIAL + " experience points]"; delitem @FETCH_LABEL_INITIAL$, @FETCH_AMOUNT_INITIAL; - set zeny, zeny + @FETCH_REWARD_GOLD_INITIAL; + set Zeny, Zeny + @FETCH_REWARD_GOLD_INITIAL; getexp @FETCH_REWARD_EXP_INITIAL, 0; set QUEST_Airlia, @Q_STATUS_INITIAL_FETCH_REWARDED; next; @@ -224,7 +224,7 @@ L_Fetch_later_rewards: if (@FETCH_REWARD_EXP > 0) mes "[" + @FETCH_REWARD_EXP + " experience points]"; delitem @FETCH_LABEL$, @FETCH_AMOUNT; - set zeny, zeny + @FETCH_REWARD_GOLD; + set Zeny, Zeny + @FETCH_REWARD_GOLD; getexp @FETCH_REWARD_EXP, 0; close; diff --git a/world/map/npc/009-2/alan.txt b/world/map/npc/009-2/alan.txt index c08a7086..1715fe72 100644 --- a/world/map/npc/009-2/alan.txt +++ b/world/map/npc/009-2/alan.txt @@ -174,12 +174,12 @@ L_State_4: close; L_State_4_pay: - if (zeny < 10000) + if (Zeny < 10000) goto L_State_4_nocash; getinventorylist; if (@inventorylist_count == 100) goto L_State_4_TooMany; - set zeny, zeny - 10000; + set Zeny, Zeny - 10000; getitem "ForestBow", 1; set @Q_status, 5; callsub S_Update_Var; diff --git a/world/map/npc/009-2/kfahr.txt b/world/map/npc/009-2/kfahr.txt index a8837865..5be800b8 100644 --- a/world/map/npc/009-2/kfahr.txt +++ b/world/map/npc/009-2/kfahr.txt @@ -283,7 +283,7 @@ L_worm_see_bones: goto L_boneknife_quest_ip; if (@Q_status > @QS_KNIFE_QUEST) goto L_worm_continue2; - if (baselevel >= 40) + if (BaseLevel >= 40) goto L_boneknife_quest; mes "[Kfahr the Warrior]"; @@ -602,7 +602,7 @@ L_boneknife_quest: goto L_boneknife_quest_ip; if (@Q_status > @QS_KNIFE_QUEST) goto L_boneknife_quest_completed; - if (baselevel < 40) + if (BaseLevel < 40) goto L_boneknife_quest_tooweak; mes "[Kfahr the Warrior]"; @@ -847,7 +847,7 @@ L_golden_scorpion: "I need a golden scorpion stinger.", -; mes "[Kfahr the Warrior]"; mes "\"A golden scorpion stinger? Those are rare and valuable, I hope that you know that!\""; - if (baselevel < 60) + if (BaseLevel < 60) goto L_too_lowlevel_for_stinger; if (@Q_status < @QS_KNIFE_QUEST) goto L_golden_requires_knife_quest; diff --git a/world/map/npc/009-2/lena.txt b/world/map/npc/009-2/lena.txt index ee4cb7f5..e458eb74 100644 --- a/world/map/npc/009-2/lena.txt +++ b/world/map/npc/009-2/lena.txt @@ -8,7 +8,7 @@ if (TMW_Quest == 43) goto L_Lena_Bandit_Leader_Fail; if (TMW_Quest == 42) goto L_Lena_Bandit_Leader; if (TMW_Quest == 41) goto L_Lena_Fairy_Hat; - if (TMW_Quest == 40) && (baselevel >= 30) goto L_Lena_Start; + if (TMW_Quest == 40) && (BaseLevel >= 30) goto L_Lena_Start; mes "[Lena]"; mes "\"I got ambushed by a group of bandits and one of them stabbed me pretty good. Hopefully I heal up soon so I can fight this menace.\""; diff --git a/world/map/npc/009-2/nicholas.txt b/world/map/npc/009-2/nicholas.txt index fbffd3e8..08fe98c2 100644 --- a/world/map/npc/009-2/nicholas.txt +++ b/world/map/npc/009-2/nicholas.txt @@ -180,40 +180,40 @@ L_NoMoney: close; L_YesKnight: - if (zeny < 10000) + if (Zeny < 10000) goto L_NoMoney; if ( (countitem("IronIngot")<3) || (countitem("Coal") < 6) ) goto L_NoItem; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; - set zeny, zeny - 10000; + set Zeny, Zeny - 10000; delitem "IronIngot", 3; delitem "Coal", 6; getitem "KnightsHelmet", 1; goto L_Done; L_YesCrusade: - if (zeny < 10000) goto L_NoMoney; + if (Zeny < 10000) goto L_NoMoney; if ( (countitem("IronIngot")<6) || (countitem("Coal") < 12) ) goto L_NoItem; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; - set zeny, zeny-10000; + set Zeny, Zeny-10000; delitem "IronIngot", 6; delitem "Coal", 12; getitem "CrusadeHelmet", 1; goto L_Done; L_YesWarlord: - if (zeny < 10000) goto L_NoMoney; + if (Zeny < 10000) goto L_NoMoney; if ( (countitem("IronIngot")<9) || (countitem("Coal") < 18) ) goto L_NoItem; getinventorylist; if (@inventorylist_count == 100) goto L_TooMany; - set zeny, zeny-10000; + set Zeny, Zeny-10000; delitem "IronIngot", 9; delitem "Coal", 18; getitem "WarlordHelmet", 1; @@ -243,7 +243,7 @@ L_YesShield: "Here you are!", -, "Where can I get a Leather Patch?", L_WhereLeather, "No way.", L_Pass; - if (zeny < 20000) + if (Zeny < 20000) goto L_ShieldNoZeny; if (countitem("InfantryHelmet") < 2) goto L_ShieldNoInfantry; @@ -264,7 +264,7 @@ L_YesShield: delitem "LeatherPatch", 1; delitem "IronIngot", 6; delitem "Coal", 12; - set zeny, zeny - 20000; + set Zeny, Zeny - 20000; if (@Q_SHIELD_status < @SHIELD_COMPLETED) getexp @SHIELD_XP, 0; @@ -332,7 +332,7 @@ L_SetzerQuest: "Here you are.", -, "Monster oil? What's that?", L_ExplainMonsterOil, "HOW much? Nevermind then!", L_Pass; - if (zeny < 50000) + if (Zeny < 50000) goto L_SetzerNoZeny; if ( (countitem("IronIngot") < 3) || (countitem("Coal") < 6) ) goto L_SetzerNoIngot; @@ -344,7 +344,7 @@ L_SetzerQuest: mes "[Nicholas]"; mes "Nicholas takes the items, heats up your sword and pounds it with a heavy hammer. As you watch, it turns thinner and flatter. Finally he pours the monster oil over it, heats the metal up again and douses it in water."; - set zeny, zeny - 50000; + set Zeny, Zeny - 50000; delitem "IronIngot", 3; delitem "Coal", 6; delitem "MonsterOilPotion", 1; diff --git a/world/map/npc/009-2/nurse.txt b/world/map/npc/009-2/nurse.txt index b9be0a7d..7052edc0 100644 --- a/world/map/npc/009-2/nurse.txt +++ b/world/map/npc/009-2/nurse.txt @@ -80,7 +80,7 @@ L_Doctor: close; L_Heal: - if (baselevel > 20) goto L_NoHeal; + if (BaseLevel > 20) goto L_NoHeal; mes "[Nurse]"; mes "\"Here, let me heal you.\""; next; diff --git a/world/map/npc/009-2/olana.txt b/world/map/npc/009-2/olana.txt index 3f5024f9..fe0e92e1 100644 --- a/world/map/npc/009-2/olana.txt +++ b/world/map/npc/009-2/olana.txt @@ -35,7 +35,7 @@ mes "\"Hello. We don't usually get guests back here.\""; next; mes "\"My name is Olana and my father owns this inn. I live in Tulimshar, but came to Hurnscald on vacation with my two young daughters, Rossy and Julia.\""; - if (baselevel < @MinLevel) close; + if (BaseLevel < @MinLevel) close; next; mes "\"I let my two lovely girls play in the woods nearby but they haven't come back yet!\""; next; @@ -90,7 +90,7 @@ L_See: mes "[Olana]"; mes "\"Ohhh... How sweet... Sometimes Rossy impresses me with her kindness. Here... You are spending so much time helping us, and we give nothing back. Take this as a small reward.\""; getexp @Cherry_EXP, 0; - set zeny, zeny + @Cherry_Money; + set Zeny, Zeny + @Cherry_Money; set gotcherry, 1; goto L_Task; @@ -168,7 +168,7 @@ L_Allergic: set Rossy_Quest, 12; mes "[Olana]"; mes "\"Oh, how stupid I am! Here, take some of my money and buy Red Tulips instead, the same amount. Keep the flowers.\""; - set zeny, zeny + @Flower_Money; + set Zeny, Zeny + @Flower_Money; next; mes "\"Please, tell Rossy I am really sorry. My mind was on Julia when I asked you to bring the red roses, they are her favorite.\""; menu @@ -207,7 +207,7 @@ L_Found: set Rossy_Quest, 19; mes "\"Thank you "+ strcharinfo(0) +", thank you! Here is a reward for you.\""; getexp @Finish_EXP, 0; - set zeny, zeny + @Finish_Money; + set Zeny, Zeny + @Finish_Money; if (Rossy_Quest == 19) goto L_Clear; close; diff --git a/world/map/npc/009-2/peter.txt b/world/map/npc/009-2/peter.txt index 10186d3b..6a97070f 100644 --- a/world/map/npc/009-2/peter.txt +++ b/world/map/npc/009-2/peter.txt @@ -17,7 +17,7 @@ close; L_Peter_Chain_Mail: - if (zeny < 20000) + if (Zeny < 20000) goto L_Peter_NotEnough_Zeny; if (countitem("IronIngot") < 5) goto L_Peter_NotEnough_Ingot; @@ -26,7 +26,7 @@ L_Peter_Chain_Mail: getinventorylist; if (@inventorylist_count == 100) goto L_Peter_TooMany; - set zeny, zeny - 20000; + set Zeny, Zeny - 20000; delitem "IronIngot", 5; getitem "ChainmailShirt", 1; mes "[Peter]"; @@ -34,7 +34,7 @@ L_Peter_Chain_Mail: close; L_Peter_Light_Plate: - if (zeny < 50000) + if (Zeny < 50000) goto L_Peter_NotEnough_Zeny; if (countitem("IronIngot") < 10) goto L_Peter_NotEnough_Ingot; @@ -43,7 +43,7 @@ L_Peter_Light_Plate: getinventorylist; if (@inventorylist_count == 100) goto L_Peter_TooMany; - set zeny, zeny - 50000; + set Zeny, Zeny - 50000; delitem "IronIngot", 10; delitem "Coal", 20; getitem "LightPlatemail", 1; @@ -52,7 +52,7 @@ L_Peter_Light_Plate: close; L_Peter_Warlord_Plate: - if (zeny < 100000) + if (Zeny < 100000) goto L_Peter_NotEnough_Zeny; if (countitem("IronIngot") < 15) goto L_Peter_NotEnough_Ingot; @@ -61,7 +61,7 @@ L_Peter_Warlord_Plate: getinventorylist; if (@inventorylist_count == 100) goto L_Peter_TooMany; - set zeny, zeny - 100000; + set Zeny, Zeny - 100000; delitem "IronIngot", 15; delitem "Coal", 30; getitem "WarlordPlate", 1; diff --git a/world/map/npc/009-2/waitress.txt b/world/map/npc/009-2/waitress.txt index 550cd6c4..782426b2 100644 --- a/world/map/npc/009-2/waitress.txt +++ b/world/map/npc/009-2/waitress.txt @@ -14,36 +14,36 @@ close; L_NoTip: - if (zeny < 170) + if (Zeny < 170) goto L_NoMoney; getinventorylist; if (@inventorylist_count == 100 && countitem("Beer") == 0) goto L_TooMany; - set zeny, zeny - 170; + set Zeny, Zeny - 170; getitem "Beer", 1; mes "[Melinda]"; mes "Pff... nickel nurser!"; close; L_5Tip: - if (zeny < 175) + if (Zeny < 175) goto L_NoMoney; getinventorylist; if (@inventorylist_count == 100 && countitem("Beer") == 0) goto L_TooMany; - set zeny, zeny - 175; + set Zeny, Zeny - 175; getitem "Beer", 1; mes "[Melinda]"; mes "\"Here you go, sweetheart!\""; close; L_10Tip: - if (zeny < 180) + if (Zeny < 180) goto L_NoMoney; getinventorylist; if (@inventorylist_count == 100 && countitem("Beer") == 0) goto L_TooMany; - set zeny, zeny - 180; + set Zeny, Zeny - 180; getitem "Beer", 1; mes "[Melinda]"; mes "\"Thank you, sweetie! Want to hear a secret?\""; -- cgit v1.2.3-70-g09d2