From 0828824948c77bbfc357e08e8a5a0a96671b1ca6 Mon Sep 17 00:00:00 2001 From: Dastgir Date: Thu, 10 Dec 2015 21:19:06 +0530 Subject: More ItemID to Constants --- npc/other/poring_war.txt | 40 +++++++++++++++++++-------------------- npc/re/jobs/3-1/archbishop.txt | 2 +- npc/re/jobs/3-2/shadow_chaser.txt | 4 ++-- npc/re/jobs/novice/academy.txt | 6 +++--- npc/re/quests/cupet.txt | 14 +++++++------- npc/re/quests/quests_malaya.txt | 18 +++++++++--------- 6 files changed, 42 insertions(+), 42 deletions(-) (limited to 'npc') diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 0515cab67..f3a1df913 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -60,7 +60,7 @@ prt_fild08,159,371,3 script Poring War Recruiter#wop 4_PORING,{ mes "[Poring]"; mes "Oh, and there's an entrance fee of 500 zeny, ring."; mes "Have a good time, ring."; - delitem 7773,countitem(War_Badge); + delitem War_Badge,countitem(War_Badge); Zeny -= 500; close2; warp "poring_w01",112,138; @@ -100,22 +100,22 @@ poring_w01,100,97,3 script Poring Vending Machine#w 4_PORING,{ next; switch(select("Marvelous Medal - 4 P.Co:Union of Tribe - 20 P.Co:Poring Box - 30 P.Co:Next")) { case 1: - callsub S_PoringVending,7515,4; + callsub S_PoringVending,Marvelous_Medal,4; case 2: - callsub S_PoringVending,658,20; + callsub S_PoringVending,Union_Of_Tribe,20; case 3: - callsub S_PoringVending,12109,30; + callsub S_PoringVending,Poring_Box,30; case 4: mes "This is a special item."; mes "Item name - Poring Coin(P.Co)"; next; switch(select("Wild Rose - 15 P.Co:Doppelganger - 20 P.Co:Egnigem Cenia - 20 P.Co:Collection Item")) { case 1: - callsub S_PoringVending,12300,15; + callsub S_PoringVending,Wild_Rose_Scroll,15; case 2: - callsub S_PoringVending,12301,20; + callsub S_PoringVending,Doppelganger_Scroll,20; case 3: - callsub S_PoringVending,12302,20; + callsub S_PoringVending,Ygnizem_Scroll,20; case 4: mes "Figures of 1st Job Class Characters including Novice are finally on sale!"; mes "Figures except for Novice are all ^4d4dffCharacter bound items^000000."; @@ -124,19 +124,19 @@ poring_w01,100,97,3 script Poring Vending Machine#w 4_PORING,{ next; switch(select("Novice Figure - 50 P.Co:Swordman Figure - 100 P.Co:Thief Figure - 100 P.Co:Merchant Figure - 100 P.Co:Acolyte Figure - 100 P.Co:Mage Figure - 100 P.Co:Archer Figure - 100 P.Co:Random Draw - 50 P.Co:Cancel")) { case 1: - callsub S_PoringVending,2765,50; + callsub S_PoringVending,Novice_Figure,50; case 2: - callsub S_PoringVending,2766,100; + callsub S_PoringVending,Swordman_Figure,100; case 3: - callsub S_PoringVending,2770,100; + callsub S_PoringVending,Thief_Figure,100; case 4: - callsub S_PoringVending,2771,100; + callsub S_PoringVending,Merchant_Figure,100; case 5: - callsub S_PoringVending,2767,100; + callsub S_PoringVending,Acolyte_Figure,100; case 6: - callsub S_PoringVending,2768,100; + callsub S_PoringVending,Mage_Figure,100; case 7: - callsub S_PoringVending,2769,100; + callsub S_PoringVending,Archer_Figure,100; case 8: mes "You have chosen Random Draw."; mes "1 of 7 diffeent kinds of figures will be selected."; @@ -326,7 +326,7 @@ OnPCLogoutEvent: WoP_SaveMap_X = 0; WoP_SaveMap_Y = 0; } - delitem 7773,countitem(War_Badge); + delitem War_Badge,countitem(War_Badge); wop_team = 0; } end; @@ -351,7 +351,7 @@ OnPCDieEvent: OnPCKillEvent: getmapxy .@map$,.@x,.@y,0; if (.@map$ == "poring_w02" && wop_team) { - getnameditem 7773,rid2name(killedrid); + getnameditem War_Badge,rid2name(killedrid); } end; @@ -674,7 +674,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{ case 2: mes "[Mr. Doppel]"; mes "Very well. Nice you have done everything on time."; - delitem 7773,countitem(War_Badge); + delitem War_Badge,countitem(War_Badge); close2; wop_team = 0; warp "poring_w02",44,82; @@ -685,7 +685,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{ mes "[Mr. Doppel]"; mes "Right. I'm gonna send you to the battle staging area."; mes "Wait for all the other party members there."; - delitem 7773,countitem(War_Badge); + delitem War_Badge,countitem(War_Badge); close2; wop_team = 0; warp "poring_w02",44,82; @@ -805,7 +805,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{ case 2: mes "[Mr. Doppel]"; mes "Very well. Nice you have done everything on time."; - delitem 7773,countitem(War_Badge); + delitem War_Badge,countitem(War_Badge); close2; wop_team = 0; warp "poring_w02",153,82; @@ -815,7 +815,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{ mes "[Mr. Doppel]"; mes "Right. I'm gonna send you to the battle staging area."; mes "Wait for all the other party members there."; - delitem 7773,countitem(War_Badge); + delitem War_Badge,countitem(War_Badge); close2; wop_team = 0; warp "poring_w02",153,82; diff --git a/npc/re/jobs/3-1/archbishop.txt b/npc/re/jobs/3-1/archbishop.txt index 2bb13bac5..f803d99f8 100644 --- a/npc/re/jobs/3-1/archbishop.txt +++ b/npc/re/jobs/3-1/archbishop.txt @@ -1218,7 +1218,7 @@ OnTouch: close2; nude; if (countitem(Will_Of_Exhausted_Angel)) - delitem Will_Of_Exhausted_Angel,(2798); + delitem Will_Of_Exhausted_Angel,countitem(Will_Of_Exhausted_Angel); delitem Broken_Horn_Pipe,countitem(Broken_Horn_Pipe); mapwarp "job3_arch02","job3_arch01",29,29; end; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index f9c856ddc..0a34ad1cb 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -2295,8 +2295,8 @@ s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{ next; .@i = select("I need a make-up brush.:I need a paint brush.:Nothing."); mes "[Max]"; - if (.@i == 1) setarray .@i[1],6121,1,10,100000; - else if (.@i == 2) setarray .@i[1],6122,2,30,200000; + if (.@i == 1) setarray .@i[1],Makeover_Brush,1,10,100000; + else if (.@i == 2) setarray .@i[1],Paint_Brush,2,30,200000; else { mes "If you need more"; mes "just visit me!"; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index b33a9d1b6..280547487 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -8204,7 +8204,7 @@ iz_ac02,70,85,5 script Arang#ac 4_F_TAEKWON,{ mes "[Arang]"; mes "It is not an easy way. So I don't like to recommend it to you if you aren't fully prepared. But it is definitely a nice and great way to follow!!"; next; - if (isequipped(2942) > 0 || countitem(Taekwon_Manual) > 0) { + if (isequipped(Taekwon_Manual) > 0 || countitem(Taekwon_Manual) > 0) { mes "[Arang]"; mes "Introduction to the class may let you know about what Taekwon in more detail."; next; @@ -9215,7 +9215,7 @@ iz_ac02,148,110,3 script Mage Chuck#ac 4_M_JOB_WIZARD,{ mes "Anything else you want to know about Mages?"; break; case 4: - if (isequippedcnt(2824) > 0 || countitem(Mage_Manual) > 0) { + if (isequippedcnt(Mage_Manual) > 0 || countitem(Mage_Manual) > 0) { mes "[Mage Chuck]"; mes "I think you already received a ^FF0000Mage Manual^000000~!"; mes "I can't offer you two of them."; @@ -12110,7 +12110,7 @@ iz_ac02,152,165,5 script A Nun#2 4_F_SISTER,{ mes "murmuring"; close; } - if (isequippedcnt(2821) > 0 || countitem(Acolyte_Manual) > 0) { + if (isequippedcnt(Acolyte_Manual) > 0 || countitem(Acolyte_Manual) > 0) { mes "[A nun]"; mes "You already have one."; mes "We do not give two."; diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index 04c9b7303..36ad2dbb3 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -36,9 +36,9 @@ - script CPM1 4_M_ALCHE_C,{ .@npc$ = "[Cute Pet Manager]"; - setarray .@tame_id[0],619,620,622,623,624,627,628,629,630; + setarray .@tame_id[0],Unripe_Apple,Orange_Juice,Rainbow_Carrot,Earthworm_The_Dude,Rotten_Fish,Sweet_Milk,Well_Dried_Bone,Singing_Flower,Dew_Laden_Moss; setarray .@tame_amount[0],3,3,3,3,3,3,3,3,3; - setarray .@hunt_id[0],909,909,705,916,935,919,919,940,921; + setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animal's_Skin,Animal's_Skin,Grasshopper's_Leg,Mushroom_Spore; setarray .@hunt_amount[0],500,600,500,500,500,500,600,500,500; setarray .@mob_id[0],1002,1113,1063,1049,1011,1167,1107,1052,1014; .@tame_gets = 3; @@ -64,9 +64,9 @@ - script CPM2 4_M_ALCHE_C,{ .@npc$ = "[Cute Pet Manager]"; - setarray .@tame_id[0],621,625,632,631,633,634,635,636,659,637,639,640; + setarray .@tame_id[0],Bitter_Herb,Lusty_Iron,Fatty_Chubby_Earthworm,Deadly_Noxious_Herb,Baked_Yam,Tropical_Banana,Horror_Of_Tribe,No_Recipient,Heart_Of_Her,Old_Broom,Armlet_Of_Obedience,Shining_Stone; setarray .@tame_amount[0],2,2,2,2,2,2,2,2,2,2,2,2; - setarray .@hunt_id[0],938,935,925,7033,945,942,931,901,1094,1021,936,1035; + setarray .@hunt_id[0],Sticky_Mucus,Shell,Bill_Of_Birds,Poison_Spore,Raccoon_Leaf,Yoyo_Tail,Orcish_Voucher,Danggie,Short_Daenggie,Dokkaebi_Horn,Scales_Shell,Dragon_Canine; setarray .@hunt_amount[0],500,600,500,300,500,500,500,500,500,500,500,500; setarray .@hunt_item_count[0],1,1,1,1,1,1,1,1,1; setarray .@mob_id[0],1031,1042,1019,1077,1056,1057,1023,1026,1188,1110,1029; @@ -93,11 +93,11 @@ - script CPM3 4_M_ALCHE_C,{ .@npc$ = "[Cute Pet Manager]"; - setarray .@tame_id[0],638,626,641,661,660,642; + setarray .@tame_id[0],Silver_Knife_Of_Chaste,Monster_Juice,Contracts_In_Shadow,Sway_Apron,Prohibition_Red_Candle,Book_Of_Devil; setarray .@tame_amount[0],1,1,1,1,1,1; - setarray .@hunt_id[0],1020,943,1038,7047,1970,923; + setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alice's_Apron,Queen's_Whip,Evil_Horn; setarray .@hunt_amount[0],600,600,600,500,1,100; - setarray .@hunt_id2[0],0,0,0,0,7017,0; + setarray .@hunt_id2[0],0,0,0,0,Executioner's_Mitten,0; setarray .@hunt_amount2[0],0,0,0,0,20,0; setarray .@mob_id[0],1170,1035,1109,1275,1200,1101; .@tame_gets = 1; diff --git a/npc/re/quests/quests_malaya.txt b/npc/re/quests/quests_malaya.txt index b75e4969b..b125b4e3a 100644 --- a/npc/re/quests/quests_malaya.txt +++ b/npc/re/quests/quests_malaya.txt @@ -8753,21 +8753,21 @@ ma_fild01,172,223,6 script Tattooist#pin 4_M_BARYO_OLD,{ mes "Hope you enjoy the '^7A96E0Pintados Festival^000000'."; close; case 2: - .@tattoo = 2911; //Bangungot_Tattoo - .@doll = 6517; //Bangungot_Doll - .@spirit = 6524; //Bangungot_Spirit_Piece + .@tattoo = Bangungot_Tattoo; + .@doll = Bangungot_Doll; + .@spirit = Bangungot_Spirit_Piece; .@name$ = "Bangungot"; break; case 3: - .@tattoo = 2907; //Buwaya_Tattoo - .@doll = 6518; //Buwaya_Doll - .@spirit = 6525; //Buwaya_Spirit_Piece + .@tattoo = Buwaya_Tattoo; + .@doll = Buwaya_Doll; + .@spirit = Buwaya_Spirit_Piece; .@name$ = "Buwaya"; break; case 4: - .@tattoo = 2910; //Bakonawa_Tattoo - .@doll = 6516; //Bakonawa_Doll - .@spirit = 6523; //Bakonawa_Spirit_Piece + .@tattoo = Bakonawa_Tattoo; + .@doll = Bakonawa_Doll; + .@spirit = Bakonawa_Spirit_Piece; .@name$ = "Bakonawa"; break; } -- cgit v1.2.3-70-g09d2