diff options
Diffstat (limited to 'npc/re')
42 files changed, 352 insertions, 355 deletions
diff --git a/npc/re/cities/malaya.txt b/npc/re/cities/malaya.txt index afe816a3e..f18bbd0af 100644 --- a/npc/re/cities/malaya.txt +++ b/npc/re/cities/malaya.txt @@ -183,7 +183,7 @@ OnBingx2: donpcevent strnpcinfo(NPC_NAME)+"::OnDisable"; end; OnTouch: - if (getcharid(1)) { + if (getcharid(CHAR_ID_PARTY)) { if ($ma_name04$ == strcharinfo(PC_NAME) || $ma_name05$ == strcharinfo(PC_NAME) || $ma_name06$ == strcharinfo(PC_NAME)) { donpcevent strnpcinfo(NPC_NAME)+"::OnBingx2"; mes "The unidentified creature gets a glimpse of you, blushes and then disappears."; @@ -236,7 +236,7 @@ OnBingx2: OnTouch: .@i = atoi(strnpcinfo(NPC_NAME_HIDDEN)); if (.@i%4 == 2) { - if (getcharid(0) == getpartyleader(getcharid(1),2)) + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) .@pass = 1; } else if (.@i%4 == 3) { if (questprogress(4229,PLAYTIME) && questprogress(9223,PLAYTIME) && questprogress(12278,PLAYTIME)) diff --git a/npc/re/events/halloween_2013.txt b/npc/re/events/halloween_2013.txt index 6f16d437c..acfd60f9f 100644 --- a/npc/re/events/halloween_2013.txt +++ b/npc/re/events/halloween_2013.txt @@ -267,7 +267,7 @@ L_Explain: niflheim,181,173,5 script Chef Candycon#2013HE 4_M_NFDEADSWDMAN,{ if (eve_bs == 1) { - if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) >= 30) { + if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) >= 30) { mes "[Chef Candycon]"; mes "Clang~Clang~!"; next; @@ -400,16 +400,16 @@ L_GivePumpkin: mes "Eeh~~ You have no use for those pumpkins~~"; close; } - if (countitem(Organic_Pumpkin) * 3 + countitem(Inorganic_Pumpkin) < 30) { + if (countitem(ORGANIC_PUMPKIN) * 3 + countitem(INORGANIC_PUMPKIN) < 30) { mes "[Chef Candycon]"; mes "Ooops where is pumpkin? escaped again?"; mes "Oh, boy...no... you should go to get them again..."; close; } - if (countitem(Inorganic_Pumpkin)) - delitem Inorganic_Pumpkin,countitem(Inorganic_Pumpkin); - if (countitem(Organic_Pumpkin)) - delitem Organic_Pumpkin,countitem(Organic_Pumpkin); + if (countitem(INORGANIC_PUMPKIN)) + delitem INORGANIC_PUMPKIN, countitem(INORGANIC_PUMPKIN); + if (countitem(ORGANIC_PUMPKIN)) + delitem ORGANIC_PUMPKIN, countitem(ORGANIC_PUMPKIN); eve_bs = 2; getitem HALLOWEEN_G_BOX,1; erasequest 11378; diff --git a/npc/re/instances/BakonawaLake.txt b/npc/re/instances/BakonawaLake.txt index 8214a3039..5e2ae7f33 100644 --- a/npc/re/instances/BakonawaLake.txt +++ b/npc/re/instances/BakonawaLake.txt @@ -56,7 +56,7 @@ ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{ close; } - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Bakonawa Lake"; .@baku_time = questprogress(12278,PLAYTIME); @@ -69,7 +69,7 @@ ma_scene01,174,179,4 script Taho 4_M_DEWZATIMAN,{ close; } if (!.@baku_time) { - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { mes "[Taho]"; mes "Are you the leader of the Bakonawa slayers? The road is not well so we have to go down the cliff with a rope, is that OK?"; next; @@ -144,7 +144,7 @@ sec_in02,26,26,4 script Bakonawa's Rage 4_M_DEWZATIMAN,{ mes "[Taho]"; mes "Bakonawa becomes invincible at some point. When that time comes, listen to my guides carefully. Just trust me and all will be good."; next; - if (getcharid(0) == getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) { mes "[Taho]"; mes "Now I will make Bakonawa spring out from the lake."; next; @@ -528,7 +528,7 @@ OnTimer10000: mes "[Taho]"; mes "HMM. We almost got him but he is one fast creature..."; next; - if (getcharid(0) == getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) { mes "[Taho]"; mes "Are we going to try again?"; next; diff --git a/npc/re/instances/BangungotHospital.txt b/npc/re/instances/BangungotHospital.txt index d45fdfc23..1504f892f 100644 --- a/npc/re/instances/BangungotHospital.txt +++ b/npc/re/instances/BangungotHospital.txt @@ -39,7 +39,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ if (BaseLevel < 100) end; - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); cutin "malaya_nurseB",2; if (!questprogress(9223)) { .@quest = questprogress(9222); @@ -60,7 +60,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ else if (malaya_bang == 31) callsub L_Closed,0; else if (malaya_bang > 39) - callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,0,0; + callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,0,0; else { mes "[Nurse Maenne]"; mes ".........."; @@ -104,7 +104,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ } else { //if (!.@party_id) goto L_NoParty; //unneeded if (malaya_bang > 39) - callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1; + callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,1,1; else { mes "[Nurse Maenne]"; mes "......."; @@ -136,7 +136,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ } else if (.@playtime == 2) { //if (!.@party_id) goto L_NoParty; //unneeded if (malaya_bang > 39) - callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1; + callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,1,1; else { mes "[Nurse Maenne]"; mes "......."; @@ -215,7 +215,7 @@ ma_dun01,147,10,5 script Nurse#ma_dun01 4_F_NURSE,{ } else { if (!.@party_id) goto L_NoParty; if (malaya_bang > 39) - callsub L_Enter,(getcharid(0) == getpartyleader(.@party_id,2))?1:0,1,1; + callsub L_Enter,(getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2))?1:0,1,1; else { mes "[Nurse Maenne]"; mes "......."; @@ -275,7 +275,7 @@ L_Enter: next; switch(select(((getarg(0))?"Prepare to enter the second floor.":""), "Enter the second floor.", "Do not enter.")) { case 1: - .@instance = instance_create(.@md_name$,getcharid(1)); + .@instance = instance_create(.@md_name$,getcharid(CHAR_ID_PARTY)); if (.@instance < 0) { mes "[Nurse Maenne]"; mes "A critical situation has happened."; @@ -312,7 +312,7 @@ L_Enter: mes "The party leader did not generate the dungeon yet."; close; } else { - mapannounce "ma_dun01", getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member entered "+.@md_name$+".",bc_map,"0x00ff99"; + mapannounce "ma_dun01", getpartyname(getcharid(CHAR_ID_PARTY))+" party's "+strcharinfo(PC_NAME)+" member entered "+.@md_name$+".",bc_map,"0x00ff99"; if (getarg(1)) { if (questprogress(9223)) { completequest 9223; diff --git a/npc/re/instances/BuwayaCave.txt b/npc/re/instances/BuwayaCave.txt index 878000d0f..242d0a8e4 100644 --- a/npc/re/instances/BuwayaCave.txt +++ b/npc/re/instances/BuwayaCave.txt @@ -44,7 +44,7 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{ close; } - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Buwaya Cave"; if (!.@party_id) { @@ -54,7 +54,7 @@ ma_fild02,312,317,5 script Guard#buwaya_cave 4_MAL_SOLDIER,{ mes "team with other people."; close; } - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { mes "[Guard]"; mes "This place is dangerous. Please go back."; mes "If you dont have any business here, please go back."; @@ -159,7 +159,7 @@ OnTouch: mes "The party leader did not generate the dungeon yet."; close; } else { - mapannounce "ma_fild02",getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 + mapannounce "ma_fild02",getpartyname(getcharid(CHAR_ID_PARTY))+" party's "+strcharinfo(PC_NAME)+" member began hunting Buwaya in Buwaya Cave.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 setquest 4229; warp "1@ma_c",35,57; end; diff --git a/npc/re/instances/EclageInterior.txt b/npc/re/instances/EclageInterior.txt index 9b232ac99..9ad8519b4 100644 --- a/npc/re/instances/EclageInterior.txt +++ b/npc/re/instances/EclageInterior.txt @@ -33,7 +33,7 @@ //========================================================================= ecl_hub01,132,12,3 script Chief of Staff#tl01::EclInstance 4_F_FAIRY,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Eclage Interior"; if (!.@party_id){ mes "-! Warning !-"; @@ -42,7 +42,7 @@ ecl_hub01,132,12,3 script Chief of Staff#tl01::EclInstance 4_F_FAIRY,{ close; } - if (getpartyleader(.@party_id,2) != getcharid(0)) { + if (getpartyleader(.@party_id,2) != getcharid(CHAR_ID_CHAR)) { mes "-! Warning !-"; mes "This current quest will be held at Memorial dungeon."; mes "Only the party leader will enter. Please create your party."; @@ -93,7 +93,7 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{ next; switch (select("Enter it.", "Forget it.")) { case 1: - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); if (has_instance("1@ecl") == "") { mes "It is closed shut."; @@ -101,7 +101,7 @@ ecl_hub01,130,15,0 script It is closed shut. CLEAR_NPC,{ } if (.@party_id) { .@md_name$ = "Eclage Interior"; - if (getpartyleader(.@party_id,2) != getcharid(0)){ + if (getpartyleader(.@party_id,2) != getcharid(CHAR_ID_CHAR)){ mes "-! Warning !-"; mes "This current quest will be held at Memorial dungeon."; mes "Only the party leader will enter. Please create your party."; diff --git a/npc/re/instances/HazyForest.txt b/npc/re/instances/HazyForest.txt index 7b12e1649..7f85fee50 100644 --- a/npc/re/instances/HazyForest.txt +++ b/npc/re/instances/HazyForest.txt @@ -38,7 +38,7 @@ //== Instance Creation ===================================== bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Mistwood Maze"; mes "[Laphine Soldier]"; @@ -51,7 +51,7 @@ bif_fild01,158,340,5 script Laphine Soldier#mist 4_M_FAIRYSOLDIER,{ close; } .@playtime = questprogress(7211,PLAYTIME); - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { if (.@playtime == 1) { mes "[Laphine Soldier]"; mes "...Are you sure you're not doing too much?"; @@ -177,7 +177,7 @@ bif_fild01,161,355,0 script Log Tunnel CLEAR_NPC,{ } else { if (questprogress(7211,PLAYTIME) == 2) erasequest 7211; if (!questprogress(7211,PLAYTIME)) setquest 7211; - mapannounce "bif_fild01",getpartyname(getcharid(1))+" party's "+strcharinfo(PC_NAME)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 + mapannounce "bif_fild01",getpartyname(getcharid(CHAR_ID_PARTY))+" party's "+strcharinfo(PC_NAME)+" member is entering the Mistwood Maze.",bc_map,"0x00ff99"; //FW_NORMAL 12 0 0 warp "1@mist",89,29; close; } diff --git a/npc/re/instances/MalangdoCulvert.txt b/npc/re/instances/MalangdoCulvert.txt index e44fed03b..164caf548 100644 --- a/npc/re/instances/MalangdoCulvert.txt +++ b/npc/re/instances/MalangdoCulvert.txt @@ -399,7 +399,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ mes "You don't look like you have Seagod Protection. I can't open door at the moment!"; close; } - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Culvert"; if (!.@party_id) { mes "^0000ffYou have to organize a party of"; @@ -409,7 +409,7 @@ mal_in01,160,34,4 script Missing, the Cleaner 4_CAT_SAILOR2,{ } .@playtime = questprogress(12254,PLAYTIME); if (!.@playtime) { - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { mes "[Missing, the Cleaner]"; mes "Ummm? What's up? Tell me the password if you're the leader!"; next; @@ -476,7 +476,7 @@ L_Enter: //== Instance: Common Scripts ============================== 1@pump,63,100,4 script Missing, the Cleaner#0 4_CAT_SAILOR2,{ - if (getcharid(0) != getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY),2)) { mes "[Missing, the Cleaner]"; mes "I am trying to have a conversation with your leader now. Please don't disturb and wait!"; close; @@ -497,7 +497,7 @@ L_Enter: mes "Huh? Not ready yet? Talk to me again when you're ready."; close; } - 'party_id = getcharid(1); + 'party_id = getcharid(CHAR_ID_PARTY); mapannounce instance_mapname("1@pump"),"Missing: Move toward the 3 o'clock direction and wait for my next order!",bc_map,"0xff88ff",FW_NORMAL,15; disablenpc instance_npcname("Missing, the Cleaner#0"); enablenpc instance_npcname("Missing, the Cleaner#n"); @@ -519,7 +519,7 @@ L_Enter: mes "Hmm? Talk to me again when you're ready."; close; } - 'party_id = getcharid(1); + 'party_id = getcharid(CHAR_ID_PARTY); mapannounce instance_mapname("1@pump"),"Missing: I'll go in first, so follow me! I'll open up a gate at the 3 o'clock direction!",bc_map,"0xff88ff",FW_NORMAL,15; disablenpc instance_npcname("Missing, the Cleaner#0"); enablenpc instance_npcname("Culvert Entrance#i"); @@ -566,7 +566,7 @@ function script F_mal_missing { mes "[Missing, the Cleaner]"; mes "I don't care if you get help from your friends or not. I want you to clean up all culverts! Don't forget! I will watch you and give you instructions. Just do what I said!!"; next; - if (getcharid(0) != getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY),2)) { mes "[Missing, the Cleaner]"; mes "Once your leader finishes preparing, it will begin, so get your hearts ready for it!!"; close; @@ -594,7 +594,7 @@ function script F_mal_missing { mes "[Missing, the Cleaner]"; mes "I see seaweed everywhere because you're wiggling! All the culverts will be blocked with seaweed!"; next; - if (getcharid(0) != getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY),2)) { mes "[Missing, the Cleaner]"; mes "Once your leader finishes preparing, settlement will be decided so get your hearts ready for it!!"; close; diff --git a/npc/re/instances/OldGlastHeim.txt b/npc/re/instances/OldGlastHeim.txt index 0b7bb7e6e..bf099cd2d 100644 --- a/npc/re/instances/OldGlastHeim.txt +++ b/npc/re/instances/OldGlastHeim.txt @@ -93,7 +93,7 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ mes("Umm? Did you see me at another place? I don't think so. What about this time?"); next; if (!questprogress(12317, PLAYTIME)) { - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@p_name$ = getpartyname(.@party_id); .@md_name$ = "Old Glast Heim"; if (!instance_check_party(.@party_id)) { @@ -103,13 +103,13 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ } if (!questprogress(12318, HUNTING)) setquest 12318; - if (getcharid(0) == getpartyleader(.@party_id, 2)) + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id, 2)) .@menu1$ = "Generate Time Gap"; else .@menu1$ = ""; switch (select(.@menu1$, "Enter Old Glast Heim", "Cancel")) { case 1: - if (getcharid(0) != getpartyleader(.@party_id, 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id, 2)) end; .@instance = instance_create(.@md_name$, .@party_id); if (.@instance < 0) { @@ -165,7 +165,7 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ // Floor 1 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ 1@gl_k,149,41,6 script Varmundt#ghinstance1 4_M_BARMUND,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) { cutin("gl_barmund2", 2); mes("[Varmundt]"); mes("Where's your leader? I need his help."); @@ -181,7 +181,7 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ select("Oh. Well I..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("Ah yes, I am. Herico told me to meet you."); - unittalk(getcharid(3), _("Ah yes, I am. Herico told me to meet you.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Ah yes, I am. Herico told me to meet you.")); next; cutin("gl_barmund2", 2); mes("[Varmundt]"); @@ -191,7 +191,7 @@ glast_01,204,273,6 script Hugin#ghinstance 4_M_SAGE_C,{ select("Himelmez..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("Who is Himelmez?"); - unittalk(getcharid(3), _("Who is Himelmez?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Who is Himelmez?")); next; cutin("gl_barmund3", 2); mes("[Varmundt]"); @@ -277,7 +277,7 @@ OnEnable: 1@gl_k,154,104,3 duplicate(Khalitzburg Knight#1) Khalitzburg Knight#22 4_F_KHALITZBURG 1@gl_k,149,100,6 script Heinrich#ghinstance1 4_M_HEINRICH,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) { cutin("gl_heinrich2", 2); mes("[Heinrich]"); mes("Where is your leader? I must talk to him."); @@ -289,7 +289,7 @@ OnEnable: select("Sir. Heinrich. Varmundt..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("Sir. Heinrich. Do you know what is happening in the castle now?"); - unittalk(getcharid(3), _("Sir. Heinrich. Do you know what is happening in the castle now?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sir. Heinrich. Do you know what is happening in the castle now?")); next; mes("[Heinrich]"); mes("Aren't you the adventurer that came along with Varmundt?"); @@ -302,7 +302,7 @@ OnEnable: select("Himelmez's invasion..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!"); - unittalk(getcharid(3), _("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Dead man's Valkyrie, Himelmez is coming to take the Ymir's Heart piece hidden inside this castle!")); next; cutin("gl_heinrich1", 2); mes("[Heinrich]"); @@ -321,7 +321,7 @@ OnEnable: select("Even if you don't believe me..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("I can't make you believe me, but there's no time to argue!"); - unittalk(getcharid(3), _("I can't make you believe me, but there's no time to argue!")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("I can't make you believe me, but there's no time to argue!")); cutin("gl_barmund2", 255); next; cutin("gl_heinrich1", 2); @@ -801,7 +801,7 @@ OnMyMobDead: } 1@gl_k,17,51,3 script Altar boy Domun#clearGH 4_M_KID1,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) { mes("[Altar boy Domun]"); mes("Save me, save me, please..."); close; @@ -814,7 +814,7 @@ OnMyMobDead: mesf("[%s]", strcharinfo(PC_NAME)); mes("Hold on!\r" "Are you the only survivor?"); - unittalk(getcharid(3), _("Hold on! Are you the only survivor?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Hold on! Are you the only survivor?")); next; mes("[Altar boy Domun]"); mes("Chamberlains... monks...\r" @@ -830,7 +830,7 @@ OnMyMobDead: select("Pull it together!"); mesf("[%s]", strcharinfo(PC_NAME)); mes("Wake up kid! Go east and find the middle passage to the outside! That is safe!"); - unittalk(getcharid(3), _("Wake up kid! Go east and find the middle passage to the outside! That is safe!")); // Displays 1st Letter of char name in small? + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Wake up kid! Go east and find the middle passage to the outside! That is safe!")); // Displays 1st Letter of char name in small? next; mes("[Altar boy Domun]"); mes("To the east passage?\r" @@ -841,7 +841,7 @@ OnMyMobDead: select("I will give you a weapon."); mesf("[%s]", strcharinfo(PC_NAME)); mes("Here's a weapon. Just close your eye and swing for those monsters."); - unittalk(getcharid(3), _("Here's a weapon. Just close your eye and swing for those monsters.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Here's a weapon. Just close your eye and swing for those monsters.")); next; mes("[Altar boy Domun]"); mes("Ok, I... I'l try."); @@ -898,7 +898,7 @@ OnMyMobDead: } 1@gl_k,291,145,3 script Holgren the Destroyer 4_F_JOB_BLACKSMITH,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) { mes("[Holgren the Destroyer]"); mes("Are you human?"); close; @@ -911,7 +911,7 @@ OnMyMobDead: select("Relax! I'm not a monster!"); mesf("[%s]", strcharinfo(PC_NAME)); mes("Relax! I am Human. Are you alone? Anyone else here?"); - unittalk(getcharid(3), _("Relax! I am Human. Are you alone? Anyone else here?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Relax! I am Human. Are you alone? Anyone else here?")); next; mes("[Holgren the Destroyer]"); mes("It's only me alive."); @@ -920,7 +920,7 @@ OnMyMobDead: select("It's dangerous here..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("It's dangerous here. You know the way to the middle passage? Can you move?"); - unittalk(getcharid(3), _("It's dangerous here. You know the way to the middle passage? Can you move?")); // Displays 1st Letter of char name in small? + unittalk(getcharid(CHAR_ID_ACCOUNT), _("It's dangerous here. You know the way to the middle passage? Can you move?")); // Displays 1st Letter of char name in small? next; mes("[Holgren the Destroyer]"); mes("Yes, I can move. I need to get out of here."); @@ -929,7 +929,7 @@ OnMyMobDead: select("Be safe..."); mesf("[%s]", strcharinfo(PC_NAME)); mes("Sorry, I can't go with you."); - unittalk(getcharid(3), _("Sorry, I can't go with you.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sorry, I can't go with you.")); next; mes("[Holgren the Destroyer]"); mes("It's ok. You've already done enough. I can help myself. Good luck to you too."); @@ -2226,7 +2226,7 @@ OnEnable: end; } -// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_STAT_Boots +// Merchant, and Trade NPC - Get Temporal Boots --> exchange to Temporal_*_Boots // Upon trade all refines got removed // Uses Temporal_Crystal /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ @@ -2275,7 +2275,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{ mes("You can trade ^0000FF1 Temporal Boots and 5 Temporal Crystals^000000 for 1 of the following items. ^FF0000Previous refine rate will not be retained with these new ones^000000."); next; setarray .@type$[0], "Strength", "Intelligence", "Agility", "Vitality", "Dexterity", "Luck"; - setarray .@equip_type[0], Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots; + setarray .@equip_type[0], Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots; .@select = select("Cancel", "Str Boots", "Int Boots", "Agi Boots", "Vit Boots", "Dex Boots", "Luk Boots"); switch (.@select) { case 1: @@ -2296,7 +2296,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{ mes("The boots has been upgraded as you want."); delequip .@part; delitem Temporal_Crystal, 5; - getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_STR_Boots, Temporal_INT_Boots, Temporal_AGI_Boots, Temporal_VIT_Boots, Temporal_DEX_Boots, Temporal_LUK_Boots + getitem2 .@equip_type[.@select-2], 1, 1, 0, 0, 0, 0, 0, 0; // Temporal_Str_Boots, Temporal_Int_Boots, Temporal_Agi_Boots, Temporal_Vit_Boots, Temporal_Dex_Boots, Temporal_Luk_Boots close; } mes("[Hugin's Butler]"); @@ -2307,7 +2307,7 @@ glast_01,210,273,5 script Hugin's Butler 1_F_04,{ } // Enchant NPC - Coagulated Spell to enchants on 4th slot. First one to pick --> upgraded --> additional random enchant on 3rd slot -// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_STAT_Boots +// Adding a socket on the Craftsman NPC will remove the 3rd and 4th slot enchants of the Temporal_*_Boots // Enchanting can fail, the 3th slot random one is guaranteed // Refine remains // Item Used: Coagulated_Spell @@ -2371,18 +2371,18 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of setarray .@enchant_rate[0], 90, 80, 70, 50, 100; // Enchant Success Rate in % .@random = rand(1, 100); switch (.@equip_id) { - case Temporal_STR_Boots: - case Temporal_INT_Boots: - case Temporal_AGI_Boots: - case Temporal_VIT_Boots: - case Temporal_DEX_Boots: - case Temporal_LUK_Boots: - case Temporal_STR_Boots_: - case Temporal_INT_Boots_: - case Temporal_AGI_Boots_: - case Temporal_VIT_Boots_: - case Temporal_DEX_Boots_: - case Temporal_LUK_Boots_: + case Temporal_Str_Boots: + case Temporal_Int_Boots: + case Temporal_Agi_Boots: + case Temporal_Vit_Boots: + case Temporal_Dex_Boots: + case Temporal_Luk_Boots: + case Temporal_Str_Boots_: + case Temporal_Int_Boots_: + case Temporal_Agi_Boots_: + case Temporal_Vit_Boots_: + case Temporal_Dex_Boots_: + case Temporal_Luk_Boots_: if (.@card3 == 0) { //4th slot 1st try enchanting .@cost = .@enchant_cost[0]; .@scs = .@enchant_rate[0]; @@ -2450,7 +2450,7 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of case MHP2: case Attack_Delay_4: case Luck6: - .@enchant = callfunc("F_Rand", Bear's_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day); + .@enchant = callfunc("F_Rand", Bears_Power, Runaway_Magic, Speed_Of_Light, Muscle_Fool, Hawkeye, Lucky_Day); mes("[Hugin's Magic Master]"); // Custom text mes("Seems you already completed the best upgrade option in your 4th slot. For that I can give a random bonus effect to your 3rd slot. And of course, with certain payment..."); next; @@ -2566,9 +2566,9 @@ glast_01,212,273,4 script Hugin's Magic Master 1_F_01,{ // Custom text due to of close; } -// Socket NPC - Contaminated_Magic or Temporal_Crystal to add card slot +// Socket NPC - Corrupted_Charm or Temporal_Crystal to add card slot // After the boots were slotted, you can still enchant, but slotting removes any enchants and refines applied before. -// Item Used: Contaminated_Magic, Temporal_Crystal +// Item Used: Corrupted_Charm, Temporal_Crystal /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ disable_items; @@ -2601,12 +2601,12 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ } .@equip_id = getequipid(.@part); switch (.@equip_id) { - case Temporal_STR_Boots: - case Temporal_INT_Boots: - case Temporal_AGI_Boots: - case Temporal_VIT_Boots: - case Temporal_DEX_Boots: - case Temporal_LUK_Boots: + case Temporal_Str_Boots: + case Temporal_Int_Boots: + case Temporal_Agi_Boots: + case Temporal_Vit_Boots: + case Temporal_Dex_Boots: + case Temporal_Luk_Boots: mes("[Hugin's Craftsman]"); mes("The ^FF0000Boots and all enchants or refines will be lost if you fail this.^000000\r" "Still want to risk it?"); @@ -2629,7 +2629,7 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ mes("Then my last question:\r" "Which item are you gonna use to pay me?"); next; - setarray .@slotpay[0], Temporal_Crystal, Contaminated_Magic; + setarray .@slotpay[0], Temporal_Crystal, Corrupted_Charm; setarray .@slotcost[0], 10, 50; setarray .@slotchance[0], 80, 65; // Custom rates .@select = select("Cancel", "Temporal Crystal", "Contaminated Magic"); @@ -2664,18 +2664,18 @@ glast_01,210,270,0 script Hugin's Craftsman 4_F_JOB_BLACKSMITH,{ specialeffect2 EF_PHARMACY_OK; delequip .@part; // todo: read aegis name and attach "_" to worn constant - if (.@equip_id == Temporal_STR_Boots) { - getitem2 Temporal_STR_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_INT_Boots) { - getitem2 Temporal_INT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_AGI_Boots) { - getitem2 Temporal_AGI_Boots_, 1, 1, 0, 0, 0, 0, .0, 0; - } else if (.@equip_id == Temporal_VIT_Boots) { - getitem2 Temporal_VIT_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_DEX_Boots) { - getitem2 Temporal_DEX_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; - } else if (.@equip_id == Temporal_LUK_Boots) { - getitem2 Temporal_LUK_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + if (.@equip_id == Temporal_Str_Boots) { + getitem2 Temporal_Str_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Int_Boots) { + getitem2 Temporal_Int_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Agi_Boots) { + getitem2 Temporal_Agi_Boots_, 1, 1, 0, 0, 0, 0, .0, 0; + } else if (.@equip_id == Temporal_Vit_Boots) { + getitem2 Temporal_Vit_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Dex_Boots) { + getitem2 Temporal_Dex_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; + } else if (.@equip_id == Temporal_Luk_Boots) { + getitem2 Temporal_Luk_Boots_, 1, 1, 0, 0, 0, 0, 0, 0; } close; default: @@ -2699,7 +2699,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{ mes("I exchange you a White Knight Card for ^0000FF3000 Coagulated Spell^000000 or ^FF000070 Contaminated Magic^000000."); mes("<ITEMLINK>White Knight Card<INFO>4608</INFO></ITEMLINK>"); next; - setarray .@item[0], Coagulated_Spell, Contaminated_Magic; + setarray .@item[0], Coagulated_Spell, Corrupted_Charm; setarray .@cost[0], 3000, 70; .@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000"); switch (.@select) { @@ -2717,7 +2717,7 @@ glast_01,188,273,5 script White Knight#1a 4_WHITEKNIGHT,{ close; } delitem .@item, .@cost; - getitem White_Knight_Card, 1; + getitem White_Knightage_Card, 1; close; } } @@ -2732,7 +2732,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{ mes("I exchange you a Khalitzburg Knight Card for ^0000FF5000 Coagulated Spell^000000 or ^FF0000100 Contaminated Magic^000000."); mes("<ITEMLINK>Khalitzburg Knight Card<INFO>4609</INFO></ITEMLINK>"); next; - setarray .@item[0], Coagulated_Spell, Contaminated_Magic; + setarray .@item[0], Coagulated_Spell, Corrupted_Charm; setarray .@cost[0], 5000, 100; .@select = select("Cancel", "^0000FFUse Coagulated Spell^000000", "^FF0000Use Contaminated Magic^000000"); switch (.@select) { @@ -2750,7 +2750,7 @@ glast_01,192,273,3 script Khalitzburg Knight#1a 4_F_KHALITZBURG,{ close; } delitem .@item, .@cost; - getitem Khalitzburg_Knight_Card, 1; + getitem Khali_Knightage_Card, 1; close; } } diff --git a/npc/re/instances/WolfchevLaboratory.txt b/npc/re/instances/WolfchevLaboratory.txt index ce0ca4c31..e88ec4332 100644 --- a/npc/re/instances/WolfchevLaboratory.txt +++ b/npc/re/instances/WolfchevLaboratory.txt @@ -1768,7 +1768,7 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ mes "So, please prepare your party members, and take care of those boss creatures. I'm not sure how long this place can hold."; close; } else if (lght_duk01 > 6) { - if (getcharid(1) > 0) { + if (getcharid(CHAR_ID_PARTY) > 0) { mes "[Wolfchev]"; mes "Are you all set there? I will prepare the entrance if you are the leader of that party."; next; @@ -1859,8 +1859,8 @@ lhz_dun04,151,276,3 script Researcher#memo 4_LGTSCIENCE,{ } } } - if (getpartyleader(getcharid(1),2) == getcharid(0)) { - .@instance = instance_create("Worsef", getcharid(1)); + if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { + .@instance = instance_create("Worsef", getcharid(CHAR_ID_PARTY)); if (.@instance < 0) { mes "[Wolfchev]"; mes "Hmm.. Lab entering system is a bit weird. Would wait for me to check the system?"; @@ -2035,7 +2035,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ 1@lhz,39,168,0 script Manual Sheet#1_1 CLEAR_NPC,{ mes "There are valve manual sheets littered on the floor."; next; - if (getpartyleader(getcharid(1),2) == getcharid(0)) { + if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { mes "You the party leader, started to read the manual."; next; mes "[Emergency Access Valve Manual]"; @@ -2112,7 +2112,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ 1@lhz,41,172,0 script Valve#1_2 CLEAR_NPC,{ .@open_portal = 0; mes "This is the left valve for the emergency access."; - if (getpartyleader(getcharid(1),2) == getcharid(0)) { + if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { next; mes "To which direction do you wish to turn?"; next; @@ -2174,7 +2174,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ 1@lhz,52,172,0 script Valve#1_3 CLEAR_NPC,{ .@open_portal = 0; mes "This is the left valve for the emergency access."; - if (getpartyleader(getcharid(1),2) == getcharid(0)) { + if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { next; mes "To which direction do you wish to turn?"; next; @@ -2562,7 +2562,7 @@ lhz_dun04,147,279,0 script Laboratory Entrance#memo CLEAR_NPC,{ //== The Lab No.2 Valves =================================== - script bio4FLab2Valve FAKE_NPC,{ - if (getpartyleader(getcharid(1),2) == getcharid(0)) { + if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { progressbar "0xffff00", 20; stopnpctimer; donpcevent instance_npcname("Lab2#2_2")+"::OnDisableValve1"; diff --git a/npc/re/instances/ghost_palace.txt b/npc/re/instances/ghost_palace.txt index 8b0bbb866..b1a8f3c10 100644 --- a/npc/re/instances/ghost_palace.txt +++ b/npc/re/instances/ghost_palace.txt @@ -59,13 +59,13 @@ dali02,44,129,5 script Unpleasent Royal Guard 4_M_SAKRAYROYAL,{ "I will be right behind you!"); close(); } - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); if (!.@party_id) { mes("[Unpleasent Royal Guard]"); mes("This is a solo instance. Please form a solo party before continuing."); close(); } - if (getcharid(0) != getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id,2)) { mes("[Unpleasent Royal Guard]"); mes("I'm looking for adventurers to help me!\r" "I want to talk to the team leader, can I?"); @@ -134,7 +134,7 @@ dali02,41,134,0 script Interdimensional Device::gpportal PORTAL,{ mes("The monsters that attacked the palace are wandering around the secret entrance. It would be very bad if they spotted us... Please wait until the time limit for re-entrance passed."); close(); } - if (getcharid(0) == getpartyleader(.@party_id,2) && !questprogress(1260)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2) && !questprogress(1260)) { mes("[Unpleasent Royal Guard]"); mes("I'm looking for adventurers to help me!\r" "I want to talk to the team leader, can I?"); @@ -155,7 +155,7 @@ dali02,41,134,0 script Interdimensional Device::gpportal PORTAL,{ mes("^FF0000Inside the device you see a dark hole. If you wish to enter you may wish to talk to the Unpleasant Royal Guard first.^000000"); close(); } - mapannounce("dali", sprintf(_$("%s of the party, %s, is entering the Ghost Palace."), strcharinfo(PC_NAME), getpartyname(getcharid(1))), bc_map, C_SPRINGGREEN); + mapannounce("dali", sprintf(_$("%s of the party, %s, is entering the Ghost Palace."), strcharinfo(PC_NAME), getpartyname(getcharid(CHAR_ID_PARTY))), bc_map, C_SPRINGGREEN); if (!questprogress(1260)) setquest 1260; setquest 1261; warp("1@spa", 198, 188); @@ -318,9 +318,9 @@ OnInstanceInit: "Everything will be vanished..."); close2(); if (first_time_gpmission) - getitem Gray_Piece, 1; + getitem(Gray_Shard, 1); if (!first_time_gpmission) { - getitem Gray_Piece, 2; + getitem(Gray_Shard, 2); getexp(900000, 500000); ++first_time_gpmission; } @@ -550,7 +550,7 @@ OnInstanceInit: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("Sakray, What do you want sympathy? Or is it a trap?"); - unittalk(getcharid(3), _("Sakray, What do you want sympathy? Or is it a trap?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sakray, What do you want sympathy? Or is it a trap?")); next; mes("[Sakray]"); mes("Non...I did not need to make an effort to catch a novice."); @@ -558,7 +558,7 @@ OnInstanceInit: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("If so... then why...?"); - unittalk(getcharid(3), _("If so... then why...?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("If so... then why...?")); next; cutin("cry-b", 3); mes("[Sakray]"); @@ -580,7 +580,7 @@ OnInstanceInit: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("..."); - unittalk(getcharid(3), _("...")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("...")); next; mes("[Sakray]"); mes("Heh heh... I will keep watching you until the day you grow up enough."); @@ -705,9 +705,10 @@ OnInstanceInit: mes("The cursed knight...\r" "Please help me save the soul of Sakray."); next; - setarray .@items_list, Thanatos_Sword, Thanatos_Great_Sword, Thanatos_Spear, Thanatos_Long_Spear, Thanatos_Staff, Thanatos_Two-Handed_Staff, Thanatos_Bow, - Thanatos_Dagger, Thanatos_Katar, Thanatos_Knuckles, Thanatos_Hammer, Thanatos_Axe, Thanatos_Violin, Thanatos_Whip, Gray_Shield, - Gray_Armor, Gray_Robe, Gray_Cloak, Boots_of_Gray, Gray_Helmet; + setarray(.@items_list, + Thanos_Sword, Thanos_Great_Sword, Thanos_Spear, Thanos_Long_Spear, Thanos_Staff, Thanos_Rod, Thanos_Bow, + Thanos_Dagger, Thanos_Katar, Thanos_Knuckle, Thanos_Hammer, Thanos_Axe, Thanos_Violin, Thanos_Whip, Shield_Of_Gray, + Armor_Of_Gray, Gray_Robe, Cloak_Of_Gray, Boots_Of_Gray, Gray_Helmet); setarray .@cost, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 200, 100, 100, 100, 100, 100, 100; .@menulist$ = ""; @@ -734,7 +735,7 @@ OnInstanceInit: break; case 2: next; - if (countitem(Gray_Piece) < .@cost[.@choice]) { + if (countitem(Gray_Shard) < .@cost[.@choice]) { mes("[King]"); mes("You don't have enough Gray Shards."); mesf("I need %d Gray Shards to make a ^FF0000%s.^000000", .@cost[.@choice], getitemname(.@items_list[.@choice])); @@ -755,7 +756,7 @@ OnInstanceInit: mes("[King]"); mes("The power requires a sacrifice.\r" "Please be careful..."); - delitem Gray_Piece, .@cost[.@choice]; + delitem(Gray_Shard, .@cost[.@choice]); getitem .@items_list[.@choice], 1; close(); } diff --git a/npc/re/instances/octopus_cave.txt b/npc/re/instances/octopus_cave.txt index 71f164ff7..b09d243ab 100644 --- a/npc/re/instances/octopus_cave.txt +++ b/npc/re/instances/octopus_cave.txt @@ -38,7 +38,7 @@ //== Instance Creation ===================================== mal_dun01,151,235,5 script Starfish 4_ASTER,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Octopus Cave"; if (!.@party_id) { @@ -46,7 +46,7 @@ mal_dun01,151,235,5 script Starfish 4_ASTER,{ mes("You alone is powerless, hehe! Better get someone to help you out. Make a party, and come back later."); close; } - if (getcharid(0) != getpartyleader(.@party_id, 2)) { + if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id, 2)) { mes("[Starfish]"); mes("Where is your leader, hehe. I don't talk to some random people. Bring your boss to me."); close; @@ -136,7 +136,7 @@ mal_dun01,153,237,5 script Weird Entrance CLEAR_NPC,{ close; } - mapannounce("mal_dun01", sprintf(_$("%s party's %s member started to hunt the Octopus!"), getpartyname(getcharid(1)), strcharinfo(PC_NAME)), bc_map, C_SPRINGGREEN); + mapannounce("mal_dun01", sprintf(_$("%s party's %s member started to hunt the Octopus!"), getpartyname(getcharid(CHAR_ID_PARTY)), strcharinfo(PC_NAME)), bc_map, C_SPRINGGREEN); if (!questprogress(4197)) setquest 4197; warp "1@cash", 199, 99; end; diff --git a/npc/re/instances/saras_memory.txt b/npc/re/instances/saras_memory.txt index 0c7f4a9cb..2b3b4f2c0 100644 --- a/npc/re/instances/saras_memory.txt +++ b/npc/re/instances/saras_memory.txt @@ -168,7 +168,7 @@ dali,138,118,0 script Dimensional Device#dimen PORTAL,{ erasequest 15002; end; } else if (!.@sara_time) { - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@p_name$ = getpartyname(.@party_id); .@md_name$ = "Sara's Memory"; if (!instance_check_party(.@party_id)) { @@ -177,13 +177,13 @@ dali,138,118,0 script Dimensional Device#dimen PORTAL,{ "can use quotes to put spaces in a party name."); close; } - if (getcharid(0) == getpartyleader(.@party_id, 2)) + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id, 2)) .@menu1$ = "Boot up the dimensional device"; else .@menu1$ = ""; switch (select(.@menu1$, "Use the dimensional device", "Cancel")) { case 1: - if (getcharid(0) != getpartyleader(.@party_id, 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(.@party_id, 2)) end; .@instance = instance_create(.@md_name$, .@party_id); if (.@instance < 0) { @@ -219,11 +219,11 @@ dali,138,118,0 script Dimensional Device#dimen PORTAL,{ } 1@sara,261,156,5 script A girl#sarains 4_F_SARAH_BABY,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) end; mesf("[%s]", strcharinfo(PC_NAME)); mes("Where am I?"); - unittalk(getcharid(3), _("Where am I?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Where am I?")); next; cutin "sara_9sara1.bmp", 2; mes("[A girl]"); @@ -232,7 +232,7 @@ dali,138,118,0 script Dimensional Device#dimen PORTAL,{ next; mesf("[%s]", strcharinfo(PC_NAME)); mes("Are you from here? You don't seem to quite match the locals either."); - unittalk(getcharid(3), _("Are you from here? You don't seem to quite match to locals either.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Are you from here? You don't seem to quite match to locals either.")); next; mes("[A girl]"); mes("Yes! I was born here! My name is Sara. Sara Irene!"); @@ -244,7 +244,7 @@ dali,138,118,0 script Dimensional Device#dimen PORTAL,{ next; mesf("[%s]", strcharinfo(PC_NAME)); mes("Oh! I am sorry! Uh... Why are you standing out here all alone?"); - unittalk(getcharid(3), _("Oh! I am sorry! Uh... Why are you standing out here all alone?")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Oh! I am sorry! Uh... Why are you standing out here all alone?")); next; mes("[Sara Irene]"); mes("I am waiting for my father. He said that he will be here soon."); @@ -523,7 +523,7 @@ OnEnable: OnTouch: .@map$ = instance_mapname("1@sara"); warp .@map$, 89, 175; - if (getcharid(0) == getpartyleader(getcharid(1),2)) + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) viewpoint 1, 39, 142, 1, C_GREEN; end; } @@ -546,7 +546,7 @@ OnTouch: } 1@sara,107,325,5 script Sara Irene#sarains1 4_F_SARAH_BABY,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) end; cutin "sara_9sara1.bmp", 2; mes("[Sara Irene]"); @@ -1007,7 +1007,7 @@ OnMyMobDead: } 1@sara,152,233,5 script Sara Irene#sarains2 4_F_SARAH_BABY,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) end; cutin "sara_9sara2.bmp", 2; mes("[Sara Irene]"); @@ -1031,7 +1031,7 @@ OnMyMobDead: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("I won't let you take Sara!"); - unittalk(getcharid(3), _("I won't let you take Sara!")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("I won't let you take Sara!")); next; cutin "sara_elder_irine3.bmp", 2; mes("[Doyen Irene]"); @@ -1040,7 +1040,7 @@ OnMyMobDead: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("Sara... run! Save yourself!"); - unittalk(getcharid(3), _("Sara... run! Save yourself!")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sara... run! Save yourself!")); next; cutin "sara_9sara2.bmp", 2; mes("[Sara Irene]"); @@ -1151,7 +1151,7 @@ OnMyMobDead: } 1@sara,156,236,3 script Doyen Irene#sarains3 4_M_CHIEF_IRIN,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) end; cutin "sara_elder_irine4.bmp", 2; mes("[Doyen Irene]"); @@ -1164,7 +1164,7 @@ OnMyMobDead: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!"); - unittalk(getcharid(3), _("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("What are you talking about? We saw you standing over Sara's mother with your sword COVERED in blood!")); next; mes("[Doyen Irene]"); mes("You.. think I killed Sara's mother?"); @@ -1188,7 +1188,7 @@ OnMyMobDead: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene."); - unittalk(getcharid(3), _("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("I am just an adventurer who was passing through. I heard some men plotting their deaths and needed to intervene.")); next; mes("[Doyen Irene]"); mes("If.. you are telling the truth...\r" @@ -1201,11 +1201,11 @@ OnMyMobDead: next; mesf("[%s]", strcharinfo(PC_NAME)); mes("There might be more assassins so we have to find Sara as fast as we can."); - unittalk(getcharid(3), _("There might be more assassins so we have to find Sara as fast as we can.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("There might be more assassins so we have to find Sara as fast as we can.")); next; mesf("[%s]", strcharinfo(PC_NAME)); mes("Sara believes that you killed her mother. We need to tell her the truth."); - unittalk(getcharid(3), _("Sara believes that you killed her mother. We need to tell her the truth.")); + unittalk(getcharid(CHAR_ID_ACCOUNT), _("Sara believes that you killed her mother. We need to tell her the truth.")); next; mes("[Doyen Irene]"); mes("We must do our best to find her. Let's split up and search for her.\r" @@ -1233,7 +1233,7 @@ OnDisable: } 1@sara,39,142,3 script Sara Irene#sarains3 4_F_SARAH_BABY,{ - if (getcharid(0) != getpartyleader(getcharid(1), 2)) + if (getcharid(CHAR_ID_CHAR) != getpartyleader(getcharid(CHAR_ID_PARTY), 2)) end; mes("^FF0000As you are about to call out to Sara a sudden blow knocks you down from behind.^000000"); dispbottom(_("As you are about to call out to Sara a sudden blow knocks you down from behind.")); diff --git a/npc/re/jobs/3-1/ranger.txt b/npc/re/jobs/3-1/ranger.txt index 0308884fd..78e200843 100644 --- a/npc/re/jobs/3-1/ranger.txt +++ b/npc/re/jobs/3-1/ranger.txt @@ -1748,7 +1748,7 @@ job3_rang01,90,43,3 script Ranger Master#jr_29 4_M_REIDIN_KURS,{ jobchange roclass(eaclass()|EAJL_THIRD); getitem Sniper_Goggle,1; getitem Green_Apple_Ring,1; - getitem Wolf's_Flute,1; + getitem Wolfs_Flute,1; close; } mes "Hey, you look great."; diff --git a/npc/re/jobs/3-2/royal_guard.txt b/npc/re/jobs/3-2/royal_guard.txt index 5cead2250..7fe7a1d2a 100644 --- a/npc/re/jobs/3-2/royal_guard.txt +++ b/npc/re/jobs/3-2/royal_guard.txt @@ -147,7 +147,6 @@ prt_castle,48,161,3 script Middle-aged Gentleman#rg 1_M_LIBRARYMASTER,{ } mes "[Heinrich]"; if (job_royal == 1) { - mes "[Heinrich]"; mes "You are persistent friend."; mes "Do you have more things to talk to me about?"; next; diff --git a/npc/re/jobs/novice/academy.txt b/npc/re/jobs/novice/academy.txt index 6164a0994..bee91f382 100644 --- a/npc/re/jobs/novice/academy.txt +++ b/npc/re/jobs/novice/academy.txt @@ -123,8 +123,8 @@ int_land,58,69,5 script Sailor#int_land 4W_SAILOR,{ mes("I'll let you know when we set sail~!"); close(); } else { - if (countitem(Lumber) >= 2) { - delitem(Lumber, countitem(Lumber)); + if (countitem(Wood) >= 2) { + delitem(Wood, countitem(Wood)); completequest(21002); mes("[Sailor]"); mes("Unbelievable, perfect! Any chance you want to join my crew?"); @@ -2646,8 +2646,8 @@ iz_ac01,100,39,5 script Academy Receptionist#1 4_F_01,{ getitem(Novice_Egg_Cap, 1); // Novice_Egg_Cap getitem(Novice_Knife, 1); // Novice_Knife getitem(Novice_Guard, 1); // Novice_Guard - getitem(Criatura_Academy_Hat, 1); // Criatura_Academy_Hat - getitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon + getitem(Cryptura_Academy_Hat, 1); + getitem(Cryptura_Hair_Coupon, 1); getitem(Novice_Potion, 300); // Novice_Potion next(); mes("[Receptionist]"); @@ -5208,7 +5208,7 @@ new_1-3,99,169,3 script Friendly Poring#ac 4_PORING,{ cutin("", 255); completequest(2295); setquest(2296); - getitem(Little_Unripe_Apple, 5); // Little_Unripe_Apple + getitem(Unripe_Apple2, 5); close(); } else if (questprogress(2296) == 1) { if (countitem(Novice_Poring_Egg) > 0) { @@ -6111,7 +6111,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ } close(); case 2: - if (!countitem(Criatura_Hair_Coupon)) { + if (!countitem(Cryptura_Hair_Coupon)) { mes("[Otter Samssoon]"); mes("Come on.. Honey~"); mes("You should bring ^ff0000'Criatura Hair Coupon'^000000 for changing hair..."); @@ -6192,7 +6192,7 @@ iz_ac01,69,36,3 script Otter Samssoon#ac 4W_SAILOR,{ mes("- Chikak, crack, crack.. -"); mes("- Snap, snap, snap.. Crack -"); next(); - delitem(Criatura_Hair_Coupon, 1); // Criatura_Hair_Coupon + delitem(Cryptura_Hair_Coupon, 1); cutin("", 255); mes("[Otter Samssoon]"); mes("Oh my! Oh my! Oh my!"); diff --git a/npc/re/jobs/novice/novice.txt b/npc/re/jobs/novice/novice.txt index 811593c81..6ac0d9935 100644 --- a/npc/re/jobs/novice/novice.txt +++ b/npc/re/jobs/novice/novice.txt @@ -445,7 +445,7 @@ new_5-2,100,29,4 duplicate(NvSprakkiB) Sprakki#nv5b 4_F_01 mes "You've come along fine this far."; mes "This is not much, but take this as a reward."; job_novice_q = 7; - getitem N_Adventurer's_Suit,1; + getitem N_Adventurers_Suit,1; completequest 7120; close; } else if (job_novice_q == 7) { @@ -2609,7 +2609,7 @@ L_Supplies: nov_3_swordman = 40; getitem Cargo_Free_Ticket,20; getitem Warp_Free_Ticket,30; - getitem N_Adventurer's_Suit,1; + getitem N_Adventurers_Suit,1; getitem N_Cutter,1; next; mes "[Hanson]"; diff --git a/npc/re/merchants/coin_exchange.txt b/npc/re/merchants/coin_exchange.txt index b714dd71d..be9f1dbee 100644 --- a/npc/re/merchants/coin_exchange.txt +++ b/npc/re/merchants/coin_exchange.txt @@ -1129,7 +1129,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{ Assassin_Mask_, Elven_Ears, Hahoe_Mask, - Boy's_Cap; + Boys_Cap; setarray .@costumes[0], C_Frog_Cap, C_Centimental_Flower, C_Magestic_Goat, @@ -1139,7 +1139,7 @@ ecl_in01,67,39,4 script Replication Expert Paltu 4_M_FAIRYKID4,{ C_Assassin_Mask_, C_Elven_Ears, C_Hahoe_Mask, - C_Boy's_Cap; + C_Boys_Cap; if ((countitem(Splendide_Coin) >= 50) && (countitem(Crystal_Mirror) >= 4) && countitem(Angel_Magic_Power) && (countitem(Azure_Jewel) >= 10) && (countitem(Cardinal_Jewel) >= 10) && (countitem(Blue_Jewel) >= 10) && (countitem(Golden_Jewel) >= 10) && (countitem(Bluish_Green_Jewel) >= 10)) .@item_check =1; diff --git a/npc/re/merchants/enchan_mal.txt b/npc/re/merchants/enchan_mal.txt index 7be4eaa6f..864505b85 100644 --- a/npc/re/merchants/enchan_mal.txt +++ b/npc/re/merchants/enchan_mal.txt @@ -93,7 +93,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 1224: callsub L_Socket,1,2; //Sword_Breaker case 1225: callsub L_Socket,1,2; //Mail_Breaker case 1227: callsub L_Socket,1,2; //Weeder_Knife - case 1229: callsub L_Socket,1,2; //Mama's_Knife + case 1229: callsub L_Socket,1,2; //Mamas_Knife case 1232: callsub L_Socket,1,2; //Assasin_Dagger case 1233: callsub L_Socket,1,2; //Exercise case 1235: callsub L_Socket,1,2; //Azoth @@ -212,7 +212,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 1466: callsub L_Socket,1,2; //Crescent_Scythe case 1467: callsub L_Socket,1,2; //Bill_Guisarme case 1468: callsub L_Socket,1,2; //Zephyrus - case 1469: callsub L_Socket,1,2; //Longinus's_Spear + case 1469: callsub L_Socket,1,2; //Longinuss_Spear case 1470: callsub L_Socket,1,2; //Brionac case 1471: callsub L_Socket,1,2; //Hell_Fire case 1474: callsub L_Socket,1,2; //Gae_Bolg @@ -264,7 +264,7 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 15: // Books switch(@mal_equip_id) { case 1557: callsub L_Socket,1,2; //Book_Of_The_Apocalypse - case 1558: callsub L_Socket,1,2; //Girl's_Diary + case 1558: callsub L_Socket,1,2; //Girls_Diary case 1559: callsub L_Socket,1,2; //Legacy_Of_Dragon case 1561: callsub L_Socket,1,2; //Hardback case 1562: callsub L_Socket,1,2; //Bible_Of_Battlefield @@ -311,11 +311,11 @@ malangdo,213,167,4 script Mayomayo#mal 4_CAT_3COLOR,{ case 1963: callsub L_Socket,1,2; //Rapture_Rose case 1964: callsub L_Socket,1,2; //Chemeti case 1969: callsub L_Socket,1,2; //Bladed_Whip - case 1970: callsub L_Socket,1,2; //Queen's_Whip + case 1970: callsub L_Socket,1,2; //Queens_Whip case 1972: callsub L_Socket,1,2; //Electric_Eel case 1973: callsub L_Socket,1,2; //Sea_Witch_Foot case 1974: callsub L_Socket,1,2; //Carrot_Whip - case 1976: callsub L_Socket,1,2; //Queen's_Whip_ + case 1976: callsub L_Socket,1,2; //Queens_Whip_ case 1979: callsub L_Socket,1,2; //Stem_Of_Nepenthes case 1984: callsub L_Socket,2,2; //Stem_Whip case 1985: callsub L_Socket,4,2; //Rosebine diff --git a/npc/re/merchants/flute.txt b/npc/re/merchants/flute.txt index 6732035dc..98fd3789c 100644 --- a/npc/re/merchants/flute.txt +++ b/npc/re/merchants/flute.txt @@ -110,7 +110,7 @@ pay_arche,91,134,3 duplicate(fflute) Falcon Flute Trader#fft2 1_M_BARD tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{ if (Class == Job_Ranger || Class == Job_Ranger_T || Class == Job_Baby_Ranger) { - if (countitem(Wolf's_Flute)) { + if (countitem(Wolfs_Flute)) { mes "[Expert Flute Crafter]"; mes "The Wolf Flute you have is crafted by myself, with wood."; mes "You can come back here and find me if you lose your Wolf flute!"; @@ -137,7 +137,7 @@ tur_dun01,89,170,5 script Expert Flute Crafter 1_M_ORIENT01,{ mes "Hope you are ready to use it."; delitem Bamboo_Cut,1; Zeny -= 100000; - getitem Wolf's_Flute,1; + getitem Wolfs_Flute,1; close; } mes "[Expert Flute Crafter]"; diff --git a/npc/re/merchants/shops.txt b/npc/re/merchants/shops.txt index 54155e8c4..543d9cdc7 100644 --- a/npc/re/merchants/shops.txt +++ b/npc/re/merchants/shops.txt @@ -547,42 +547,42 @@ OnInit: prontera,92,209,4 trader Rebellion Weapon Vending 2_VENDING_MACHINE1,{ OnInit: - sellitem Heaven's_Feather_and_Hell's_Fire; - sellitem Altea_and_Ares; - sellitem Color_Scope; + sellitem H_FEATHER_H_FIRE; + sellitem ALTAIR_ARES; + sellitem COLORSCOPE; sellitem RAG203; - sellitem Death_Fire; - sellitem Rolling_Thunder; - sellitem Peace_Breaker; - sellitem Mini_Mei; - sellitem Tempest; - sellitem End_Of_The_Horizon; - sellitem South_Cross; + sellitem DEATHFIRE; + sellitem R_THUNDER; + sellitem P_BREAKER; + sellitem MINIMAY; + sellitem TEMPEST; + sellitem END_OF_HORIZON; + sellitem Southern_Cross_R; } prontera,96,209,4 trader Rebellion Prop Vending 2_VENDING_MACHINE1,{ OnInit: - sellitem Slug_Ammunition_L; - sellitem Slug_Ammunition_M; - sellitem Slug_Ammunition_H; - sellitem Full_Metal_Jacket; - sellitem Projection_Landmines; + sellitem Slug_Bullet_1; + sellitem Slug_Bullet_2; + sellitem Slug_Bullet_3; + sellitem Fullmetal_Jacket_Bullet; + sellitem Mine_Projectile; sellitem Dragon_Tail_Missile; sellitem Special_Alloy_Trap; sellitem Bullet; sellitem Silver_Bullet_; sellitem Shell_Of_Blood_; - sellitem Armor_Piercing_Bullet; - sellitem Blazing_Bullet; + sellitem AP_Ammo; + sellitem Blaze_Bullet; sellitem Freezing_Bullet; - sellitem Lightning_Bullet; - sellitem Magic_Stone_Bullet; - sellitem Purifying_Bullet; - sellitem Incendiary_Grenade; - sellitem Lightning_Grenade; - sellitem Poison_Grenade; - sellitem Flash_Grenade; - sellitem Cyro_Grenade; + sellitem Electric_Shock_Bullet; + sellitem Magical_Stone_Bullet; + sellitem Sanctified_Bullet; + sellitem Flare_Sphere_; + sellitem Lighting_Sphere_; + sellitem Poison_Sphere_; + sellitem Blind_Sphere_; + sellitem Freezing_Sphere_; } //== Morroc =============================================== @@ -712,16 +712,16 @@ OnInit: morocc,171,103,4 trader Item Collector#moc3 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } morocc,205,247,2 trader Item Collector#moc4 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } diff --git a/npc/re/quests/cupet.txt b/npc/re/quests/cupet.txt index ac4a765fd..72e1bd6c9 100644 --- a/npc/re/quests/cupet.txt +++ b/npc/re/quests/cupet.txt @@ -38,7 +38,7 @@ 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],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animal's_Skin,Animal's_Skin,Grasshopper's_Leg,Mushroom_Spore; + setarray .@hunt_id[0],Jellopy,Jellopy,Clover,Feather_Of_Birds,Shell,Animals_Skin,Animals_Skin,Grasshoppers_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; @@ -95,9 +95,9 @@ 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],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alice's_Apron,Queen's_Whip,Evil_Horn; + setarray .@hunt_id[0],Long_Hair,Solid_Shell,Petite_DiablOfs_Horn,Alices_Apron,Queens_Whip,Evil_Horn; setarray .@hunt_amount[0],600,600,600,500,1,100; - setarray .@hunt_id2[0],0,0,0,0,Executioner's_Mitten,0; + setarray .@hunt_id2[0],0,0,0,0,Executioners_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/eden/100-110.txt b/npc/re/quests/eden/100-110.txt index 2ea72a2d1..3cc47f6ef 100644 --- a/npc/re/quests/eden/100-110.txt +++ b/npc/re/quests/eden/100-110.txt @@ -52,7 +52,7 @@ moc_para01,37,95,5 script Gelkah#1 4_F_GELKA,{ end; } mes "[Gelkah]"; - if (!countitem(Para_Team_Mark)) { + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "- You need to have an -"; mes "- ^4d4dff'Eden Group Mark'^000000 -"; mes "- to receive these missions. -"; @@ -1047,7 +1047,7 @@ S_Hunting: moc_para01,41,95,5 script Rohtert#12 4_M_ROTERT,{ mes "[Rohtert]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { cutin "rote01",2; mes "You are not even a member of Eden Group. What are you doing here?"; mes "I'm only dealing with base level ^FF0000100 - 110^000000 adventurers."; diff --git a/npc/re/quests/eden/11-25.txt b/npc/re/quests/eden/11-25.txt index 361d6a2e3..f65ad9090 100644 --- a/npc/re/quests/eden/11-25.txt +++ b/npc/re/quests/eden/11-25.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,36,38,3 script Mission [11 - 25]#Tuto 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "- You need to have an -"; mes "- ^4d4dff'Eden Group Mark'^000000 -"; mes "- to receive these missions. -"; diff --git a/npc/re/quests/eden/111-120.txt b/npc/re/quests/eden/111-120.txt index f133ca85f..4422c92c7 100644 --- a/npc/re/quests/eden/111-120.txt +++ b/npc/re/quests/eden/111-120.txt @@ -41,7 +41,7 @@ moc_para01,17,95,5 script Mingmin#1 4_F_GENETIC,{ mes "[Mingmin]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { cutin "min02",0; mes "A stranger. This place is supposed to be for Eden Group Members only."; mes "I'm in need base level ^FF0000111 - 120^000000 adventurers to help my research."; diff --git a/npc/re/quests/eden/121-130.txt b/npc/re/quests/eden/121-130.txt index 32fbdeb26..d48c71702 100644 --- a/npc/re/quests/eden/121-130.txt +++ b/npc/re/quests/eden/121-130.txt @@ -41,7 +41,7 @@ moc_para01,44,81,3 script Melody-Jack#1 4_M_MELODY,8,8,{ mes "[Melody-Jack]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "Who the hell are you? Get out of here!"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } @@ -582,7 +582,7 @@ OnTouch: moc_para01,17,77,5 script Aigu#1 4_F_IU,{ mes "[Aigu]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "Oh, why aren't you a part of Eden Group?"; mes "I'm only talking to base level ^FF0000121-130^000000 adventurers."; } diff --git a/npc/re/quests/eden/131-140.txt b/npc/re/quests/eden/131-140.txt index 806466624..fa6061b42 100644 --- a/npc/re/quests/eden/131-140.txt +++ b/npc/re/quests/eden/131-140.txt @@ -42,7 +42,7 @@ moc_para01,41,76,3 script Ragi#1 4_M_RAGI,{ cutin "ragi01",0; mes "[Ragi]"; - if (!countitem(Para_Team_Mark)) {// Para_Team_Mark + if (!countitem(Para_Team_Mark) && !countitem(Para_Team_Mark_)) { mes "Only adventurers from Eden Group are welcome here."; mes "I'm giving requests to base level ^FF0000130-140^000000 adventurers only."; } diff --git a/npc/re/quests/eden/26-40.txt b/npc/re/quests/eden/26-40.txt index c80f1c2c8..1c680d7ed 100644 --- a/npc/re/quests/eden/26-40.txt +++ b/npc/re/quests/eden/26-40.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,38,38,3 script Mission [26 - 40] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "You are not a qualified member. You can not use the bulletin board."; close; } @@ -530,11 +530,11 @@ payon,179,66,3 script Dashia 4_M_RACHMAN1,{ break; case 2: callsub L_Quest,8275; - if ((countitem(Bear's_Foot) > 9) && (countitem(Animal's_Skin) > 4)) { + if ((countitem(Bears_Foot) > 9) && (countitem(Animals_Skin) > 4)) { callsub L_Reward; getitem Novice_Potion,100; - delitem Bear's_Foot,10; - delitem Animal's_Skin,5; + delitem Bears_Foot,10; + delitem Animals_Skin,5; getexp 1000,100; erasequest 8275; close; diff --git a/npc/re/quests/eden/41-55.txt b/npc/re/quests/eden/41-55.txt index a13db78f8..b7d95aa71 100644 --- a/npc/re/quests/eden/41-55.txt +++ b/npc/re/quests/eden/41-55.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,40,38,3 script Mission [41 - 55] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "You are not an Eden group member. You are not qualified to access the bulletin board."; close; } diff --git a/npc/re/quests/eden/56-70.txt b/npc/re/quests/eden/56-70.txt index 741e6af89..c6aeb8c15 100644 --- a/npc/re/quests/eden/56-70.txt +++ b/npc/re/quests/eden/56-70.txt @@ -36,7 +36,7 @@ //========================================================================= moc_para01,42,38,3 script Mission [56 - 70] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "To get these missions, I need to Join the Eden Group first. I must find Secretary Lime Evenor and become a member."; close; } diff --git a/npc/re/quests/eden/71-85.txt b/npc/re/quests/eden/71-85.txt index f2bd68b6f..31f51871d 100644 --- a/npc/re/quests/eden/71-85.txt +++ b/npc/re/quests/eden/71-85.txt @@ -35,7 +35,7 @@ //========================================================================= moc_para01,44,38,3 script Mission [71 - 85] 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "- Only members of the -"; mes "- Eden Group can read -"; mes "- this bulletin board. -"; diff --git a/npc/re/quests/eden/86-90.txt b/npc/re/quests/eden/86-90.txt index 029a482ad..394970944 100644 --- a/npc/re/quests/eden/86-90.txt +++ b/npc/re/quests/eden/86-90.txt @@ -41,7 +41,7 @@ //========================================================================= moc_para01,48,175,3 script 86-90 Mission Board 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Wait a minute!"; mes "-You need to have an-"; mes "-^4d4dff'Eden Group Mark'^000000-"; diff --git a/npc/re/quests/eden/91-99.txt b/npc/re/quests/eden/91-99.txt index 2c86f6091..328cc4474 100644 --- a/npc/re/quests/eden/91-99.txt +++ b/npc/re/quests/eden/91-99.txt @@ -41,7 +41,7 @@ //========================================================================= moc_para01,48,177,3 script 91-99 Mission Board 4_BOARD3,{ - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Wait a minute!"; mes "-You need to have an-"; mes "-^4d4dff'Eden Group Mark'^000000-"; diff --git a/npc/re/quests/eden/eden_common.txt b/npc/re/quests/eden/eden_common.txt index f07ebb2ad..9085cad91 100644 --- a/npc/re/quests/eden/eden_common.txt +++ b/npc/re/quests/eden/eden_common.txt @@ -44,6 +44,26 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ mes "- after you loose some weight. -"; close; } + if (countitem(Para_Team_Mark) > 0) { + mes "[Lime Evenor]"; + mes "Thanks to many adventurers visiting our Eden Group, we've recently prepared a new version of Eden Group Mark for our visitors."; + mes "And it is also possible to exchange old version of Eden Group Mark into a new one."; + next; + mes "[Lime Evenor]"; + mes "Though it has a slight time delay, this new version of Eden Group Mark will send you back to current saved location."; + mes "Would you like to exchange yours?"; + next; + if (select("Sure", "I'm good.") == 2){ + mes "[Lime Evenor]"; + mes "What possible reason would you have... to not exchange?"; + close; + } + delitem Para_Team_Mark,1; + getitem Para_Team_Mark_,1; + mes "[Lime Evenor]"; + mes "There you go. Come back again~"; + close; + } mes "[Lime Evenor]"; mes "People who follow their dreams and romances listen to me. We are representatives of the paradise called 'The garden of Eden' called the Eden group . There is no place like this anywhere."; mes "Hello. Can I help you?"; @@ -67,7 +87,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ next; break; case 2: - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "[Lime Evenor]"; mes "You can be a Eden's member by simply registering with me."; mes "Would you like to join Eden Group?"; @@ -106,7 +126,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ next; mes "[Lime Evenor]"; mes "Hopefully you can do great work as an Eden's member."; - getitem Para_Team_Mark,1; + getitem Para_Team_Mark_,1; next; break; case 2: @@ -179,7 +199,7 @@ moc_para01,27,35,5 script Secretary Lime Evenor 4_F_EDEN_OFFICER,{ } break; case 4: - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Lime Evenor]"; mes "Would like to try some missions as an Eden member?"; next; @@ -306,7 +326,7 @@ OnTouch: } moc_para01,47,39,3 script #warp_2_pass HIDDEN_NPC,{ - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Lime Evenor]"; mes "Oh, it is an exclusive place only for Eden's members."; mes "If you are a member, you can come whenever you want!"; diff --git a/npc/re/quests/eden/eden_iro.txt b/npc/re/quests/eden/eden_iro.txt index 460960d72..2d72b3541 100644 --- a/npc/re/quests/eden/eden_iro.txt +++ b/npc/re/quests/eden/eden_iro.txt @@ -709,7 +709,7 @@ OnInit: tradertype(NST_CASH); sellitem Blue_Potion_Box,5; sellitem F_Neuralizer_Box,400; - sellitem FPr_Reset_Stone_Box,100; + sellitem FPremium_Reset_Stone_Box,100; sellitem F_Abrasive_Box10,75; sellitem F_G_O_I_Box10,25; sellitem Greed_Scroll_Box_30,30; diff --git a/npc/re/quests/eden/eden_quests.txt b/npc/re/quests/eden/eden_quests.txt index 4e472d1af..9e49a415b 100644 --- a/npc/re/quests/eden/eden_quests.txt +++ b/npc/re/quests/eden/eden_quests.txt @@ -9,7 +9,7 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2016 Hercules Dev Team //= Copyright (C) Capuche //= Copyright (C) Euphy //= Copyright (C) Masao @@ -37,7 +37,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ mes "[Boya]"; - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "You are not in my group are you?"; mes "I don't have anything to say to outsiders."; mes "If you want something register with my group."; @@ -117,7 +117,7 @@ moc_para01,25,35,4 script Instructor Boya#para01 4_M_KNIGHT_GOLD,{ case 2: mes "You are so rude!"; specialeffect2 EF_HIT1; - percentheal -50,0; + percentheal -50, 0; next; mes "-Beats quickly and this shining Rune Knight turns invisible."; mes "It hurts too much-"; @@ -712,7 +712,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ next; mes "-When the dog barked, your HP and SP recovered.-"; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 3) { @@ -750,7 +750,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ next; mes "-When the dog barked, your HP and SP recovered.-"; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 4) { @@ -806,7 +806,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ next; mes "-When the dog barked, your HP and SP recovered.-"; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 5) { @@ -839,7 +839,7 @@ moc_fild11,180,253,5 script Talking Dog#para03 4_RUS_DWOLF,{ mes "Not a wolf."; mes "I wasn't a dog originally..."; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Talking Dog]"; mes "Anyway are you a Eden Group member?"; mes "Oh good to see you."; @@ -952,7 +952,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ mes "Take care to check your map so you don't get lost."; mes "It's a service meeow."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 8) { @@ -990,7 +990,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ mes "I will help you a little."; mes "Here, I have recovered your strengh meow.."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 9) { @@ -1025,7 +1025,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ mes "I will help you a little."; mes "Here, I have recovered your strengh meow.."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 >= 10) { @@ -1047,7 +1047,7 @@ prt_sewb1,131,262,3 script Timid Cat#para04 4_M_BABYCAT,{ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ if (para_suv01 < 13) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Karl]"; mes "Hey, how are you?"; mes "Good to see you~"; @@ -1137,7 +1137,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ mes "Just in case I will recover all your energy."; mes "It's the last step so be careful."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 15) { @@ -1168,7 +1168,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ mes "Just in case I will recover all your energy."; mes "It's the last step so be careful."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 >= 16) { @@ -1190,7 +1190,7 @@ pay_arche,41,136,3 script Eden Member Karl#para05 4_M_KHMAN,{ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ if (para_suv01 < 17) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Cloud]"; mes "Oops."; mes "You are a member of my group."; @@ -1290,7 +1290,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ mes "Can you stay longer?"; mes "Ok, I will recover your strengh so, keep going."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 19) { @@ -1329,7 +1329,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ mes "See, to cheer you up I will heal you until you finish the training."; mes "Chin up and cheer up."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 20) { @@ -1357,7 +1357,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ mes "Just Vitata, isn't that an easy opponent?"; mes "If you see Maya just run away."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 >= 21) { @@ -1380,7 +1380,7 @@ anthell01,29,264,5 script Eden Member Cloud#para06 4_M_HUMAN_02,{ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ if (para_suv01 < 24) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Hooksha]"; mes "Unbelievable why did you come here?"; mes "Um... You are not on the third step of the training?"; @@ -1472,7 +1472,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ mes "You look tired I will recover your health."; mes "If you are in trouble just come back here to safety."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 26) { @@ -1503,7 +1503,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ mes "You look tired, I will recover your health."; mes "If you are in trouble just come back here to safety."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 27) { @@ -1529,7 +1529,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ mes "You look tired, I will recover your health."; mes "If you are in trouble just come back here to safety."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 28) { @@ -1602,7 +1602,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ mes "You look tired, I will recover your health."; mes "If you are in trouble just come back here to safety."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 31) { @@ -1626,7 +1626,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ mes "You look tired I will recover your health."; mes "If you are in trouble just come back here to safety."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 32) { @@ -1649,7 +1649,7 @@ in_orcs01,38,175,3 script Eden Member Hooksha 1_F_SIGNZISK,{ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ if (para_suv01 < 33) { - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Callandiva]"; mes "How did you get so deep in this ocean city?"; mes "Ah, that symbol is of our group."; @@ -1729,7 +1729,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ mes "Mermans are not easy opponents."; mes "I will help you recover so cheer up."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 == 35) { @@ -1763,7 +1763,7 @@ iz_dun04,43,46,3 script Eden Member Callandiva 4_F_CRU,{ mes "Strouf are not easy opponents."; mes "I can help you recover so cheer up."; npcskill "AL_HEAL",11,99,60; - percentheal 100,100; + percentheal 100, 100; close; } if (para_suv01 >= 36) { @@ -1855,38 +1855,31 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{ close; } mes "[Michael]"; - if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) { + if (BaseClass == Job_Swordman) { callsub S_Select,"We have one and Two-handed swords", P_Slayer1,"Eden Slayer I","Two-handed sword","Attack 162","", P_Sabre1,"Eden Saber I","One-handed sword","Attack 147","This is what we strive for."; - } - if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Ninja || Class == Job_Novice || Class == Job_Novice_High) { + } else if (BaseClass == Job_Thief || BaseClass == Job_Ninja || BaseClass == Job_Novice) { callsub S_Select,"", P_Dagger1,"Eden Dagger I","Dagger","MATK+60, attack 124","This is what we strive for."; - } - if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) { + } else if (BaseClass == Job_Merchant) { callsub S_Select,"We have a mace and a One-handed sword", P_Sabre1,"Eden Saber I","One-handed sword","Attack 147","This is what we strive for.", P_Mace1,"Eden Mace I","Mace","Attack 142",""; - } - if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) { + } else if (BaseClass == Job_Archer) { callsub S_Select,"", P_Bow1,"Eden Bow I","Bow","Attack 82",""; - } - if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) { + } else if (BaseClass == Job_Acolyte) { callsub S_Select,"We have a mace and a staff", P_Mace1,"Eden Mace I","Mace","Attack 142","", P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60",""; - } - if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) { + } else if (BaseClass == Job_Mage) { callsub S_Select,"", P_Staff1,"Eden Staff I","Staff","INT+2, MATK+125, attack 60",""; - } - if (Class == Job_Gunslinger) { + } else if (BaseClass == Job_Gunslinger) { callsub S_Select,"", P_Revolver1,"Eden Revolver I","Revolver","HIT-5, attack 44",""; } - mes "Let me see... you will receive.."; mes "the Eden Group Boots II and Uniform II."; next; @@ -1933,34 +1926,28 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{ close; } mes "[Michael]"; - if (Class == Job_Swordman || Class == Job_Swordman_High || Class == Job_Knight || Class == Job_Crusader) { + if (BaseClass == Job_Swordman) { callsub S_Select,"We have one and Two-handed swords", P_Sabre2,"Eden Saber II","One-handed sword","Attack 170","", P_Slayer2,"Eden Slayer II","Two-handed sword","Attack 185",""; - } - if (Class == Job_Thief || Class == Job_Thief_High || Class == Job_Assassin || Class == Job_Rogue || Class == Job_Novice || Class == Job_Novice_High || Class == Job_SuperNovice || Class == Job_Soul_Linker || Class == Job_Ninja) { + } else if (BaseClass == Job_Thief || BaseClass == Job_Novice || BaseJob == Job_Soul_Linker || BaseClass == Job_Ninja) { callsub S_Select,"", P_Dagger2,"Eden Dagger II","Dagger","MATK+70, attack 158",""; - } - if (Class == Job_Acolyte || Class == Job_Acolyte_High || Class == Job_Priest || Class == Job_Monk) { + } else if (BaseClass == Job_Acolyte) { callsub S_Select,"We have a mace and a staff", P_Mace2,"Eden Mace II","Mace","Attack 163","", P_Staff2,"Eden Staff II","Staff","INT+3, MATK+150, attack 60",""; - } - if (Class == Job_Archer || Class == Job_Archer_High || Class == Job_Hunter || Class == Job_Dancer || Class == Job_Bard) { + } else if (BaseClass == Job_Archer) { callsub S_Select,"", P_Bow2,"Eden Bow II","Bow","Attack 82",""; - } - if (Class == Job_Mage || Class == Job_Mage_High || Class == Job_Wizard || Class == Job_Sage) { + } else if (BaseClass == Job_Mage) { callsub S_Select,"", P_Staff2,"Eden Staff II","Staff","INT+3, MATK+155, attack 60",""; - } - if (Class == Job_Merchant || Class == Job_Merchant_High || Class == Job_Blacksmith || Class == Job_Alchemist) { + } else if (BaseClass == Job_Merchant) { callsub S_Select,"We have a mace and a One-handed sword", P_Sabre2,"Eden Saber II","One-handed sword","Attack 170","", P_Mace2,"Eden Mace II","Mace","Attack 163",""; - } - if (Class == Job_Gunslinger) { + } else if (BaseClass == Job_Gunslinger) { callsub S_Select,"", P_Revolver2,"Eden Revolver II","Revolver","HIT-5, attack 60",""; } @@ -2024,12 +2011,12 @@ moc_para01,112,96,5 script Administrator Michael 4_M_RUSMAN1,{ mes "What status bonus do you want to upgrade?"; next; switch (select("Upgrade STR", "Upgrade AGI", "Upgrade VIT", "Upgrade INT", "Upgrade DEX", "Upgrade LUK", "Nevermind.")) { - case 1: callsub S_Upgrade,"STR",4701; - case 2: callsub S_Upgrade,"AGI",4731; - case 3: callsub S_Upgrade,"VIT",4741; - case 4: callsub S_Upgrade,"INT",4711; - case 5: callsub S_Upgrade,"DEX",4721; - case 6: callsub S_Upgrade,"LUK",4751; + case 1: callsub S_Upgrade,"STR",Strength2; + case 2: callsub S_Upgrade,"AGI",Agility2; + case 3: callsub S_Upgrade,"VIT",Vitality2; + case 4: callsub S_Upgrade,"INT",Inteligence2; + case 5: callsub S_Upgrade,"DEX",Dexterity2; + case 6: callsub S_Upgrade,"LUK",Luck2; case 7: mes "[Michael]"; mes "Why? It'll be beter than it is."; @@ -2243,7 +2230,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "Ah, Kim-dduck-soon."; mes "It's the representative meal for normal citizens."; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { if (Zeny > 2699) { mes "[Chef]"; mes "Hey, here you are."; @@ -2252,8 +2239,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; Zeny = Zeny - 2700; - percentheal 50,0; - percentheal 0,50; + percentheal 50, 50; close; } mes "[Chef]"; @@ -2269,8 +2255,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; Zeny = Zeny - 3000; - percentheal 50,0; - percentheal 0,50; + percentheal 50, 50; close; } mes "[Chef]"; @@ -2282,7 +2267,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "Course meal B?"; mes "This food with meat and vegetables in hot soup has it's origins from nomadic life under the cold and dry nature."; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { if (Zeny > 3599) { mes "[Chef]"; mes "Hey, here you are."; @@ -2291,8 +2276,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; Zeny = Zeny - 3600; - percentheal 75,0; - percentheal 0,75; + percentheal 75, 75; close; } mes "[Chef]"; @@ -2308,8 +2292,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- After eating the meal, You feel a little bit full."; mes "You've recovered some HP and SP. -"; Zeny = Zeny - 4000; - percentheal 75,0; - percentheal 0,75; + percentheal 75, 75; close; } mes "[Chef]"; @@ -2317,7 +2300,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "How many times do I have to tell you?"; close; case 4: - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { if (Zeny > 4499) { mes "[Chef]"; mes "Hey, here you are."; @@ -2327,8 +2310,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- After eating the meal, You feel a little bit full."; mes "You've recovered your HP and SP. -"; Zeny = Zeny - 4500; - percentheal 100,0; - percentheal 0,100; + percentheal 100, 100; close; } mes "[Chef]"; @@ -2346,8 +2328,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ mes "- After eating the meal, You feel a little bit full."; mes "You've recovered your HP and SP. -"; Zeny = Zeny - 5000; - percentheal 100,0; - percentheal 0,100; + percentheal 100, 100; close; } mes "[Chef]"; @@ -2360,7 +2341,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ close; } case 2: - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "[Chef]"; mes "Most jobs should be managed by yourself. So it might be difficult, right?"; mes "Actually it's harmful so they have requested continuously."; @@ -2469,7 +2450,7 @@ moc_para01,179,44,3 script Chef 4_M_CHNCOOK,{ moc_para01,23,35,5 script Instructor Ur#2nd01 4_M_KNIGHT_BLACK,{ mes "[Instructor Ur]"; - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Hey there!"; mes "I see you're not one of our agents?"; mes "Are you interested in joining us?"; @@ -2967,7 +2948,7 @@ comodo,173,354,5 script Dispatched Instructor#02 1_M_JOBTESTER,{ mes "[Romeo]"; mes "Let me help you recover if you are tired."; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 3) { @@ -3027,7 +3008,7 @@ um_fild01,34,280,5 script Instructor Romeo#2nd02 1_M_JOBTESTER,{ mes "[Romeo]"; mes "I'll help you recover if you are tired."; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 4) { @@ -3057,7 +3038,7 @@ um_fild01,34,280,5 script Instructor Romeo#2nd02 1_M_JOBTESTER,{ mes "[Romeo]"; mes "I'll help you recover if you are tired."; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else { @@ -3144,7 +3125,7 @@ glast_01,195,131,5 script Dispatched Instructor#03 4_F_SISTER,{ mes "I'll watch your back!."; mes "... Of.. Course.. I'll fight too!"; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 9) { @@ -3176,7 +3157,7 @@ glast_01,195,131,5 script Dispatched Instructor#03 4_F_SISTER,{ mes "I'll watch your back, like last time."; mes "... Of... Course... I'll fight them too!"; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 10) { @@ -3280,7 +3261,7 @@ ein_fild08,172,359,3 script Dispatched Instructor#04 4_M_4THPRIN1,{ mes "If you're hurt I'll heal you a bit."; } npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } else if (para_2nd01 == 14) { if (questprogress(7226,HUNTING) == 2 && questprogress(7227,HUNTING) == 2) { @@ -3312,7 +3293,7 @@ ein_fild08,172,359,3 script Dispatched Instructor#04 4_M_4THPRIN1,{ mes "Ugh this is difficult."; mes "I'll make you feel better though."; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 15) { @@ -3418,7 +3399,7 @@ ice_dun01,154,13,5 script Dispatched Instructor#05 4_F_JOB_BLACKSMITH,{ setquest 7231; // Hunting and Gathering getexp 40000,40000; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } else { mes "The biggest stumbling block is dealing with the Siromas."; @@ -3637,7 +3618,7 @@ man_fild01,43,234,3 script Dispatched Instructor#07 4_DST_SOLDIER,{ mes "You seem a bit flushed."; mes "Fine I'll heal you!"; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 25) @@ -3722,7 +3703,7 @@ spl_fild02,377,149,3 script Dispatched Instructor#08 4_M_DST_MASTER,{ mes "[Mine]"; mes "You're not lying about being a real adventurer are you?"; npcskill "AL_HEAL",10,99,60; - percentheal 0,100; + percentheal 0, 100; } } else if (para_2nd01 == 27) { @@ -3740,7 +3721,7 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{ close; } mes "[Thorn]"; - if (countitem(Para_Team_Mark) < 1) { + if (countitem(Para_Team_Mark) < 1 && countitem(Para_Team_Mark_) < 1) { mes "Hmm, are you a member of Eden Group?"; mes "You need to be one of our members to use my services."; close; @@ -3952,19 +3933,19 @@ moc_para01,111,83,3 script Blacksmith Thorn#2nd10 2_M_OLDBLSMITH,{ P_Bow3,"Eden Group Bow III","Bow, Attack 140", P_Tail1,"Eden Group Whip I","Whip, Attack 125"; } - else if (Class == Job_Ninja) { + else if (BaseClass == Job_Ninja) { callsub L_Select,"", P_Dagger3,"Eden Group Dagger III","Dagger, MATK +80, ATK 165", P_Huuma_Shuriken1,"Eden Group Huuma Shuriken I","Huuma Suriken, MATK +50, ATK 170"; } - else if (Class == Job_Star_Gladiator) + else if (BaseJob == Job_Star_Gladiator) getitem P_Dic1,1; - else if (Class == Job_Soul_Linker) { + else if (BaseJob == Job_Soul_Linker) { callsub L_Select,"", P_Dagger3,"Eden Group Dagger III","Dagger, MATK +80, ATK 165", P_Staff3,"Eden Group Staff III","Staff, MATK +170, INT +4, ATK 60"; } - else if (Class == Job_Gunslinger) + else if (BaseClass == Job_Gunslinger) getitem P_Revolver3,1; else { mes "Hmm, you are eligible to receive equipment."; @@ -4079,21 +4060,10 @@ moc_para01,112,79,3 script Weapons Expert BK#2nd11 4_M_REPAIR,{ P_Revolver3, P_Knuckle1, P_Huuma_Shuriken1; - .@menu$ = "Eden Group Slayer III:" + - "Eden Group Saber III:" + - "Eden Group Dagger III:" + - "Eden Group Katar I:" + - "Eden Group Axe I:" + - "Eden Group Spear I:" + - "Eden Group Staff III:" + - "Eden Group Mace III:" + - "Eden Group Bow III:" + - "Eden Group Dictionary I:" + - "Eden Group Guitar I:" + - "Eden Group Whip I:" + - "Eden Group Revolver III:" + - "Eden Group Knuckles I:" + - "Eden Group Huuma Shuriken I"; + .@wplist_size = getarraysize(.@wplist); + for ( .@i = 0; .@i < .@wplist_size; ++.@i ) { + .@menu$ += getitemname(.@wplist[.@i]) + ":"; + } mes "[BK]"; mes "What's happening?"; mes "No way?!"; diff --git a/npc/re/quests/eden/eden_service.txt b/npc/re/quests/eden/eden_service.txt index 387141623..ce6efaa67 100644 --- a/npc/re/quests/eden/eden_service.txt +++ b/npc/re/quests/eden/eden_service.txt @@ -50,7 +50,7 @@ mes "3.Cabinet fee is"; mes " ^4d4dff500 zeny^000000!"; next; - if (countitem(Para_Team_Mark) > 0) { + if (countitem(Para_Team_Mark) > 0 || countitem(Para_Team_Mark_) > 0) { mes "You need to insert zeny to use the cabinet."; mes "Cost : 500 Zeny "; mes "Would you like to use it?"; diff --git a/npc/re/quests/newgears/2012_headgears.txt b/npc/re/quests/newgears/2012_headgears.txt index 10566cb39..e243300d5 100644 --- a/npc/re/quests/newgears/2012_headgears.txt +++ b/npc/re/quests/newgears/2012_headgears.txt @@ -469,10 +469,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ Assassin_Mask_, -1, 200, Improved_Assassin_Mask, Welding_Mask, -1, 200, Improved_Welding_Mask, Safety_Ring, -1, 200, Safety_Ring_, - Angel's_Protection, 1, 100, Im_Angel's_Protection, - Angel's_Safeguard, 1, 100, Impr_Angel's_Safeguard, - Angel's_Arrival, 1, 100, Impr_Angel's_Arrival, - Angel's_Warmth, 1, 100, Impr_Angel's_Warmth, + Angels_Protection, 1, 100, Im_Angels_Protection, + Angels_Safeguard, 1, 100, Impr_Angels_Safeguard, + Angels_Arrival, 1, 100, Impr_Angels_Arrival, + Angels_Warmth, 1, 100, Impr_Angels_Warmth, Kiss_Of_Angel, 1, 100, Improved_Kiss_Of_Angel; break; case 4: @@ -487,10 +487,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ Variant_Shoes, -1, 300, Enhanced_Variant_Shoes, Ring_Of_Flame_Lord,-1, 300, Good_Ring_Of_Flame_Lord, Ring_Of_Resonance, -1, 300, Good_Ring_Of_Resonance, - Angel's_Protection, 1, 20, Im_Angel's_Protection, - Angel's_Safeguard, 1, 20, Impr_Angel's_Safeguard, - Angel's_Arrival, 1, 20, Impr_Angel's_Arrival, - Angel's_Warmth, 1, 20, Impr_Angel's_Warmth, + Angels_Protection, 1, 20, Im_Angels_Protection, + Angels_Safeguard, 1, 20, Impr_Angels_Safeguard, + Angels_Arrival, 1, 20, Impr_Angels_Arrival, + Angels_Warmth, 1, 20, Impr_Angels_Warmth, Kiss_Of_Angel, 1, 20, Improved_Kiss_Of_Angel; break; } @@ -680,10 +680,10 @@ moc_para01,41,169,3 script Reno#2012hat 1_M_WIZARD,{ else if (.@r <= 9) getitem Improved_Assassin_Mask,1; else if (.@r <= 12) getitem Improved_Welding_Mask,1; else if (.@r <= 13) getitem Safety_Ring_,1; - else if (.@r <= 14) getitem Im_Angel's_Protection,1; - else if (.@r <= 15) getitem Impr_Angel's_Safeguard,1; - else if (.@r <= 16) getitem Impr_Angel's_Arrival,1; - else if (.@r <= 17) getitem Impr_Angel's_Warmth,1; + else if (.@r <= 14) getitem Im_Angels_Protection,1; + else if (.@r <= 15) getitem Impr_Angels_Safeguard,1; + else if (.@r <= 16) getitem Impr_Angels_Arrival,1; + else if (.@r <= 17) getitem Impr_Angels_Warmth,1; else getitem Improved_Kiss_Of_Angel,1; break; case 4: diff --git a/npc/re/quests/quests_eclage.txt b/npc/re/quests/quests_eclage.txt index f1abf56aa..d669d0d46 100644 --- a/npc/re/quests/quests_eclage.txt +++ b/npc/re/quests/quests_eclage.txt @@ -2807,7 +2807,7 @@ ecl_in04,226,231,4 script Du Lian#ep14_2in2 4_M_REDMAN,{ emotion e_dots,0,"Alp Ocart#ep14_2in2"; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -2949,7 +2949,7 @@ ecl_in04,224,234,4 script Mark Esha#ep14_2in2 4_M_BLUEMAN,{ emotion e_dots,0,"Alp Ocart#ep14_2in2"; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -3094,7 +3094,7 @@ ecl_in04,223,234,4 script Maggi Steen#ep14_2in2 4_F_PINKWOMAN,{ emotion e_dots,0,"Alp Ocart#ep14_2in2"; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -3230,7 +3230,7 @@ ecl_in04,223,230,4 script Alp Ocart#ep14_2in2 4_M_BLACKMAN,{ emotion e_dots; cutin "bu_alp2",2; ep14_2_oliver = 30; - getitem C_Oliver_Wolf_Hood,1; + getitem(Oliver_Wolf_Hood, 1); completequest 11337; close2; cutin "",255; @@ -17592,7 +17592,7 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ } } else if (questprogress(7420) == 1) { - if ((countitem(Pinguicula's_fruit_Jam) < 3) || (countitem(Luciola's_Honey_Jam) < 3)) { + if ((countitem(Pinguiculas_fruit_Jam) < 3) || (countitem(Luciolas_Honey_Jam) < 3)) { mes "[Leo]"; mes "I need 3 jars of Pinguicula's pickled fruits and another 3 jars of Luciola's honey jam~"; mes "They are specialties of the base of Splendide."; @@ -17611,8 +17611,8 @@ eclage,112,40,3 script Eclage Guard Leo#tl 4_M_FAIRYSOLDIER2,{ mes "It seems like Mayor Jun has an eye for character."; mes "So he is Mayor after all..."; next; - delitem Pinguicula's_fruit_Jam,3; //Pinguicula's_fruit_Jam - delitem Luciola's_Honey_Jam,3; //Luciola's_Honey_Jam + delitem Pinguiculas_fruit_Jam,3; + delitem Luciolas_Honey_Jam, 3; completequest 7420; getexp 200000,200000; .@alltotal = questprogress(7420) + questprogress(7419) + questprogress(7418); diff --git a/npc/re/quests/quests_mora.txt b/npc/re/quests/quests_mora.txt index 79615327d..39ca8649c 100644 --- a/npc/re/quests/quests_mora.txt +++ b/npc/re/quests/quests_mora.txt @@ -5148,7 +5148,7 @@ function script mora_remains { 1@mist,145,245,0 script Meshir's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12245,"Meshir",5,943,4; } //Solid_Shell 1@mist,196,276,0 script Noirit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12246,"Noirit",6,549,3; } //Nice_Sweet_Potato 1@mist,304,327,0 script Pajama God's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12247,"Pajama God",5,945,18; } //Raccoon_Leaf -1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snail's_Shell +1@mist,334,287,0 script Mendel's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12248,"Mendel",7,946,31; } //Snails_Shell 1@mist,330,177,0 script Milebit's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12249,"Milebit",5,7008,17; } //Stiff_Horn 1@mist,284,84,0 script Kunmun's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12250,"Kunmun",4,6380,20; } //Mora_Coin 1@mist,170,54,0 script Tsaihokin's Remains#33 CLEAR_NPC,{ callfunc "mora_remains",12251,"Tsaihokin",2,929,5; } //Immortal_Heart diff --git a/npc/re/warps/cities/izlude.txt b/npc/re/warps/cities/izlude.txt index 0fb3b1f86..124e3ed1f 100644 --- a/npc/re/warps/cities/izlude.txt +++ b/npc/re/warps/cities/izlude.txt @@ -83,6 +83,7 @@ OnTouch: OnInit: questinfo(21001, QTYPE_QUEST, 1, Job_Novice); + end; } iz_int,47,30,3 script noviship#room1-2 WARPNPC,2,2,{ @@ -100,31 +101,37 @@ iz_int,56,15,0 script noviship WARPNPC,2,2,{ OnTouch: savepoint("int_land"+strnpcinfo(NPC_NAME_HIDDEN), 77, 101); warp("int_land"+strnpcinfo(NPC_NAME_HIDDEN), 85, 107); + end; } int_land,49,57,0 script noviship#izlude WARPNPC,2,2,{ end; OnTouch: - mes "^4d4dffOnce you left this island there is no way back."; - mes "Are you sure you want to go directly to Izlude?^000000"; - next; - mes "^4d4dffIf you do, the quest got deleted from your Quest Log.^000000"; - next; + mes("^4d4dffOnce you left this island there is no way back."); + mes("Are you sure you want to go directly to Izlude?^000000"); + next(); + mes("^4d4dffIf you do, the quest got deleted from your Quest Log.^000000"); + next(); if (select("Do not go to Izlude yet", "Sail to Izlude!") == 1) { - mes "[Sailor]"; - mes "You want to stay here longer?"; - mes "Good, then I wait until you're ready~"; + mes("[Sailor]"); + mes("You want to stay here longer?"); + mes("Good, then I wait until you're ready~"); close(); } - mes "[Sailor]"; - mes "Lets head toward Izlude!"; - close2; + mes("[Sailor]"); + mes("Lets head toward Izlude!"); + close2(); if (questprogress(21001)) - erasequest 21001; + erasequest(21001); if (questprogress(21002)) - erasequest 21002; - warp("izlude"+strnpcinfo(NPC_NAME_HIDDEN), 196, 209); + erasequest(21002); + + .@map$ = "izlude"; + if (strnpcinfo(NPC_NAME_HIDDEN) != "izlude") + .@map$ = .@map$ + strnpcinfo(NPC_NAME_HIDDEN); + + warp(.@map$, 196, 209); end; } diff --git a/npc/re/woe-fe/invest_main.txt b/npc/re/woe-fe/invest_main.txt index 012a96afe..c912444cc 100644 --- a/npc/re/woe-fe/invest_main.txt +++ b/npc/re/woe-fe/invest_main.txt @@ -902,7 +902,7 @@ OnAgitInvest: mes "Please come back during the investment duration."; close; } - .@guild = getcharid(2); + .@guild = getcharid(CHAR_ID_GUILD); for(.@i = 1; .@i<=5; ++.@i) { .@castle_name$[.@i] = getcastlename(.@npc$+"g_cas0"+.@i); .@owner_id[.@i] = getcastledata(.@npc$+"g_cas0"+.@i,1); @@ -1114,7 +1114,7 @@ OnAgitInvest: } .@GID = getcastledata(strnpcinfo(NPC_MAP),1); - if (getcharid(2) != .@GID) { + if (getcharid(CHAR_ID_GUILD) != .@GID) { mes "[Gate Manager]"; mes "You don't seem to be the member of guild owning this castle."; mes "If you need any help, please visit any of our guild members at "+.@realm$+" Square."; @@ -1145,7 +1145,7 @@ OnAgitInvest: mes "Please come back during the investment duration."; close; } - if (getcharid(2) != .@GID) { + if (getcharid(CHAR_ID_GUILD) != .@GID) { mes "[Gate Manager]"; mes "You don't seem to be the member of the guild owning this castle."; mes "Please use the normal investment from "+.@realm$+" Square."; |