diff options
author | Haru <haru@dotalux.com> | 2015-12-18 05:22:33 +0100 |
---|---|---|
committer | Haru <haru@dotalux.com> | 2015-12-18 05:22:33 +0100 |
commit | 8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a (patch) | |
tree | 54669433655bb853309ea1cae12da049622324fa /npc/re/jobs/3-2 | |
parent | 53abb8cdf92cd3d153b0a3d5b99b55cbd631f36c (diff) | |
parent | 0828824948c77bbfc357e08e8a5a0a96671b1ca6 (diff) | |
download | hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.gz hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.bz2 hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.tar.xz hercules-8bb331ce4c2e662a096c9f7a8fd308dc1e5eac0a.zip |
Merge branch 'dastgir-ScriptCleanup2' into hercules
Closes #920 as merged
Diffstat (limited to 'npc/re/jobs/3-2')
-rw-r--r-- | npc/re/jobs/3-2/genetic.txt | 22 | ||||
-rw-r--r-- | npc/re/jobs/3-2/minstrel.txt | 14 | ||||
-rw-r--r-- | npc/re/jobs/3-2/royal_guard.txt | 34 | ||||
-rw-r--r-- | npc/re/jobs/3-2/shadow_chaser.txt | 70 | ||||
-rw-r--r-- | npc/re/jobs/3-2/sorcerer.txt | 18 | ||||
-rw-r--r-- | npc/re/jobs/3-2/sura.txt | 6 | ||||
-rw-r--r-- | npc/re/jobs/3-2/wanderer.txt | 6 |
7 files changed, 85 insertions, 85 deletions
diff --git a/npc/re/jobs/3-2/genetic.txt b/npc/re/jobs/3-2/genetic.txt index a5fb81479..f74bcd31a 100644 --- a/npc/re/jobs/3-2/genetic.txt +++ b/npc/re/jobs/3-2/genetic.txt @@ -433,7 +433,7 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "Your study is done, Popo?"; mes "Give me those seeds."; next; - if (countitem(6273) == 0 && countitem(6272) == 0) { + if (countitem(Altered_Seed) == 0 && countitem(Experiment_Seed) == 0) { mes "[Devries]"; mes "What happened?"; mes "How could you say the study is completed without any result?"; @@ -481,7 +481,7 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "She is a fellow Geneticist, specializing in mini cannons."; mes "Go take a look at her experiment results."; mes "Could you give this message to her? Tell her to conduct her experiments quietly."; - delitem 6273,1; //Altered_Seed + delitem Altered_Seed,1; job_gen = 62; changequest 2215,2216; } else { @@ -491,7 +491,7 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "Uh oh! You failed, Popo."; mes "It didn't grow at all, it's withered already."; mes "Go and start over!"; - delitem 6272,1; //Experiment_Seed + delitem Experiment_Seed,1; job_gen = 7; } } @@ -519,7 +519,7 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "Popo!"; mes "I've got good news for you!"; next; - if (checkweight(1201,2) == 0 || MaxWeight - Weight < 2000) { + if (checkweight(Knife,2) == 0 || MaxWeight - Weight < 2000) { mes "- Wait a minute !! -"; mes "- Currently you're carrying -"; mes "- too many items with you. -"; @@ -578,8 +578,8 @@ job3_gen01,25,58,3 script Devries#gen 4_LGTSCIENCE,{ mes "You are a Geneticist from now on!!"; jobchange roclass(eaclass()|EAJL_THIRD); job_gen = 77; - getitem 5752,1; //Midas_Whisper - getitem 2795,1; //Green_Apple_Ring + getitem Midas_Whisper,1; + getitem Green_Apple_Ring,1; next; mes "[Devries]"; mes "Just like the word from the Union, I'm also looking forward to your awesome activities."; @@ -751,7 +751,7 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ mes "Good. Now I can let Miss Devries take a look at this seed!"; if (!questprogress(2209) && !questprogress(2210) && !questprogress(2211)) { job_gen = 61; - getitem 6272,1; //Experiment_Seed + getitem Experiment_Seed,1; close; } if (questprogress(2209) == 1) job_gen += 10; @@ -760,18 +760,18 @@ job3_gen01,7,50,3 script Testing Table#gen CLEAR_NPC,{ .@score = job_gen + JobLevel - 20; if (rand(1,100) < .@score) { job_gen = 60; - getitem 6273,1; //Altered_Seed + getitem Altered_Seed,1; close; } else { job_gen = 61; - getitem 6272,1; //Experiment_Seed + getitem Experiment_Seed,1; close; } } else if (job_gen > 7 && job_gen < 60) { mes "- It looks like the experiment has failed. I better start over. -"; job_gen = 7; - if (countitem(6273)) delitem 6273,1; //Altered_Seed - if (countitem(6272)) delitem 6272,1; //Experiment_Seed + if (countitem(Altered_Seed)) delitem Altered_Seed,1; + if (countitem(Experiment_Seed)) delitem Experiment_Seed,1; if (questprogress(2209) == 1) erasequest 2209; if (questprogress(2210) == 1) erasequest 2210; if (questprogress(2211) == 1) erasequest 2211; diff --git a/npc/re/jobs/3-2/minstrel.txt b/npc/re/jobs/3-2/minstrel.txt index d0eafcec5..eb39e4d68 100644 --- a/npc/re/jobs/3-2/minstrel.txt +++ b/npc/re/jobs/3-2/minstrel.txt @@ -728,7 +728,7 @@ hu_in01,361,103,3 script Tone-deaf person 4_M_CASMAN1,{ tha_scene01,140,200,0 script #min_receipt HIDDEN_WARP_NPC,3,3,{ OnTouch: - if (job_min == 10 || (job_min == 11 && countitem(6271) == 0)) { + if (job_min == 10 || (job_min == 11 && countitem(Mins_Receipt) == 0)) { mes "-There is a piece of paper on the ground.-"; next; mes "["+strcharinfo(0)+"]"; @@ -749,7 +749,7 @@ OnTouch: mes "- Juno's store manager : Mr. Click."; next; mes "- Directions : Around Juno's plaza."; - getitem 6271,1; //Mins_Receipt + getitem Mins_Receipt,1; next; mes "["+strcharinfo(0)+"]"; mes "Photo exchange receipt?"; @@ -948,7 +948,7 @@ yuno,143,170,6 script Mr. Click#job_min 4_M_ALCHE_A,{ mes "I'll get the 33 Teddy Bears."; donpcevent "Karian#cmd2::OnDisable"; job_min = 12; - getitem 6270,1; //Mins_Picture + getitem Mins_Picture,1; changequest 11144,11145; close; } else if (job_min == 12) { @@ -1804,7 +1804,7 @@ OnTouch: mes "You should use them."; close; } - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 3500) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; mes "right now, store some of"; @@ -1845,7 +1845,7 @@ OnTouch: prt_in,94,172,4 script Karian#job_min3 4_M_MINSTREL1,{ if (job_min == 27) { - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 3500) { mes "While you are on a trip, you gain lots of stuff. Make yourself lighter."; close; } @@ -1898,8 +1898,8 @@ prt_in,94,172,4 script Karian#job_min3 4_M_MINSTREL1,{ job_min = 100; jobchange roclass(eaclass()|EAJL_THIRD); completequest 11154; - getitem 5751,1; //Minstrel_Song_Hat - getitem 2795,1; //Green_Apple_Ring + getitem Minstrel_Song_Hat,1; + getitem Green_Apple_Ring,1; close; } else if (job_min > 99) { switch(select("Talk.:Leave.")) { diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index c9cc13471..09618e2bb 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -35,7 +35,7 @@ //========================================================================= prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 1000) { mes "- Your pack is too heavy. -"; mes "- Lighten your body first -"; mes "- and please try again. -"; @@ -212,7 +212,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ changequest 12090,12091; close; } else if (job_royal == 2) { - if (countitem(7097) < 100) { + if (countitem(Burning_Heart) < 100) { mes "Don't forget to bring 100 Burning Heart."; close; } @@ -221,7 +221,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ next; mes "[Heinrich]"; mes "Wait while I arrange the stuff that you brought."; - delitem 7097,100; //Burning_Heart + delitem Burning_Heart,100; job_royal = 3; changequest 12091,12092; close; @@ -300,7 +300,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ changequest 12092,12093; close; } else if (job_royal == 4) { - if (countitem(6274) == 0) { + if (countitem(Saint_Cloth_Piece) == 0) { mes "Our staff has already left to find the last trace, so don't work too hard."; close; } @@ -338,15 +338,15 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ mes "[Heinrich]"; mes "Ok~~ now."; mes "I'll be deciphering the cloth for now so I will be very busy!"; - delitem 6274,1; //Saint_Cloth_Piece - getitem 6275,1; //King_Shield + delitem Saint_Cloth_Piece,1; + getitem King_Shield,1; job_royal = 5; changequest 12093,12094; close; } else if (job_royal == 5) { - if (countitem(6275) == 0) { + if (countitem(King_Shield) == 0) { mes "What? Did you lose the shield? What is the one on your back?"; - getitem 6275,1; //King_Shield + getitem King_Shield,1; close; } mes "Thanks to your help I can finish the excavation work. Thanks a lot."; @@ -355,7 +355,7 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ } glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{ - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 1000) { mes "- Your pack is too heavy. -"; mes "- Lighten your body first -"; mes "- and please try again. -"; @@ -366,7 +366,7 @@ glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{ close; } if (BaseJob == Job_Crusader && job_royal == 5) { - if (countitem(6275) == 0) { + if (countitem(King_Shield) == 0) { mes "^000099You seem to have lost the shield. Go back to Heinrich and ask for help^000000."; close; } @@ -445,24 +445,24 @@ glast_01,240,366,5 script Memory of King Schmidtz CLEAR_NPC,{ specialeffect2 EF_MAPPILLAR; progressbar "FFFF00",7; specialeffect2 EF_LORD; - delitem 6275,1; //King_Shield + delitem King_Shield,1; erasequest 12094; jobchange roclass(eaclass()|EAJL_THIRD); - getitem 5757,1; //Schmidt_Helm - getitem 2795,1; //Green_Apple_Ring + getitem Schmidt_Helm,1; + getitem Green_Apple_Ring,1; end; } end; } gl_church,173,88,0 script Delicate trace#01 CLEAR_NPC,{ - if (job_royal == 4 && countitem(6274) == 0) { + if (job_royal == 4 && countitem(Saint_Cloth_Piece) == 0) { progressbar "ffff00",5; .@roy_ran = rand(1,70); if (.@roy_ran < 6) - getitem 6274,1; //Saint_Cloth_Piece + getitem Saint_Cloth_Piece,1; else if (.@roy_ran > 5 && .@roy_ran < 66) - getitem 7049,1; //Stone + getitem Stone,1; else { mes "While investigating, the topography breaks. It would be better to dig other places for a while."; disablenpc strnpcinfo(0); @@ -499,7 +499,7 @@ gl_church,105,115,0 duplicate(Delicate trace#01) Delicate trace#11 CLEAR_NPC gl_church,158,100,0 script #Clue of traces HIDDEN_NPC,4,4,{ end; OnTouch: - if (job_royal == 4 && countitem(6274) == 0) { + if (job_royal == 4 && countitem(Saint_Cloth_Piece) == 0) { specialeffect2 EF_FREEZE; mes "I can feel strong power around here. It would be better to explore around here."; viewpoint 1,173,88 ,1, 0xFFFF00; diff --git a/npc/re/jobs/3-2/shadow_chaser.txt b/npc/re/jobs/3-2/shadow_chaser.txt index 2466147f5..0a34ad1cb 100644 --- a/npc/re/jobs/3-2/shadow_chaser.txt +++ b/npc/re/jobs/3-2/shadow_chaser.txt @@ -665,7 +665,7 @@ s_atelier,168,65,5 script Manager#sc08_ra 4_M_DOCTOR,{ mes "Graham?"; mes "Why?"; next; - if (countitem(6266) == 0) { + if (countitem(Cheat_Key) == 0) { mes "You don't seem to have brought it here."; next; mes "[Manager]"; @@ -1026,7 +1026,7 @@ s_atelier,167,129,3 script Manager#sc06_yuno 1_M_SIGNART,{ mes "Did you find something?"; next; select("Show the key of pleasure."); - if (countitem(6268)) { + if (countitem(Mirth_Key)) { mes "[Haled]"; mes "Ha..........akkk."; mes "Another key?"; @@ -1376,7 +1376,7 @@ s_atelier,70,66,4 script Dumk#sc13_lgh 4_M_SHADOWCHASER,{ mes "HuhuHuhu..."; close; } - if (checkweight(1201,4) == 0) { + if (checkweight(Knife,4) == 0) { mes "- You can't continue on in this quest because you are overweight. -"; close; } @@ -1430,7 +1430,7 @@ s_atelier,70,66,4 script Dumk#sc13_lgh 4_M_SHADOWCHASER,{ mes "It's you? You are the one who found the brush?"; next; select("Show the brush to him."); - if (countitem(6269)) { + if (countitem(Master_Brush)) { mes "[Dumk]"; mes "That's it."; mes "Did you find it by yourself?"; @@ -1518,7 +1518,7 @@ s_atelier,70,66,4 script Dumk#sc13_lgh 4_M_SHADOWCHASER,{ mes "I need it again."; mes "I'm so thirsty."; mes "Wait a minute."; - delitem 6269,1; //Master_Brush + delitem Master_Brush,1; job_sha = 30; close; } @@ -1614,11 +1614,11 @@ s_atelier,70,66,4 script Dumk#sc13_lgh 4_M_SHADOWCHASER,{ mes "Congratulations."; mes "Welcome to your new life."; jobchange roclass(eaclass()|EAJL_THIRD); - getitem 6121,1; //Makeover_Brush - getitem 6122,1; //Paint_Brush + getitem Makeover_Brush,1; + getitem Paint_Brush,1; job_sha = 32; - getitem 2795,1; //Green_Apple_Ring - getitem 5750,1; //Shadow_Handicraft + getitem Green_Apple_Ring,1; + getitem Shadow_Handicraft,1; next; mes "[Dumk]"; mes "It's a fashionable uniform."; @@ -1941,7 +1941,7 @@ niflheim,230,276,1 script Red Flame#sc_f03 4_NFWISP,{ //== Boxes ================================================= job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{ - if (checkweight(1201,1) == 0) { + if (checkweight(Knife,1) == 0) { mes "- You can't continue on in this quest because you are overweight. -"; close; } @@ -1994,7 +1994,7 @@ job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{ next; mes "- You get the Key of Deception. -"; job_sha = 8; - getitem 6266,1; //Cheat_Key + getitem Cheat_Key,1; setquest 7165; close; } @@ -2011,7 +2011,7 @@ job3_sha01,22,78,0 script ????#keybox01 CLEAR_NPC,{ } job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ - if (checkweight(1201,1) == 0) { + if (checkweight(Knife,1) == 0) { mes "- You can't continue on in this quest because you are overweight. -"; close; } @@ -2059,7 +2059,7 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ mes "Key again..."; mes "How can I escape from here...?"; job_sha = 17; - getitem 6267,1; //Virtual_Key + getitem Virtual_Key,1; erasequest 7171; changequest 7168+.@i,7172; next; @@ -2090,7 +2090,7 @@ job3_sha01,25,28,0 script ????#keybox02 CLEAR_NPC,{ } job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{ - if (checkweight(1201,1) == 0) { + if (checkweight(Knife,1) == 0) { mes "- You can't continue on in this quest because you are overweight. -"; close; } @@ -2195,7 +2195,7 @@ job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{ mes "I better go back."; job_sha = 25; setquest 7176; - getitem 6268,1; //Mirth_Key + getitem Mirth_Key,1; close; } break; @@ -2227,7 +2227,7 @@ job3_sha01,73,80,0 script ????#keybox03 CLEAR_NPC,{ } job3_sha01,71,27,0 script ????#keybox04 CLEAR_NPC,{ - if (checkweight(1201,1) == 0) { + if (checkweight(Knife,1) == 0) { mes "- You can't continue on in this quest because you are overweight. -"; close; } @@ -2242,7 +2242,7 @@ job3_sha01,71,27,0 script ????#keybox04 CLEAR_NPC,{ mes "deception, illusion and pleasure."; next; select("Place the key in the holes."); - if (countitem(6266) && countitem(6267) && countitem(6268)) { + if (countitem(Cheat_Key) && countitem(Virtual_Key) && countitem(Mirth_Key)) { mes "["+strcharinfo(0)+"]"; mes "At first, Deception..."; mes "then Illusion..."; @@ -2253,11 +2253,11 @@ job3_sha01,71,27,0 script ????#keybox04 CLEAR_NPC,{ mes "something comes out."; next; mes "- You got a brush with a fabulous pattern on it. -"; - delitem 6266,1; //Cheat_Key - delitem 6267,1; //Virtual_Key - delitem 6268,1; //Mirth_Key + delitem Cheat_Key,1; + delitem Virtual_Key,1; + delitem Mirth_Key,1; job_sha = 28; - getitem 6269,1; //Master_Brush + getitem Master_Brush,1; changequest 7178,7179; next; mes "["+strcharinfo(0)+"]"; @@ -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!"; @@ -2311,7 +2311,7 @@ s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{ mes "Visit later and use what you have!"; close; } - if (countitem(7150) >= .@i[2] && countitem(949) >= .@i[3] && Zeny >= .@i[4]) { + if (countitem(Bamboo_Cut) >= .@i[2] && countitem(Feather) >= .@i[3] && Zeny >= .@i[4]) { mes "Oh you brought all the things required."; mes "Hold on a bit."; next; @@ -2321,8 +2321,8 @@ s_atelier,29,119,3 script Max#sc05_prt 4W_M_01,{ mes "[Max]"; mes "Take it."; mes "Good luck!"; - delitem 7150,.@i[2]; //Bamboo_Cut - delitem 949,.@i[3]; //Feather + delitem Bamboo_Cut,.@i[2]; + delitem Feather,.@i[3]; Zeny -= .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; @@ -2371,11 +2371,11 @@ s_atelier,136,70,3 script Titika#sc09_ra 4_F_CHILD,{ mes "I think it's enough..."; close; } - if (countitem(7150) >= .@i[2] && countitem(949) >= .@i[3] && Zeny >= .@i[4]) { + if (countitem(Bamboo_Cut) >= .@i[2] && countitem(Feather) >= .@i[3] && Zeny >= .@i[4]) { mes "You brought all the materials."; mes "I'll exchange it with the goods that I made."; - delitem 7150,.@i[2]; //Bamboo_Cut - delitem 949,.@i[3]; //Feather + delitem Bamboo_Cut,.@i[2]; + delitem Feather,.@i[3]; Zeny -= .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; @@ -2421,11 +2421,11 @@ s_atelier,124,128,3 script RimiGX#sc07_yuno 4_F_LGTGIRL,{ mes "Visit here when you lost stuff."; close; } - if (countitem(7150) >= .@i[2] && countitem(949) >= .@i[3] && Zeny >= .@i[4]) { + if (countitem(Bamboo_Cut) >= .@i[2] && countitem(Feather) >= .@i[3] && Zeny >= .@i[4]) { mes "You brought stuff you need."; mes "It will be fast when I exchange the stuff made?"; - delitem 7150,.@i[2]; //Bamboo_Cut - delitem 949,.@i[3]; //Feather + delitem Bamboo_Cut,.@i[2]; + delitem Feather,.@i[3]; Zeny -= .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; @@ -2471,11 +2471,11 @@ s_atelier,26,68,3 script Vito#sc11_lgt 4_M_KHMAN,{ mes "We can't offer extra blushes."; close; } - if (countitem(7150) >= .@i[2] && countitem(949) >= .@i[3] && Zeny >= .@i[4]) { + if (countitem(Bamboo_Cut) >= .@i[2] && countitem(Feather) >= .@i[3] && Zeny >= .@i[4]) { mes "You brought all what you need."; mes "I'm going to exchange the blush I made before."; - delitem 7150,.@i[2]; //Bamboo_Cut - delitem 949,.@i[3]; //Feather + delitem Bamboo_Cut,.@i[2]; + delitem Feather,.@i[3]; Zeny -= .@i[4]; getitem .@i[1],1; //Makeover_Brush,Paint_Brush close; diff --git a/npc/re/jobs/3-2/sorcerer.txt b/npc/re/jobs/3-2/sorcerer.txt index e5bef2534..ba278fbd7 100644 --- a/npc/re/jobs/3-2/sorcerer.txt +++ b/npc/re/jobs/3-2/sorcerer.txt @@ -36,7 +36,7 @@ gef_tower,102,34,5 script Merito 2_M_SAGE_B,{ mes "[Merito]"; - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 1000) { mes "You packed so much in your bag. Try again after emptying your bag."; close; } @@ -148,7 +148,7 @@ gef_tower,102,34,5 script Merito 2_M_SAGE_B,{ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{ mes "[Karacas]"; - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 1000) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 1000) { mes "Oh, it seems that you're too heavy. Empty your bag and then come again."; close; } @@ -249,7 +249,7 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{ changequest 12096,12097; close; } else if (job_soc == 3) { - if (countitem(992) > 2 && countitem(991) > 2 && countitem(990) > 2 && countitem(993) > 2) { + if (countitem(Wind_Of_Verdure) > 2 && countitem(Crystal_Blue) > 2 && countitem(Boody_Red) > 2 && countitem(Yellow_Live) > 2) { mes "Oh, you have all the materials."; next; select("What should I do next?"); @@ -332,16 +332,16 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{ mes "When you bring these basic things, I'll guide you to the next step."; close; } else if (job_soc == 4) { - if (countitem(6276) && countitem(6278) && countitem(6277)) { + if (countitem(Clear_Reagent) && countitem(Black_Reagent) && countitem(Red_Reagent)) { mes "Wow~ your skill is good."; mes "I thought you'd be overwhelmed by the spirits but you've managed to get the effective medicine!"; next; select("Is this all I need to do?"); mes "[Karacas]"; mes "Well done. First, I will organize the miraculous medicine so please wait a moment."; - delitem 6276,1; //Clear_Reagent - delitem 6278,1; //Black_Reagent - delitem 6277,1; //Red_Reagent + delitem Clear_Reagent,1; + delitem Black_Reagent,1; + delitem Red_Reagent,1; job_soc = 5; completequest 12098; close; @@ -382,8 +382,8 @@ gef_tower,113,161,5 script Karacas 4_M_SAGE_A,{ mes "[Karacas]"; mes "Congratulations, [" + strcharinfo(0) + "]"; jobchange roclass(eaclass()|EAJL_THIRD); - getitem 5756,1; //Wind_Whisper - getitem 2795,1; //Green_Apple_Ring + getitem Wind_Whisper,1; + getitem Green_Apple_Ring,1; next; mes "[Karacas]"; mes "I hope that you gain more communion with spirits from now on."; diff --git a/npc/re/jobs/3-2/sura.txt b/npc/re/jobs/3-2/sura.txt index f41d3584a..6a56f5665 100644 --- a/npc/re/jobs/3-2/sura.txt +++ b/npc/re/jobs/3-2/sura.txt @@ -774,7 +774,7 @@ sword_1-1,223,167,2 script Master#job_shu 4_M_SURA,{ mes "You can't become a Sura unless you use all your skill points."; close; } - if (checkweight(1201,1) == 0 || MaxWeight - Weight < 3500) { + if (checkweight(Knife,1) == 0 || MaxWeight - Weight < 3500) { mes "You seem to be heavily burdened. Please remove some of it."; close; } @@ -827,8 +827,8 @@ sword_1-1,223,167,2 script Master#job_shu 4_M_SURA,{ job_shu = 100; jobchange roclass(eaclass()|EAJL_THIRD); completequest 11158; - getitem 5754,1; //Blazing_Soul - getitem 2795,1; //Green_Apple_Ring + getitem Blazing_Soul,1; + getitem Green_Apple_Ring,1; close; } else if (job_shu > 5) { mes "Once I was also an ordinary young man who traveled a lot and met many friends."; diff --git a/npc/re/jobs/3-2/wanderer.txt b/npc/re/jobs/3-2/wanderer.txt index b9a27f52c..24c06ed2e 100644 --- a/npc/re/jobs/3-2/wanderer.txt +++ b/npc/re/jobs/3-2/wanderer.txt @@ -915,7 +915,7 @@ xmas,147,135,5 script Dancer Kim#xmas 4_F_WANDERER,{ mes "- You can't continue the quest because you have remaining skill points. -"; close; } - if (checkweight(1201,2) == 0) { + if (checkweight(Knife,2) == 0) { mes "- You need to empty your inventory if you want to continue the quest. -"; close; } @@ -1003,8 +1003,8 @@ xmas,147,135,5 script Dancer Kim#xmas 4_F_WANDERER,{ mes "This rising Wanderer star, " + strcharinfo(0) + "!"; jobchange roclass(eaclass()|EAJL_THIRD); job_wan = 10; - getitem 2795,1; //Green_Apple_Ring - getitem 5758,1; //Dying_Swan + getitem Green_Apple_Ring,1; + getitem Dying_Swan,1; completequest 2222; next; mes "[Dancer Kim]"; |