From 4e98d4621f225766abb32d30ab6cea8d2739a419 Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Fri, 23 Jan 2009 16:52:05 +0000 Subject: Start converting scripts over to "ItemName" Instead of using the item number. A few small bug fixes are also here. --- npc/001-1_Tulimshar/elanore.txt | 42 +++++++++++----------------- npc/001-1_Tulimshar/guide.txt | 2 +- npc/001-1_Tulimshar/rewards_master.txt | 8 +++--- npc/001-1_Tulimshar/sandra.txt | 14 +++++----- npc/001-1_Tulimshar/vincent.txt | 4 +-- npc/001-2_Tulimshar/casino.txt | 14 +++++----- npc/001-2_Tulimshar/troupe_leader.txt | 2 +- npc/002-1_Sandstorm/_import.txt | 1 - npc/002-1_Sandstorm/dark_mage.txt | 48 -------------------------------- npc/002-4_Desert_mines/chest.txt | 8 +++--- npc/005-1_Snake_desert/spirit.txt | 6 ++-- npc/005-1_Snake_desert/tree.txt | 9 +++--- npc/006-1_Desert_mountains/pachua.txt | 39 ++++++++++++-------------- npc/008-1_Hurnscald_outskirts/hinnak.txt | 16 ++++------- npc/013-3_Cave/sword_chest.txt | 8 +++--- npc/functions/slot_machine.txt | 6 ++-- npc/items/purification_potion.txt | 14 +++------- 17 files changed, 84 insertions(+), 157 deletions(-) delete mode 100644 npc/002-1_Sandstorm/dark_mage.txt (limited to 'npc') diff --git a/npc/001-1_Tulimshar/elanore.txt b/npc/001-1_Tulimshar/elanore.txt index a303af19..5179760b 100644 --- a/npc/001-1_Tulimshar/elanore.txt +++ b/npc/001-1_Tulimshar/elanore.txt @@ -10,14 +10,6 @@ set @Q_status, (QUEST_MAGIC2 & @Q_MASK) >> @Q_SHIFT; set @Q_heal_exp, MAGIC_EXPERIENCE >> 24; - set @BUGLEG, 518; - set @MAGGOTSLIME, 505; - set @MAUVE, 680; - set @GAMBOGE, 681; - set @COBALT, 682; - set @ALIZARIN, 683; - set @LIFESTONE, 730; - set @STATUS_INITIAL, 0; set @STATUS_LEARNED_LIGHT_HEAL, 1; set @STATUS_MASTERED_LIGHT_HEAL, 2; @@ -161,22 +153,22 @@ L_Lifestones: close; L_Lifestones_Trade: - if (countitem(@MAUVE) < 10) goto L_Lifestones_Trade_Missing; - if (countitem(@GAMBOGE) < 10) goto L_Lifestones_Trade_Missing; - if (countitem(@ALIZARIN) < 10) goto L_Lifestones_Trade_Missing; - if (countitem(@COBALT) < 10) goto L_Lifestones_Trade_Missing; + if (countitem("MauveHerb") < 10) goto L_Lifestones_Trade_Missing; + if (countitem("GambogeHerb") < 10) goto L_Lifestones_Trade_Missing; + if (countitem("AlizarinHerb") < 10) goto L_Lifestones_Trade_Missing; + if (countitem("CobaltHerb") < 10) goto L_Lifestones_Trade_Missing; getinventorylist; - if (@inventorylist_count == 100 && countitem(@LIFESTONE) == 0 - && countitem(@MAUVE) > 10 - && countitem(@GAMBOGE) > 10 - && countitem(@ALIZARIN) > 10 - && countitem(@COBALT) > 10) goto L_Lifestones_NoRoom; - - delitem @MAUVE, 10; - delitem @GAMBOGE, 10; - delitem @ALIZARIN, 10; - delitem @COBALT, 10; - getitem @LIFESTONE, 5; + if (@inventorylist_count == 100 && countitem("Lifestone") == 0 + && countitem("MauveHerb") > 10 + && countitem("GambogeHerb") > 10 + && countitem("AlizarinHerb") > 10 + && countitem("CobaltHerb") > 10) goto L_Lifestones_NoRoom; + + delitem "MauveHerb", 10; + delitem "GambogeHerb", 10; + delitem "AlizarinHerb", 10; + delitem "CobaltHerb", 10; + getitem "LifeStone", 5; getexp 200, 1; mes "[Elanore the Healer]"; mes "Elanore carefully goes over your leaves, then smiles."; @@ -262,10 +254,10 @@ L_Teach_Initial: next; getinventorylist; - if ((@inventorylist_count == 100) && (countitem(@LIFESTONE) == 0)) + if ((@inventorylist_count == 100) && (countitem("LifeStone") == 0)) goto L_Teach_Initial_Noroom; - getitem @LIFESTONE, 1; + getitem "LifeStone", 1; set @Q_status, @STATUS_LEARNED_LIGHT_HEAL; callsub S_update_var; diff --git a/npc/001-1_Tulimshar/guide.txt b/npc/001-1_Tulimshar/guide.txt index d4367616..30a9cb51 100644 --- a/npc/001-1_Tulimshar/guide.txt +++ b/npc/001-1_Tulimshar/guide.txt @@ -153,7 +153,7 @@ S_Grad: mes "[Ian the Guide]"; mes "\"Hey, you've been doing good, let me give you this.\""; - getitem 675, 1; + getitem "GraduationCap", 1; set TUT_var, TUT_var | 2; next; diff --git a/npc/001-1_Tulimshar/rewards_master.txt b/npc/001-1_Tulimshar/rewards_master.txt index 657b82f4..cc64da8c 100644 --- a/npc/001-1_Tulimshar/rewards_master.txt +++ b/npc/001-1_Tulimshar/rewards_master.txt @@ -5,7 +5,7 @@ if (tvis == 0) set tvis, 1; if (Mobpt < tvis) goto L_NotEnough; - setarray @Items, 502, 502, 503, 504, 505, 506, 507, 508, 509, 510, 586, 512, 513, 514, 515, 516, 517, 518, 519, 520; + setarray @Items$, "CactusPotion", "CactusPotion", "CasinoCoins", "DecorCandy", "MaggotSlime", "CandyCane", "ScorpionStinger", "XmasCake", "ChocolateBar", "Candy", "GingerBreadMan", "Cake", "XmasCandyCane", "PurplePresentBox", "BluePresentBox", "RedScorpionStinger", "BugLeg", "CherryCake", "EasterEgg", "CottonShirt", "CottonShorts"; mes "[Ishi the Rewards Master]"; mes "\"Welcome! I see you have " + Mobpt + " Monster Points. Would you like to exchange some of those for items?\""; @@ -79,11 +79,11 @@ L_Menu_Done: SUB_give_item: set Mobpt, Mobpt - tvis; set tvis, tvis + 1; - set @ID, @Items[rand(getarraysize(@Items))]; + set @item$, @Items$[rand(getarraysize(@Items$))]; - getitem @ID, 1; + getitem @item$, 1; - mes "You received one " + getitemname(@ID) + "!"; + mes "You received one " + getitemname(@item$) + "!"; return; } diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt index 314e009a..e1e2f652 100644 --- a/npc/001-1_Tulimshar/sandra.txt +++ b/npc/001-1_Tulimshar/sandra.txt @@ -70,17 +70,17 @@ L_Set: close; L_Progress: - if (countitem(507) < 5) goto L_NotEnough; - if (countitem(517) < 1) goto L_NotEnough; + if (countitem("ScorpionStinger") < 5) goto L_NotEnough; + if (countitem("RedScorpionStinger") < 1) goto L_NotEnough; mes "[Sandra]"; mes "\"Excellent!"; mes "You brought me 5 [Scorpion Stingers] and 1 [Red Scoprion Stinger]!\""; getinventorylist; - if ((@inventorylist_count - (countitem(507) == 5) - (countitem(517) == 1)) > 99 - (countitem(1199) == 0)) goto L_TooMany; - delitem 507, 5; - delitem 517, 1; - getitem 1200, 1; - getitem 1199, 100; + if ((@inventorylist_count - (countitem("ScorpionStinger") == 5) - (countitem("RedScorpionStinger") == 1)) > 99 - (countitem("Arrow") == 0)) goto L_TooMany; + delitem "ScorpionStinger", 5; + delitem "RedScorpionStinger", 1; + getitem "Bow", 1; + getitem "Arrow", 100; set Scorp, 2; close; diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt index b0412517..b8997e8f 100644 --- a/npc/001-1_Tulimshar/vincent.txt +++ b/npc/001-1_Tulimshar/vincent.txt @@ -80,13 +80,13 @@ L_Wait: close; L_Progress: - if(countitem(518) >= 30) goto L_Have; + if(countitem("BugLeg") >= 30) goto L_Have; mes "[Vincent]"; mes "\"Please help me collect 30 [Bug Legs]!\""; close; L_Have: - delitem 518, 30; + delitem "BugLeg", 30; mes "[Vincent]"; mes "\"Excellent! Finally I can complete the model!!\""; next; diff --git a/npc/001-2_Tulimshar/casino.txt b/npc/001-2_Tulimshar/casino.txt index b5da3933..079f163d 100644 --- a/npc/001-2_Tulimshar/casino.txt +++ b/npc/001-2_Tulimshar/casino.txt @@ -33,8 +33,8 @@ close; L_Begin: - if(countitem(503) < 15) goto L_NoCoin; - delitem 503, 15; + if(countitem("CasinoCoins") < 15) goto L_NoCoin; + delitem "CasinoCoins", 15; set @croupier, rand(0, 4); set @croupier, @croupier + 17; set @player, rand(4, 21); @@ -65,7 +65,7 @@ L_End: mes "\"Congratulations, you won!"; mes "I had " + @croupier + "."; mes "You get 45 casino coins.\""; - getitem 503, 45; + getitem "CasinoCoins", 45; close; L_NoCoin: @@ -129,8 +129,8 @@ L_b100: goto L_Check; L_Check: - if(countitem(503) < @bet) goto L_NoCoin; - delitem 503, @bet; + if(countitem("CasinoCoins") < @bet) goto L_NoCoin; + delitem "CasinoCoins", @bet; menu "Choose a color", -, "Choose a number", L_Number; @@ -140,7 +140,7 @@ L_Check: set @color,rand(2); if(@color == 1) goto L_Lost; mes "You won!"; - getitem 503, @bet * 2; + getitem "CasinoCoins", @bet * 2; close; L_Number: @@ -159,7 +159,7 @@ L_Number: if (@roulette < 37) mes "The ball stopped on " + @roulette; if (@number != @roulette) goto L_Lost; mes "\"You won!\""; - getitem 503, @bet * 10; + getitem "CasinoCoins", @bet * 10; close; L_NoCoin: diff --git a/npc/001-2_Tulimshar/troupe_leader.txt b/npc/001-2_Tulimshar/troupe_leader.txt index d5c8bbfd..7bace781 100644 --- a/npc/001-2_Tulimshar/troupe_leader.txt +++ b/npc/001-2_Tulimshar/troupe_leader.txt @@ -37,7 +37,7 @@ L_NohMask_Found: mes "[1500 experience points]"; getexp 1500, 0; set Inspector, 14; - getitem 678, 1; + getitem "NohMask", 1; next; mes "[Troupe Leader]"; mes "\"We don't need it anymore. We're doing different shows here.\""; diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt index cb6b0a78..0066d7bd 100644 --- a/npc/002-1_Sandstorm/_import.txt +++ b/npc/002-1_Sandstorm/_import.txt @@ -1,7 +1,6 @@ map: 002-1.gat npc: npc/002-1_Sandstorm/_mobs.txt npc: npc/002-1_Sandstorm/_warps.txt -npc: npc/002-1_Sandstorm/dark_mage.txt npc: npc/002-1_Sandstorm/merchant.txt npc: npc/002-1_Sandstorm/nomads.txt npc: npc/002-1_Sandstorm/rogue.txt diff --git a/npc/002-1_Sandstorm/dark_mage.txt b/npc/002-1_Sandstorm/dark_mage.txt deleted file mode 100644 index 002b5ed9..00000000 --- a/npc/002-1_Sandstorm/dark_mage.txt +++ /dev/null @@ -1,48 +0,0 @@ -// - -// 002-1.gat,24,24,0 script SoulThief 103,{ - -// if (class == 1) goto L_Soul; -// mes "[Dark Mage]"; -// mes "\"Psss hey would you like to have more power?\""; -// next; - -// menu -// "You fool, that's not possible", -, -// "I'm listening...", L_Go; -// close; - -// L_Go: -// mes "[Dark Mage]"; -// mes "\"I can give you ancient powers that will let you become the greatest warrior in The Mana World, or the best merchant."; -// mes "But everything has got his price...\""; -// next; - -// mes "[Dark Mage]"; -// mes "\"Oh nothing important nor expensive."; -// mes "Just your soul!\""; -// next; - -// menu -// "My soul? Here it is", L_Soul, -// "I need a better explanation!", -; - -// mes "[Dark Mage]"; -// mes "Well there's a very small possibility that your player will be translated into the new server."; -// mes "I said a very, very small possibility."; -// mes "Players without a soul instead will be lost forever..."; -// mes "Come on, you won't loose that much!\""; -// next; - -// menu -// "Hmmm ok, I guess you can take it.", L_Soul, -// "Maybe I'll think about it a bit more", -; -// mes "\"I know you'll come here again when you'll get killed by a maggot, begging me to help you\""; -// close; - -// L_Soul: -// mes "[Dark Mage]"; -// mes "\"Hrhrhr, your soul is finally mine!\""; -// jobchange 1; -// close; -// } diff --git a/npc/002-4_Desert_mines/chest.txt b/npc/002-4_Desert_mines/chest.txt index e76332fd..e1825d0f 100644 --- a/npc/002-4_Desert_mines/chest.txt +++ b/npc/002-4_Desert_mines/chest.txt @@ -12,13 +12,13 @@ close; L_Yes: - if(countitem(537) < 3) goto L_Not_Enough; + if(countitem("TreasureKey") < 3) goto L_Not_Enough; getinventorylist; - if (@inventorylist_count == 100 && countitem(537) > 3) goto L_TooMany; + if (@inventorylist_count == 100 && countitem("TreasureKey") > 3) goto L_TooMany; mes "[Chest]"; mes "You opened it and found a short sword!"; - delitem 537, 3; - getitem 536, 1; + delitem "TreasureKey", 3; + getitem "ShortSword", 1; set ChestQuest, ChestQuest | 1; close; diff --git a/npc/005-1_Snake_desert/spirit.txt b/npc/005-1_Snake_desert/spirit.txt index 5ef46cbc..ad835121 100644 --- a/npc/005-1_Snake_desert/spirit.txt +++ b/npc/005-1_Snake_desert/spirit.txt @@ -15,8 +15,6 @@ L_message: set @Q_STATUS_STUDENT2, 4; set @Q_STATUS_STUDENT3, 5; - set @BRANCH, 732; - set @s$, "girl"; if (Sex) set @s$, "boy"; @@ -143,7 +141,7 @@ L_Q_magic_1: "Where was the tree again?", L_Q_tree_where, "What is that tree?", L_Q_tree_what; - if (countitem(@BRANCH) < 1) + if (countitem("DruidTreeBranch") < 1) goto L_Q_tree_none; if (!(MAGIC_FLAGS & MFLAG_DID_CUTTREE)) goto L_Q_tree_dry; @@ -151,7 +149,7 @@ L_Q_magic_1: goto L_Q_tree_nomoney; set zeny, zeny - 100000; - delitem @BRANCH, 1; + delitem "DruidTreeBranch", 1; mes "[Earth Spirit]"; mes "Following the earth sprite's instructions, you throw branch and GP into the well."; diff --git a/npc/005-1_Snake_desert/tree.txt b/npc/005-1_Snake_desert/tree.txt index 5e576cea..093cbe1e 100644 --- a/npc/005-1_Snake_desert/tree.txt +++ b/npc/005-1_Snake_desert/tree.txt @@ -95,13 +95,12 @@ L_both: close; L_givewater: - set @WATER, 541; set @BOTTLE, 540; - if (countitem(@WATER) < 1) + if (countitem("BottleOfWater") < 1) goto L_no_water; - delitem @WATER, 1; - getitem @BOTTLE, 1; + delitem "BottleOfWater", 1; + getitem "EmptyBottle", 1; mes "[Dying Tree]"; mes "You pour a bottle of water into the sand. The water dissipates quickly, without any effect."; @@ -141,7 +140,7 @@ L_do_cut: L_really_cut: set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_DID_CUTTREE; - getitem 732, 1; + getitem "DruidTreeBranch", 1; mes "[Dying Tree]"; mes "You cut off a branch from the tree."; mes "For an instant, you have an uneasy feeling, as if the branch were writhing in your hand..."; diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt index 51c2d3b2..e0fcef7f 100644 --- a/npc/006-1_Desert_mountains/pachua.txt +++ b/npc/006-1_Desert_mountains/pachua.txt @@ -1,8 +1,5 @@ 006-1.gat,23,100,0 script Pachua 143,{ - set @LEATHER_PATCH, 708; - set @SNAKE_SKIN, 641; - set @LEATHER_PATCH_PRICE, 300; set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK; @@ -19,9 +16,9 @@ next; L_Check_Shops: - if((countitem(610) > 0 && countitem(@SNAKE_SKIN) > 9) && (countitem(524) > 0 && countitem(@SNAKE_SKIN) > 1)) goto L_Super_store; - if(countitem(610) > 0 && countitem(@SNAKE_SKIN) > 9) goto L_Chaps_store; - if(countitem(524) > 0 && countitem(@SNAKE_SKIN) > 1) goto L_Cowboy_store; + if((countitem("JeansShorts") > 0 && countitem("SnakeSkin") > 9) && (countitem("FancyHat") > 0 && countitem("SnakeSkin") > 1)) goto L_Super_store; + if(countitem("JeansShorts") > 0 && countitem("SnakeSkin") > 9) goto L_Chaps_store; + if(countitem("FancyHat") > 0 && countitem("SnakeSkin") > 1) goto L_Cowboy_store; mes "[Chief Pachua]"; mes "\"Maybe if you bring me the right materials I can make something for you.\""; @@ -101,31 +98,31 @@ L_Chaps_store: L_BuyChaps: if (zeny < 10000) goto L_NoMoney; - if (countitem(610) < 1) goto L_NoJeans; - if (countitem(@SNAKE_SKIN) < 10) goto L_NoSkin; + if (countitem("JeansShorts") < 1) goto L_NoJeans; + if (countitem("SnakeSkin") < 10) goto L_NoSkin; set zeny, zeny - 10000; - delitem @SNAKE_SKIN, 10; - delitem 610, 1; - getitem 642, 1; + delitem "SnakeSkin", 10; + delitem "JeansShorts", 1; + getitem "JeansChaps", 1; goto L_DealDone; L_BuyCowboy: if (zeny < 5000) goto L_NoMoney; - if (countitem(524) < 1) goto L_NoFancy; - if (countitem(@SNAKE_SKIN) < 2) goto L_NoSkin; + if (countitem("FancyHat") < 1) goto L_NoFancy; + if (countitem("SnakeSkin") < 2) goto L_NoSkin; set zeny, zeny - 5000; - delitem @SNAKE_SKIN, 2; - delitem 524, 1; + delitem "SnakeSkin", 2; + delitem "FancyHat", 1; set @temp,rand(2); if(@temp == 0) goto L_Cowboy_white; goto L_Cowboy_black; L_Cowboy_white: - getitem 643, 1; + getitem "CowboyWhite", 1; goto L_DealDone; L_Cowboy_black: - getitem 644, 1; + getitem "CowboyBlack", 1; goto L_DealDone; L_leather_patch: @@ -137,14 +134,14 @@ L_leather_patch: "OK, I'll be back later.", L_End, "That's too expensive!.", L_NoDeal; - if (countitem(@SNAKE_SKIN) < 1) goto L_NoSkins; + if (countitem("SnakeSkin") < 1) goto L_NoSkins; if (zeny < @LEATHER_PATCH_PRICE) goto L_NoMoney; getinventorylist; - if (@inventorylist_count == 100 && countitem(@SNAKE_SKIN) > 1) goto L_TooMany; + if (@inventorylist_count == 100 && countitem("SnakeSkin") > 1) goto L_TooMany; set zeny, zeny - @LEATHER_PATCH_PRICE; - delitem @SNAKE_SKIN, 1; - getitem @LEATHER_PATCH, 1; + delitem "SnakeSkin", 1; + getitem "LeatherPatch", 1; goto L_DealDone; L_DealDone: diff --git a/npc/008-1_Hurnscald_outskirts/hinnak.txt b/npc/008-1_Hurnscald_outskirts/hinnak.txt index c2a547d4..0aa10570 100644 --- a/npc/008-1_Hurnscald_outskirts/hinnak.txt +++ b/npc/008-1_Hurnscald_outskirts/hinnak.txt @@ -56,19 +56,17 @@ L_Exchange: mes "\"Have you got the 10 antennae?\""; next; - if (countitem(614) < 10) goto L_Exchange_Notenough; - menu "Not yet, but I am working on it.", -, "Sure, here they are!", L_Exchange_Exchange; close; L_Exchange_Exchange: - if (countitem(614) < 10) goto L_Exchange_Notenough; + if (countitem("PinkAntenna") < 10) goto L_Exchange_Notenough; getinventorylist; - if (@inventorylist_count == 100) goto L_Exchange_TooMany; - delitem 614, 10; - getitem 623, 1; + if (@inventorylist_count == 100 && countitem("PinkAntenna") > 10) goto L_Exchange_TooMany; + delitem "PinkAntenna", 10; + getitem "Scythe", 1; set QUEST_Scythe_state, 2; mes "[Farmer Hinnak]"; mes "\"Thank you very much. I've got something for you. My old scythe. Maybe you can use it as a weapon. It is a bit cumbersome but its strikes are deadly.\""; @@ -88,8 +86,6 @@ L_ThanksAgain: mes "[Farmer Hinnak]"; mes "\"Good to see you again, and thanks again for helping me with the pinkies!\""; - set @BEER, 539; - next; menu @@ -115,8 +111,8 @@ L_ThanksAgain: "I don't have any.", L_NoBeer; L_GiveBeer: - if (countitem(@BEER) < 1) goto L_NoBeer; - delitem @BEER, 1; + if (countitem("Beer") < 1) goto L_NoBeer; + delitem "Beer", 1; mes "[Farmer Hinnak]"; mes "Hinnak takes a sip."; mes "\"Aaah! Nothing like a well-deserved beer after a long day of tending the crops!\""; diff --git a/npc/013-3_Cave/sword_chest.txt b/npc/013-3_Cave/sword_chest.txt index c570bfcd..5d2c97b7 100644 --- a/npc/013-3_Cave/sword_chest.txt +++ b/npc/013-3_Cave/sword_chest.txt @@ -12,11 +12,11 @@ close; L_Yes: - if(countitem(537) < 10) goto L_Not_Enough; + if(countitem("TreasureKey") < 10) goto L_Not_Enough; getinventorylist; - if (@inventorylist_count == 100 && countitem(537) > 10) goto L_TooMany; - delitem 537, 10; - getitem 536, 1; + if (@inventorylist_count == 100 && countitem("TreasureKey") > 10) goto L_TooMany; + delitem "TreasureKey", 10; + getitem "ShortSword", 1; mes "[Chest]"; mes "You opened it and found a short sword!"; set ChestQuest, ChestQuest | 2; diff --git a/npc/functions/slot_machine.txt b/npc/functions/slot_machine.txt index 024a2e8a..8f4482cc 100644 --- a/npc/functions/slot_machine.txt +++ b/npc/functions/slot_machine.txt @@ -9,8 +9,8 @@ function script SlotMachine { close; L_Play: - if(countitem(503) < 1) goto L_NoCoin; - delitem 503, 1; + if(countitem("CasinoCoins") < 1) goto L_NoCoin; + delitem "CasinoCoins", 1; set @Temp1,rand(7); set @Temp2,rand(7); set @Temp3,rand(7); @@ -22,7 +22,7 @@ L_Play: if(@Temp1 != @Temp3) goto L_Lost; mes "Congratulations! You won!"; mes "You get 10 casino coins"; - getitem 503, 10; + getitem "CasinoCoins", 10; close; L_Lost: diff --git a/npc/items/purification_potion.txt b/npc/items/purification_potion.txt index 9f3c7e5e..85b07010 100644 --- a/npc/items/purification_potion.txt +++ b/npc/items/purification_potion.txt @@ -1,15 +1,13 @@ -// - -function script PurificationPotion { - set @PURIFICATIONPOTION, 733; +// THis is the function to use the PurificationPotion +function script usePurificationPotion { if (isat("011-1.gat", 88,67)) goto L_Wyara_Pond; L_NoUse: message strcharinfo(0), "You don't know what to do with this."; - getitem @PURIFICATIONPOTION, 1; - close; + getitem "PurificationPotion", 1; + return; L_Wyara_Pond: set @Q_MASK, NIBBLE_2_MASK; @@ -29,8 +27,4 @@ L_Wyara_Pond: (QUEST_MAGIC2 & ~(@Q_MASK) | (@Q_status << @Q_SHIFT)); return; - -L_NoUse: - message strcharinfo(0), "You don't know what to do with this."; - return; } -- cgit v1.2.3-60-g2f50