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/021-2/bakery.txt | 8 ++--- world/map/npc/021-2/government_building.txt | 24 ++++++------- world/map/npc/021-2/heathin.txt | 56 ++++++++++++++--------------- world/map/npc/021-2/inya.txt | 48 ++++++++++++------------- world/map/npc/021-2/jhedia.txt | 4 +-- 5 files changed, 70 insertions(+), 70 deletions(-) (limited to 'world/map/npc/021-2') diff --git a/world/map/npc/021-2/bakery.txt b/world/map/npc/021-2/bakery.txt index 76253c0f..bea20d9e 100644 --- a/world/map/npc/021-2/bakery.txt +++ b/world/map/npc/021-2/bakery.txt @@ -72,12 +72,12 @@ L_lace_chococake: goto L_lacking_ingredients; if (countitem("MopoxCurePotion") < 1) goto L_lacking_ingredients; - if (zeny < 400) - goto L_lacking_zeny; + if (Zeny < 400) + goto L_lacking_Zeny; delitem "MopoxCurePotion", 1; delitem "ChocolateBar", 10; getitem "LacedChocolateCake", 1; - set zeny, zeny - 400; + set Zeny, Zeny - 400; mes "[Riskim]"; mes ""; @@ -91,7 +91,7 @@ L_lace_chococake: mes "\"Here you are. I hope that this works.\""; close; -L_lacking_zeny: +L_lacking_Zeny: mes "[Riskim]"; mes ""; mes "\"I'm sorry, but I have to charge 400 GP.\""; diff --git a/world/map/npc/021-2/government_building.txt b/world/map/npc/021-2/government_building.txt index ab2a9214..dc2749b2 100644 --- a/world/map/npc/021-2/government_building.txt +++ b/world/map/npc/021-2/government_building.txt @@ -24,7 +24,7 @@ L_main_married: L_marry: if (BaseLevel < WEDDING_MIN_LEVEL) goto L_marry_too_young; - if (zeny < WEDDING_FEE) + if (Zeny < WEDDING_FEE) goto L_marry_too_poor; mes "[Estard]"; @@ -60,10 +60,10 @@ L_get_rings: mes "[Estard]"; mes "\"Yes. They are " + WEDDING_FEE + " GP. That covers all administrative fees for the marriage.\""; - if (zeny < WEDDING_FEE) + if (Zeny < WEDDING_FEE) menu "Thanks anyways. I don't have enough with me.", -; - if (zeny >= WEDDING_FEE) + if (Zeny >= WEDDING_FEE) menu "I'll buy a pair.", L_get_rings_pay, "Thanks anyways.", -; @@ -79,7 +79,7 @@ L_get_rings_pay: L_divorce: set @divorce_cost, DIVORCE_FEE_PER_LEVEL * BaseLevel; - if (zeny < @divorce_cost) + if (Zeny < @divorce_cost) goto L_divorce_not_enough; mes "[Estard]"; @@ -91,7 +91,7 @@ L_divorce: close; L_do_divorce: - if (zeny < @divorce_cost) + if (Zeny < @divorce_cost) goto L_not_enough_money; if (divorce()) @@ -104,7 +104,7 @@ L_do_divorce: close; L_divorce_done: - set zeny, zeny - @divorce_cost; + set Zeny, Zeny - @divorce_cost; mes "[Estard]"; mes "\"You have been divorced. Come again.\""; @@ -126,13 +126,13 @@ L_no_room_for_rings: close; S_give_rings: - if (zeny < WEDDING_FEE) + if (Zeny < WEDDING_FEE) goto L_not_enough_money; getinventorylist; if (@inventorylist_count > 98) goto L_no_room_for_rings; - set zeny, zeny - WEDDING_FEE; + set Zeny, Zeny - WEDDING_FEE; getitem "WeddingRing", 1; getitem "WeddingRing", 1; return; @@ -187,9 +187,9 @@ L_Get_Party: close; L_Give_Party: - if (zeny < 10) + if (Zeny < 10) goto L_NotEnoughMoney; - set zeny, zeny - 10; + set Zeny, Zeny - 10; setskill @PARTY_SKILL, 1; mes "[Tathin]"; mes "\"Here's your permit. You'll need to be invited by an existing member of a party to join it.\""; @@ -208,9 +208,9 @@ L_Get_Make_Party: close; L_Give_Make_Party: - if (zeny < 50) + if (Zeny < 50) goto L_NotEnoughMoney; - set zeny, zeny - 50; + set Zeny, Zeny - 50; setskill @PARTY_SKILL, 2; mes "[Tathin]"; mes "\"Here's your permit. You can create parties with the 'new' or 'create' commands on the Party tab in the client. Parties need to have unique names.\""; diff --git a/world/map/npc/021-2/heathin.txt b/world/map/npc/021-2/heathin.txt index e83ab281..acfff47f 100644 --- a/world/map/npc/021-2/heathin.txt +++ b/world/map/npc/021-2/heathin.txt @@ -6,22 +6,22 @@ set @TARROW_REQ_COAL, 5; set @TARROW_REQ_GP, 3000; - if (HEATHIN_QUEST == 14) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Trade; - if (HEATHIN_QUEST == 13) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Ready; - if (HEATHIN_QUEST == 12) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows_Forge; - if (HEATHIN_QUEST == 11) && (baselevel >= 80) goto L_Heathin_Terranite_Arrows; - if (HEATHIN_QUEST == 10) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Ready; - if (HEATHIN_QUEST == 9) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Forge; - if (HEATHIN_QUEST == 8) && (baselevel >= 80) goto L_Heathin_Terranite_Chest_Armor; - if (HEATHIN_QUEST == 7) && (baselevel >= 80) goto L_Heathin_Terranite_Legs_Ready; - if (HEATHIN_QUEST == 6) && (baselevel >= 80) goto L_Heathin_Terranite_Legs_Forge; - if (HEATHIN_QUEST == 5) && (baselevel >= 80) goto L_Heathin_Terranite_Legs; - if (HEATHIN_QUEST == 4) && (baselevel >= 80) goto L_Heathin_Terranite_Hood_Ready; - if (HEATHIN_QUEST == 3) && (baselevel >= 80) goto L_Heathin_Terranite_Hood_Forge; - if (HEATHIN_QUEST == 2) && (baselevel >= 80) goto L_Heathin_Terranite_Hood; - if (HEATHIN_QUEST == 2) && (baselevel >= 60)goto L_Heathin_Ring_Thanks; - if (HEATHIN_QUEST == 1) && (baselevel >= 60) goto L_Heathin_Ring_Award; - if (baselevel >= 60) goto L_Heathin_Start; + if (HEATHIN_QUEST == 14) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Trade; + if (HEATHIN_QUEST == 13) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Ready; + if (HEATHIN_QUEST == 12) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows_Forge; + if (HEATHIN_QUEST == 11) && (BaseLevel >= 80) goto L_Heathin_Terranite_Arrows; + if (HEATHIN_QUEST == 10) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Ready; + if (HEATHIN_QUEST == 9) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor_Forge; + if (HEATHIN_QUEST == 8) && (BaseLevel >= 80) goto L_Heathin_Terranite_Chest_Armor; + if (HEATHIN_QUEST == 7) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs_Ready; + if (HEATHIN_QUEST == 6) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs_Forge; + if (HEATHIN_QUEST == 5) && (BaseLevel >= 80) goto L_Heathin_Terranite_Legs; + if (HEATHIN_QUEST == 4) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Ready; + if (HEATHIN_QUEST == 3) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood_Forge; + if (HEATHIN_QUEST == 2) && (BaseLevel >= 80) goto L_Heathin_Terranite_Hood; + if (HEATHIN_QUEST == 2) && (BaseLevel >= 60)goto L_Heathin_Ring_Thanks; + if (HEATHIN_QUEST == 1) && (BaseLevel >= 60) goto L_Heathin_Ring_Award; + if (BaseLevel >= 60) goto L_Heathin_Start; mes "[Heathin]"; mes "\"Hello, friend. I am Heathin, a smith of exotic metals. \""; @@ -68,11 +68,11 @@ L_Heathin_Interested: close; L_Heathin_Ring_Award: - if ( (zeny < 100000) + if ( (Zeny < 100000) | (countitem ("Coal") < 50) ) goto L_Heathin_Ring_Wait; set HEATHIN_QUEST, 2; - set zeny, zeny - 100000; + set Zeny, Zeny - 100000; delitem "Coal", 50; getitem "SimpleRing", 1; mes "[Heathin]"; @@ -131,14 +131,14 @@ L_Heathin_Terranite_Yes: close; L_Heathin_Terranite_Hood_Forge: - if ( (zeny < 200000) + if ( (Zeny < 200000) | (countitem("Coal") < 100) | (countitem("TerraniteOre") < 10) ) goto L_Heathin_Terranite_Hood_Wait; set HEATHIN_QUEST, 4; delitem "Coal", 100; delitem "TerraniteOre", 10; - set zeny, zeny - 200000; + set Zeny, Zeny - 200000; mes "[Heathin]"; mes "\"Great, you brought everything! Come back later and I'll have the helm ready for you.\""; close; @@ -164,14 +164,14 @@ L_Heathin_Terranite_Legs: close; L_Heathin_Terranite_Legs_Forge: - if ( (zeny < 400000) + if ( (Zeny < 400000) | (countitem("Coal") < 200) | (countitem("TerraniteOre") < 30) ) goto L_Heathin_Terranite_Legs_Wait; set HEATHIN_QUEST, 7; delitem "Coal", 200; delitem "TerraniteOre", 30; - set zeny, zeny - 400000; + set Zeny, Zeny - 400000; mes "[Heathin]"; mes "\"Great, you have brought everything! Come back later and I will have those terranite pants ready for you.\""; close; @@ -197,14 +197,14 @@ L_Heathin_Terranite_Chest_Armor: close; L_Heathin_Terranite_Chest_Armor_Forge: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem("Coal") < 250) | (countitem("TerraniteOre") < 40) ) goto L_Heathin_Terranite_Chest_Armor_Wait; set HEATHIN_QUEST, 10; delitem "Coal", 250; delitem "TerraniteOre", 40; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; mes "[Heathin]"; mes "\"Splendid, you have brought everything! Come back later and I will have the terranite chest armor ready for you.\""; close; @@ -245,14 +245,14 @@ L_Heathin_Terranite_Arrows_Yes: close; L_Heathin_Terranite_Arrows_Forge: - if ( (zeny < @TARROW_REQ_GP) + if ( (Zeny < @TARROW_REQ_GP) | (countitem("Coal") < @TARROW_REQ_COAL) | (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) ) goto L_Heathin_Terranite_Arrows_Wait; set HEATHIN_QUEST, 13; delitem "Coal", @TARROW_REQ_COAL; delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE; - set zeny, zeny - @TARROW_REQ_GP; + set Zeny, Zeny - @TARROW_REQ_GP; mes "[Heathin]"; mes "\"Wonderful! You have everything I asked for. I will start working on the arrows right away.\""; close; @@ -283,13 +283,13 @@ L_Heathin_Terranite_Arrows_Trade_No: close; L_Heathin_Terranite_Arrows_Trade_Yes: - if ( (zeny < @TARROW_REQ_GP) + if ( (Zeny < @TARROW_REQ_GP) | (countitem("Coal") < @TARROW_REQ_COAL) | (countitem("TerraniteOre") < @TARROW_REQ_TERRA_ORE) ) goto L_Heathin_Terranite_Arrows_Trade_Wait; delitem "Coal", @TARROW_REQ_COAL; delitem "TerraniteOre", @TARROW_REQ_TERRA_ORE; - set zeny, zeny - @TARROW_REQ_GP; + set Zeny, Zeny - @TARROW_REQ_GP; set @lucky, 5 * rand(readparam(bLuk)); getitem "TerraniteArrow", 1000 + @lucky; mes "[Heathin]"; diff --git a/world/map/npc/021-2/inya.txt b/world/map/npc/021-2/inya.txt index 1213246c..946bdb33 100644 --- a/world/map/npc/021-2/inya.txt +++ b/world/map/npc/021-2/inya.txt @@ -48,10 +48,10 @@ L_Inya_Add_RingGem: close; L_Inya_Remove_Diamond: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem ("DiamondRing") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; delitem "DiamondRing", 1; getitem "SimpleRing", 1; mes "[Inya]"; @@ -59,10 +59,10 @@ L_Inya_Remove_Diamond: close; L_Inya_Remove_Ruby: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem ("RubyRing") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; delitem "RubyRing", 1; getitem "SimpleRing", 1; mes "[Inya]"; @@ -70,10 +70,10 @@ L_Inya_Remove_Ruby: close; L_Inya_Remove_Emerald: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem ("EmeraldRing") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; delitem "EmeraldRing", 1; getitem "SimpleRing", 1; mes "[Inya]"; @@ -81,10 +81,10 @@ L_Inya_Remove_Emerald: close; L_Inya_Remove_Sapphire: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem ("SapphireRing") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; delitem "SapphireRing", 1; getitem "SimpleRing", 1; mes "[Inya]"; @@ -92,10 +92,10 @@ L_Inya_Remove_Sapphire: close; L_Inya_Remove_Topaz: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem ("TopazRing") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; delitem "TopazRing", 1; getitem "SimpleRing", 1; mes "[Inya]"; @@ -103,10 +103,10 @@ L_Inya_Remove_Topaz: close; L_Inya_Remove_Amethyst: - if ( (zeny < 500000) + if ( (Zeny < 500000) | (countitem ("AmethystRing") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 500000; + set Zeny, Zeny - 500000; delitem "AmethystRing", 1; getitem "SimpleRing", 1; mes "[Inya]"; @@ -114,11 +114,11 @@ L_Inya_Remove_Amethyst: close; L_Inya_Add_Diamond: - if ( (zeny < 1000000) + if ( (Zeny < 1000000) | (countitem ("SimpleRing") < 1) | (countitem ("Diamond") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 1000000; + set Zeny, Zeny - 1000000; delitem "SimpleRing", 1; delitem "Diamond", 1; getitem "DiamondRing", 1; @@ -127,11 +127,11 @@ L_Inya_Add_Diamond: close; L_Inya_Add_Ruby: - if ( (zeny < 1000000) + if ( (Zeny < 1000000) | (countitem ("SimpleRing") < 1) | (countitem ("Ruby") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 1000000; + set Zeny, Zeny - 1000000; delitem "SimpleRing", 1; delitem "Ruby", 1; getitem "RubyRing", 1; @@ -140,11 +140,11 @@ L_Inya_Add_Ruby: close; L_Inya_Add_Emerald: - if ( (zeny < 1000000) + if ( (Zeny < 1000000) | (countitem ("SimpleRing") < 1) | (countitem ("Emerald") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 1000000; + set Zeny, Zeny - 1000000; delitem "SimpleRing", 1; delitem "Emerald", 1; getitem "EmeraldRing", 1; @@ -153,11 +153,11 @@ L_Inya_Add_Emerald: close; L_Inya_Add_Sapphire: - if ( (zeny < 1000000) + if ( (Zeny < 1000000) | (countitem ("SimpleRing") < 1) | (countitem ("Sapphire") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 1000000; + set Zeny, Zeny - 1000000; delitem "SimpleRing", 1; delitem "Sapphire", 1; getitem "SapphireRing", 1; @@ -166,11 +166,11 @@ L_Inya_Add_Sapphire: close; L_Inya_Add_Topaz: - if ( (zeny < 1000000) + if ( (Zeny < 1000000) | (countitem ("SimpleRing") < 1) | (countitem ("Topaz") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 1000000; + set Zeny, Zeny - 1000000; delitem "SimpleRing", 1; delitem "Topaz", 1; getitem "TopazRing", 1; @@ -179,11 +179,11 @@ L_Inya_Add_Topaz: close; L_Inya_Add_Amethyst: - if ( (zeny < 1000000) + if ( (Zeny < 1000000) | (countitem ("SimpleRing") < 1) | (countitem ("Amethyst") < 1) ) goto L_Inya_Not_Enough; - set zeny, zeny - 1000000; + set Zeny, Zeny - 1000000; delitem "SimpleRing", 1; delitem "Amethyst", 1; getitem "AmethystRing", 1; diff --git a/world/map/npc/021-2/jhedia.txt b/world/map/npc/021-2/jhedia.txt index 9df2bab0..32f043f3 100644 --- a/world/map/npc/021-2/jhedia.txt +++ b/world/map/npc/021-2/jhedia.txt @@ -20,7 +20,7 @@ goto L_Jhedia_NotEnough_Ore; if (countitem("Coal") < @Coal_Per * @ingot_count) goto L_Jhedia_NotEnough_Coal; - if (zeny < @Zeny_cost) + if (Zeny < @Zeny_cost) goto L_Jhedia_NotEnough_Zeny; getinventorylist; if (@inventorylist_count == 100 @@ -28,7 +28,7 @@ && countitem("IronOre") > @ingot_count * @Iron_Ore_Per | countitem("Coal") > @ingot_count * @Coal_Per) goto L_Jhedia_NotEnoughSlots; - set zeny, zeny - @Zeny_cost; + set Zeny, Zeny - @Zeny_cost; delitem "IronOre", @ingot_count * @Iron_Ore_Per; delitem "Coal", @ingot_count * @Coal_Per; getitem "IronIngot", @ingot_count; -- cgit v1.2.3-60-g2f50