diff options
-rw-r--r-- | npc/cities/alberta.txt | 28 | ||||
-rw-r--r-- | npc/cities/aldebaran.txt | 66 | ||||
-rw-r--r-- | npc/cities/einbroch.txt | 4 | ||||
-rw-r--r-- | npc/cities/geffen.txt | 6 | ||||
-rw-r--r-- | npc/cities/hugel.txt | 2 | ||||
-rw-r--r-- | npc/cities/jawaii.txt | 8 | ||||
-rw-r--r-- | npc/cities/lighthalzen.txt | 4 | ||||
-rw-r--r-- | npc/cities/lutie.txt | 24 | ||||
-rw-r--r-- | npc/cities/prontera.txt | 2 | ||||
-rw-r--r-- | npc/cities/umbala.txt | 28 | ||||
-rw-r--r-- | npc/cities/yuno.txt | 6 |
11 files changed, 89 insertions, 89 deletions
diff --git a/npc/cities/alberta.txt b/npc/cities/alberta.txt index 74c9da687..ed4be5438 100644 --- a/npc/cities/alberta.txt +++ b/npc/cities/alberta.txt @@ -329,19 +329,19 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "what'cha got..."; next; mes "[Phelix]"; - if (countitem(909) < 10) { + if (countitem(Jellopy) < 10) { mes "Hey! Weren't you listening?. I said 10 jellopies for 1 Red Potion.. are ya deaf?"; close; } else { - .@max = countitem(909)/10; + .@max = countitem(Jellopy)/10; mes "Hmm, not bad..."; mes "How many potions"; mes "do you want to get?"; next; switch(select("As many as I can, please.","I want this many.","Never mind, I like my jellopy.")) { case 1: - delitem 909,.@max*10; // Jellopy - getitem 501,.@max; // Red_Potion + delitem Jellopy,.@max*10; // Jellopy + getitem Red_Potion,.@max; // Red_Potion break; case 2: mes "[Phelix]"; @@ -358,12 +358,12 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Hey, what'd I say? 100 at a time at most, you're trying to kill me aren't you!"; close; } - if (countitem(909) < .@amount*10) { + if (countitem(Jellopy) < .@amount*10) { mes "Hmm, it looks like you don't have enough. Go get more jellopies if you want anything else from me."; close; } - delitem 909,.@amount*10; // Jellopy - getitem 501,.@amount; // Red_Potion + delitem Jellopy,.@amount*10; // Jellopy + getitem Red_Potion,.@amount; // Red_Potion break; case 3: mes "[Phelix]"; @@ -380,18 +380,18 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Alright, let's see what ya got..."; next; mes "[Phelix]"; - if (countitem(909) < 3) { + if (countitem(Jellopy) < 3) { mes "Hmm, look pansy ass, I said 3 jellopies for 1 Carrot.. got it?"; close; } else { - .@max = countitem(909)/3; + .@max = countitem(Jellopy)/3; mes "Not too bad pansy..."; mes "How many do you want?"; next; switch(select("As many as I can get, please","I want this many.","Never mind, I like my jellopy.")) { case 1: - delitem 909,.@max*3; // Jellopy - getitem 515,.@max; // Carrot + delitem Jellopy,.@max*3; // Jellopy + getitem Carrot,.@max; // Carrot break; case 2: mes "[Phelix]"; @@ -407,12 +407,12 @@ alberta,190,173,4 script Phelix 4_M_03,{ mes "Hey pansy ass, I said 100 at most, no more then that! I'm not going to break my back for the likes of you!"; close; } - if (countitem(909) < .@amount*10) { + if (countitem(Jellopy) < .@amount*10) { mes "Seems you don't have enough. Go get some more if you want anything else."; close; } - delitem 909,.@amount*3; // Jellopy - getitem 515,.@amount; // Carrot + delitem Jellopy,.@amount*3; // Jellopy + getitem Carrot,.@amount; // Carrot break; case 3: mes "[Phelix]"; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index 1977587c4..5dc71e04a 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -777,7 +777,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ mes "Due to a change in customer support policy, we no longer accept Kafra Passes. However, we are offering refunds for our customers who still possess these passes."; next; if (select("Sell Kafra Pass:Alright, bye~") == 1) { - if (countitem(1084) == 0) { + if (countitem(Kapra's_Pass) == 0) { mes "[Kafra Pavianne]"; mes "I'm sorry,"; mes "but you don't"; @@ -787,27 +787,27 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ end; } else { - .@kafrapassmoney = countitem(1084)*2000; + .@kafrapassmoney = countitem(Kapra's_Pass)*2000; mes "[Kafra Pavianne]"; mes "Let's see..."; - if (countitem(1084) == 1) { + if (countitem(Kapra's_Pass) == 1) { mes "You have 1 Kafra Pass."; mes "You can sell that pass to us for 2000 zeny. Would you like to sell this Kafra Pass back to the Kafra Corporation?"; } else { - mes "You have "+ countitem(1084) +" Kafra Passes."; + mes "You have "+ countitem(Kapra's_Pass) +" Kafra Passes."; mes "If you want to sell them to us, you will receive "+ .@kafrapassmoney +" zeny. Would you like to sell these back to the Kafra Corporation?"; } next; if (select("Yes:No") == 1) { - if (countitem(1084) == 0) { + if (countitem(Kapra's_Pass) == 0) { mes "[Kafra Pavianne]"; mes "I'm sorry, but you don't have any Kafra Passes."; close2; cutin "",255; end; } - delitem 1084,countitem(1084); //Kapra's_Pass + delitem Kapra's_Pass,countitem(Kapra's_Pass); Zeny += .@kafrapassmoney; mes "[Kafra Pavianne]"; mes "Thank you."; @@ -1218,53 +1218,53 @@ function script F_Lottery { sL_Prize1: mes "[Kafra]"; mes "WOW!!!!..... You win!!! 1st Prize~! Congratulations~~ You got the 1st prize~~"; - if(@Lotto == 1) getitem 2328,1;//Items: Wooden_Mail, - if(@Lotto == 2) getitem 2307,1;//Items: Mantle, - if(@Lotto == 3) getitem 657,10;//Items: Berserk_Potion, + if(@Lotto == 1) getitem Wooden_Mail,1;//Items: Wooden_Mail, + if(@Lotto == 2) getitem Mantle,1;//Items: Mantle, + if(@Lotto == 3) getitem Berserk_Potion,10;//Items: Berserk_Potion, if(@Lotto == 4) { - getitem 607,2;//Items: Yggdrasilberry, - getitem 608,1;//Items: Yggdrasil_Seed, + getitem Yggdrasilberry,2;//Items: Yggdrasilberry, + getitem Seed_Of_Yggdrasil,1;//Items: Yggdrasil_Seed, } - if(@Lotto == 5) getitem 607,3;//Items: Yggdrasilberry, + if(@Lotto == 5) getitem Yggdrasilberry,3;//Items: Yggdrasilberry, return; sL_Prize2: mes "[Kafra]"; mes "Oh! WOW! You've won the 2nd prize! Congratulations!!"; - if(@Lotto == 1) getitem 2403,1;//Items: Shoes, - if(@Lotto == 2) getitem 2226,1;//Items: Cap, - if(@Lotto == 3) getitem 2201,1;//Items: Sunglasses, - if(@Lotto == 4) getitem 526,3;//Items: Royal_Jelly, + if(@Lotto == 1) getitem Shoes,1;//Items: Shoes, + if(@Lotto == 2) getitem Cap,1;//Items: Cap, + if(@Lotto == 3) getitem Sunglasses,1;//Items: Sunglasses, + if(@Lotto == 4) getitem Royal_Jelly,3;//Items: Royal_Jelly, if(@Lotto == 5) { - getitem 608,1;//Items: Yggdrasil_Seed, - getitem 526,10;//Items: Royal_Jelly, + getitem Seed_Of_Yggdrasil,1;//Items: Yggdrasil_Seed, + getitem Royal_Jelly,10;//Items: Royal_Jelly, } return; sL_Prize3: mes "[Kafra]"; mes "Congratulations! You've won the 3rd prize."; - if(@Lotto == 1) getitem 602,4;//Items: Butterfly_Wing, - if(@Lotto == 2) getitem 505,3;//Items: Blue_Potion, - if(@Lotto == 3) getitem 2203,1;//Items: Glasses, - if(@Lotto == 4) getitem 504,15;//Items: White_Potion, - if(@Lotto == 5) getitem 504,30;//Items: White_Potion, + if(@Lotto == 1) getitem Wing_Of_Butterfly,4;//Items: Butterfly_Wing, + if(@Lotto == 2) getitem Blue_Potion,3;//Items: Blue_Potion, + if(@Lotto == 3) getitem Glasses,1;//Items: Glasses, + if(@Lotto == 4) getitem White_Potion,15;//Items: White_Potion, + if(@Lotto == 5) getitem White_Potion,30;//Items: White_Potion, return; sL_Prize4: mes "[Kafra]"; mes "You've won the 4th prize."; - if(@Lotto == 1) getitem 516,100;//Items: Sweet_Potato, - if(@Lotto == 2) getitem 501,150;//Items: Red_Potion, - if(@Lotto == 3) getitem 502,150;//Items: Orange_Potion, - if(@Lotto == 4) getitem 505,5;//Items: Blue_Potion, - if(@Lotto == 5) getitem 505,10;//Items: Blue_Potion, + if(@Lotto == 1) getitem Sweet_Potato,100;//Items: Sweet_Potato, + if(@Lotto == 2) getitem Red_Potion,150;//Items: Red_Potion, + if(@Lotto == 3) getitem Orange_Potion,150;//Items: Orange_Potion, + if(@Lotto == 4) getitem Blue_Potion,5;//Items: Blue_Potion, + if(@Lotto == 5) getitem Blue_Potion,10;//Items: Blue_Potion, return; sL_Prize5: mes "[Kafra]"; mes "You've won the 5th prize."; - if(@Lotto == 1) getitem 516,50;//Items: Sweet_Potato, - if(@Lotto == 2) getitem 501,100;//Items: Red_Potion, - if(@Lotto == 3) getitem 501,200;//Items: Red_Potion, - if(@Lotto == 4) getitem 501,250;//Items: Red_Potion, - if(@Lotto == 5) getitem 501,300;//Items: Red_Potion, + if(@Lotto == 1) getitem Sweet_Potato,50;//Items: Sweet_Potato, + if(@Lotto == 2) getitem Red_Potion,100;//Items: Red_Potion, + if(@Lotto == 3) getitem Red_Potion,200;//Items: Red_Potion, + if(@Lotto == 4) getitem Red_Potion,250;//Items: Red_Potion, + if(@Lotto == 5) getitem Red_Potion,300;//Items: Red_Potion, return; sF_Spin: diff --git a/npc/cities/einbroch.txt b/npc/cities/einbroch.txt index 15bbc6614..8fd4c3119 100644 --- a/npc/cities/einbroch.txt +++ b/npc/cities/einbroch.txt @@ -158,14 +158,14 @@ function script EinTower { mes "your safety before I give"; mes "you the Apple Combo Set."; next; - if (checkweight(512,1)) { + if (checkweight(Apple,1)) { mes "[" + getarg(0) + "]"; mes "Thank you for"; mes "using our services."; mes "Let me guide you to"; mes "the tower right away."; Zeny -= 20; - getitem 512,1; //Apple + getitem Apple,1; close2; warp "einbroch",174,204; end; diff --git a/npc/cities/geffen.txt b/npc/cities/geffen.txt index dc1e690a6..6c8ecd1be 100644 --- a/npc/cities/geffen.txt +++ b/npc/cities/geffen.txt @@ -305,7 +305,7 @@ OnTouch: close; } Zeny -= .@Red_potion_hap; - getitem 501,.@input; //Red_Potion + getitem Red_Potion,.@input; break; case 2: mes "[Suspicious Guy]"; @@ -370,7 +370,7 @@ OnTouch: close; } Zeny -= .@Main_gauche_hap; - getitem 1207,.@input; //Main_Gauche + getitem Main_Gauche,.@input; break; case 3: mes "[Suspicious Guy]"; @@ -422,7 +422,7 @@ OnTouch: close; } Zeny -= .@Hood__hap; - getitem 2501,.@input; //Hood + getitem Hood,.@input; break; case 4: mes "[Suspicious Guy]"; diff --git a/npc/cities/hugel.txt b/npc/cities/hugel.txt index 621a6d015..b82e51863 100644 --- a/npc/cities/hugel.txt +++ b/npc/cities/hugel.txt @@ -166,7 +166,7 @@ hu_in01,23,311,4 script Party Supplies Shop 4_M_HUMAN_01,{ close; } Zeny -= 500; - getitem 12018,5; // Fire_Cracker + getitem Fire_Cracker,5; // Fire_Cracker mes "[Shopkeeper]"; mes "Here you go!"; mes "Have fun with them!"; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index ac470827a..2ac6b57b2 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -416,7 +416,7 @@ jawaii,214,168,5 script Honeymoon Helper#Jawaii 1_F_LIBRARYGIRL,{ mes "[Helper]"; if (Zeny > 49999) { Zeny -= 50000; - getitem 681,1; //Memory_Of_Wedding + getitem Memory_Of_Wedding,1; mes "Thank you very much~!"; mes "Please remember, you"; mes "should use this with your"; @@ -717,7 +717,7 @@ OnTouch: } jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ - if (checkweight(1201,1) == 0) { + if (checkweight(Knife,1) == 0) { mes "^3355FF * Wait a minute! *"; mes "You're carrying too many items with you right now. Please store some of your things into Kafra Storage and try again.^000000"; close; @@ -739,7 +739,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ mes "[Waitress]"; if (Zeny > 999) { Zeny -= 1000; - getitem 517,1; //Meat + getitem Meat,1; mes "There you go~"; mes "Enjoy your meal~!"; close; @@ -765,7 +765,7 @@ jawaii_in,15,104,0 script Waitress#jawaii 1_F_PUBGIRL,{ mes "[Waitress]"; if (Zeny > 999) { Zeny -= 1000; - getitem 503,1; //Yelow_Potion + getitem Yellow_Potion,1; //Yelow_Potion mes "There you go~"; mes "Enjoy your meal~!"; close; diff --git a/npc/cities/lighthalzen.txt b/npc/cities/lighthalzen.txt index 1c075b6e3..e7dfb8351 100644 --- a/npc/cities/lighthalzen.txt +++ b/npc/cities/lighthalzen.txt @@ -613,8 +613,8 @@ lighthalzen,182,102,3 script Lucius#zen5 4_M_LGTGRAND,{ mes "my gratitude, adventurer. Bless"; mes "you, youngster and take care."; $donatedzeny = 0; - getitem 603,1; //Old_Blue_Box - getitem 12016,1; //Speed_Up_Potion + getitem Old_Blue_Box,1; + getitem Speed_Up_Potion,1; } close; } diff --git a/npc/cities/lutie.txt b/npc/cities/lutie.txt index 4b18ee7b1..4ddfe206d 100644 --- a/npc/cities/lutie.txt +++ b/npc/cities/lutie.txt @@ -338,12 +338,12 @@ xmas,117,304,4 script Poze 4_M_06,{ xmas,176,236,4 script Uncle Hairy 4_M_05,{ if (xmas_npc == 4) { - if (countitem(1024) > 0 && countitem(938) > 0) { + if (countitem(Chinese_Ink) > 0 && countitem(Sticky_Mucus) > 0) { mes "[Cantata]"; mes "Oh? Y-y-you've got the stuff? Goooooooood. It's been so long since I've been able to have some of this... G-give it to me!"; next; - delitem 1024,1; // Chinese_Ink - delitem 938,1; // Sticky_Mucus + delitem Chinese_Ink,1; // Chinese_Ink + delitem Sticky_Mucus,1; // Sticky_Mucus mes "^3355FFYou quickly handed him the Squid Ink and Sticky Mucus and watched with a little disgust as he relished the flavor.^000000"; next; mes "[Cantata]"; @@ -470,7 +470,7 @@ xmas,176,236,4 script Uncle Hairy 4_M_05,{ } xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ - if (checkweight(1201,1) == 0 ) { + if (checkweight(Knife,1) == 0 ) { cutin "rutie_snownow01.bmp",2; mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; @@ -678,7 +678,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ switch(.@snownow) { case 1: xmas_npc = 11; - getitem 529,5; // Candy + getitem Candy,5; // Candy cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Wow~!"; @@ -687,7 +687,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 2: xmas_npc = 11; - getitem 529,10; // Candy + getitem Candy,10; // Candy cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Ooh~!"; @@ -695,7 +695,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 3: xmas_npc = 11; - getitem 530,5; // Candy_Striper + getitem Candy_Striper,5; // Candy_Striper cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Hoooraaaay~!"; @@ -703,7 +703,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 4: xmas_npc = 11; - getitem 530,10; // Candy_Striper + getitem Candy_Striper,10; // Candy_Striper cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Wow, that's so great!"; @@ -711,7 +711,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 5: xmas_npc = 11; - getitem 539,1; // Piece_Of_Cake + getitem Piece_Of_Cake,1; // Piece_Of_Cake cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Aren't you lucky!"; @@ -719,7 +719,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 6: xmas_npc = 11; - getitem 539,2; // Piece_Of_Cake + getitem Piece_Of_Cake,2; // Piece_Of_Cake cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Now, isn't that nice?"; @@ -727,7 +727,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 7: xmas_npc = 11; - getitem 538,5; // Well_Baked_Cookie + getitem Well_Baked_Cookie,5; // Well_Baked_Cookie cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "Oh woooooow~!"; @@ -735,7 +735,7 @@ xmas,134,112,4 script Snowman 4_M_SNOWMAN,{ break; case 8: xmas_npc = 11; - getitem 538,10; // Well_Baked_Cookie + getitem Well_Baked_Cookie,10; // Well_Baked_Cookie cutin "rutie_snownow02.bmp",2; mes "[Snowysnow]"; mes "*Gasp!* Ooh~"; diff --git a/npc/cities/prontera.txt b/npc/cities/prontera.txt index 2b9e564b6..dbe70787a 100644 --- a/npc/cities/prontera.txt +++ b/npc/cities/prontera.txt @@ -188,7 +188,7 @@ prontera,216,70,2 script Strife#pront 1_M_02,{ mes "train even harder!"; next; event_prt_nov_dreamtalk = 2; - getitem 2501,1; //Hood + getitem Hood,1; mes "[Strife]"; mes "This is, well, for you to help you get even stronger. I guess I want to thank you for being such a good example."; close; diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index e6f2cb56f..8f0c39658 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -293,8 +293,8 @@ umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{ mes "Thank you so much, yay~!"; if (Zeny > 1000) { Zeny -= 1000; - if (checkweight(517,1)) { - getitem 517,1; //Meat + if (checkweight(Meat,1)) { + getitem Meat,1; } emotion e_swt2; } @@ -354,8 +354,8 @@ umbala,70,106,3 script Utan Kid#um 4_F_UMGIRL,{ mes "Um~baumbah~ um~baumbah~"; if (Zeny > 1000) { Zeny -= 1000; - if (checkweight(517,1)) { - getitem 517,1; //Meat + if (checkweight(Meat,1)) { + getitem Meat,1; } emotion e_swt2; } @@ -390,15 +390,15 @@ umbala,59,243,5 script Utan Kid#1 4_M_UMKID,{ emotion e_rock; next; if (select("Give him Meat.:Refuse.") == 1) { - if (countitem(517) > 0) { + if (countitem(Meat) > 0) { mes "[Kotan]"; mes "Whoa, are you really giving me"; mes "Meat? Thanks! I will pay you"; mes "back with these."; - delitem 517,1; //Meat - getitem 909,2; //Jellopy - getitem 914,2; //Fluff - getitem 705,2; //Clover + delitem Meat,1; + getitem Jellopy,2; + getitem Fluff,2; + getitem Clover,2; emotion e_scissors; close; } @@ -428,14 +428,14 @@ umbala,59,243,5 script Utan Kid#1 4_M_UMKID,{ emotion e_rock; next; if (select("Umbah:Umbaboo") == 1) { - if (countitem(517) > 0) { + if (countitem(Meat) > 0) { mes "[???]"; mes "Umbaumbaumbabababah."; mes "Umbababahum."; - delitem 517,1; //Meat - getitem 909,2; //Jellopy - getitem 914,2; //Fluff - getitem 705,2; //Clover + delitem Meat,1; + getitem Jellopy,2; + getitem Fluff,2; + getitem Clover,2; emotion e_scissors; close; } diff --git a/npc/cities/yuno.txt b/npc/cities/yuno.txt index b2367b2d5..59486c8c0 100644 --- a/npc/cities/yuno.txt +++ b/npc/cities/yuno.txt @@ -91,7 +91,7 @@ yuno,337,227,4 script Juno Granny#juno 8_F_GRANDMOTHER,{ mes "*Giggle*"; mes "There you go~"; Zeny -= 1000; - getitem 529,1; //Candy + getitem Candy,1; next; mes "[Granny]"; mes "*Giggle*"; @@ -182,7 +182,7 @@ yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{ mes "[Le Morpheus]"; mes "As you have chosen, you will forget everything, and remain in this virtual reality."; Zeny -= 5000; - getitem 507,1; //Red_Herb + getitem Red_Herb,1; close2; warp "prontera",182,206; end; @@ -190,7 +190,7 @@ yuno,165,111,4 script Juno Sage#juno 2_F_MAGICMASTER,,{ mes "[Le Morpheus]"; mes "You will see the truth."; Zeny -= 5000; - getitem 510,1; //Blue_Herb + getitem Blue_Herb,1; close2; warp "pay_dun03",200,222; end; |