diff options
Diffstat (limited to 'npc')
165 files changed, 1098 insertions, 985 deletions
diff --git a/npc/airports/airships.txt b/npc/airports/airships.txt index 9653b9394..7bac19e21 100644 --- a/npc/airports/airships.txt +++ b/npc/airports/airships.txt @@ -1452,6 +1452,8 @@ function script applegamble { getitem Apple,.@amount; end; } + mes("Alright."); + mes("Let me cast the dice again."); } else { mesf("^FF0000%s^000000, you got ^FF0000%d^000000 and the total is now ^FF0000%d^000000. " diff --git a/npc/battleground/flavius/flavius01.txt b/npc/battleground/flavius/flavius01.txt index 681786792..8370f1e53 100644 --- a/npc/battleground/flavius/flavius01.txt +++ b/npc/battleground/flavius/flavius01.txt @@ -405,7 +405,7 @@ OnTouch: } bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{ - if ($@FlaviusBG1_id1 == getcharid(4)) { + if ($@FlaviusBG1_id1 == getcharid(CHAR_ID_BG)) { if ($@FlaviusBG1_Victory == 1) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; @@ -457,7 +457,7 @@ OnInit: } bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ - if ($@FlaviusBG1_id2 == getcharid(4)) { + if ($@FlaviusBG1_id2 == getcharid(CHAR_ID_BG)) { if ($@FlaviusBG1_Victory == 2) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; @@ -590,7 +590,7 @@ bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; } bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ .@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1; - if ($@FlaviusBG1_id1 == getcharid(4)) { + if ($@FlaviusBG1_id1 == getcharid(CHAR_ID_BG)) { if (.@A_B_gap > 0) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; @@ -668,7 +668,7 @@ OnInit: bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ .@A_B_gap = $@Guill_ScoreBG1 - $@Croix_ScoreBG1; - if ($@FlaviusBG1_id2 == getcharid(4)) { + if ($@FlaviusBG1_id2 == getcharid(CHAR_ID_BG)) { if (.@A_B_gap > 0) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; diff --git a/npc/battleground/flavius/flavius02.txt b/npc/battleground/flavius/flavius02.txt index becee77c6..232dd7e39 100644 --- a/npc/battleground/flavius/flavius02.txt +++ b/npc/battleground/flavius/flavius02.txt @@ -405,7 +405,7 @@ OnTouch: } bat_b02,10,294,3 script Guillaume Vintenar#b02_a 4_M_RASWORD,{ - if ($@FlaviusBG2_id1 == getcharid(4)) { + if ($@FlaviusBG2_id1 == getcharid(CHAR_ID_BG)) { if ($@FlaviusBG2_Victory == 1) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; @@ -457,7 +457,7 @@ OnInit: } bat_b02,389,14,3 script Croix Vintenar#b02_b 4_M_RASWORD,{ - if ($@FlaviusBG2_id2 == getcharid(4)) { + if ($@FlaviusBG2_id2 == getcharid(CHAR_ID_BG)) { if ($@FlaviusBG2_Victory == 2) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; @@ -590,7 +590,7 @@ bat_b02,389,16,3 script Croix Camp#flag42 1_FLAG_EAGLE,{ end; } bat_b02,10,294,3 script Vintenar#bat_b02_aover 4_M_KY_HEAD,{ .@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2; - if ($@FlaviusBG2_id1 == getcharid(4)) { + if ($@FlaviusBG2_id1 == getcharid(CHAR_ID_BG)) { if (.@A_B_gap > 0) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; @@ -668,7 +668,7 @@ OnInit: bat_b02,389,14,3 script Vintenar#bat_b02_bover 4_M_CRU_HEAD,{ .@A_B_gap = $@Guill_ScoreBG2 - $@Croix_ScoreBG2; - if ($@FlaviusBG2_id2 == getcharid(4)) { + if ($@FlaviusBG2_id2 == getcharid(CHAR_ID_BG)) { if (.@A_B_gap > 0) { .@your_medal = countitem(BF_Badge2); .@medal_gap = 500 - .@your_medal; diff --git a/npc/battleground/tierra/tierra01.txt b/npc/battleground/tierra/tierra01.txt index 0dabe28d0..22a612c81 100644 --- a/npc/battleground/tierra/tierra01.txt +++ b/npc/battleground/tierra/tierra01.txt @@ -267,8 +267,8 @@ OnKill: OnMyMobDead: if (mobcount("bat_a01","OBJ#bat_a01_n::OnMyMobDead") < 17) { - bg_team_setxy getcharid(4),56,212; - if (getcharid(4) == $@TierraBG1_id1) { + bg_team_setxy getcharid(CHAR_ID_BG),56,212; + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id1) { donpcevent "NOBJ_mob#bat_a01_a::OnEnable"; mapannounce("bat_a01", _("Guillaume captured a Neutrality Flag, so they have an advantage."), bc_map, "0xFFCE00"); } @@ -313,7 +313,7 @@ OnMyMobDead: } bat_a01,185,270,1 script Guillaume Blacksmith#a01 4_M_REPAIR,{ - if (getcharid(4) == $@TierraBG1_id1) { + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id1) { mes("[Guillaume Blacksmith]"); mes("We are in urgency! The Barricade has been destroyed!"); mes("We can repair the Barricade with ^3131FF50 Stones, 3 Sinew of Bear, 500 Metal Fragments, 30 Rough Elunium and 100 Gold.^000000"); @@ -397,7 +397,7 @@ OnInit: } bat_a01,170,121,5 script Croix Blacksmith#bat_a01 4_M_REPAIR,{ - if (getcharid(4) == $@TierraBG1_id2) { + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id2) { mes("[Croix Blacksmith]"); mes("We are in urgency! The Barricade has been destroyed!"); mes("We can repair the Barricade with ^3131FF50 Stones, 3 Sinew of Bear, 500 Metal Fragments, 30 Rough Elunium and 100 Gold.^000000"); @@ -622,28 +622,28 @@ OnTouch: bat_a01,194,267,0 script barri_warp_up#bat_a01_a FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG1_id1) + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id1) warp "bat_a01",194,261; end; } bat_a01,194,265,0 script barri_warp_down#bat_a01a FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG1_id1) + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id1) warp "bat_a01",194,270; end; } bat_a01,177,130,0 script barri_warp_up#bat_a01_b FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG1_id2) + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id2) warp "bat_a01",178,125; end; } bat_a01,177,128,0 script barri_warp_down#bat_a01b FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG1_id2) + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id2) warp "bat_a01",178,134; end; } @@ -695,7 +695,7 @@ bat_a01,357,74,3 script Croix Camp#flag8 1_FLAG_EAGLE,{ end; } bat_a01,348,74,3 script Croix Camp#flag9 1_FLAG_EAGLE,{ end; } bat_a01,53,377,3 script Guillaume Vintenar#a01_a 4_M_KY_HEAD,{ - if (getcharid(4) == $@TierraBG1_id1) { + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id1) { if ($@TierraBG1_Victory == 1) { .@your_medal = countitem(BF_Badge1); .@medal_gap = 500 - .@your_medal; @@ -789,7 +789,7 @@ OnInit: } bat_a01,45,19,3 script Croix Vintenar#a01_b 4_M_CRU_HEAD,{ - if (getcharid(4) == $@TierraBG1_id2) { + if (getcharid(CHAR_ID_BG) == $@TierraBG1_id2) { if ($@TierraBG1_Victory == 2) { .@your_medal = countitem(BF_Badge1); .@medal_gap = 500 - .@your_medal; diff --git a/npc/battleground/tierra/tierra02.txt b/npc/battleground/tierra/tierra02.txt index ac7710aa8..a54935089 100644 --- a/npc/battleground/tierra/tierra02.txt +++ b/npc/battleground/tierra/tierra02.txt @@ -267,8 +267,8 @@ OnKill: OnMyMobDead: if (mobcount("bat_a02","OBJ#bat_a02_n::OnMyMobDead") < 17) { - bg_team_setxy getcharid(4),56,212; - if (getcharid(4) == $@TierraBG2_id1) { + bg_team_setxy getcharid(CHAR_ID_BG),56,212; + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id1) { donpcevent "NOBJ_mob#bat_a02_a::OnEnable"; mapannounce("bat_a02", _("Guillaume captured a Neutrality Flag, so they have an advantage."), bc_map, "0xFFCE00"); } @@ -313,7 +313,7 @@ OnMyMobDead: } bat_a02,185,270,1 script Guillaume Blacksmith#a02 4_M_REPAIR,{ - if (getcharid(4) == $@TierraBG2_id1) { + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id1) { mes("[Guillaume Blacksmith]"); mes("We are in urgency! The Barricade has been destroyed!"); mes("We can repair the Barricade with ^3131FF50 Stones, 3 Sinew of Bear, 500 Metal Fragments, 30 Rough Elunium and 100 Gold.^000000"); @@ -397,7 +397,7 @@ OnInit: } bat_a02,170,121,5 script Croix Blacksmith#bat_a02 4_M_REPAIR,{ - if (getcharid(4) == $@TierraBG2_id2) { + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id2) { mes("[Croix Blacksmith]"); mes("We are in urgency! The Barricade has been destroyed!"); mes("We can repair the Barricade with ^3131FF50 Stones, 3 Sinew of Bear, 500 Metal Fragments, 30 Rough Elunium and 100 Gold.^000000"); @@ -622,28 +622,28 @@ OnTouch: bat_a02,194,267,0 script barri_warp_up#bat_a02_a FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG2_id1) + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id1) warp "bat_a02",194,261; end; } bat_a02,194,265,0 script barri_warp_down#bat_a02a FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG2_id1) + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id1) warp "bat_a02",194,270; end; } bat_a02,177,130,0 script barri_warp_up#bat_a02_b FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG2_id2) + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id2) warp "bat_a02",178,125; end; } bat_a02,177,128,0 script barri_warp_down#bat_a02b FAKE_NPC,7,0,{ OnTouch: - if (getcharid(4) == $@TierraBG2_id2) + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id2) warp "bat_a02",178,134; end; } @@ -695,7 +695,7 @@ bat_a02,357,74,3 script Croix Camp#flag18 1_FLAG_EAGLE,{ end; } bat_a02,348,74,3 script Croix Camp#flag19 1_FLAG_EAGLE,{ end; } bat_a02,53,377,3 script Guillaume Vintenar#a02_a 4_M_KY_HEAD,{ - if (getcharid(4) == $@TierraBG2_id1) { + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id1) { if ($@TierraBG2_Victory == 1) { .@your_medal = countitem(BF_Badge1); .@medal_gap = 500 - .@your_medal; @@ -789,7 +789,7 @@ OnInit: } bat_a02,45,19,3 script Croix Vintenar#a02_b 4_M_CRU_HEAD,{ - if (getcharid(4) == $@TierraBG2_id2) { + if (getcharid(CHAR_ID_BG) == $@TierraBG2_id2) { if ($@TierraBG2_Victory == 2) { .@your_medal = countitem(BF_Badge1); .@medal_gap = 500 - .@your_medal; diff --git a/npc/cities/aldebaran.txt b/npc/cities/aldebaran.txt index ecd6f8b6b..f2820b3b0 100644 --- a/npc/cities/aldebaran.txt +++ b/npc/cities/aldebaran.txt @@ -777,7 +777,7 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ mes "Due to a change in customer support policy, we no longer accept Kafra Passes. However, we are offering refunds for our customers who still possess these passes."; next; if (select("Sell Kafra Pass", "Alright, bye~") == 1) { - if (countitem(Kapra's_Pass) == 0) { + if (countitem(Kapras_Pass) == 0) { mes "[Kafra Pavianne]"; mes "I'm sorry,"; mes "but you don't"; @@ -787,27 +787,27 @@ aldeba_in,84,166,4 script Kafra Service#alde 4_F_KAFRA1,{ end; } else { - .@kafrapassmoney = countitem(Kapra's_Pass)*2000; + .@kafrapassmoney = countitem(Kapras_Pass)*2000; mes "[Kafra Pavianne]"; mes "Let's see..."; - if (countitem(Kapra's_Pass) == 1) { + if (countitem(Kapras_Pass) == 1) { mes "You have 1 Kafra Pass."; mes "You can sell that pass to us for 2000 zeny. Would you like to sell this Kafra Pass back to the Kafra Corporation?"; } else { - mes "You have "+ countitem(Kapra's_Pass) +" Kafra Passes."; + mes "You have "+ countitem(Kapras_Pass) +" Kafra Passes."; mes "If you want to sell them to us, you will receive "+ .@kafrapassmoney +" zeny. Would you like to sell these back to the Kafra Corporation?"; } next; if (select("Yes", "No") == 1) { - if (countitem(Kapra's_Pass) == 0) { + if (countitem(Kapras_Pass) == 0) { mes "[Kafra Pavianne]"; mes "I'm sorry, but you don't have any Kafra Passes."; close2; cutin "",255; end; } - delitem Kapra's_Pass,countitem(Kapra's_Pass); + delitem Kapras_Pass,countitem(Kapras_Pass); Zeny += .@kafrapassmoney; mes "[Kafra Pavianne]"; mes "Thank you."; diff --git a/npc/cities/jawaii.txt b/npc/cities/jawaii.txt index 0c841a76e..e308d9f73 100644 --- a/npc/cities/jawaii.txt +++ b/npc/cities/jawaii.txt @@ -862,7 +862,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "Thank you."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } while (1) { @@ -893,7 +893,7 @@ jawaii_in,28,124,0 script Bartender#jaw 1_ETC_01,{ mes "Thank you..."; mes "So much..."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } if (Zeny > 99) Zeny -= 100; @@ -1103,7 +1103,7 @@ S_KillChar: mes "Thank you..."; mes "Mr. Bartender..."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } if (Zeny > 99) Zeny -= 100; @@ -1154,8 +1154,9 @@ jawaii_in,43,115,0 script Customer#jaw_1 4W_M_01,{ mes "the one who laughs last!"; next; mes "^3355FFYou drank to your fill.^000000"; - close; - percentheal -100,0; + close2; + unitkill getcharid(CHAR_ID_ACCOUNT); + end; } mes "[Buchi]"; mes "You look happy..."; diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index d705e4baa..a8127c372 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -1021,7 +1021,7 @@ umbala,140,197,1 script Bungee Jump FAKE_NPC,0,0,{ OnTouch: switch(rand(1,3)) { case 1: - percentheal -100,0; + Hp = 1; mapannounce "umbala","Bungee Jump: "+strcharinfo(PC_NAME)+" : Kyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa~~~~~~~",bc_map; end; case 2: @@ -1030,7 +1030,7 @@ OnTouch: end; case 3: if (rand(1,2) == 2) { - percentheal -99,0; + Hp = 1; warp "nif_in",69,15; } end; diff --git a/npc/custom/battleground/bg_tierra_01.txt b/npc/custom/battleground/bg_tierra_01.txt index bab80916b..56a505356 100644 --- a/npc/custom/battleground/bg_tierra_01.txt +++ b/npc/custom/battleground/bg_tierra_01.txt @@ -99,13 +99,13 @@ OnReadyCheck: end; OnNeutralBreak: - if( getcharid(4) == $@TierraBG1_id1 ) + if( getcharid(CHAR_ID_BG) == $@TierraBG1_id1 ) { mapannounce "bat_a01","Guillaume obtained a neurality banner, so they have an advantage.",1,0x0000FF; bg_team_setxy $@TierraBG1_id2,42,16; areawarp "bat_a01",52,208,61,217,"bat_a01",42,16; } - else if( getcharid(4) == $@TierraBG1_id2 ) + else if( getcharid(CHAR_ID_BG) == $@TierraBG1_id2 ) { mapannounce "bat_a01","Croix obtained a neutrality banner, so they have an advantage.",1,0xFF0000; bg_team_setxy $@TierraBG1_id1,50,374; @@ -113,7 +113,7 @@ OnNeutralBreak: } else end; - set .Neutral_Base, getcharid(4); + set .Neutral_Base, getcharid(CHAR_ID_BG); bg_team_setxy .Neutral_Base,56,212; if( .Guardian_1 == 0 ) diff --git a/npc/custom/battleground/bg_tierra_02.txt b/npc/custom/battleground/bg_tierra_02.txt index 791f02109..e0f1b402a 100644 --- a/npc/custom/battleground/bg_tierra_02.txt +++ b/npc/custom/battleground/bg_tierra_02.txt @@ -99,13 +99,13 @@ OnReadyCheck: end; OnNeutralBreak: - if( getcharid(4) == $@TierraBG2_id1 ) + if( getcharid(CHAR_ID_BG) == $@TierraBG2_id1 ) { mapannounce "bat_a02","Guillaume obtained a neurality banner, so they have an advantage.",1,0x0000FF; bg_team_setxy $@TierraBG2_id2,42,16; areawarp "bat_a02",52,208,61,217,"bat_a02",42,16; } - else if( getcharid(4) == $@TierraBG2_id2 ) + else if( getcharid(CHAR_ID_BG) == $@TierraBG2_id2 ) { mapannounce "bat_a02","Croix obtained a neutrality banner, so they have an advantage.",1,0xFF0000; bg_team_setxy $@TierraBG2_id1,50,374; @@ -113,7 +113,7 @@ OnNeutralBreak: } else end; - set .Neutral_Base, getcharid(4); + set .Neutral_Base, getcharid(CHAR_ID_BG); bg_team_setxy .Neutral_Base,56,212; if( .Guardian_1 == 0 ) diff --git a/npc/custom/bgqueue/flavius.txt b/npc/custom/bgqueue/flavius.txt index 33561db0a..d959253f3 100644 --- a/npc/custom/bgqueue/flavius.txt +++ b/npc/custom/bgqueue/flavius.txt @@ -170,12 +170,12 @@ OnReset: end; OnCroixQuit: - queueremove($@Croix_QueueBG1,getcharid(3)); + queueremove($@Croix_QueueBG1,getcharid(CHAR_ID_ACCOUNT)); callsub L_OnPlayerQuit; end; OnGuillaumeQuit: - queueremove($@Guill_QueueBG1,getcharid(3)); + queueremove($@Guill_QueueBG1,getcharid(CHAR_ID_ACCOUNT)); callsub L_OnPlayerQuit; end; @@ -437,7 +437,7 @@ OnTouch: } bat_b01,10,294,3 script Guillaume Vintenar#b01_a 4_M_RASWORD,{ - if ($@FlaviusBG1_id1 == getcharid(4)) { + if ($@FlaviusBG1_id1 == getcharid(CHAR_ID_BG)) { if ($@FlaviusBG1_Victory == 1) { set .@your_medal,countitem(BF_Badge2); set .@medal_gap,500 - .@your_medal; @@ -489,7 +489,7 @@ OnInit: } bat_b01,389,14,3 script Croix Vintenar#b01_b 4_M_RASWORD,{ - if ($@FlaviusBG1_id2 == getcharid(4)) { + if ($@FlaviusBG1_id2 == getcharid(CHAR_ID_BG)) { if ($@FlaviusBG1_Victory == 2) { set .@your_medal,countitem(BF_Badge2); set .@medal_gap,500 - .@your_medal; @@ -623,7 +623,7 @@ bat_b01,389,16,3 script Croix Camp#flag31 1_FLAG_EAGLE,{ end; } bat_b01,10,294,3 script Vintenar#bat_b01_aover 4_M_KY_HEAD,{ set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1; - if ($@FlaviusBG1_id1 == getcharid(4)) { + if ($@FlaviusBG1_id1 == getcharid(CHAR_ID_BG)) { if (.@A_B_gap > 0) { set .@your_medal,countitem(BF_Badge2); set .@medal_gap,500 - .@your_medal; @@ -701,7 +701,7 @@ OnInit: bat_b01,389,14,3 script Vintenar#bat_b01_bover 4_M_CRU_HEAD,{ set .@A_B_gap,$@Guill_ScoreBG1 - $@Croix_ScoreBG1; - if ($@FlaviusBG1_id2 == getcharid(4)) { + if ($@FlaviusBG1_id2 == getcharid(CHAR_ID_BG)) { if (.@A_B_gap > 0) { set .@your_medal,countitem(BF_Badge2); set .@medal_gap,500 - .@your_medal; diff --git a/npc/custom/breeder.txt b/npc/custom/breeder.txt index c02122c3f..555fd4c93 100644 --- a/npc/custom/breeder.txt +++ b/npc/custom/breeder.txt @@ -16,16 +16,16 @@ prontera,124,201,1 script Universal Rental NPC 4_F_JOB_BLACKSMITH,{ if (hascashmount()) { message strcharinfo(PC_NAME),"You must first remove your mount."; end; - } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolf's_Flute)) { + } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_RANGER && !countitem(Wolfs_Flute)) { if (!checkfalcon() && getskilllv(HT_FALCON) && !checkwug()) { if (select(" ~ Falcon", " ~ Warg") == 1) setfalcon; else - getitem Wolf's_Flute, 1; + getitem Wolfs_Flute, 1; specialeffect2 EF_TEIHIT3; close; } else { - getitem Wolf's_Flute,1; + getitem Wolfs_Flute,1; } } else if ((eaclass()&EAJ_THIRDMASK) == EAJ_MECHANIC && !checkcart() && getskilllv(MC_PUSHCART)) { if (!checkmount() != MOUNT_MADO && getskilllv(NC_MADOLICENCE)) { diff --git a/npc/custom/etc/marriage.txt b/npc/custom/etc/marriage.txt index 76b0429c8..4e521ec55 100644 --- a/npc/custom/etc/marriage.txt +++ b/npc/custom/etc/marriage.txt @@ -723,13 +723,13 @@ function SF_TryRegister { set $wed_bride$,strcharinfo(PC_NAME); $wed_bride_sex = Sex; if ($@wedding_effect == 1) //Store account id for effect. - set $wedding_effect_id, getcharid(3); + set $wedding_effect_id, getcharid(CHAR_ID_ACCOUNT); } else { set $wed_groom_progress,1; set $wed_groom$,strcharinfo(PC_NAME); $wed_groom_sex = Sex; if ($@wedding_effect == 2) //Store account id for effect. - set $wedding_effect_id, getcharid(3); + set $wedding_effect_id, getcharid(CHAR_ID_ACCOUNT); } } @@ -882,7 +882,7 @@ function SF_InProgress { mes "...I am still waiting for your partner to confirm the divorce procedure."; close; } - if (getcharid(0) != $@divorcee) { + if (getcharid(CHAR_ID_CHAR) != $@divorcee) { mes "["+@name$+"]"; mes "I am in the progress of divorcing "+$@divorcer$+"."; mes "Do you know who the spouse is?"; diff --git a/npc/custom/etc/monster_arena.txt b/npc/custom/etc/monster_arena.txt index 24edd14d9..db4c37b73 100644 --- a/npc/custom/etc/monster_arena.txt +++ b/npc/custom/etc/monster_arena.txt @@ -724,7 +724,8 @@ L_Heal: function script illegalkill { announce "Illegal Kill by " + strcharinfo(PC_NAME) + " Detected",1; - percentheal -100,-100; + Sp = 0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } diff --git a/npc/custom/etc/rpsroulette.txt b/npc/custom/etc/rpsroulette.txt index e0f8b8952..331c0f0af 100644 --- a/npc/custom/etc/rpsroulette.txt +++ b/npc/custom/etc/rpsroulette.txt @@ -96,7 +96,8 @@ cmd_in02,182,126,2 script Crazy Boris 4_M_03,{ mes "*^0000FFClick^000000* *^FF0000BANG^000000*"; mes "You're dead!"; emotion e_gg; - percentheal -100,-100; + Sp = 0; + unitkill getcharid(CHAR_ID_ACCOUNT); close; } specialeffect EF_SUI_EXPLOSION; diff --git a/npc/custom/events/cluckers.txt b/npc/custom/events/cluckers.txt index f0967590b..fbdbbed3f 100644 --- a/npc/custom/events/cluckers.txt +++ b/npc/custom/events/cluckers.txt @@ -23,20 +23,20 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ if (.startcluck) { specialeffect2 2; switch(rand(15)) { - case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break; + case 0: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break; case 1: npctalk "Cluuuuuck!~"; break; - case 2: unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; break; + case 2: unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; break; case 3: sc_start SC_FREEZE,10000,0; break; - case 4: npctalk "CLUUUUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break; + case 4: npctalk "CLUUUUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break; case 5: sc_start SC_SLEEP,10000,0; break; case 6: sc_start SC_STONE,10000,0; emotion 29; break; - case 7: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break; - case 8: npctalk "Cluck! CLUUUCK!!"; unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; emotion 23; break; + case 7: npctalk "CLUUUUUUCK!!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break; + case 8: npctalk "Cluck! CLUUUCK!!"; unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; emotion 23; break; case 9: sc_start SC_STUN,10000,0; break; case 10: sc_start SC_SLEEP,10000,0; emotion 29; break; case 11: npctalk "Cluck! Cluck!"; break; case 12: sc_start SC_STUN,10000,0; break; - case 13: unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; break; + case 13: unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; break; default: if (rand(50) < 4) { npctalk "WOOF!..........."; @@ -46,7 +46,7 @@ prontera,156,219,4 script Cluckers 4_NFCOCK,{ set .startcluck,0; } else { npctalk "Cluck! CLUUUCK!!"; - unitskilluseid getcharid(3),"NPC_SELFDESTRUCTION",1; + unitskilluseid getcharid(CHAR_ID_ACCOUNT),"NPC_SELFDESTRUCTION",1; } break; } diff --git a/npc/custom/item_signer.txt b/npc/custom/item_signer.txt index 7e90542b1..a0097bb55 100644 --- a/npc/custom/item_signer.txt +++ b/npc/custom/item_signer.txt @@ -126,7 +126,7 @@ prt_in,24,61,7 script Perchik 1_M_01,{ delitem2 .@id,1,1,.@ref,0,.@slot[0],.@slot[1],.@slot[2],.@slot[3]; mes "Done!"; emotion e_proud; - getitem2 .@id,1,1,.@ref,0,254,0,getcharid(0)&0xffff,(getcharid(0)>>16)&0xffff; + getitem2 .@id,1,1,.@ref,0,254,0,getcharid(CHAR_ID_CHAR)&0xffff,(getcharid(CHAR_ID_CHAR)>>16)&0xffff; equip .@id; close; } diff --git a/npc/custom/itembind.txt b/npc/custom/itembind.txt index 66b37f4e7..8c51ad24d 100644 --- a/npc/custom/itembind.txt +++ b/npc/custom/itembind.txt @@ -25,7 +25,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ } mes "What kind of bind?"; .@boundtype = 1 << (select("Account", "Guild", "Character")-1); - if(.@boundtype == 2 && (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(PC_NAME))) { + if(.@boundtype == 2 && (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME))) { mes "In order for me to bind an item to a guild you must be the master of one."; close; } @@ -92,7 +92,7 @@ prontera,144,174,4 script Bound Items 4_M_JP_MID,{ next; for(.@i = 0; .@i < getarraysize(@bound_items); .@i++) { if(@inventorylist_id[.@item] == @bound_items[.@i] && - (!getcharid(2) || getguildmaster(getcharid(2)) != strcharinfo(PC_NAME)) + (!getcharid(CHAR_ID_GUILD) || getguildmaster(getcharid(CHAR_ID_GUILD)) != strcharinfo(PC_NAME)) ) { mes "I will only unbind guild bound items that the guild master requests."; close; diff --git a/npc/custom/quests/bandit_beard.txt b/npc/custom/quests/bandit_beard.txt index fa1e61eac..9f9e509f4 100644 --- a/npc/custom/quests/bandit_beard.txt +++ b/npc/custom/quests/bandit_beard.txt @@ -70,7 +70,7 @@ L_MAKE: mes "[Bearded Man]"; mes "Let's make you your beard!"; next; - if(countitem(Flexible_String) < 1 || countitem(Animal's_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 || + if(countitem(Flexible_String) < 1 || countitem(Animals_Skin) < 1 || countitem(Black_Dyestuffs) < 1 || countitem(Granpa_Beard) < 1 || countitem(Sticky_Mucus) < 100 || countitem(Counteragent) < 1 || countitem(Crystal_Jewel_) < 1) goto L_NOITEMS; delitem 7200, 1; delitem 919, 1; diff --git a/npc/custom/quests/elvenear.txt b/npc/custom/quests/elvenear.txt index dca4fdfd8..02e650e78 100644 --- a/npc/custom/quests/elvenear.txt +++ b/npc/custom/quests/elvenear.txt @@ -36,7 +36,7 @@ geffen,127,49,5 script Elven Ears Quest 4_M_02,{ mes "[Elven Ears quest]"; mes "Good good, let me just check"; next; - if (countitem(Cat_Hairband)<1 || countitem(Elder_Pixie's_Beard)<20 || countitem(Animal's_Skin)<20) { + if (countitem(Cat_Hairband) < 1 || countitem(Elder_Pixies_Beard) < 20 || countitem(Animals_Skin) < 20) { mes "[Elven Ears Quest]"; mes "You don't have the requirements."; mes "Please come back another time..."; diff --git a/npc/custom/quests/event_6_new_hats.txt b/npc/custom/quests/event_6_new_hats.txt index 593293a69..50110ff52 100644 --- a/npc/custom/quests/event_6_new_hats.txt +++ b/npc/custom/quests/event_6_new_hats.txt @@ -194,13 +194,13 @@ prt_in,53,56,5 script Jac 1_M_PAY_ELDER,{ mes "Oh, dear. You need 10 Steels..."; close; } - if (countitem(Bear's_Foot) < 200) { + if (countitem(Bears_Foot) < 200) { mes "[Jac]"; mes "Oh, dear. You need 200 Bear Footskins..."; close; } delitem Steel,10;//Items: Steel, - delitem Bear's_Foot,200; //Items: Bears Footskin, + delitem Bears_Foot,200; //Items: Bears Footskin, mes "[Jac]"; mes "Wow!! Well done! Finally you have gathered all items needed! We will make the Panda Hat for you right away. Please Wait a Moment."; next; diff --git a/npc/custom/quests/hunting_missions.txt b/npc/custom/quests/hunting_missions.txt index dc4e20f79..611bdd480 100644 --- a/npc/custom/quests/hunting_missions.txt +++ b/npc/custom/quests/hunting_missions.txt @@ -50,7 +50,7 @@ function Chk; function Cm; mes "You've started a mission"; mes "on another character."; if ( !@hm_char_del_check ) { - if ( !query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(3) +" )", .@dummy ) ) { + if ( !query_sql( "SELECT 1 FROM `char_reg_num_db` WHERE `key` = 'Mission0' AND `char_id` IN ( SELECT `char_id` FROM `char` WHERE `account_id` = "+ getcharid(CHAR_ID_ACCOUNT) +" )", .@dummy ) ) { next; mes "[Hunting Missions]"; mes "I can't seem to find any records"; @@ -198,8 +198,8 @@ Mission_Status: set #Mission_Count,0; if (.Delay) set #Mission_Delay, gettimetick(2)+(.Delay*3600); set Mission_Total, Mission_Total+1; - if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(0)+",'Mission_Total','0',1)"); - else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(0)+" AND `key` = 'Mission_Total'"); + if (Mission_Total == 1) query_sql("INSERT INTO `char_reg_num_db` (`char_id`,`key`,`index`,`value`) VALUES ("+getcharid(CHAR_ID_CHAR)+",'Mission_Total','0',1)"); + else query_sql("UPDATE `char_reg_num_db` SET `value` = "+Mission_Total+" WHERE `char_id` = "+getcharid(CHAR_ID_CHAR)+" AND `key` = 'Mission_Total'"); close; Mission_Info: @@ -258,7 +258,7 @@ OnBuyItem: close; OnNPCKillEvent: - if (!getcharid(1) || !.Party) { + if (!getcharid(CHAR_ID_PARTY) || !.Party) { if (!#Mission_Count || !Mission0) end; for (set .@i, 0; .@i<.Quests; set .@i,.@i+1) { if (strmobinfo(1,killedrid) == strmobinfo(1,getd("Mission"+.@i))) { @@ -271,8 +271,8 @@ OnNPCKillEvent: } else if (.Party) { set .@mob, killedrid; getmapxy(.@map1$, .@x1, .@y1, UNITTYPE_PC); - getpartymember getcharid(1),1; - getpartymember getcharid(1),2; + getpartymember getcharid(CHAR_ID_PARTY),1; + getpartymember getcharid(CHAR_ID_PARTY),2; for(set .@i,0; .@i<$@partymembercount; set .@i,.@i+1) { if (isloggedin($@partymemberaid[.@i], $@partymembercid[.@i])) { attachrid $@partymemberaid[.@i]; diff --git a/npc/custom/quests/may_hats.txt b/npc/custom/quests/may_hats.txt index beea787a1..a1864f96f 100644 --- a/npc/custom/quests/may_hats.txt +++ b/npc/custom/quests/may_hats.txt @@ -62,10 +62,10 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ next; if (select("Yeah.", "Nay." != 1)) break; - if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tiger's_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger's_Footskin, Tiger_Panty, + if(countitem(Tiger_Mask) < 1 || countitem(Tiger_Footskin) < 10 || countitem(Tigers_Skin) < 30 || countitem(Tiger_Skin_Panties) < 300) goto l_noitem;//Items: Tiger_Mask, Tiger_Skin, Tiger_Footskin, Tiger_Panty, delitem Tiger_Mask,1;//Items: Tiger_Mask, - delitem Tiger_Footskin,10;//Items: Tiger's_Footskin, - delitem Tiger's_Skin,30;//Items: Tiger_Skin, + delitem Tiger_Footskin,10;//Items: Tiger_Footskin, + delitem Tigers_Skin,30;//Items: Tiger_Skin, delitem Tiger_Skin_Panties,300;//Items: Tiger_Panty, getitem Lion_Mask,1;//Items: Lion_Mask, mes "[Yakima]"; @@ -95,7 +95,7 @@ gonryun,187,140,4 script Yakima 4_F_EINWOMAN,{ delitem Manteau_,2;//Items: Manteau_, delitem Skul_Ring,3;//Items: Skull_Ring, delitem Old_Manteau,10;//Items: Old_Manteau, - getitem Skeleton's_Cape,1;//Items: Skeleton_Manteau, + getitem Skeletons_Cape,1;//Items: Skeleton_Manteau, mes "[Yakima]"; mes "Thank you very very much!"; mes callfunc("F_Bye"); diff --git a/npc/custom/quests/thq/THQS_Quests.txt b/npc/custom/quests/thq/THQS_Quests.txt index bc81fb24b..c0eb1427a 100644 --- a/npc/custom/quests/thq/THQS_Quests.txt +++ b/npc/custom/quests/thq/THQS_Quests.txt @@ -228,7 +228,7 @@ N_QuestStart: ///////Job list 3/////// //3-1; moc_fild04,208,322,6 script Clark 1_M_YOUNGKNIGHT,{ - if (three_qset == 1 && countitem(Elder_Pixie's_Beard) > 29) goto N_QuestComp; + if (three_qset == 1 && countitem(Elder_Pixies_Beard) > 29) goto N_QuestComp; if (three_qset == 1) goto N_QuestStart; mes "[Clark]"; mes "Love to chat, but I'm waiting for someone."; @@ -456,7 +456,7 @@ N_QuestStart: ///////Job list 5/////// //5-1; prt_maze01,18,184,6 script Lithin#01 4_M_CRU_OLD,{ - if (five_qset == 1 && countitem(Wild_Boar's_Mane) > 14) goto N_QuestComp; + if (five_qset == 1 && countitem(Wild_Boars_Mane) > 14) goto N_QuestComp; if (five_qset == 1) goto N_QuestStart; mes "[Lithin]"; mes "Well hello."; @@ -975,7 +975,7 @@ N_QuestStart: } //10-2; pay_fild10,145,252,6 script Man#02 2_M_DYEINGER,{ - if (ten_qset == 2 && countitem(Tiger's_Skin) > 0) goto N_QuestComp; + if (ten_qset == 2 && countitem(Tigers_Skin) > 0) goto N_QuestComp; if (ten_qset == 2) goto N_QuestStart; mes "[Man]"; mes "Sorry I'm waiting for someone, you will have to come back later"; @@ -995,12 +995,12 @@ N_QuestStart: mes "[Man]"; mes "Tony the Tiger is on Crack! He must be stoped, KILL HIM!"; mes " "; - mes "Bring me back 1 Tiger's_Skin!"; + mes "Bring me back 1 Tiger's Skin!"; close; } //10-3; cmd_fild08,328,349,4 script Caral 2_M_SWORDMASTER,{ - if (ten_qset == 3 && countitem(Thin_N'_Long_Tongue) > 0) goto N_QuestComp; + if (ten_qset == 3 && countitem(Thin_N_Long_Tongue) > 0) goto N_QuestComp; if (ten_qset == 3) goto N_QuestStart; mes "[Caral]"; mes "Sorry I'm waiting for someone, you will have to come back later."; diff --git a/npc/custom/woe_controller.txt b/npc/custom/woe_controller.txt index e109951d7..14e288be7 100644 --- a/npc/custom/woe_controller.txt +++ b/npc/custom/woe_controller.txt @@ -194,7 +194,7 @@ OnReward: OnPCLoadMapEvent: if (!compare(strcharinfo(PC_MAP),"g_cas")) end; if (((.AutoKick && .Active[0]) || (.NoOwner && !getcastledata(strcharinfo(PC_MAP),1))) && !(.Active[0]&(1<<getd("."+strcharinfo(PC_MAP))))) { - if (getcharid(2) && getcastledata(strcharinfo(PC_MAP),1) == getcharid(2)) end; + if (getcharid(CHAR_ID_GUILD) && getcastledata(strcharinfo(PC_MAP),1) == getcharid(CHAR_ID_GUILD)) end; sleep2 1000; message strcharinfo(PC_NAME), getcastlename(strcharinfo(PC_MAP))+" is currently inactive."; sleep2 5000; diff --git a/npc/dev/test.txt b/npc/dev/test.txt index ee2bda259..b711a0a28 100644 --- a/npc/dev/test.txt +++ b/npc/dev/test.txt @@ -606,7 +606,7 @@ function script HerculesSelfTestHelper { callsub(OnCheck, "'PORING' mob ID", PORING, 1002); callsub(OnCheck, "'NV_BASIC' skill ID", NV_BASIC, 1); callsub(OnCheck, "'Red_Potion' item ID", Red_Potion, 501); - callsub(OnCheck, "'Monster's_Feed' item ID", Monster's_Feed, 528); + callsub(OnCheck, "'Monsters_Feed' item ID", Monsters_Feed, 528); // setd/getd diff --git a/npc/events/christmas_2005.txt b/npc/events/christmas_2005.txt index 795b50256..0a631cfb6 100644 --- a/npc/events/christmas_2005.txt +++ b/npc/events/christmas_2005.txt @@ -64,7 +64,7 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{ mes ""; emotion e_lv; next; - if (countitem(Santa's_Hat) > 0) { + if (countitem(Santas_Hat) > 0) { if (select("Here.", "It's ok.") == 1) { mes "[Designer Louise Kim]"; mes "Nice choice!!"; @@ -160,11 +160,11 @@ xmas_in,89,92,5 script Louise Kim#designer 4_F_06,{ mes "~Who would be happier than~"; mes "~being with Louise.~"; emotion e_ho; - delitem Santa's_Hat,1; + delitem Santas_Hat,1; delitem Cactus_Needle,1; delitem Holy_Water,10; delitem Rosary,1; - getitem Santa's_Hat_,1; + getitem Santas_Hat_,1; close; } else { @@ -1370,7 +1370,7 @@ prontera,156,242,0 script Oholy#pron::OholyDup 1_F_PRIEST,{ emotion e_heh; delitem Worn_Out_Page,1; christ_carol05 = 3; - getitem Santa's_Hat,1; + getitem Santas_Hat,1; close; } } diff --git a/npc/events/gdevent_aru.txt b/npc/events/gdevent_aru.txt index 39c3ca5f7..d192456aa 100644 --- a/npc/events/gdevent_aru.txt +++ b/npc/events/gdevent_aru.txt @@ -79,13 +79,13 @@ OnMyMobDead: } arug_dun01,199,195,5 script Dwarf#aru_gd 4_M_DWARF,{ - if (getcharid(2) == 0) { + if (getcharid(CHAR_ID_GUILD) == 0) { mes "[Dwarf]"; mes "Hey did you see an ugly Goblin come by? He stole something from me!"; close; } .@chk_urquest = questprogress(2143,PLAYTIME); - .@chk_yourgdname$ = getguildname(getcharid(2)); + .@chk_yourgdname$ = getguildname(getcharid(CHAR_ID_GUILD)); if ($@gdeventv_a1 == 0) { if ($@gdevents_a$ == "") { $@gdeventv_a1 = 1; @@ -521,7 +521,7 @@ arug_que01,100,81,3 script Pierrot Pier#aru_gd 4_M_PIERROT,{ mes "- and come back later. -"; close; } - if (strcharinfo(PC_NAME) == getguildmaster(getcharid(2))) { + if (strcharinfo(PC_NAME) == getguildmaster(getcharid(CHAR_ID_GUILD))) { if ($@gdeventv_a2 == 0) { .@que_2143 = questprogress(2143,PLAYTIME); if (!.@que_2143) { @@ -1333,7 +1333,7 @@ OnInit: disablenpc "removepp_aru_gd"; end; -OnTouch2: +OnTouch: .@paper_aru_gd = countitem(Glitering_PaperA); .@spaper_aru_gd = countitem(Glitering_PaperB); if ((.@paper_aru_gd > 0) || (.@spaper_aru_gd > 0)) { diff --git a/npc/events/gdevent_sch.txt b/npc/events/gdevent_sch.txt index 1d6b892b7..dcb529ebe 100644 --- a/npc/events/gdevent_sch.txt +++ b/npc/events/gdevent_sch.txt @@ -79,13 +79,13 @@ OnMyMobDead: } schg_dun01,194,148,5 script Dwarf#sch_gd 4_M_DWARF,{ - if (getcharid(2) == 0) { + if (getcharid(CHAR_ID_GUILD) == 0) { mes "[Dwarf]"; mes "Hey did you see an ugly Goblin come by? He stole something from me!"; close; } .@chk_urquest = questprogress(2143,PLAYTIME); - .@chk_yourgdname$ = getguildname(getcharid(2)); + .@chk_yourgdname$ = getguildname(getcharid(CHAR_ID_GUILD)); if ($@gdeventv_s1 == 0) { if ($@gdevents_s$ == "") { $@gdeventv_s1 = 1; @@ -520,7 +520,7 @@ schg_que01,100,81,3 script Pierrot Pier#sch_gd 4_M_PIERROT,{ mes "- and come back later. -"; close; } - if (strcharinfo(PC_NAME) == getguildmaster(getcharid(2))) { + if (strcharinfo(PC_NAME) == getguildmaster(getcharid(CHAR_ID_GUILD))) { if ($@gdeventv_s2 == 0) { .@que_2143 = questprogress(2143,PLAYTIME); if (!.@que_2143) { @@ -1330,7 +1330,7 @@ OnInit: disablenpc "removepp_sch_gd"; end; -OnTouch2: +OnTouch: .@paper_sch_gd = countitem(Glitering_PaperA); .@spaper_sch_gd = countitem(Glitering_PaperB); if ((.@paper_sch_gd > 0) || (.@spaper_sch_gd > 0)) { diff --git a/npc/events/god_se_festival.txt b/npc/events/god_se_festival.txt index 1dbbe434a..7c0523cf5 100644 --- a/npc/events/god_se_festival.txt +++ b/npc/events/god_se_festival.txt @@ -66,7 +66,7 @@ yuno,1,1,0 script Festival Manager#gq_fes0 4_F_HUGIRL,{ } yuno,118,192,5 script Rmimi Ravies#gq_fes01 4_F_HUGIRL,{ - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); if (countitem(Valkyrie_Gift) > 0) { mes "[Rmimi Ravies]"; mes "This is the flower."; @@ -442,7 +442,7 @@ rachel,1,1,0 script Festival Manager#gq_fes2 4_F_HUGIRL,{ } rachel,132,117,3 script Rhehe Ravies#gq_fes03 4_F_HUGIRL,{ - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); if (countitem(Valkyrie_Gift) > 0) { mes "[Rhehe Ravies]"; mes "A flower!!"; diff --git a/npc/events/nguild/nguild_dunsw.txt b/npc/events/nguild/nguild_dunsw.txt index 23cd8ec8c..291b08db3 100644 --- a/npc/events/nguild/nguild_dunsw.txt +++ b/npc/events/nguild/nguild_dunsw.txt @@ -49,7 +49,7 @@ function script F_GldDunSw { next; if (select("Pull.", "Do not.") == 1) { - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { warp "gld_dun"+getarg(1),getarg(2),getarg(3); end; } diff --git a/npc/events/nguild/nguild_ev_agit.txt b/npc/events/nguild/nguild_ev_agit.txt index cbf6aec3c..99545bfff 100644 --- a/npc/events/nguild/nguild_ev_agit.txt +++ b/npc/events/nguild/nguild_ev_agit.txt @@ -67,7 +67,7 @@ function script F_AgitBreak { .@map$ = getarg(0); .@castle$ = getarg(1); - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); if (.@GID <= 0) return; .@Economy = getcastledata(.@map$,2) - 5; diff --git a/npc/events/nguild/nguild_flags.txt b/npc/events/nguild/nguild_flags.txt index d2a753003..999f79dca 100644 --- a/npc/events/nguild/nguild_flags.txt +++ b/npc/events/nguild/nguild_flags.txt @@ -53,12 +53,12 @@ function script F_Flags { return; } else { - if (getcharid(2) == .@GID && getarg(4) == 1) { + if (getcharid(CHAR_ID_GUILD) == .@GID && getarg(4) == 1) { mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if (select("Return to the guild castle.", "Quit.") == 1) { - if (getcharid(2) == getcastledata(getarg(1),1)) + if (getcharid(CHAR_ID_GUILD) == getcastledata(getarg(1),1)) warp getarg(1),getarg(2),getarg(3); } return; diff --git a/npc/events/nguild/nguild_kafras.txt b/npc/events/nguild/nguild_kafras.txt index 66c53ff2d..8b448bbe3 100644 --- a/npc/events/nguild/nguild_kafras.txt +++ b/npc/events/nguild/nguild_kafras.txt @@ -39,7 +39,7 @@ function script F_GKafra { cutin "kafra_01",2; @GID = getcastledata(getarg(0),1); - if (getcharid(2) == @GID && getgdskilllv(@GID,10001)) goto L_StartG; + if (getcharid(CHAR_ID_GUILD) == @GID && getgdskilllv(@GID,10001)) goto L_StartG; mes "[Kafra Service]"; mes "I am contracted to provide service only for the ^ff0000" + getguildname(@GID) + "^000000 Guild. Please use another Kafra Corporation staff member around here. I am Sorry for your inconvenience."; diff --git a/npc/events/nguild/nguild_managers.txt b/npc/events/nguild/nguild_managers.txt index 6ff1e7e2a..1d9b56966 100644 --- a/npc/events/nguild/nguild_managers.txt +++ b/npc/events/nguild/nguild_managers.txt @@ -47,7 +47,7 @@ function script F_GldManager { mes "I am waiting for my master. Brave adventurer, follow your destiny!"; return; } - if (getcharid(2) != @GID){ + if (getcharid(CHAR_ID_GUILD) != @GID){ mes "I am here to follow ^5533FF" + getguildmaster(@GID) + "^000000's command! Hey! Your not even a part of the guild!!"; mes "Where are the guardians? Destroy these intruders!"; return; diff --git a/npc/events/nguild/nguild_warper.txt b/npc/events/nguild/nguild_warper.txt index 07ee4b0ed..a2e2faed1 100644 --- a/npc/events/nguild/nguild_warper.txt +++ b/npc/events/nguild/nguild_warper.txt @@ -42,24 +42,24 @@ prontera,146,163,6 script Novice Castles 4_F_NOVICE,{ mes "[Cita]"; - if (!getcharid(2)) { + if (!getcharid(CHAR_ID_GUILD)) { mes "^FF0000You have to enter a guild to be able to hit Emperium!^000000"; - } else if (getgdskilllv(getcharid(2),10013) || - (getgdskilllv(getcharid(2),10000) + - getgdskilllv(getcharid(2),10001) + - getgdskilllv(getcharid(2),10002) + - getgdskilllv(getcharid(2),10003) + - getgdskilllv(getcharid(2),10004) + - getgdskilllv(getcharid(2),10005) + - getgdskilllv(getcharid(2),10006) + - getgdskilllv(getcharid(2),10007) + - getgdskilllv(getcharid(2),10008) + - getgdskilllv(getcharid(2),10009) + - getgdskilllv(getcharid(2),10010) + - getgdskilllv(getcharid(2),10011) + - getgdskilllv(getcharid(2),10012) + - getgdskilllv(getcharid(2),10013) + - getgdskilllv(getcharid(2),10014) > 9) + } else if (getgdskilllv(getcharid(CHAR_ID_GUILD),10013) || + (getgdskilllv(getcharid(CHAR_ID_GUILD),10000) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10001) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10002) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10003) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10004) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10005) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10006) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10007) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10008) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10009) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10010) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10011) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10012) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10013) + + getgdskilllv(getcharid(CHAR_ID_GUILD),10014) > 9) ) { mes "I see... your guild has Emergency Call mastered."; mes "You cannot enter the Novice Castle area."; diff --git a/npc/instances/EndlessTower.txt b/npc/instances/EndlessTower.txt index 8fc6f973e..e6947d2a4 100644 --- a/npc/instances/EndlessTower.txt +++ b/npc/instances/EndlessTower.txt @@ -209,7 +209,7 @@ alberta,214,77,6 script Captain Janssen 4_M_SEAMAN,{ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@p_name$ = getpartyname(.@party_id); .@md_name$ = "Endless Tower"; @@ -221,7 +221,7 @@ e_tower,81,105,0 script Tower Protection Stone 2_MONEMUS,{ close; } if (!.@etower_timer) { - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { mes "Confirmed the party has been made. Would you like to reserve entrance to the Endless Tower?"; next; switch(select("Generate dungeon "+.@md_name$, "Enter the dungeon", "Return to Alberta", "Cancel")) { diff --git a/npc/instances/NydhoggsNest.txt b/npc/instances/NydhoggsNest.txt index c8f6c8567..16df567e3 100644 --- a/npc/instances/NydhoggsNest.txt +++ b/npc/instances/NydhoggsNest.txt @@ -104,7 +104,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{ } } else if (ins_nyd == 131 || ins_nyd == 132 || ins_nyd > 199) { - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@md_name$ = "Nidhoggur's Nest"; .@ins_nyd_check = questprogress(3135,PLAYTIME); // 3 Day cooldown @@ -124,7 +124,7 @@ nyd_dun02,100,201,3 script Yggdrasil Gatekeeper HIDDEN_NPC,8,8,{ mes "And only 1 representative of you needs to talk to me, so don't annoy me..."; close; } - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { mes "[Yggdrasil Gatekeeper]"; mes "The loyal servants of the Guardian... what can I do for you?"; next; @@ -224,7 +224,7 @@ L_Enter: mes "You did not request for entrance. Please let your leader request entrance."; close; } else { - mapannounce "nyd_dun02", getpartyname(getcharid(1))+"'s party member "+strcharinfo(PC_NAME)+" has entered Nidhoggur's Nest.",bc_map,"0x00ff99"; + mapannounce "nyd_dun02", getpartyname(getcharid(CHAR_ID_PARTY))+"'s party member "+strcharinfo(PC_NAME)+" has entered Nidhoggur's Nest.",bc_map,"0x00ff99"; if (!questprogress(3135)) setquest 3135; if (!questprogress(3136)) setquest 3136; warp "1@nyd",32,37; @@ -1608,7 +1608,7 @@ OnTouch_: mes "I thank you deeply for your decision. I will use what is left of my powers to open up the path towards the Guardian's Nest."; next; mes "[World Tree Yggdrasil]"; - if (getcharid(0) == getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) { mes "The path to the Guardian's Nest is just past the waterfall by the large World Tree Yggdrasil to the North. The defensive mechanisms of the Sanctuary will start immediately."; next; mes "[World Tree Yggdrasil]"; @@ -1860,7 +1860,7 @@ OnTouch: 2@nyd,199,268,0 script nyd_2f_boss_enter FAKE_NPC,8,8,{ OnTouch_: - if (getcharid(0) == getpartyleader(getcharid(1),2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(getcharid(CHAR_ID_PARTY),2)) { donpcevent instance_npcname("nyd_2f_boss_enter_call")+"::OnEnable"; disablenpc instance_npcname("nyd_2f_boss_enter"); end; @@ -2168,27 +2168,27 @@ OnTouch: 2@nyd,1,1,0 script ins_nyd2_spawn_mobs FAKE_NPC,{ OnInstanceInit: - .@map$ = instance_mapname("2@nyd"); - areamonster .@map$,200,92,180,80,"Rhyncho",2020,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead"; - areamonster .@map$,200,92,180,80,"Phylla",2021,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead"; - areamonster .@map$,200,92,180,80,"Dark Shadow",2023,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead"; - areamonster .@map$,200,92,180,80,"Dark Pinguicula",2015,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead"; + .@map$ = instance_mapname("2@nyd"); //temp fix since all mobs spawn on the same (inaccessable) area + areamonster .@map$,14,20,382,180,"Rhyncho",2020,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead"; + areamonster .@map$,14,20,382,180,"Phylla",2021,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead"; + areamonster .@map$,14,20,382,180,"Dark Shadow",2023,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead"; + areamonster .@map$,14,20,382,180,"Dark Pinguicula",2015,40,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead"; end; OnMyRhynDead: - areamonster instance_mapname("2@nyd"),200,92,180,80,"Rhyncho",2020,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead"; + areamonster instance_mapname("2@nyd"),14,20,382,180,"Rhyncho",2020,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyRhynDead"; end; OnMyPhyDead: - areamonster instance_mapname("2@nyd"),200,92,180,80,"Phylla",2021,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead"; + areamonster instance_mapname("2@nyd"),14,20,382,180,"Phylla",2021,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPhyDead"; end; OnMyDarkshaDead: - areamonster instance_mapname("2@nyd"),200,92,180,80,"Dark Shadow",2023,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead"; + areamonster instance_mapname("2@nyd"),14,20,382,180,"Dark Shadow",2023,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyDarkshaDead"; end; OnMyPingDead: - areamonster instance_mapname("2@nyd"),200,92,180,80,"Dark Pinguicula",2015,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead"; + areamonster instance_mapname("2@nyd"),14,20,382,180,"Dark Pinguicula",2015,1,instance_npcname("ins_nyd2_spawn_mobs")+"::OnMyPingDead"; end; } diff --git a/npc/instances/OrcsMemory.txt b/npc/instances/OrcsMemory.txt index 4455124eb..48412a631 100644 --- a/npc/instances/OrcsMemory.txt +++ b/npc/instances/OrcsMemory.txt @@ -39,7 +39,7 @@ //== Entrance ============================================== gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); .@p_name$ = getpartyname(.@party_id); .@md_name$ = "Orc's Memory"; @@ -62,7 +62,7 @@ gef_fild10,242,202,0 script Dimensional Gorge Piece 2_MONEMUS,{ close; // Fall through to access the dungeon } else { // !.@orctime - if (getcharid(0) == getpartyleader(.@party_id,2)) { + if (getcharid(CHAR_ID_CHAR) == getpartyleader(.@party_id,2)) { mes "Party status confirmed. Would you like to book entrance to the "+.@md_name$+"?"; next; switch(select("Reserve the "+.@md_name$, "Enter the Dungeon", "Cancel")) { @@ -684,7 +684,7 @@ OnTimer23910: } 2@orcs,26,164,0 script Torch#1-1 CLEAR_NPC,{ - if(getpartyleader(getcharid(1),2) != getcharid(0)) end; + if(getpartyleader(getcharid(CHAR_ID_PARTY),2) != getcharid(CHAR_ID_CHAR)) end; progressbar "ffff00",5; setarray .@id[0], atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),0)), atoi(charat(strnpcinfo(NPC_NAME_HIDDEN),2)); if (.@id[1] == 4) diff --git a/npc/instances/SealedShrine.txt b/npc/instances/SealedShrine.txt index fd33f16a0..90efe6f5c 100644 --- a/npc/instances/SealedShrine.txt +++ b/npc/instances/SealedShrine.txt @@ -105,7 +105,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ case 2: if (BaseLevel >= 75) { - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); mes "[Friar Patrick]"; mes "Do you mean you'll go to the shrine and reseal Baphomet?"; @@ -117,7 +117,7 @@ monk_test,309,146,3 script Friar Patrick#edq 4_M_OLDFRIAR,{ //.@ins_bapho_check2 = questprogress(3045,PLAYTIME); if (!.@ins_bapho_check) { - if (getpartyleader(.@party_id,2) == getcharid(0) && instance_check_party(.@party_id,2,75)) { + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR) && instance_check_party(.@party_id,2,75)) { mes "[Friar Patrick]"; mes "Party name is "+getpartyname(.@party_id)+"..."; mes "Name of the leader is "+strcharinfo(PC_NAME)+"..."; @@ -491,7 +491,7 @@ OnMyMobDead: //== Soul of hero near the north grave ===================== 1@cata,141,221,0 script Gravestone# CLEAR_NPC,3,3,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); if ('ins_baphomet == 0) { mes "The gravestone is trembling..."; next; @@ -548,7 +548,7 @@ OnMyMobDead: mes "If your ^0000FFparty leader^000000 brings me the pendant, my soul can be substantialized. So, hurry up."; close; } - else if (('ins_baphomet == 2) && (getpartyleader(.@party_id,2) == getcharid(0))) { + else if (('ins_baphomet == 2) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { mes "[Voice of the Gravestone]"; mes "Did you find the pendant?"; next; @@ -598,7 +598,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. } 1@cata,176,119,4 script Ancient Hero's Soul#1F 4_M_CHAMPSOUL,{ - .@party_id = getcharid(1); + .@party_id = getcharid(CHAR_ID_PARTY); cutin "ins_cata_champ_n",2; if ('ins_baphomet == 2) { mes "[Ancient Hero's Soul]"; @@ -660,7 +660,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. break; case 3: ++.@ins_baphomet_1f_3; - if (getpartyleader(.@party_id,2) == getcharid(0)) { + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR)) { mes "[Ancient Hero's Soul]"; mes "You look like the leader of this party. You need to go and get ^0000FF10 Essence of Fire^000000 from the torches."; next; @@ -712,7 +712,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. } if (.@exitloop) break; } - if (getpartyleader(.@party_id,2) == getcharid(0)) { + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR)) { mes "[Ancient Hero's Soul]"; mes "To remind you again, I must be substantialized within the next hour. So everyone, finish your work within that time!"; 'ins_baphomet = 3; @@ -729,7 +729,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. cutin "",255; end; } - else if (('ins_baphomet == 3) && (getpartyleader(.@party_id,2) == getcharid(0))) { + else if (('ins_baphomet == 3) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { cutin "ins_cata_champ_n",2; mes "[Ancient Hero's Soul]"; mes "Did you get 10 ^0000FFEssence of Fire^000000 and ^0000FFToken of Apostle^000000?"; @@ -766,7 +766,7 @@ OnInstanceInit: // Temporary fix for @reloadscript. cutin "",255; end; } - else if (('ins_baphomet == 4) && (getpartyleader(.@party_id,2) == getcharid(0))) { + else if (('ins_baphomet == 4) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { cutin "ins_cata_champ_n",2; mes "[Ancient Hero's Soul]"; mes "Are you ready? I opened the sealed gate. To pass the gate, you should carry a ^0000FFToken of Apostle^000000."; @@ -886,8 +886,8 @@ OnInstanceInit: //== Bobbing Torches ======================================= - script Bobbing Torch#SS FAKE_NPC,{ - .@party_id = getcharid(1); - if (getpartyleader(.@party_id,2) == getcharid(0)) { + .@party_id = getcharid(CHAR_ID_PARTY); + if (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR)) { if (('ins_baphomet == 3) && (countitem(Essence_Of_Fire) < 11)) { mes "A huge torch appearing as if it can burn everything is bobbing up and down in front of me."; next; @@ -1124,8 +1124,8 @@ OnInstanceInit: 2@cata,35,109,0 duplicate(Magical Seal#SS) Magical Seal#10 CLEAR_NPC 2@cata,79,65,0 script The Main Altar#ss CLEAR_NPC,{ - .@party_id = getcharid(1); - if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(0))) { + .@party_id = getcharid(CHAR_ID_PARTY); + if (('ins_baphomet == 5) && (getpartyleader(.@party_id,2) == getcharid(CHAR_ID_CHAR))) { mes "An evil power, too terrible to describe, lies under the great altar radiating a violet color."; next; mes "Complicated Magical Rune letters blink rapidly, attempting to suppress the dreadful power within."; diff --git a/npc/jobs/2-1/assassin.txt b/npc/jobs/2-1/assassin.txt index 86ce74644..fcc1c4c98 100644 --- a/npc/jobs/2-1/assassin.txt +++ b/npc/jobs/2-1/assassin.txt @@ -1103,7 +1103,7 @@ OnStartArena: warpwaitingpc "in_moc_16", 66, 151; attachrid($@warpwaitingpc[0]); if (ASSIN_Q2 < 5) { - warpchar "in_moc_16",20,145,getcharid(0); + warpchar "in_moc_16",20,145,getcharid(CHAR_ID_CHAR); end; } donpcevent "Beholder#ASNTEST::OnEnable"; diff --git a/npc/jobs/2-1/blacksmith.txt b/npc/jobs/2-1/blacksmith.txt index 5f971049f..8b1c9e9d3 100644 --- a/npc/jobs/2-1/blacksmith.txt +++ b/npc/jobs/2-1/blacksmith.txt @@ -589,7 +589,7 @@ ein_in01,201,27,3 script Guildsman#alberta 1_M_SMITH,{ case 3: setarray .@items[0], 1003,1, 935,2, 990,2, 1119,1, 6; changequest 2002,2005; break; //Iron_Ore, Eye_Bandage, Blue_Gemstone, Arbalest case 4: setarray .@items[0], 1002,1, 2212,1, 717,2, 1713,1, 7; changequest 2002,2006; break; - //Iron, Green_Herb, Animal's_Skin, Ring_Pommel_Saber + //Iron, Green_Herb, Animals_Skin, Ring_Pommel_Saber default: setarray .@items[0], 998,1, 511,1, 919,2, 1122,1, 8; changequest 2002,2007; break; } BSMITH_Q = .@items[8]; diff --git a/npc/jobs/2-1/hunter.txt b/npc/jobs/2-1/hunter.txt index 609ea56de..76b3c4b39 100644 --- a/npc/jobs/2-1/hunter.txt +++ b/npc/jobs/2-1/hunter.txt @@ -495,13 +495,13 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{ case 1: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 3; changequest 4001,4002; break; //Bill_Of_Birds, Skel_Bone, Green_Herb case 2: setarray .@items[0], 925,3, 932,5, 511,3, 4; changequest 4001,4003; break; - //Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb + //Colorful_Shell/Posionous_Canine, Animals_Skin, Red_Herb case 3: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 5; changequest 4001,4004; break; //Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff case 4: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 6; changequest 4001,4005; break; //Shell, Worm_Peelings, Yellow_Herb case 5: setarray .@items[0], 935,9, 955,9, 508,9, 7; changequest 4001,4006; break; - //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot + //Tooth_Of_Bat, Sticky_Mucus, Bears_Foot case 6: setarray .@items[0], 913,3, 938,1, 948,1, 8; changequest 4001,4007; break; //Porcupine_Spike, Yoyo_Tail, Acorn case 7: setarray .@items[0], 1027,2, 942,1, 1026,1, 9; changequest 4001,4008; break; @@ -525,13 +525,13 @@ hu_in01,382,382,4 script Guild Receptionist#hnt 4_M_JOB_HUNTER,{ case 3: setarray .@items[0], (RENEWAL?928:7030),5, 1019,5, 509,3, 10; break; //Bill_Of_Birds, Skel_Bone, Green_Herb case 4: setarray .@items[0], 925,3, 932,5, 511,3, 10; break; - //Colorful_Shell/Posionous_Canine, Animal's_Skin, Red_Herb + //Colorful_Shell/Posionous_Canine, Animals_Skin, Red_Herb case 5: setarray .@items[0], (RENEWAL?1013:937),3, 919,3, 507,5, 10; break; //Horn/Dokkaebi_Horn, Poison_Spore/Piece_Of_Egg_Shell, Fluff case 6: setarray .@items[0], (RENEWAL?947:1021),3, (RENEWAL?7033:7032),3, 914,10, 10; break; //Shell, Worm_Peelings, Yellow_Herb case 7: setarray .@items[0], 935,9, 955,9, 508,9, 11; break; - //Tooth_Of_Bat, Sticky_Mucus, Bear's_Foot + //Tooth_Of_Bat, Sticky_Mucus, Bears_Foot case 8: setarray .@items[0], 913,3, 938,1, 948,1, 11; break; //Porcupine_Spike, Yoyo_Tail, Acorn case 9: setarray .@items[0], 1027,2, 942,1, 1026,1, 11; break; diff --git a/npc/jobs/2-1/knight.txt b/npc/jobs/2-1/knight.txt index b5afe995d..f75d0ea46 100644 --- a/npc/jobs/2-1/knight.txt +++ b/npc/jobs/2-1/knight.txt @@ -573,9 +573,9 @@ prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{ next; mes "[Sir Andrew]"; switch(rand(1,2)) { - //Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane + //Elder_Pixies_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boars_Mane case 1: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 2; break; - //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell + //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snails_Shell case 2: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 3; break; } KNIGHT_Q = .@items[12]; @@ -610,9 +610,9 @@ prt_in,75,107,4 script Sir Andrew#knt 1_M_YOUNGKNIGHT,{ mes "Let's check and see..."; next; switch(KNIGHT_Q) { - //Elder_Pixie's_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boar's_Mane + //Elder_Pixies_Beard, Wing_Of_Red_Bat, Orcish_Voucher, Moth_Dust, Reptile_Tongue, Wild_Boars_Mane case 2: setarray .@items[0], 1040,5, 7006,5, 931,5, 1057,5, 903,5, 1028,5, 0; break; - //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snail's_Shell + //Short_Leg, Heart_Of_Mermaid. Blossom_Of_Maneater, Flesh_Of_Clam, Old_Frying_Pan, Snails_Shell case 3: setarray .@items[0], 1042,5, 950,5, 1032,5, 966,5, 7031,5, 946,5, 0; break; } if (countitem(.@items[0]) >= .@items[1] && countitem(.@items[2]) >= .@items[3] && countitem(.@items[4]) >= .@items[5] && countitem(.@items[6]) >= .@items[7] && countitem(.@items[8]) >= .@items[9] && countitem(.@items[10]) >= .@items[11]) { diff --git a/npc/jobs/2-2/alchemist.txt b/npc/jobs/2-2/alchemist.txt index d5edd8bf2..634e0753b 100644 --- a/npc/jobs/2-2/alchemist.txt +++ b/npc/jobs/2-2/alchemist.txt @@ -715,7 +715,7 @@ alde_alche,175,107,3 script Fastidious Alchemist#am 4_M_ALCHE_B,{ getitemname(Buckler), getitemname(Coat), getitemname(Gas_Mask), - getitemname(Big_Sis'_Ribbon), + getitemname(Big_Sis_Ribbon), getitemname(Fillet), getitemname(Sahkkat), getitemname(Glasses)); @@ -1690,7 +1690,7 @@ alde_alche,79,19,5 script Experiment Expert#am 4_M_ALCHE_A,{ "a %s?", getitemname(Mixture)); next; - select(getitemname(Monster's_Feed), + select(getitemname(Monsters_Feed), getitemname(Lip_Of_Ancient_Fish), getitemname(Rotten_Bandage)); mes "[Van Helmont]"; diff --git a/npc/jobs/2-2/monk.txt b/npc/jobs/2-2/monk.txt index 442014649..631da5f7d 100644 --- a/npc/jobs/2-2/monk.txt +++ b/npc/jobs/2-2/monk.txt @@ -594,14 +594,14 @@ monk_in,99,58,1 script Sensei Moohae#mk 1_M_PASTOR,{ mes "[Sensei Moohae]"; mes "Hmm?"; next; - if (countitem(Tooth_Of_Bat) > 9 && countitem(Bear's_Foot) > 4 && countitem(Poison_Spore) > 19) { + if (countitem(Tooth_Of_Bat) > 9 && countitem(Bears_Foot) > 4 && countitem(Poison_Spore) > 19) { mes "[Sensei Moohae]"; mes "Excellent, all the items I asked for."; mes "I will tell this to the elders."; MONK_Q = 10; changequest 3022,3024; delitem Tooth_Of_Bat,10; - delitem Bear's_Foot,5; + delitem Bears_Foot,5; delitem Poison_Spore,20; next; mes "[Sensei Moohae]"; diff --git a/npc/jobs/2-2/rogue.txt b/npc/jobs/2-2/rogue.txt index 5c6fd13cd..311915097 100644 --- a/npc/jobs/2-2/rogue.txt +++ b/npc/jobs/2-2/rogue.txt @@ -674,8 +674,8 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ else if (ROGUE_Q == 5) callsub S_CheckItems,508,10,948,10,935,10,940,10; else if (ROGUE_Q == 6) { if (Zeny > 9999 && countitem(Chrysalis) > 4 && countitem(Empty_Bottle) > 4 && countitem(Iron_Ore) > 4 && - countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animal's_Skin) > 4 && countitem(Yellow_Gemstone) > 4 && - countitem(Tooth_Of_Bat) > 4 && countitem(Scorpion's_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monster's_Feed) > 4 && + countitem(Stone_Heart) > 4 && countitem(Red_Herb) > 4 && countitem(Animals_Skin) > 4 && countitem(Yellow_Gemstone) > 4 && + countitem(Tooth_Of_Bat) > 4 && countitem(Scorpions_Tail) > 4 && countitem(Yoyo_Tail) > 4 && countitem(Monsters_Feed) > 4 && countitem(Fluff) > 4 && countitem(Clover) > 4 && countitem(Feather_Of_Birds) > 4 && countitem(Talon) > 4 && countitem(Spawn) > 4 && countitem(Raccoon_Leaf) > 4) { mes "[Mr. Smith]"; @@ -686,12 +686,12 @@ in_rogue,376,23,1 script Mr. Smith#rg 1_M_LIBRARYMASTER,{ delitem Iron_Ore,5; delitem Stone_Heart,5; delitem Red_Herb,5; - delitem Animal's_Skin,5; + delitem Animals_Skin,5; delitem Yellow_Gemstone,5; delitem Tooth_Of_Bat,5; - delitem Scorpion's_Tail,5; + delitem Scorpions_Tail,5; delitem Yoyo_Tail,5; - delitem Monster's_Feed,5; + delitem Monsters_Feed,5; delitem Fluff,5; delitem Clover,5; delitem Feather_Of_Birds,5; diff --git a/npc/jobs/2-2/sage.txt b/npc/jobs/2-2/sage.txt index 4c5424f9a..cb5492046 100644 --- a/npc/jobs/2-2/sage.txt +++ b/npc/jobs/2-2/sage.txt @@ -1494,9 +1494,9 @@ yuno_in03,62,176,2 script History Professor#sa 4_M_MANAGER,{ } } else if (SAGE_Q == 10) { - if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { + if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { delitem Feather_Of_Birds,1; - delitem Animal's_Skin,1; + delitem Animals_Skin,1; delitem Wooden_Block,1; delitem Chinese_Ink,1; delitem Empty_Bottle,1; @@ -2045,9 +2045,9 @@ yuno_in03,32,102,1 script Biology Professor#sa 4_M_SAGE_C,{ close; } else if (SAGE_Q == 12) { - if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { + if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { delitem Feather_Of_Birds,1; - delitem Animal's_Skin,1; + delitem Animals_Skin,1; delitem Wooden_Block,1; delitem Chinese_Ink,1; delitem Empty_Bottle,1; @@ -2368,9 +2368,9 @@ yuno_in03,244,31,3 script Physics Professor#sa 2_M_PHARMACIST,{ } } else if (SAGE_Q == 14) { - if (countitem(Feather_Of_Birds) > 0 && countitem(Animal's_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { + if (countitem(Feather_Of_Birds) > 0 && countitem(Animals_Skin) > 0 && countitem(Wooden_Block) > 0 && countitem(Chinese_Ink) > 0 && countitem(Empty_Bottle) > 0) { delitem Feather_Of_Birds,1; - delitem Animal's_Skin,1; + delitem Animals_Skin,1; delitem Wooden_Block,1; delitem Chinese_Ink,1; delitem Empty_Bottle,1; diff --git a/npc/kafras/functions_kafras.txt b/npc/kafras/functions_kafras.txt index 379aabfb7..e1e547174 100644 --- a/npc/kafras/functions_kafras.txt +++ b/npc/kafras/functions_kafras.txt @@ -10,6 +10,7 @@ //= http://herc.ws - http://github.com/HerculesWS/Hercules //= //= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) Dastgir //= Copyright (C) Haru //= Copyright (C) rAthena Dev Team //= Copyright (C) Euphy @@ -47,7 +48,7 @@ //= These functions handle save, storage, cart rental, teleport, and Free //= Teleport/Warp/Rent Cart options for all Kafra NPCs. //================= Current Version ======================================= -//= 6.8 +//= 6.9 //========================================================================= //== Main Function ========================================= @@ -80,7 +81,7 @@ function script F_Kafra { break; case 2: // Guild Castle Kafra message - @GID = getcharid(2); + @GID = getcharid(CHAR_ID_GUILD); mes "[Kafra Employee]"; mes "Welcome. ^ff0000" + getguildname(@GID) + "^000000 Member."; mes "The Kafra Coporation will stay with you wherever you go."; @@ -210,7 +211,7 @@ function script F_KafStor { close; } // Unable to access Normal Storage (Insufficient Basic Skills) - if (basicskillcheck() && getskilllv(NV_BASIC) < 6) { + if (basicskillcheck() && getskilllv(NV_BASIC) < 6 && getskilllv(SU_BASIC_SKILL) == 0) { mes getarg(3); // Niflheim Specific Message if (getarg(2) == 1) { diff --git a/npc/mapflag/zone.txt b/npc/mapflag/zone.txt index d3b88c0c7..cb73a32ec 100644 --- a/npc/mapflag/zone.txt +++ b/npc/mapflag/zone.txt @@ -137,3 +137,15 @@ umbala mapflag zone Towns veins mapflag zone Towns xmas mapflag zone Towns yuno mapflag zone Towns + +// WoE SE +arug_cas01 mapflag zone GvG2 +arug_cas02 mapflag zone GvG2 +arug_cas03 mapflag zone GvG2 +arug_cas04 mapflag zone GvG2 +arug_cas05 mapflag zone GvG2 +schg_cas01 mapflag zone GvG2 +schg_cas02 mapflag zone GvG2 +schg_cas03 mapflag zone GvG2 +schg_cas04 mapflag zone GvG2 +schg_cas05 mapflag zone GvG2 diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt index d4b623031..b215bd6d8 100644 --- a/npc/merchants/shops.txt +++ b/npc/merchants/shops.txt @@ -53,7 +53,7 @@ alberta_in,165,96,0 trader Item Collector#alb 1_F_MERCHANT_02,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } alberta_in,180,15,0 trader Armor Dealer#alb 4W_F_01,{ @@ -68,7 +68,7 @@ OnInit: sellitem Manteau; sellitem Glasses; sellitem Sunglasses; - sellitem Diver's_Goggles; + sellitem Divers_Goggles; sellitem Cap; sellitem Cotton_Shirt; sellitem Leather_Jacket; @@ -507,7 +507,7 @@ ein_in01,119,26,4 trader Weapon Dealer#ein 4_M_EINMAN,{ OnInit: sellitem Kindling_Dagger; sellitem Obsidian_Dagger; - sellitem Fisherman's_Dagger; + sellitem Fishermans_Dagger; sellitem Jujube_Dagger; } @@ -707,7 +707,7 @@ OnInit: sellitem Blue_Gemstone; sellitem Sunglasses; sellitem Garlet; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } hu_in01,100,390,3 trader Bow Dealer#hu 4_M_04,{ @@ -1103,7 +1103,7 @@ OnInit: sellitem Scell; sellitem Garlet; sellitem Zargon; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } //== Louyang =============================================== @@ -1216,16 +1216,16 @@ OnInit: moc_ruins,93,53,2 trader Item Collector#moc1 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } moc_ruins,81,113,0 trader Item Collector#moc2 4_M_03,{ OnInit: sellitem Scell; - sellitem Monster's_Feed; - sellitem Animal's_Skin; + sellitem Monsters_Feed; + sellitem Animals_Skin; sellitem Bill_Of_Birds; } @@ -1408,7 +1408,7 @@ OnInit: sellitem Pumpkin; sellitem Pumpkin_Head; sellitem Tree_Root; - sellitem Goat's_Horn; + sellitem Goats_Horn; sellitem Pet_Food; sellitem Poison_Powder; sellitem Single_Cell; @@ -1480,7 +1480,7 @@ OnInit: prontera,64,125,0 trader Butcher#prt 4_M_BARBER,{ OnInit: sellitem Meat; - sellitem Monster's_Feed; + sellitem Monsters_Feed; } prontera,58,182,0 trader Flower Girl#prt 4W_KID,{ @@ -1701,7 +1701,7 @@ OnInit: sellitem Sweet_Potato; sellitem Banana; sellitem Meat; - sellitem Monster's_Feed; + sellitem Monsters_Feed; sellitem Pet_Food; sellitem Wing_Of_Fly; sellitem Wing_Of_Butterfly; diff --git a/npc/other/CashShop_Functions.txt b/npc/other/CashShop_Functions.txt index 3197b3838..629e91b8a 100644 --- a/npc/other/CashShop_Functions.txt +++ b/npc/other/CashShop_Functions.txt @@ -57,9 +57,9 @@ function script F_CashStore { // - No arguments. function script F_CashPartyCall { warp "Random",0,0; - if (getpartyleader(getcharid(1),2) == getcharid(0)) { + if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { getmapxy(.@mapl$, .@xl, .@yl, UNITTYPE_PC); - warpparty .@mapl$, .@xl, .@yl, getcharid(1), .@mapl$; + warpparty .@mapl$, .@xl, .@yl, getcharid(CHAR_ID_PARTY), .@mapl$; } return; } @@ -285,7 +285,7 @@ function script F_Snowball { case 2: mes "Blessings."; mes "Holy night~"; - unitskilluseid getcharid(3),"SM_ENDURE",10; + unitskilluseid getcharid(CHAR_ID_ACCOUNT),"SM_ENDURE",10; close2; cutin "",255; break; diff --git a/npc/other/arena/arena_party.txt b/npc/other/arena/arena_party.txt index ad341e8a9..d7865d441 100644 --- a/npc/other/arena/arena_party.txt +++ b/npc/other/arena/arena_party.txt @@ -1025,7 +1025,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ mes "[Staff]"; mes "^3131FF"+$arena_pttopn$+"^000000's running time was ^3131FF"+$top_ptmin+"^000000minutes ^3131FF"+$top_ptsec+"^000000seconds."; next; - .arn_party = getcharid(1); + .arn_party = getcharid(CHAR_ID_PARTY); if (@gappt < 0) { mes "[Staff]"; mes "Although you failed to make a new record, I hope you will succeed next time."; @@ -1053,7 +1053,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ mes "See you later~"; close2; } - if(getpartyleader(.arn_party,2) == getcharid(0)) { + if(getpartyleader(.arn_party,2) == getcharid(CHAR_ID_CHAR)) { donpcevent "#arn_timer_pt::OnStop"; donpcevent "alloff#pt::OnEnable"; donpcevent "Ponox::OnStart"; @@ -1068,7 +1068,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ mes "Wow! You have renewed the record!"; mes "What a great job!"; next; - if(getpartyleader(.arn_party,2) == getcharid(0)) { + if(getpartyleader(.arn_party,2) == getcharid(CHAR_ID_CHAR)) { mes "[Staff]"; mes "You can record you and your party members on ^FF0000the hall of Arena Time Force Battle party ^000000."; mes "When you enter a name, the name will be remained on the top unless someone make a new record."; @@ -1131,7 +1131,7 @@ prt_are_in,77,135,3 script Staff#party-2 1_F_02,{ mes "See you later~"; close2; } - if(getpartyleader(.arn_party,2) == getcharid(0)) { + if(getpartyleader(.arn_party,2) == getcharid(CHAR_ID_CHAR)) { donpcevent "#arn_timer_pt::OnStop"; donpcevent "alloff#pt::OnEnable"; donpcevent "Ponox::OnStart"; diff --git a/npc/other/divorce.txt b/npc/other/divorce.txt index dd4bad6b6..e3d6f5ee7 100644 --- a/npc/other/divorce.txt +++ b/npc/other/divorce.txt @@ -211,7 +211,8 @@ nif_in,190,112,5 script Deviruchi#divorce 4_DEVIRUCHI,{ specialeffect2 EF_DEVIL; wedding_sign = 0; Zeny -= 2500000; - percentheal -100,-100; + Sp = 0; + Hp = 1; divorce; mes "[Deviruchi]"; mes "Bwahhahahaha~!"; diff --git a/npc/other/marriage.txt b/npc/other/marriage.txt index ea43b347f..bbd659420 100644 --- a/npc/other/marriage.txt +++ b/npc/other/marriage.txt @@ -577,7 +577,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ if (!getpartnerid()) { if (!$@wedding) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { if (Sex == SEX_MALE) { @@ -648,7 +648,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ } else if ($@wedding == 1) { if (wedding_sign == 1) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount == 2) { if (Sex == SEX_FEMALE) { @@ -689,7 +689,7 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ mes "Will you marry "+$@wed_groom$+"?"; next; if (select("Yes, I do.", "^FF0000No.^000000") == 1) { - if (isloggedin(getcharid(3,$@wed_groom$))) { + if (isloggedin(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$))) { if (marriage($@wed_groom$)) { //Call Wedding effect wedding; @@ -697,12 +697,12 @@ prt_church,100,128,4 script Bishop#w 1_M_PASTOR,{ sc_start SC_WEDDING,3600000,1; getitem Bride_Ring,1; //Give ring to Groom, and change to wedding sprite. - attachrid(getcharid(3,$@wed_groom$)); + attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_groom$)); sc_start SC_WEDDING,3600000,1; getitem Bridegroom_Ring,1; detachrid; //Switch Script progression back to Bride - attachrid(getcharid(3,$@wed_bride$)); + attachrid(getcharid(CHAR_ID_ACCOUNT,$@wed_bride$)); cutin "wedding_bomars02",2; mapannounce "prt_church","I now pronounce you, "+$@wed_groom$+" and "+$@wed_bride$+", husband and wife.",bc_map; mes "[Vomars]"; diff --git a/npc/other/poring_war.txt b/npc/other/poring_war.txt index 7d58569ef..b3e0eb15a 100644 --- a/npc/other/poring_war.txt +++ b/npc/other/poring_war.txt @@ -644,8 +644,8 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{ close; } .@a_tname$ = getpartyname($@wop_team_a); - .@pname$ = getpartyname(getcharid(1)); - if ($@wop_team_a != 0 && $@wop_team_a == getcharid(1)) { + .@pname$ = getpartyname(getcharid(CHAR_ID_PARTY)); + if ($@wop_team_a != 0 && $@wop_team_a == getcharid(CHAR_ID_PARTY)) { mes "[Mr. Doppel]"; mes "So, everyone joined the party?"; mes "The name of the party is... " + .@pname$ + ", right?"; @@ -662,7 +662,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{ mes "If you don't get there in time, you won't make it to the battle."; close; case 2: - if ((getpartyleader(getcharid(1),2) == getcharid(0))) { + if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) { mes "[Mr. Doppel]"; mes "So, you are the leader. Before going to the battlefield, you should check all your members."; next; @@ -694,7 +694,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{ } } else { - if ((getpartyleader(getcharid(1),2) == getcharid(0))) { + if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) { if ($@wop_team_a == 0) { mes "[Mr. Doppel]"; mes "So, you are the party leader of Angeling Team."; @@ -719,7 +719,7 @@ poring_w02,26,181,3 script Mr. Doppel#wop_team_a 8_DOPPEL,{ mes "So, I'll register your party name as - " +.@pname$ + " -."; mes "Now, Tell your ^4d4dffmembers to confirm your party^000000."; mes "I'll send you to the battlefield as soon as I confirm your party."; - $@wop_team_a = getcharid(1); + $@wop_team_a = getcharid(CHAR_ID_PARTY); mapannounce "poring_w02","The registration of the Angeling Team has been confirmed. The party members must confirm their team with Mr. Doppel.",0,0x33FF66; close; case 3: @@ -775,8 +775,8 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{ close; } .@d_tname$ = getpartyname($@wop_team_d); - .@pname$ = getpartyname(getcharid(1)); - if ($@wop_team_d != 0 && $@wop_team_d == getcharid(1)) { + .@pname$ = getpartyname(getcharid(CHAR_ID_PARTY)); + if ($@wop_team_d != 0 && $@wop_team_d == getcharid(CHAR_ID_PARTY)) { mes "[Mr. Doppel]"; mes "So, everyone joined the party?"; mes "The name of the party is... " + .@pname$ + ", right?"; @@ -793,7 +793,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{ mes "If you don't get there in time, you won't make it to the battle."; close; case 2: - if ((getpartyleader(getcharid(1),2) == getcharid(0))) { + if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) { mes "[Mr. Doppel]"; mes "So, you are the leader. Before going to the battlefield, you should check all your members."; next; @@ -823,7 +823,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{ } } } else { - if ((getpartyleader(getcharid(1),2) == getcharid(0))) { + if ((getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR))) { if ($@wop_team_d == 0) { mes "[Mr. Doppel]"; mes "So, you are the party leader of Deviling Team."; @@ -848,7 +848,7 @@ poring_w02,170,181,3 script Mr. Doppel#wop_team_d 8_DOPPEL,{ mes "So, I'll register your party name as - " + .@pname$ + " -."; mes "Now, Tell your ^4d4dffmembers to confirm your party^000000."; mes "I'll send you to the battlefield as soon as I confirm your party."; - $@wop_team_d = getcharid(1); + $@wop_team_d = getcharid(CHAR_ID_PARTY); mapannounce "poring_w02","The registration of the Deviling Team has been confirmed. The party members must confirm their team with Mr. Doppel.",0,0x33FF66; close; case 3: @@ -1238,7 +1238,7 @@ poring_w02,99,201,3 script Deviruchi#wop_endmaster 4_DEVIRUCHI,{ } .@a_point = $@wop_deadcount_a; .@d_point = $@wop_deadcount_d; - if (getcharid(1) == $@wop_team_a) { + if (getcharid(CHAR_ID_PARTY) == $@wop_team_a) { if (.@a_point < .@d_point) { mes "[Devi]"; mes "Good work!"; @@ -1319,7 +1319,7 @@ poring_w02,99,201,3 script Deviruchi#wop_endmaster 4_DEVIRUCHI,{ } } } - else if (getcharid(1) == $@wop_team_d) { + else if (getcharid(CHAR_ID_PARTY) == $@wop_team_d) { if (.@a_point > .@d_point) { mes "[Devi]"; mes "Good work!"; diff --git a/npc/pre-re/jobs/1-1e/taekwon.txt b/npc/pre-re/jobs/1-1e/taekwon.txt index 3e9814dee..e97cb204d 100644 --- a/npc/pre-re/jobs/1-1e/taekwon.txt +++ b/npc/pre-re/jobs/1-1e/taekwon.txt @@ -28,7 +28,7 @@ //================= Description =========================================== //= Official TaeKwon Job Change Quest //================= Current Version ======================================= -//= 1.0 +//= 1.0.1 //========================================================================= -payon,157,141,5 duplicate(Pheonix) Phoenix#TKJobChangePRE 4_M_MONK +payon,157,141,5 duplicate(TKJobChange) Phoenix#TKJobChangePRE 4_M_MONK diff --git a/npc/pre-re/quests/collection/quest_goat.txt b/npc/pre-re/quests/collection/quest_goat.txt index 9f2b7525e..e09fd90c0 100644 --- a/npc/pre-re/quests/collection/quest_goat.txt +++ b/npc/pre-re/quests/collection/quest_goat.txt @@ -188,11 +188,11 @@ ein_fild06,82,171,0 script Vegetable Farmer#Goat 4_F_SHABBY,{ close; } */ - if (countitem(Goat's_Horn) > 49) { + if (countitem(Goats_Horn) > 49) { mes "[Vegetable Farmer]"; mes "Amazing, you did that with speed."; mes "I am truly grateful."; - delitem Goat's_Horn,50; + delitem Goats_Horn,50; getexp 258489,155155; //getitem White_Potion,10; close; diff --git a/npc/pre-re/scripts_jobs.conf b/npc/pre-re/scripts_jobs.conf index 139f9de48..14dc97eee 100644 --- a/npc/pre-re/scripts_jobs.conf +++ b/npc/pre-re/scripts_jobs.conf @@ -36,6 +36,8 @@ "npc/pre-re/jobs/1-1/merchant.txt", "npc/pre-re/jobs/1-1/swordman.txt", "npc/pre-re/jobs/1-1/thief.txt", +// - 1-1 Expanded +"npc/pre-re/jobs/1-1e/taekwon.txt", // - Novice "npc/pre-re/jobs/novice/novice.txt", diff --git a/npc/quests/cooking_quest.txt b/npc/quests/cooking_quest.txt index 83e7e2ea4..3b97f60ee 100644 --- a/npc/quests/cooking_quest.txt +++ b/npc/quests/cooking_quest.txt @@ -429,7 +429,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ goto L_End; } else if (cooking_q == 1) { - if (countitem(Grasshopper's_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) { + if (countitem(Grasshoppers_Leg) > 4 && countitem(Old_Frying_Pan) > 0 && countitem(Cooking_Oil) > 0) { cutin "orleans_4",0; emotion e_an; mes "[Charles Orleans]"; @@ -462,7 +462,7 @@ prt_castle,43,30,3 script Charles Orleans#cook 4_M_OILMAN,{ mes "know this recipe now. That's"; mes "all for today, so please go"; mes "and practice on your own now."; - delitem Grasshopper's_Leg,5; + delitem Grasshoppers_Leg,5; delitem Old_Frying_Pan,1; delitem Cooking_Oil,1; cooking_q = 7; diff --git a/npc/quests/doomed_swords.txt b/npc/quests/doomed_swords.txt index 63fdccf16..7b0911f37 100644 --- a/npc/quests/doomed_swords.txt +++ b/npc/quests/doomed_swords.txt @@ -723,7 +723,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "Mysteltainn twig used to kill Baldur. Hurry and bring it..."; close; } - if (countitem(Loki's_Whispers) < 1) { + if (countitem(Lokis_Whispers) < 1) { mes "[Mysterious Blacksmith]"; mes "Hm. You forgot to bring"; mes "^0099FF1 Loki's Whispers^000000. We need"; @@ -732,7 +732,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "find that as quickly as you can! "; close; } - if (countitem(Mother's_Nightmare) < 1) { + if (countitem(Mothers_Nightmare) < 1) { mes "[Mysterious Blacksmith]"; mes "Hm, you still need to"; mes "bring ^0099FF1 Mother's Nightmare^000000"; @@ -758,7 +758,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "of wielding it. Bring ^0099FF1 Emperium^000000 and I will recognize your worth."; close; } - if (countitem(Young_Twig) > 0 && countitem(Loki's_Whispers) > 0 && countitem(Mother's_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) { + if (countitem(Young_Twig) > 0 && countitem(Lokis_Whispers) > 0 && countitem(Mothers_Nightmare) > 0 && countitem(Foolishness_Of_Blind) > 0 && countitem(Emperium) > 0) { mes "[Mysterious Blacksmith]"; mes "Well done, adventurer."; mes "All seems to be in readiness."; @@ -773,8 +773,8 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "quickly! I d-don't want"; mes "to touch it if I can avoid it."; delitem Young_Twig,1; - delitem Loki's_Whispers,1; - delitem Mother's_Nightmare,1; + delitem Lokis_Whispers,1; + delitem Mothers_Nightmare,1; delitem Foolishness_Of_Blind,1; delitem Emperium,1; getitem Mysteltainn_,1; @@ -1058,7 +1058,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "prepared to wield that blade"; mes "with your own two hands..."; next; - if (countitem(Executioner's_Mitten) < 2) { + if (countitem(Executioners_Mitten) < 2) { mes "[Mysterious Blacksmith]"; mes "Hm. In order for me"; mes "to forge the Executioner,"; @@ -1105,7 +1105,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "if you bring ^0099FF1 Emperium^000000."; close; } - if (countitem(Executioner's_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) { + if (countitem(Executioners_Mitten) > 1 && countitem(Bloody_Edge) > 9 && countitem(Frozen_Heart) > 2 && countitem(Amulet) > 49 && countitem(Emperium) > 0) { mes "[Mysterious Blacksmith]"; mes "Great, I see that you've"; mes "prepared everything that"; @@ -1120,7 +1120,7 @@ pay_fild08,218,283,2 script Mysterious Man#magum 4_M_ORIENT02,{ mes "terrifying sword. Now"; mes "take it! Be wary, and don't"; mes "let its bloodlust consume you!"; - delitem Executioner's_Mitten,2; + delitem Executioners_Mitten,2; delitem Bloody_Edge,10; delitem Frozen_Heart,3; delitem Amulet,50; diff --git a/npc/quests/doomed_swords_quest.txt b/npc/quests/doomed_swords_quest.txt index 6b10b67fc..2f8ac43c1 100644 --- a/npc/quests/doomed_swords_quest.txt +++ b/npc/quests/doomed_swords_quest.txt @@ -896,7 +896,7 @@ morocc,248,159,4 script Young Man#magum1 4_M_04,{ close; } else if (dmdswrd_Q == 40) { - if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Loki's_Whispers) == 1) { + if (countitem(Bloody_Edge) == 9 && countitem(Blade_Lost_In_Darkness) == 6 && countitem(Cardinal_Jewel) == 9 && countitem(Lokis_Whispers) == 1) { mes "[Huey]"; mes "Oh, you're back. Did"; mes "you bring everything"; @@ -914,7 +914,7 @@ morocc,248,159,4 script Young Man#magum1 4_M_04,{ delitem Bloody_Edge,9; delitem Blade_Lost_In_Darkness,6; delitem Cardinal_Jewel,9; - delitem Loki's_Whispers,1; + delitem Lokis_Whispers,1; dmdswrd_Q = 41; close; } diff --git a/npc/quests/eye_of_hellion.txt b/npc/quests/eye_of_hellion.txt index 15a61bf2b..f785023fe 100644 --- a/npc/quests/eye_of_hellion.txt +++ b/npc/quests/eye_of_hellion.txt @@ -395,7 +395,7 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 4_M_JOB_WIZARD,3,3,{ mes "you now before you are"; mes "consumed by its darkness!"; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } else if (HELLIONQ > 57 && HELLIONQ < 66) { @@ -434,8 +434,8 @@ morocc_in,116,101,3 script Old Scholar Tyus#hellion 4_M_JOB_WIZARD,3,3,{ mes "for yourself?! I must smite"; mes "you now before you are"; mes "consumed by its darkness!"; - close; - percentheal -100,0; + close2; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } else if (HELLIONQ == 67) { @@ -1853,7 +1853,7 @@ pay_arche,142,28,0 script Buddha Statue#paypuzz6 HIDDEN_NPC,5,5,{ mes "to your answer. However..."; mes "You have chosen poorly."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; case 2: mes "[Echoing Voice]"; @@ -1863,7 +1863,7 @@ pay_arche,142,28,0 script Buddha Statue#paypuzz6 HIDDEN_NPC,5,5,{ mes "where is the respect for your"; mes "own life? If you are that willing to throw it away, you are no hero."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; case 3: mes "[Echoing Voice]"; @@ -1889,7 +1889,7 @@ pay_arche,142,28,0 script Buddha Statue#paypuzz6 HIDDEN_NPC,5,5,{ mes "your own cowardice. You have"; mes "chosen extremely poorly..."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } } diff --git a/npc/quests/first_class/tu_archer.txt b/npc/quests/first_class/tu_archer.txt index 89af304ef..479e71e67 100644 --- a/npc/quests/first_class/tu_archer.txt +++ b/npc/quests/first_class/tu_archer.txt @@ -938,7 +938,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ tu_archer01 = 11; close; } else if(tu_archer01 == 11){ - if (RENEWAL && countitem(Grasshopper's_Leg) < 10) { + if (RENEWAL && countitem(Grasshoppers_Leg) < 10) { mes "Hey..."; mes "You gotta bring"; mes "^3131FF10 Grasshopper's Leg^000000 to pass my midterm! Go back to the southwest area of Prontera and get them!"; @@ -965,7 +965,7 @@ pay_arche,103,165,5 script Reidin Corse#tu 4_M_REIDIN_KURS,{ specialeffect2 EF_WIND; tu_archer01 = 12; if (RENEWAL) - delitem Grasshopper's_Leg,10; + delitem Grasshoppers_Leg,10; getexp 1000,1000; getitem Great_Bow,1; close; diff --git a/npc/quests/guildrelay.txt b/npc/quests/guildrelay.txt index 55717e9ce..87c72ef16 100644 --- a/npc/quests/guildrelay.txt +++ b/npc/quests/guildrelay.txt @@ -85,7 +85,7 @@ mes "head on your way.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (guildrelay_q == 100) { if (guildtime > 22) { @@ -619,7 +619,7 @@ getitem Old_Violet_Box,1; } else if ((.@incen_item > 90) && (.@incen_item < 101)) { - getitem Ear_Of_Angel's_Wing,1; + getitem Ear_Of_Angels_Wing,1; } next; mes "[" + .@name$ + "]"; @@ -1197,7 +1197,7 @@ } } else { - if (getcharid(2) == 0) { + if (getcharid(CHAR_ID_GUILD) == 0) { mes "[" + .@name$ + "]"; mes "You haven't joined"; mes "a guild yet? Why don't"; @@ -1264,7 +1264,7 @@ mes "head on your way.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (countitem(Soul_Of_Guild) > 0) { mes "[" + .@name$ + "]"; @@ -1330,7 +1330,7 @@ close; } } - if ((countitem(Thin_N'_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) { + if ((countitem(Thin_N_Long_Tongue) > 29) && (countitem(Shoulder_Protection) > 29) && (countitem(Black_Mask) > 29) && (guildrelay_q == 2)) { mes "[" + .@name$ + "]"; mes "Huh. I didn't actually"; mes "expect that you'd collect"; @@ -1338,7 +1338,7 @@ mes "Now, take this and give it to"; mes "a Blacksmith or Mastersmith."; mes "Your guild's pretty good..."; - delitem Thin_N'_Long_Tongue,30; + delitem Thin_N_Long_Tongue,30; delitem Shoulder_Protection,30; delitem Black_Mask,30; guildrelay_q = 88; @@ -1380,7 +1380,7 @@ mes "Don't forget this time."; close; } - if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixie's_Beard) > 29) && (guildrelay_q == 89)) { + if ((countitem(Fright_Paper_Blade) > 29) && (countitem(Lizard_Scruff) > 29) && (countitem(Elder_Pixies_Beard) > 29) && (guildrelay_q == 89)) { mes "[" + .@name$ + "]"; mes "Huh. I didn't actually"; mes "expect that you'd collect"; @@ -1390,7 +1390,7 @@ mes "Your guild's pretty good..."; delitem Fright_Paper_Blade,30; delitem Lizard_Scruff,30; - delitem Elder_Pixie's_Beard,30; + delitem Elder_Pixies_Beard,30; guildrelay_q = 88; getitem Soul_Of_Courage,1; close; @@ -1768,7 +1768,7 @@ mes "there's no reason to be here.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (countitem(Soul_Of_Confidence) > 0) { mes "[" + .@name$ + "]"; @@ -2019,7 +2019,7 @@ getitem Soul_Of_Harmony,1; close; } - else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toad's_Skin) > 29) && (guildrelay_q == 11)) { + else if ((countitem(Heart_Of_Tree) > 29) && (countitem(Soft_Leaf) > 29) && (countitem(Poison_Toads_Skin) > 29) && (guildrelay_q == 11)) { mes "[" + .@name$ + "]"; mes "Oh, perfect! You brought"; mes "all the items. Well then,"; @@ -2029,7 +2029,7 @@ mes "^42426FAssassin Cross^000000. Thank you."; delitem Heart_Of_Tree,30; delitem Soft_Leaf,30; - delitem Poison_Toad's_Skin,30; + delitem Poison_Toads_Skin,30; if (BaseJob == Job_Dancer) { guildrelay_q = 72; } @@ -2039,7 +2039,7 @@ getitem Soul_Of_Harmony,1; close; } - else if ((countitem(Goat's_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) { + else if ((countitem(Goats_Horn) > 29) && (countitem(Honey_Jar) > 29) && (countitem(Porcupine_Spike) > 29) && (guildrelay_q == 80)) { mes "[" + .@name$ + "]"; mes "Oh, perfect! You brought"; mes "all the items. Well then,"; @@ -2047,7 +2047,7 @@ mes "take this spirit now. Please"; mes "give it to an ^42426FAssassin^000000 or an"; mes "^42426FAssassin Cross^000000. Thank you."; - delitem Goat's_Horn,30; + delitem Goats_Horn,30; delitem Honey_Jar,30; delitem Porcupine_Spike,30; if (BaseJob == Job_Dancer) { @@ -2452,7 +2452,7 @@ mes "there's no reason to be here.^000000"; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (countitem(Soul_Of_Peace) > 0) { mes "[" + .@name$ + "]"; @@ -2527,9 +2527,9 @@ close; } } - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; - .@partyleader = getpartyleader(getcharid(1),2); + .@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2); if (guildrelay_q == 91) { if (.@partymembercount == 6) { mes "[" + .@name$ + "]"; diff --git a/npc/quests/kiel_hyre_quest.txt b/npc/quests/kiel_hyre_quest.txt index 9468bbe38..3a21bbfa0 100644 --- a/npc/quests/kiel_hyre_quest.txt +++ b/npc/quests/kiel_hyre_quest.txt @@ -302,7 +302,6 @@ yuno_in01,35,179,4 script Pub Master#kh 1_ETC_01,5,5,{ close; } -//OnTouch2: OnTouch: if (KielHyreQuest < 1) { mes "[Vandt]"; @@ -1987,7 +1986,6 @@ kh_vila,175,19,0 duplicate(BookKHQ1) Book#kh4 HIDDEN_NPC //- Store room interior; Letter to Elly on the floor. - kh_vila,179,11,0 script Letter#kh FAKE_NPC,1,1,{ -//OnTouch2: OnTouch: if (KielHyreQuest == 18) { if (checkweight(Kyll_Hire_Letter,1) == 0) { @@ -2369,7 +2367,6 @@ kh_vila,39,41,0 script Pool#khp1 HIDDEN_NPC,{ //- Cottage interior, upstairs; Vicious Dog - kh_vila,181,178,4 script Vicious Dog#khp1 4_DOG01,7,3,{ -//OnTouch2: OnTouch: mes "*Grrr~*"; next; @@ -3456,7 +3453,6 @@ kh_dun01,162,206,0 duplicate(KHKeyardReader) Mechanical Device HIDDEN_NPC //- Kiel Hyre - OnTouch - kh_dun01,224,233,0 script Factory B Area Door FAKE_NPC,5,5,{ -//OnTouch2: OnTouch: if (KielHyreQuest == 40) { if (checkweight(Steel_Piece,1) == 0) { @@ -4612,7 +4608,6 @@ kh_mansion,18,30,4 script Allysia 4_F_KHELLISIA,{ //- Abduction triggering NPC - lighthalzen,188,200,0 script Abduction_trigger FAKE_NPC,3,1,{ -//OnTouch2: OnTouch: if (KielHyreQuest == 50) { mes "^3355FFAs you walked out of"; @@ -4630,7 +4625,6 @@ OnTouch: //- Mysterious Woman "Mitchell Layla" - kh_mansion,25,79,4 script Mysterious Woman#kh 4_F_JOB_HUNTER,3,3,{ -//OnTouch2: OnTouch: if (KielHyreQuest == 50) { mes "^3355FFYou awaken with your"; diff --git a/npc/quests/lvl4_weapon_quest.txt b/npc/quests/lvl4_weapon_quest.txt index bbc75cd19..977071343 100644 --- a/npc/quests/lvl4_weapon_quest.txt +++ b/npc/quests/lvl4_weapon_quest.txt @@ -1778,7 +1778,7 @@ niflheim,240,193,3 script Kayron#lv4 4_M_NFDEADMAN2,{ } else { mes "this... Longinus's Spear!"; - getitem Longinus's_Spear,1; + getitem Longinuss_Spear,1; } lv4_weapon = 0; next; diff --git a/npc/quests/monstertamers.txt b/npc/quests/monstertamers.txt index 503fc23bd..8e55e54a3 100644 --- a/npc/quests/monstertamers.txt +++ b/npc/quests/monstertamers.txt @@ -593,7 +593,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ mes "Its name?"; mes "^3355FFOrc Trophy^000000!"; next; - if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpion's_Tail) > 0)) { + if ((countitem(Patriotism_Marks) > 0) && (countitem(Scorpions_Tail) > 0)) { mes "[Shogo]"; mes "Oh! You have all the items necessary to make an Orc Trophy! Good, good! With all my pride as a monster tamer, let me make one for you right away!"; next; @@ -610,7 +610,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ mes "the cute monster"; mes "you are raising..."; mes "Orc Trophy!"; - delitem Scorpion's_Tail,1; + delitem Scorpions_Tail,1; delitem Patriotism_Marks,1; getitem Horror_Of_Tribe,1; // Horror_Of_Tribe close; @@ -641,7 +641,7 @@ aldeba_in,168,175,4 script Monster Tamer#alde 4_M_TELEPORTER,{ } comodo,112,182,0 script Munak's Grandma 8_F_GRANDMOTHER,{ - if (countitem(Girl's_Diary) > 0) { + if (countitem(Girls_Diary) > 0) { mes "[Munak's grandma]"; mes "Oh my..."; mes "Have you seen my granddaughter,"; diff --git a/npc/quests/newgears/2004_headgears.txt b/npc/quests/newgears/2004_headgears.txt index 6a8a295bf..722509fbc 100644 --- a/npc/quests/newgears/2004_headgears.txt +++ b/npc/quests/newgears/2004_headgears.txt @@ -414,7 +414,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{ mes "- you put some items into Kafra Storage. -"; close; } - if (countitem(Big_Sis'_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) { + if (countitem(Big_Sis_Ribbon) > 0 && countitem(Ribbon_) > 0 && countitem(Silk_Ribbon) > 0) { mes "[Nephia]"; mes "Oh..."; mes "You've brought all these ribbons! I can't wait to tie you a new ribbon to put on your ^FF66CCbeautiful hair!^000000"; @@ -430,7 +430,7 @@ prontera,165,232,3 script Nephia#1 4_F_ALCHE,{ next; mes "[Nephia]"; mes "That's it~! We're done! Oh, I just know you're going to look precious wearing this."; - delitem Big_Sis'_Ribbon,1; + delitem Big_Sis_Ribbon,1; delitem Ribbon_,1; delitem Silk_Ribbon,1; getitem Red_Tailed_Ribbon,1; @@ -719,7 +719,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Angelic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Angel's_Wing,1; + getitem Ear_Of_Angels_Wing,1; next; mes "[Hatbyr Mhore]"; mes "There's no doubt that you'll be the talk of the town sporting these fashionable things."; @@ -774,7 +774,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Satanic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Devil's_Wing,1; + getitem Ear_Of_Devils_Wing,1; next; mes "[Hatbyr Mhore]"; mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!"; @@ -844,7 +844,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Satanic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Devil's_Wing,1; + getitem Ear_Of_Devils_Wing,1; next; mes "[Hatbyr Mhore]"; mes "You'll be wowing everyone on the streets with your fashionable new look that says 'It feels so good to be so bad.' Glad to be of service~!"; @@ -898,7 +898,7 @@ yuno,241,52,3 script Old Blacksmith#hgear 2_M_OLDBLSMITH,{ delitem Angelic_Chain,1; delitem Elven_Ears,1; Zeny -= 20000; - getitem Ear_Of_Angel's_Wing,1; + getitem Ear_Of_Angels_Wing,1; next; mes "[Hatbyr Mhore]"; mes "There's no doubt that you'll be the talk of the town sporting these fashionable things."; @@ -1094,7 +1094,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{ mes "- you put some items into Kafra Storage. -"; close; } - if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99 && countitem(Spool) > 99 && countitem(Black_Bear's_Skin) > 299) { + if (countitem(Panda_Cap) > 0 && countitem(Needle_Pouch) > 99 && countitem(Spool) > 99 && countitem(Black_Bears_Skin) > 299) { if ((MaxWeight-Weight) < 2000) { mes "[Fuzzy Fuzz]"; mes "You brought every material I need, but unfortunately you don't have enough space in your inventory. Try and place some of your items into Kafra Storage first."; @@ -1120,7 +1120,7 @@ xmas,175,156,3 script Fuzzy Fuzz#1 4_M_05,{ delitem Panda_Cap,1; delitem Needle_Pouch,100; delitem Spool,100; - delitem Black_Bear's_Skin,300; + delitem Black_Bears_Skin,300; getitem Brown_Bear_Cap,1; close; } @@ -1471,7 +1471,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{ next; switch(select("Party Hat", "Straw Hat", "Cowboy Hat", "Sombrero", "Beanie")) { case 1: - if (countitem(Santa's_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) { + if (countitem(Santas_Hat) > 0 && countitem(Oil_Paper) > 99 && countitem(Smooth_Paper) > 99) { mes "[Mad Hatter]"; mes "Party Hat! It's a Santa Hat I've remade by adding colorful paper for a festive look. Celebrate good times with a Party Hat! Come on!"; next; @@ -1494,7 +1494,7 @@ xmas_in,35,30,3 script Hat Merchant#zero 4_M_NFLOSTMAN,{ mes "^3355FF*Squick Squick Grind Grind*^000000"; mes "^3355FF*Swish Swish Rustle Rustle*^000000"; next; - delitem Santa's_Hat,1; + delitem Santas_Hat,1; delitem Oil_Paper,100; delitem Smooth_Paper,100; mes "[Mad Hatter]"; @@ -1809,7 +1809,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ mes "[Nehris]"; mes "This crown is inspired by the the one worn by the 'Isis' monster. It has a elegant look fitting for ancient royalty."; next; - if (countitem(Queen's_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) { + if (countitem(Queens_Hair_Ornament) > 0 && countitem(Emperium) > 0 && countitem(Gold) > 2 && Zeny > 19999) { mes "[Nehris]"; mes "Thank you for"; mes "bringing everything."; @@ -1817,7 +1817,7 @@ yuno_in03,20,18,6 script Nehris#1 4_F_JOB_BLACKSMITH,{ next; mes "^3355FF* Clang Clang! Scrape Scrape! Jingle Jingle! *^000000"; next; - delitem Queen's_Hair_Ornament,1; + delitem Queens_Hair_Ornament,1; delitem Emperium,1; delitem Gold,3; Zeny -= 20000; diff --git a/npc/quests/newgears/2005_headgears.txt b/npc/quests/newgears/2005_headgears.txt index 8efebb27a..80cea9f6a 100644 --- a/npc/quests/newgears/2005_headgears.txt +++ b/npc/quests/newgears/2005_headgears.txt @@ -1650,7 +1650,7 @@ gl_prison1,97,104,1 script Phendark#LhzHat PHENDARK,{ countitem(Tail_) || countitem(Whip) || countitem(Whip_) || countitem(Lariat) || countitem(Rapture_Rose) || countitem(Chemeti) || countitem(Whip_Of_Red_Flame) || countitem(Whip_Of_Ice_Piece) || countitem(Whip_Of_Earth) || - countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queen's_Whip) || + countitem(Jump_Rope) || countitem(Bladed_Whip) || countitem(Queens_Whip) || countitem(Electric_Wire) )) close; // no whip equipped or in inventory diff --git a/npc/quests/newgears/2006_headgears.txt b/npc/quests/newgears/2006_headgears.txt index 9daf0f24c..0a90d3a0b 100644 --- a/npc/quests/newgears/2006_headgears.txt +++ b/npc/quests/newgears/2006_headgears.txt @@ -577,8 +577,8 @@ hugel,147,103,3 script Ghenirhemin 4_M_HUGRANFA,{ //== Hahoe Mask / Mythical Lion Mask / Bride Mask ========== payon,135,320,3 script Chungwolmang 4W_M_01,{ if (moza_tal == 2) { - if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boar's_Mane) > 99) { - //Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boar's_Mane + if (countitem(Bookclip_In_Memory) > 19 && countitem(Cactus_Needle) > 99 && countitem(Wild_Boars_Mane) > 99) { + //Hahoe_Mask: Bookclip_In_Memory, Cactus_Needle, Wild_Boars_Mane callsub S_MakeMask,5176,7015,20,952,100,1028,100,0,0; } if (countitem(Slender_Snake) > 499 && countitem(Tooth_Of_Ancient_Fish) > 1 && countitem(Orange_Dyestuffs) > 0) { diff --git a/npc/quests/newgears/2010_headgears.txt b/npc/quests/newgears/2010_headgears.txt index ec856c37f..7fb5178b8 100644 --- a/npc/quests/newgears/2010_headgears.txt +++ b/npc/quests/newgears/2010_headgears.txt @@ -368,8 +368,8 @@ comodo,236,164,0 script Hat Girl#Hair_Brush 1_F_04,{ //== 4. Making the new headgear Statue Of Baby Angel(5443) = alberta,151,78,0 script Bebete#Baby_Angel_Status 4W_KID,{ - // Check if wearing Ear_Of_Angel's_Wing, Angelic_Chain, Flying_Angel - if (!isequipped(Ear_Of_Angel's_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) { + // Check if wearing Ear_Of_Angels_Wing, Angelic_Chain, Flying_Angel + if (!isequipped(Ear_Of_Angels_Wing) && !isequipped(Angelic_Chain) && !isequipped(Flying_Angel)) { mes "[Bebete]"; mes "A fake angel? Go away!!"; next; diff --git a/npc/quests/ninja_quests.txt b/npc/quests/ninja_quests.txt index b8322b4f5..78f21d38b 100644 --- a/npc/quests/ninja_quests.txt +++ b/npc/quests/ninja_quests.txt @@ -897,7 +897,7 @@ que_ng,72,34,3 script Craftsman Kaibara 4_M_EINOLD,{ mes "If you ever happen to gather all these materials one day, feel free to come back."; close; }else{ - if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragon's_Skin) < 30){ + if(countitem(Dragon_Scale) < 400 || countitem(Oridecon) < 5 || countitem(Dragons_Skin) < 30){ mes "[Kaibara]"; mes "It looks like there are not enough ingredients for me to make you a Gokurin."; next; @@ -1180,7 +1180,7 @@ que_ng,22,62,3 script Tetsu 4_M_SEAMAN,{ break; } - if(countitem(Steel)<50 || countitem(Harpy's_Feather)<20 || countitem(Oridecon)<5){ + if (countitem(Steel) < 50 || countitem(Harpys_Feather) < 20 || countitem(Oridecon) < 5) { mes "[Tetsu]"; mes "It looks like you haven't brought me enough materials to make you a Fuuma Shuriken Beneki."; next; diff --git a/npc/quests/okolnir.txt b/npc/quests/okolnir.txt index 4d5cb4910..bdf763bd5 100644 --- a/npc/quests/okolnir.txt +++ b/npc/quests/okolnir.txt @@ -44,7 +44,7 @@ function script F_Okolnir { - script Guide#gq_main FAKE_NPC,{ .@sub$ = callfunc("F_Okolnir"); .@GID = getcastledata(strnpcinfo(NPC_MAP),1); - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (getd("$siz_"+.@sub$+"_on") == 0) { mes "[Guide]"; mes "This castle has a hidden secret."; @@ -192,7 +192,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 .@sub$ = callfunc("F_Okolnir"); .@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1)); .@GID = getcastledata(.@t$,1); - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { cutin "wish_maiden31",1; if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { mes "[Wish Maiden]"; @@ -358,7 +358,7 @@ que_qsch05,345,23,0 warp Gate02#gq_sch05 1,1,schg_cas05,369,306 mes "[Wish Maiden]"; mes "...You are not qualified."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); cutin "wish_maiden11",255; end; } @@ -2161,7 +2161,7 @@ que_qsch05,251,255,3 duplicate(Wish Maiden#main_boss) Wish Maiden#sch05_boss WIS .@sub$ = callfunc("F_Okolnir"); .@t$ = ((compare(strnpcinfo(NPC_MAP),"aru"))?"arug_cas0":"schg_cas0")+(charat(strnpcinfo(NPC_MAP),getstrlen(strnpcinfo(NPC_MAP))-1)); .@GID = getcastledata(.@t$,1); - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (compare(.@sub$,"aru")) { setarray .@n, 7835,1,7836,1,7837,1,7838,1,2513,1,7291,10,7293,10,7063,100,985,20; diff --git a/npc/quests/partyrelay.txt b/npc/quests/partyrelay.txt index 54d78bec6..c9d4e48f9 100644 --- a/npc/quests/partyrelay.txt +++ b/npc/quests/partyrelay.txt @@ -34,9 +34,9 @@ //========================================================================= payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; - .@partyleader = getpartyleader(getcharid(1),2); + .@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2); if (checkweight(Resin,300) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; @@ -54,7 +54,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ mes "of your group members with you."; close; } - if ((countitem(Mission_Certificate12) > 0) && (.@partyleader == getcharid(0)) && (getcharid(2) > 0) && (.@partymembercount > 5)) { + if ((countitem(Mission_Certificate12) > 0) && (.@partyleader == getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0) && (.@partymembercount > 5)) { mes "[Ledrion]"; mes "Ah, you've brought the"; mes "last ticket from Rospii."; @@ -129,7 +129,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ mes "over to Gatan right now?"; close; } - if ((countitem(Mission_Certificate8) > 0) && (.@partyleader == getcharid(0)) && (getcharid(2) > 0) && (.@partymembercount > 5)) { + if ((countitem(Mission_Certificate8) > 0) && (.@partyleader == getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0) && (.@partymembercount > 5)) { mes "[Ledrion]"; mes "Great, you've brought"; mes "me the eighth ticket from"; @@ -178,7 +178,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ mes "a ticket to Gatan?"; close; } - if ((countitem(Mission_Certificate4) > 0) && (.@partyleader == getcharid(0)) && (getcharid(2) > 0) && (.@partymembercount > 5)) { + if ((countitem(Mission_Certificate4) > 0) && (.@partyleader == getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0) && (.@partymembercount > 5)) { mes "[Ledrion]"; mes "I see that you've brought"; mes "me the fourth ticket from"; @@ -219,7 +219,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ mes "come to me, not yet."; close; } - if ((BaseLevel > 39) && (.@partyleader == getcharid(0)) && (getcharid(2) > 0) && (.@partymembercount > 5) && (party_relay == 1)) { + if ((BaseLevel > 39) && (.@partyleader == getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0) && (.@partymembercount > 5) && (party_relay == 1)) { mes "[Ledrion]"; mes "As I mentioned earlier,"; mes "I'm challenging guild"; @@ -271,7 +271,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ mes "once the time is right."; close; } - if ((.@partyleader == getcharid(0)) && (getcharid(2) > 0) && (.@partymembercount > 5) && (party_relay > 0)) { + if ((.@partyleader == getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0) && (.@partymembercount > 5) && (party_relay > 0)) { mes "[Ledrion]"; mes "As leader of your"; mes "Party, you should"; @@ -280,7 +280,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ mes "of your partners."; close; } - if ((.@partyleader != getcharid(0)) && (getcharid(2) > 0)) { + if ((.@partyleader != getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0)) { mes "[Ledrion]"; mes "I'm sorry, but there's"; mes "nothing I can really offer"; @@ -363,7 +363,7 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ next; switch(select("Sure!", "No.")) { case 1: - if ((BaseLevel > 39) && (.@partyleader == getcharid(0)) && (getcharid(2) > 0) && (.@partymembercount > 5)) { + if ((BaseLevel > 39) && (.@partyleader == getcharid(CHAR_ID_CHAR)) && (getcharid(CHAR_ID_GUILD) > 0) && (.@partymembercount > 5)) { mes "[Ledrion]"; mes "Great! Let's see..."; mes "Well, you meet all the"; @@ -402,9 +402,9 @@ payon,103,113,3 script Ledrion#payon::RelayLedrion 4_M_MANAGER,{ } payon,83,327,3 script Gatan#payon::RelayGatan 4_M_04,{ - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; - .@partyleader = getpartyleader(getcharid(1),2); + .@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2); if (checkweight(Resin,300) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; @@ -1837,9 +1837,9 @@ payon,83,327,3 script Gatan#payon::RelayGatan 4_M_04,{ } payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; - .@partyleader = getpartyleader(getcharid(1),2); + .@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2); if (checkweight(Resin,300) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; @@ -2015,7 +2015,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "you've already forgotten."; close; } - if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) { + if ((party_relay == 19) && (.@relaytime >= 14) && (.@relaytime < 17) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2023,9 +2023,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Please take your next ticket"; mes "and this small reward for you."; next; - delitem Thin_N'_Long_Tongue,10; + delitem Thin_N_Long_Tongue,10; delitem Leopard_Talon,10; - delitem Poison_Toad's_Skin,10; + delitem Poison_Toads_Skin,10; party_relay = 20; getitem Mission_Certificate7,1; getitem Leaf_Of_Yggdrasil,2; @@ -2039,7 +2039,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "I'll see you later, then."; close; } - else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N'_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toad's_Skin) > 9)) { + else if ((party_relay == 19) && (.@relaytime >= 18) && (.@relaytime < 21) && (countitem(Thin_N_Long_Tongue) > 9) && (countitem(Leopard_Talon) > 9) && (countitem(Poison_Toads_Skin) > 9)) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2047,9 +2047,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Please take your next ticket"; mes "and this small reward for you."; next; - delitem Thin_N'_Long_Tongue,10; + delitem Thin_N_Long_Tongue,10; delitem Leopard_Talon,10; - delitem Poison_Toad's_Skin,10; + delitem Poison_Toads_Skin,10; party_relay = 20; getitem Mission_Certificate7,1; getitem Leaf_Of_Yggdrasil,2; @@ -2310,7 +2310,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Standard Time. Don't forget!"; close; } - if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9)) { + if ((party_relay == 7) && ((.@relaytime >= 8) && (.@relaytime < 11)) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9)) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2319,7 +2319,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "and this small reward for you."; next; delitem Porcupine_Spike,10; - delitem Elder_Pixie's_Beard,10; + delitem Elder_Pixies_Beard,10; delitem Fish_Tail,10; party_relay = 9; getitem Mission_Certificate3,1; @@ -2332,7 +2332,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "Good luck on your travels~"; close; } - else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixie's_Beard) > 9) && (countitem(Fish_Tail) > 9))) { + else if ((party_relay == 7) && ((.@relaytime >= 21) && (countitem(Porcupine_Spike) > 9) && (countitem(Elder_Pixies_Beard) > 9) && (countitem(Fish_Tail) > 9))) { mes "[Bafhail]"; mes "Well, it looks like you came"; mes "at the right time and brought"; @@ -2341,7 +2341,7 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ mes "and this small reward for you."; next; delitem Porcupine_Spike,10; - delitem Elder_Pixie's_Beard,10; + delitem Elder_Pixies_Beard,10; delitem Fish_Tail,10; party_relay = 9; getitem Mission_Certificate3,1; @@ -2470,9 +2470,9 @@ payon,204,221,3 script Bafhail#payon::RelayBafhail 4_M_JOB_BLACKSMITH,{ } payon,168,314,3 script Lospii#payon::RelayLospii 4_M_KID1,{ - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; - .@partyleader = getpartyleader(getcharid(1),2); + .@partyleader = getpartyleader(getcharid(CHAR_ID_PARTY),2); if (checkweight(Resin,300) == 0) { mes "^3355FFWait a minute! You're"; mes "carrying too many items"; diff --git a/npc/quests/quests_13_1.txt b/npc/quests/quests_13_1.txt index 8e57b3a96..562609d31 100644 --- a/npc/quests/quests_13_1.txt +++ b/npc/quests/quests_13_1.txt @@ -7289,7 +7289,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ } } else if (ep13_alba == 3) { - if ((countitem(Monster's_Feed) > 19) && (countitem(Pet_Food) > 29)) { + if ((countitem(Monsters_Feed) > 19) && (countitem(Pet_Food) > 29)) { mes "[Taab]"; mes "Oh, thanks!"; mes "You brought them their"; @@ -7305,7 +7305,7 @@ mid_camp,143,306,5 script Breeder Taab#ep13_alba 4_M_DST_MASTER,{ mes "material to give you."; mes "How about a spiritual reward?"; next; - delitem Monster's_Feed,20; + delitem Monsters_Feed,20; delitem Pet_Food,30; ep13_alba = 6; if (RENEWAL_EXP) { @@ -7470,7 +7470,6 @@ OnDisable: disablenpc "Hillsrion#alba01"; end; -//OnTouch2: OnTouch: mes "It is hissing in a low voice."; mes "Sometimes it purrs, too."; @@ -7487,7 +7486,6 @@ OnDisable: disablenpc "Tatacho#alba02"; end; -//OnTouch2: OnTouch: mes "[Taab]"; mes "Oh, please don't disturb"; @@ -7508,7 +7506,6 @@ OnDisable: disablenpc "Cornus#alba03"; end; -//OnTouch2: OnTouch: mes "[Taab]"; mes "Oh, please don't get"; @@ -8270,7 +8267,7 @@ spl_fild02,314,165,0 script School of Fish#1::Fishinghole CLEAR_NPC,{ specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; .@fcast = 15; - if (isequipped(2550)) //Fisher's_Muffler + if (isequipped(2550)) //Fishers_Muffler .@fcast -= 2; if (isequipped(2443)) //Fish_Shoes .@fcast -= 2; @@ -11528,7 +11525,6 @@ OnInit: } mid_camp,205,312,0 script #moc2_talkevent01 FAKE_NPC,1,1,{ -//OnTouch2: OnTouch: if (mao_morocc2 == 11) { mes "[Mr. Kidd]"; @@ -13394,7 +13390,6 @@ hu_fild04,235,103,0 script Heap of Earth#mao2_01 CLEAR_NPC,4,4,{ close; } -//OnTouch2: OnTouch: if (mao_morocc2 == 7) { specialeffect EF_LEVEL99_4; @@ -13731,7 +13726,6 @@ yuno_fild09,234,133,0 warp #moc2_fild09-que_dan02 1,1,que_dan02,13,10 que_dan02,13,6,0 warp #moc_que_dan02-fild09 1,1,yuno_fild09,234,129 que_dan02,21,37,0 script #moc2_b1_gate FAKE_NPC,1,1,{ -//OnTouch2: OnTouch: if (mao_morocc2 == 17) { mes "- You find a side door that leads to the basement."; @@ -13912,7 +13906,7 @@ que_dan02,115,53,3 script Man#moc2_crazyR01 4_M_DSTMAN,{ mes "Are you his enemy?"; mes "DIE!"; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } cutin "mocseal_kid01",255; diff --git a/npc/quests/quests_13_2.txt b/npc/quests/quests_13_2.txt index 09ef6209e..0dfd16d23 100644 --- a/npc/quests/quests_13_2.txt +++ b/npc/quests/quests_13_2.txt @@ -458,7 +458,7 @@ spl_fild03,226,151,0 script School of Fish#5::FishingHole_spl3 CLEAR_NPC,{ specialeffect2 EF_BUBBLE; specialeffect2 EF_INVENOM; .@fcast = 15; - if (isequipped(2550)) //Fisher's_Muffler + if (isequipped(2550)) //Fishers_Muffler .@fcast -= 2; if (isequipped(2443)) //Fish_Shoes .@fcast -= 2; @@ -4467,6 +4467,11 @@ function script jewel_13_2 { mes "...What the heck am I doing now..."; close; } + if (checkweight(Knife, 1) == 0) { // Custom check + mes "- It looks like you're carrying too many things. -"; + mes "- Why not put some of your items in storage and come back? -"; + close; + } if (rand(1,4) == 2) { mes "- You dug up a pile of earth -"; mes "- and pulled out the "+getarg(0)+" Gem -"; @@ -6495,7 +6500,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ ep13_2_bs2 = 1; ep13_2_bs3 = 1; ep13_2_bs4 = 1; - getitem Bazett's_Order,1; + getitem Bazetts_Order,1; changequest 11101,11102; close; } @@ -6503,7 +6508,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ mes "[Bazett]"; mes "How's the search going?"; next; - if (countitem(Bazett's_Order) < 1) { + if (countitem(Bazetts_Order) < 1) { mes "[Bazett]"; mes "!!!!!!!"; mes "You lost the notes!!?"; @@ -6512,7 +6517,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ mes "[Bazett]"; mes "What's done has been done."; mes "I'll give you a new one."; - getitem Bazett's_Order,1; + getitem Bazetts_Order,1; close; } else { @@ -6527,7 +6532,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ next; switch(select("Yes.", "Not yet...")) { case 1: - if (countitem(Bazett's_Order) < 1) { + if (countitem(Bazetts_Order) < 1) { mes "[Bazett]"; mes "!!!!!!!"; mes "You lost the notes!!?"; @@ -6570,7 +6575,7 @@ mid_camp,283,198,5 script Bazett Teablack#ep13bs 4_M_ALCHE_D,{ mes "[Bazett]"; mes "Ah... this isn't much, but it's a coin that the giants use."; mes "Maybe you can buy something from them with this."; - delitem Bazett's_Order,1; + delitem Bazetts_Order,1; ep13_2_busut = 7; if (ep13_2_bs1 == 3) getitem Manuk_Coin,1; if (ep13_2_bs2 == 3) getitem Manuk_Coin,1; diff --git a/npc/quests/quests_alberta.txt b/npc/quests/quests_alberta.txt index f816efcdc..c2f726023 100644 --- a/npc/quests/quests_alberta.txt +++ b/npc/quests/quests_alberta.txt @@ -424,7 +424,7 @@ alberta_in,28,145,4 script Grampa 2_M_PHARMACIST,{ close; case 2: delitem Tiger_Footskin,10; - getitem Boy's_Cap,1; + getitem Boys_Cap,1; mes "[Grampa]"; mes "T... Thank you !!"; mes "With this I can revive my youthful splendor!! I must eat this thing right away !"; @@ -2650,7 +2650,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ mes "I should stay at home."; close; } - if ((ep13_2_hiki == 6) && (countitem(Monster's_Feed) > 0) && (countitem(Red_Potion) > 0)) { + if ((ep13_2_hiki == 6) && (countitem(Monsters_Feed) > 0) && (countitem(Red_Potion) > 0)) { mes "[Iromo]"; mes "...Huh? This smell..."; mes "This is the one I like the most."; @@ -2687,7 +2687,7 @@ alberta_in,131,95,5 script Iromo#ep3_2 4_M_KID1,{ mes "I like cats so I approached him."; mes "Then suddenly he scratched and bit me."; next; - delitem Monster's_Feed,1; + delitem Monsters_Feed,1; delitem Red_Potion,1; ep13_2_hiki = 7; changequest 10083,10084; diff --git a/npc/quests/quests_aldebaran.txt b/npc/quests/quests_aldebaran.txt index 1b58726dd..e276622e9 100644 --- a/npc/quests/quests_aldebaran.txt +++ b/npc/quests/quests_aldebaran.txt @@ -79,8 +79,8 @@ aldeba_in,152,166,4 script Trader#01 4_M_04,{ close; } case 2: - if ((countitem(Oldman's_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) { - delitem Oldman's_Romance,1; + if ((countitem(Oldmans_Romance) > 0) && (countitem(Feather_Of_Birds) > 299) && (Zeny > 499)) { + delitem Oldmans_Romance,1; delitem Feather_Of_Birds,300; Zeny -= 500; mes "[Trader]"; diff --git a/npc/quests/quests_amatsu.txt b/npc/quests/quests_amatsu.txt index c2a20306b..31ebb517a 100644 --- a/npc/quests/quests_amatsu.txt +++ b/npc/quests/quests_amatsu.txt @@ -1484,7 +1484,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{ switch(select("Issue me a Transit Permit", "I want to live in Amatsu", "Nothing")) { case 1: if (event_amatsu == 6) { - if (countitem(Lord's_Passable_Ticket) > 0) { + if (countitem(Lords_Passable_Ticket) > 0) { mes "[Jiro]"; mes "You already have one..."; mes "You don't need to have two of them."; @@ -1497,7 +1497,7 @@ ama_in02,170,62,4 script Soldier#ama2 8_M_JPNSOLDIER,{ next; if (select("Issue one", "Talk to you later") == 1) { Zeny -= 10000; - getitem Lord's_Passable_Ticket,1; + getitem Lords_Passable_Ticket,1; mes "[Jiro]"; mes "There you go."; mes "Don't lose it this time."; @@ -1678,7 +1678,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{ close; } if (event_amatsu == 6) { - if (countitem(Lord's_Passable_Ticket) > 0) { + if (countitem(Lords_Passable_Ticket) > 0) { mes "[Jyuro]"; mes "You have the ticket..."; mes "Do you want me to send you now, or do you need a little instruction?"; @@ -1734,7 +1734,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{ mes "A gate? On the top floor of the building??? Surely, you must been be mistaken."; emotion e_swt; next; - if (countitem(Lord's_Passable_Ticket) > 0) { + if (countitem(Lords_Passable_Ticket) > 0) { if (select("Show him the ticket", "Cancel") == 1) { mes "[Jyuro]"; mes "What? That pass is...?"; @@ -1742,7 +1742,7 @@ ama_in02,115,177,7 script Soldier#ama10 8_M_JPNSOLDIER,{ mes "the lord but I guess it has"; mes "been issued to the wrong person."; next; - delitem Lord's_Passable_Ticket,1; + delitem Lords_Passable_Ticket,1; mes "[Jyuro]"; mes "I will keep this ticket because"; mes "it was issued without permission."; @@ -1885,7 +1885,7 @@ ama_in02,200,176,4 script Lord of Palace#ama 8_M_JPNMASTER,{ event_amatsu = 6; completequest 8135; delitem Fox_Tail,1; - getitem Lord's_Passable_Ticket,1; + getitem Lords_Passable_Ticket,1; mes "[Ishida Yoshinaga]"; mes "This isn't a big reward but"; mes "someday it will be useful for you."; @@ -1943,7 +1943,7 @@ ama_in01,22,111,0 script Grandma#ama2 4_F_JPNOBA,{ mes "it won't harm me!! Yelp!^000000"; next; select("Taaaah!!"); - if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bear's_Foot) < 1 || countitem(Tiger's_Skin) < 1)) { + if ((BaseJob == Job_Priest || BaseJob != Job_Acolyte && BaseJob != Job_Monk) || (countitem(Holy_Water) < 1 || countitem(Bears_Foot) < 1 || countitem(Tigers_Skin) < 1)) { if (rand(1,4) == 1) .@fox_kill = 0; else diff --git a/npc/quests/quests_ayothaya.txt b/npc/quests/quests_ayothaya.txt index 61f3d821c..dba9c5d14 100644 --- a/npc/quests/quests_ayothaya.txt +++ b/npc/quests/quests_ayothaya.txt @@ -859,7 +859,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{ next; switch(select("Yes.", "No, thanks.")) { case 1: - if (countitem(Monster's_Feed) && Zeny > 49) { + if (countitem(Monsters_Feed) && Zeny > 49) { mes "^3355FFYou cast your"; mes "fishing line"; mes "into the water.^000000"; @@ -871,7 +871,7 @@ ayothaya,253,99,3 script Fisherman 4_M_THAIONGBAK,{ next; mes "^3355FFYou've hooked a Phen!^000000"; next; - delitem Monster's_Feed,1; + delitem Monsters_Feed,1; Zeny -= 50; .@randfish = rand(1,100); if (.@randfish > 0 && .@randfish < 40) { @@ -1947,7 +1947,7 @@ ayo_dun01,272,26,0 duplicate(AyoTrap1) #th_dun1_1_4 HIDDEN_NPC ayo_dun01,26,27,0 script #th_dun1_1::AyoTrap2 FAKE_NPC,1,1,{ OnTouch: - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } diff --git a/npc/quests/quests_hugel.txt b/npc/quests/quests_hugel.txt index 039e773a7..1ac300153 100644 --- a/npc/quests/quests_hugel.txt +++ b/npc/quests/quests_hugel.txt @@ -5836,7 +5836,7 @@ hugel,76,134,3 script Neha 4W_F_01,{ mes "for your impertinence, girl!"; } for (.@i = 8064; .@i <= 8067; ++.@i) { - if (questprogress(.@i) && questprogress(.@i) != 2) + if (questprogress(.@i) == 1) completequest .@i; } setquest 8068; @@ -8706,7 +8706,7 @@ hu_in01,14,11,4 script Laura 1_F_GYPSY,{ select("Yeah, yeah, whatever.", "Sure thing.", "I s-s-s-suppose...!", "Yes, Ma'am!"); hg_odin = 17; for(.@i = 11002; .@i <= 11005; ++.@i) { - if (questprogress(.@i) && questprogress(.@i) != 2) + if (questprogress(.@i) == 1) completequest .@i; } setquest 11006; diff --git a/npc/quests/quests_juperos.txt b/npc/quests/quests_juperos.txt index d43749b3e..558c80860 100644 --- a/npc/quests/quests_juperos.txt +++ b/npc/quests/quests_juperos.txt @@ -9,12 +9,13 @@ //= This file is part of Hercules. //= http://herc.ws - http://github.com/HerculesWS/Hercules //= -//= Copyright (C) 2012-2015 Hercules Dev Team +//= Copyright (C) 2012-2017 Hercules Dev Team //= Copyright (C) Euphy //= Copyright (C) Zephyrus //= Copyright (C) L0ne_W0lf //= Copyright (C) SinSloth //= Copyright (C) MasterOfMuppets +//= Copyright (C) Capuche //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -33,11 +34,11 @@ //================= Description =========================================== //= Juperos Ruins related Quests/Events //================= Current Version ======================================= -//= 1.9 +//= 2.0 //========================================================================= yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ - switch(yuno_hist) { + switch (yuno_book) { case 0: mes "[Scholar]"; mes "...Mm? "; @@ -155,7 +156,8 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ mes "service of his royal majesty,"; mes "the wise and benevolent"; mes "King Tristram III."; - yuno_hist = 2; + yuno_book = 2; + setquest(11017); next; mes "[Fayruz]"; mes "Well, "+strcharinfo(PC_NAME)+","; @@ -258,7 +260,8 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ mes "''You will see him, the one"; mes "who was vain and extravagant,"; mes "with your own eyes at the place where the light passes through."; - yuno_hist = 4; + yuno_book = 4; + changequest(11018, 11019); next; mes "[Fayruz]"; mes "Ah, usually, descriptions"; @@ -387,7 +390,7 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ next; switch(select("Take a look at this.", "Oh, I'm sorry...")) { case 1: - switch(jupe_hist) { + switch (jupe_book) { case 1: callfunc "Func_JupHist",7353,7354,7355,7352; case 2: callfunc "Func_JupHist",7352,7354,7355,7353; case 4: callfunc "Func_JupHist",7352,7353,7355,7354; @@ -419,7 +422,7 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ mes "last time is really helping me"; mes "in my research. If you get the"; mes "chance, please bring me more!"; - yuno_hist = 7; + yuno_book = 7; next; mes "[Fayruz]"; mes "This new data is adding"; @@ -438,7 +441,7 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ next; switch(select("Yeah, take a look at this.", "No, I'm sorry...")) { case 1: - switch(jupe_hist) { + switch (jupe_book) { case 3: callfunc "Func_JupHist",7354,7355,7352,7353; case 5: callfunc "Func_JupHist",7353,7355,7352,7354; case 6: callfunc "Func_JupHist",7352,7355,7353,7354; @@ -470,7 +473,7 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ mes "Alright. Okay. Yes."; mes "Yes! Of course, how"; mes "could I not see it before!"; - yuno_hist = 9; + yuno_book = 9; next; mes "[Fayruz]"; mes "I'll be with you"; @@ -487,7 +490,7 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ next; switch(select("Actually, I did find this...", "I'm sorry, I haven't...")) { case 1: - switch(jupe_hist) { + switch (jupe_book) { case 7: callfunc "Func_JupHist",7355,7352,7353,7354; case 11: callfunc "Func_JupHist",7354,7352,7353,7355; case 13: callfunc "Func_JupHist",7353,7352,7354,7355; @@ -564,7 +567,7 @@ yuno_in04,190,125,4 script Scholar 8_F_GIRL,{ } function script Func_JupHist { - switch(yuno_hist) { + switch (yuno_book) { case 4: mes "[Fayruz]"; mes "Thank you so much,"; @@ -588,8 +591,9 @@ function script Func_JupHist { mes "and you awaken from the trance,"; mes "gently brought back to reality.^000000"; delitem getarg(0),1; - yuno_hist = 5; - jupe_hist = getarg(1); + yuno_book = 5; + jupe_book = getarg(1); + changequest(11019, 11020); getexp RENEWAL_EXP?10000:100000,0; next; mes "[Fayruz]"; @@ -652,20 +656,21 @@ function script Func_JupHist { mes "mankind that can't be ignored."; if (countitem(getarg(0))) { delitem getarg(0),1; - if (getarg(0) == 7352) jupe_hist += 1; - else jupe_hist += 2; + if (getarg(0) == 7352) jupe_book += 1; + else jupe_book += 2; } else if (countitem(getarg(1))) { delitem getarg(1),1; - if (getarg(1) == 7353) jupe_hist += 2; - else jupe_hist += 4; + if (getarg(1) == 7353) jupe_book += 2; + else jupe_book += 4; } else { delitem getarg(2),1; - if (getarg(2) == 7354) jupe_hist += 4; - else jupe_hist += 8; + if (getarg(2) == 7354) jupe_book += 4; + else jupe_book += 8; } - yuno_hist = 6; + yuno_book = 6; + changequest(11020, 11021); getexp RENEWAL_EXP?10000:100000,0; next; mes "[Fayruz]"; @@ -779,17 +784,18 @@ function script Func_JupHist { mes "like the strange and grotesque."; if (countitem(getarg(0))) { delitem getarg(0),1; - if (getarg(0) == 7352) jupe_hist += 1; - else if (getarg(0) == 7353) jupe_hist += 2; - else jupe_hist += 4; + if (getarg(0) == 7352) jupe_book += 1; + else if (getarg(0) == 7353) jupe_book += 2; + else jupe_book += 4; } else if (countitem(getarg(1))) { delitem getarg(1),1; - if (getarg(1) == 7353) jupe_hist += 2; - else if (getarg(1) == 7354) jupe_hist += 4; - else jupe_hist += 8; + if (getarg(1) == 7353) jupe_book += 2; + else if (getarg(1) == 7354) jupe_book += 4; + else jupe_book += 8; } - yuno_hist = 8; + yuno_book = 8; + changequest(11021, 11022); getexp RENEWAL_EXP?10000:100000,0; next; mes "[Fayruz]"; @@ -881,12 +887,13 @@ function script Func_JupHist { mes "feeling of indefatigable"; mes "hope and inspiration..."; mes "You can make it if you try!^000000"; - if (getarg(0) == 7352) jupe_hist += 1; - else if (getarg(0) == 7353) jupe_hist += 2; - else if (getarg(0) == 7354) jupe_hist += 4; - else jupe_hist += 8; - yuno_hist = 10; - delitem getarg(0),1; + delitem(getarg(0), 1); + if (getarg(0) == 7352) jupe_book += 1; + else if (getarg(0) == 7353) jupe_book += 2; + else if (getarg(0) == 7354) jupe_book += 4; + else jupe_book += 8; + yuno_book = 10; + completequest(11022); getexp RENEWAL_EXP?10000:100000,0; next; mes "[Fayruz]"; @@ -941,7 +948,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ next; switch(select("Table of Contents.", "Leave it alone.")) { case 1: - if (yuno_hist > 4) { + if (yuno_book > 4) { mes "^8B6914 1. Preface"; mes " 2. Juperos Background"; mes " 3. Theory Behind Its Fall^000000"; @@ -954,7 +961,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ mes "ground, but it is now buried"; mes "beneath the El Mes Plateau."; mes "The reasons for the city's"; - if (yuno_hist < 9) { + if (yuno_book < 9) { mes "ruin are still nebulous...^000000"; next; mes "^8B6914There is much speculation"; @@ -971,7 +978,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ mes "may be able to learn much"; mes "from that ancient city's ruins."; mes "..................^000000"; - if (yuno_hist < 7) { + if (yuno_book < 7) { next; mes "["+strcharinfo(PC_NAME)+"]"; mes "Hmmm..."; @@ -991,7 +998,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ mes "us to make a few conclusions.^000000"; close; case 2: - if (yuno_hist < 9) { + if (yuno_book < 9) { mes "^8B6914..."; mes "......"; mes "..........^000000"; @@ -1003,7 +1010,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ mes "yet to be a real thesis..."; close; } - else if (yuno_hist == 9) { + else if (yuno_book == 9) { mes "^8B6914Juperos was built over"; mes "a thousand years ago in"; mes "an era of peace just after"; @@ -1041,7 +1048,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ mes "life. Science was reponsible for Juperos's rise and downfall."; close; case 3: - if (yuno_hist < 10) { + if (yuno_book < 10) { mes "^8B6914..."; mes "......"; mes "..........^000000"; @@ -1146,7 +1153,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ mes "may be able to learn much"; mes "from that ancient city's ruins."; mes "..................^000000"; - if (!yuno_hist) yuno_hist = 1; + if (!yuno_book) yuno_book = 1; next; mes "["+strcharinfo(PC_NAME)+"]"; mes "This..."; @@ -1165,26 +1172,26 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ close; } case 2: - if (yuno_hist < 5) { + if (yuno_book < 5) { mes "["+strcharinfo(PC_NAME)+"]"; mes "Nah..."; mes "I'm tired of reading."; mes "Ironically enough."; close; } - else if (yuno_hist < 7) { + else if (yuno_book < 7) { mes "["+strcharinfo(PC_NAME)+"]"; mes "I don't feel like"; mes "reading this. Not"; mes "enough pictures..."; close; } - else if (yuno_hist < 9) { + else if (yuno_book < 9) { mes "["+strcharinfo(PC_NAME)+"]"; mes "It looks very sophisticated..."; close; } - else if (yuno_hist < 10) { + else if (yuno_book < 10) { mes "["+strcharinfo(PC_NAME)+"]"; mes "I know this book..."; mes "But I don't feel like"; @@ -1203,7 +1210,7 @@ yuno_in04,186,125,4 script Bundle of Files HIDDEN_NPC,{ } yuno_in04,188,118,4 script Book#juperos HIDDEN_NPC,{ - if (yuno_hist > 7) { + if (yuno_book > 7) { mes "^8B6914*Self-Honesty*"; mes "*'Benefits Fo' Life!'*"; mes "By Stephen Oyoung"; @@ -1262,7 +1269,7 @@ yuno_in04,188,118,4 script Book#juperos HIDDEN_NPC,{ //- Bronze Statue - juperos_01 99 112 juperos_01,99,112,4 script Bronze Statue#1 CLEAR_NPC,{ - if (yuno_hist > 3) { + if (yuno_book > 3) { mes "^3355FF''Do you wish to see"; mes "the end of the madness?"; mes "He is waiting where the three"; @@ -1270,7 +1277,7 @@ juperos_01,99,112,4 script Bronze Statue#1 CLEAR_NPC,{ mes "two hundred illusions wander.''^000000"; close; } - else if (yuno_hist == 3) { + else if (yuno_book == 3) { mes "["+strcharinfo(PC_NAME)+"]"; mes "I better go and"; mes "see Fayruz in the"; @@ -1300,14 +1307,15 @@ juperos_01,99,112,4 script Bronze Statue#1 CLEAR_NPC,{ mes "I am. I know what sounds"; mes "all of these letters make..."; next; - if (yuno_hist == 2) { + if (yuno_book == 2) { mes "["+strcharinfo(PC_NAME)+"]"; mes "Then again, Fayruz did"; mes "say this was enchanted."; mes "Okay, I guess I'll go back"; mes "to the Juno Library and"; mes "tell her what I found."; - yuno_hist = 3; + yuno_book = 3; + changequest(11017, 11018); close; } mes "["+strcharinfo(PC_NAME)+"]"; @@ -1535,7 +1543,7 @@ yuno_in04,118,116,4 script Paper HIDDEN_NPC,{ next; switch(select("Read it.", "Leave it alone.")) { case 1: - if (yuno_hist > 7) { + if (yuno_book > 7) { mes "^8B6914P.S."; mes "Please..."; mes "Come back to me."; @@ -1582,7 +1590,7 @@ yuno_in04,118,116,4 script Paper HIDDEN_NPC,{ } juperos_01,123,92,4 script Stone Statue CLEAR_NPC,{ - if (yuno_hist) { + if (yuno_book) { mes "^3355FFIt's a stone statue"; mes "that looks exactly like"; mes "the one in the Juno Library."; diff --git a/npc/quests/quests_lighthalzen.txt b/npc/quests/quests_lighthalzen.txt index 480b696b3..66cfb0e73 100644 --- a/npc/quests/quests_lighthalzen.txt +++ b/npc/quests/quests_lighthalzen.txt @@ -2148,7 +2148,7 @@ lhz_in02,201,210,5 script Digotz 4_M_LGTMAN,{ mes "my fashionable street clothes?"; close; } - if ((friendship == 12 && countitem(Friend's_Diary) > 0)) { + if ((friendship == 12 && countitem(Friends_Diary) > 0)) { mes "[Digotz]"; mes "Even if Benkaistein"; mes "did come back, I don't"; @@ -2555,7 +2555,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ cutin "lhz_macu05",255; end; } - if (friendship == 13 && countitem(Friend's_Diary) > 0) { + if (friendship == 13 && countitem(Friends_Diary) > 0) { cutin "lhz_macu06",2; mes "[Maku]"; mes "Hey, what is that? You want"; @@ -2703,7 +2703,7 @@ lighthalzen,337,232,3 script Maku 4_M_LGTPOOR,{ mes "that I'm grateful or anything."; cutin "lhz_macu07",255; next; - delitem Friend's_Diary,1; + delitem Friends_Diary,1; friendship = 14; if (RENEWAL_EXP) { if (BaseLevel > 90) getexp 70000,0; @@ -3175,7 +3175,7 @@ yuno_in04,96,106,5 script Passionate Student 4_M_SAGE_A,{ mes "sure to let you know~"; close; } - if ((friendship == 11 && countitem(Friend's_Diary) > 0)) { + if ((friendship == 11 && countitem(Friends_Diary) > 0)) { mes "[Benkaistein]"; mes "Aw nuts, this is"; mes "taking much longer"; @@ -3351,7 +3351,7 @@ yuno_in04,168,117,3 script Book#lhz HIDDEN_NPC,{ } if (friendship == 10) { friendship = 11; - getitem Friend's_Diary,1; + getitem Friends_Diary,1; mes "^3355FFThis book is labeled,"; mes "''Benkaistein's Journal"; mes "Vol. 6.'' This is probably"; @@ -8503,7 +8503,7 @@ L_Mission: mes "........."; mes "............"; for (.@i = 12015; .@i <= 12028; ++.@i) { - if (questprogress(.@i) && questprogress(.@i) != 2) + if (questprogress(.@i) == 1) completequest .@i; } close; diff --git a/npc/quests/quests_louyang.txt b/npc/quests/quests_louyang.txt index e9e76b99c..e05cd3313 100644 --- a/npc/quests/quests_louyang.txt +++ b/npc/quests/quests_louyang.txt @@ -1433,7 +1433,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{ close; } else if (ch_par == 17) { - if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toad's_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) { + if (countitem(Leopard_Talon) > 1 && countitem(Hard_Peach) > 9 && countitem(Poison_Toads_Skin) > 4 && countitem(Browny_Root) > 19 && countitem(Germinating_Sprout) > 9 && countitem(Honey_Jar) > 4) { mes "[Hua Tuo]"; mes "Hm? Ah, you have returned."; mes "Sorry, I was taking care of my other patients. Have you already gathered the medicines I'll need?"; @@ -1448,7 +1448,7 @@ lou_in02,265,69,5 script Doctor#lyang 4_F_CHNDOCTOR,{ mes "Please take this as a token of my appreciation. It's not much, but this medicine is an old family secret. I hope it will be helpful to you in dangerous situations."; delitem Leopard_Talon,2; delitem Hard_Peach,10; - delitem Poison_Toad's_Skin,5; + delitem Poison_Toads_Skin,5; delitem Browny_Root,20; delitem Germinating_Sprout,10; delitem Honey_Jar,5; @@ -2123,7 +2123,7 @@ lou_in02,156,38,0 script Studying Officer#lou 4_M_CHNMAN,{ mes "so I was able to find it again pretty easily. I hope it's useful to you."; ch_par = 15; for (.@i = 11051; .@i <= 11054; ++.@i) { - if (questprogress(.@i) && questprogress(.@i) != 2) + if (questprogress(.@i) == 1) completequest .@i; } setquest 11055; @@ -4634,9 +4634,9 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{ mes strcharinfo(PC_NAME)+ "...!"; mes "Your name is now engraved on this bloody pledge board. We will fight together to the death for Louyang's future!"; next; - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); @partymember = $@partymembercount; - if (getpartyleader(getcharid(1),1) == getcharid(0) || !@partymember) { + if (getpartyleader(getcharid(CHAR_ID_PARTY),1) == getcharid(CHAR_ID_CHAR) || !@partymember) { mes "[Sun Mao]"; mes "Now, the most important thing for our cause is to gather more recruits and increase our numbers. Please find others who will join us in our fight."; next; @@ -4659,7 +4659,7 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{ mes "If you're a real tourist, you do not want to get involved in our business, one way or another."; close; } - } else if (getpartyleader(getcharid(1),2) == getcharid(0)) { + } else if (getpartyleader(getcharid(CHAR_ID_PARTY),2) == getcharid(CHAR_ID_CHAR)) { if (QL_REVOL == 9) { mes "[Sun Mao]"; mes "Once again,"; @@ -4668,7 +4668,7 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{ mes "Go back safe."; close; } - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); @partymember = $@partymembercount; if (QL_REVOL < 8) { if (@partymember == QL_REVOL +1) { @@ -4860,7 +4860,7 @@ lou_in02,77,37,7 script Hermit 4_M_CHNOLD,{ lou_in01,43,147,3 script Gunpowder Expert 4_M_ALCHE_C,{ if (ch_make == 0) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); @partymember = $@partymembercount; if (!QL_REVOL) { mes "[Hao Chenryu]"; diff --git a/npc/quests/quests_lutie.txt b/npc/quests/quests_lutie.txt index 3a74bdd26..4a1143c8f 100644 --- a/npc/quests/quests_lutie.txt +++ b/npc/quests/quests_lutie.txt @@ -204,12 +204,12 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ } break; case 3: - if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N'_Long_Tongue) > 0)) { + if ((countitem(Poison_Spore) > 849) && (countitem(Burn_Tree) > 299) && (countitem(Thin_N_Long_Tongue) > 0)) { mes "^3355FFYou gingerly place the items into the snowman's mouth.^000000"; next; delitem Poison_Spore,850; delitem Burn_Tree,300; - delitem Thin_N'_Long_Tongue,1; + delitem Thin_N_Long_Tongue,1; emotion e_oh; mes "^3355FF*Vroooooom~~*"; mes "*Bzzzzzt*"; @@ -268,10 +268,10 @@ xmas,115,297,4 script Vending Machine HIDDEN_NPC,{ } break; case 6: - if (countitem(Alice's_Apron) > 99) { + if (countitem(Alices_Apron) > 99) { mes "^3355FFYou gingerly place all 100 Aprons into the snowman's mouth.^000000"; next; - delitem Alice's_Apron,100; + delitem(Alices_Apron, 100); emotion e_oh; mes "^3355FF*Vroooooom~~*"; mes "*Bzzzzzt*"; diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index c7acc986e..0d509b2d4 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -938,12 +938,12 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3, close; case 2: if ($@re_moc < 3) { - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; copyarray .@partymembername$[0],$@partymembername$[0],.@partymembercount; while (.@partymembercount >= 0) { .@name$ = .@partymembername$[.@partymembercount]; - if (isloggedin(getcharid(3,.@name$))) { + if (isloggedin(getcharid(CHAR_ID_ACCOUNT,.@name$))) { ++.@onlinemembers; } --.@partymembercount; @@ -1001,12 +1001,12 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3, mes "[Continental Guard]"; mes "Ah, you're an adventurer working for the Continental Guard. Nice to meet you. Feel free to ask me if you need my assistance."; next; - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; copyarray .@partymembername$[0],$@partymembername$[0],.@partymembercount; while (.@partymembercount >= 0) { .@name$ = .@partymembername$[.@partymembercount]; - if (isloggedin(getcharid(3,.@name$))) { + if (isloggedin(getcharid(CHAR_ID_ACCOUNT,.@name$))) { ++.@onlinemembers; } --.@partymembercount; @@ -1092,7 +1092,6 @@ moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 4_M_MOC_SOLDIER,3, end; } -//OnTouch2: OnTouch: mes "[Continental Guard]"; mes "No commoners are allowed in the area beyond this point."; @@ -2647,7 +2646,6 @@ yuno,333,210,5 script Library Master#garas 1_M_LIBRARYMASTER,{ } yuno,336,203,0 script #garas_catch HIDDEN_WARP_NPC,3,3,{ -//OnTouch2: OnTouch: if (barmunt_crow == 2) { mes "[Dog]"; @@ -2912,8 +2910,7 @@ yuno_in04,100,5,3 script Hot Bestseller Corner HIDDEN_NPC,{ } yuno_in04,100,3,0 script #garas_path HIDDEN_WARP_NPC,1,1,{ -//OnTouch2: -OnTouch2: +OnTouch: if (barmunt_crow == 6) { mes "..................................."; next; @@ -3572,7 +3569,6 @@ yuno_in04,167,120,3 script Worn-out Book#garas HIDDEN_NPC,{ } que_ba,247,33,0 script #bpast_1_1 FAKE_NPC,1,1,{ -//OnTouch2: OnTouch: if (barmunt_crow < 4) { warp "ama_dun03",119,110; @@ -3640,7 +3636,6 @@ que_ba,183,25,0 warp #bpast_2to3_1 1,1,que_ba,72,25 que_ba,183,52,0 warp #bpast_2to3_2 1,1,que_ba,72,51 que_ba,102,56,0 script #3room_barmunt FAKE_NPC,3,3,{ -//OnTouch2: OnTouch: if (barmunt_crow < 4) { warp "yuno_in04",100,3; @@ -3712,7 +3707,6 @@ que_ba,99,51,7 script Grotesque Man#zid1 4_M_MUT1,{ } que_ba,53,232,0 script #garas_f_yume HIDDEN_WARP_NPC,1,1,{ -//OnTouch2: OnTouch: if (barmunt_crow == 5) { //GetHEALTHSTATE VAR_HEALTHSTATENORMAL 0 @@ -3757,7 +3751,6 @@ que_ba,48,227,7 script Grotesque Man#zid2 4_M_MUT1,{ } que_ba,264,186,0 script #barmut_room1 HIDDEN_WARP_NPC,2,2,{ -//OnTouch2: OnTouch: if (barmunt_crow == 11) { mes "^660000You wake up, and look around you. Somehow, you've now ended up in a huge mansion.^000000"; @@ -3797,7 +3790,6 @@ que_ba,270,181,3 script #barmunt_fire 4_M_SAGE_C,{ } que_ba,270,270,0 script #barmunt_living HIDDEN_WARP_NPC,1,1,{ -//OnTouch2: OnTouch: mes ".................."; mes ".................."; @@ -3974,7 +3966,6 @@ cave,82,97,3 script Cave Settler#g1 4_M_CAVE1,3,3,{ close; } -//OnTouch2: OnTouch: if (barmunt_crow == 8) { mes "[Cave Settler]"; @@ -6810,7 +6801,6 @@ prt_castle,368,312,4 script Prince#ern 4_M_2NDPRIN1,{ } prt_castle,163,319,0 script #twonoble FAKE_NPC,3,3,{ -//OnTouch2: OnTouch: if (nkprince_eisen == 7) { donpcevent "Young Noble#valter::OnEnable"; @@ -7723,7 +7713,6 @@ prt_castle,176,170,5 script Guard#princein 8W_SOLDIER,{ } prt_castle,121,168,0 script #arm HIDDEN_NPC,4,4,{ -//OnTouch2: OnTouch: if (nk_prince == 8) { mes "[" + strcharinfo(PC_NAME) + "]"; @@ -7744,7 +7733,6 @@ OnTouch: } prt_castle,316,313,0 script #arm1 HIDDEN_NPC,3,3,{ -//OnTouch2: OnTouch: if (nkprince_eisen > 14) { mes "[" + strcharinfo(PC_NAME) + "]"; diff --git a/npc/quests/quests_moscovia.txt b/npc/quests/quests_moscovia.txt index 13dd91908..c722f2677 100644 --- a/npc/quests/quests_moscovia.txt +++ b/npc/quests/quests_moscovia.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-2017 Hercules Dev Team //= Copyright (C) Lemongrass //= Copyright (C) Euphy //= Copyright (C) Joseph @@ -17,6 +17,7 @@ //= Copyright (C) Gepard //= Copyright (C) brianluau //= Copyright (C) Kisuka +//= Copyright (C) Asheraf //= //= Hercules is free software: you can redistribute it and/or modify //= it under the terms of the GNU General Public License as published by @@ -43,7 +44,7 @@ //= The Moving Island, Help Mikhail, Acorn Exchange, Banish Winter, Shafka //= Hat, Koshei the Immortal. //================= Current Version ======================================= -//= 2.3 +//= 2.4 //========================================================================= //== The Moving Island :: mos_whale_edq ==================== @@ -65,6 +66,7 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{ mes "seen many marvelous things"; mes "from near and far."; next; + setquest(18100); mes "[Berbayeff]"; mes "I'm sure you'll probably"; mes "be interested in my story."; @@ -189,6 +191,7 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{ mes "I'll definitely go up to that"; mes "island... and verify it with my own eyes!"; mos_whale_edq = 1; + changequest(18100, 18101); close; } else if (mos_whale_edq == 1) { .@speak = rand(1,5); @@ -235,6 +238,7 @@ moscovia,171,71,3 script Berbayeff#npc 4_M_RUSMAN2,{ mes "If you want to find the island"; mes "by ship, go to Mr. Ibanoff"; mes "and ask for a favor."; + changequest(18101, 18102); close; } else if (mos_whale_edq > 12 && mos_whale_edq < 42) { emotion e_omg; @@ -298,6 +302,8 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ mes "What's up?"; next; if(select("Tell me an adventure story.", "Lend me your ship.") == 1) { + completequest(18101, 18102); + setquest(18103); mes "[Mr. Ibanoff]"; mes "You are an adventurer, right?"; mes "You come from a strange land?"; @@ -399,6 +405,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ mes "If you ever need anything,"; mes "come talk to me whenever, hahaha!"; mos_whale_edq = 2; + changequest(18103, 18104); close; } if (mos_whale_edq == 2) { @@ -452,6 +459,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ mes "materials, bring them to me. I'll"; mes "repair the ship."; mos_whale_edq = 3; + changequest(18104, 18105); close; } emotion e_ag; @@ -483,6 +491,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ delitem Tube,5; delitem Jubilee,10; mos_whale_edq = 4; + changequest(18105, 18106); mes "[Mr. Ibanoff]"; mes "Okay, we are at the ready."; mes "When would you like to depart?"; @@ -603,6 +612,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ mes "back to the island, I want to go"; mes "together with you! Eh? Hahaha!"; mos_whale_edq = 16; + changequest(18111, 18112); close; } else if (mos_whale_edq < 18) { mes "[Mr. Ibanoff]"; @@ -640,6 +650,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ mes "[Mr. Ibanoff]"; mes "Again, let's get the ship ready and sail before the sun sets!"; mos_whale_edq = 19; + changequest(18113, 18114); close; } mes "[Mr. Ibanoff]"; @@ -676,6 +687,7 @@ moscovia,135,49,5 script Mr. Ibanoff#npc 4_M_RUSBALD,{ mes "been, it's very good to see you"; mes "again."; mos_whale_edq = 19; + changequest(18113, 18114); next; mes "[Mr. Ibanoff]"; mes "I can guess you'd like to go to"; @@ -821,6 +833,7 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 4_M_RUSBALD,{ mes "At first, hold the rudder to go"; mes "forward, to the east."; mos_whale_edq = 5; + changequest(18106, 18107); close; } else if (mos_whale_edq == 5) { mes "[Mr. Ibanoff]"; @@ -874,6 +887,7 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 4_M_RUSBALD,{ mes "Go around the deck to look more"; mes "carefully! Go!"; mos_whale_edq = 12; + changequest(18107, 18108); donpcevent "#findship::OnEnable"; close; } else if (mos_whale_edq == 12) { @@ -904,6 +918,7 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 4_M_RUSBALD,{ mes "At first, hold the rudder to go"; mes "forward, to the east."; mos_whale_edq = 20; + changequest(18114, 18115); close; } else if (mos_whale_edq == 20) { mes "[Mr. Ibanoff]"; @@ -921,6 +936,7 @@ mosk_ship,98,110,3 script Mr. Ibanoff#npc2 4_M_RUSBALD,{ mes "There is a moving island!"; mes "We have done well!"; next; + changequest(18115, 18116); mes "[Mr. Ibanoff]"; mes "Oh...my..."; mes "It really is there..."; @@ -1230,6 +1246,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "the back of a gigantic whale!"; mes "That's why I call it Whale Island!"; next; + changequest(18109, 18110); mes "["+strcharinfo(PC_NAME)+"]"; mes "How...? How is it possible"; mes "that the water flows in streams"; @@ -1269,6 +1286,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ next; callsub S_AS_3; mos_whale_edq = 14; + changequest(18110, 18111); close2; sleep2 20000; mos_whale_edq = 15; @@ -1411,6 +1429,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "I'll send you back to the"; mes "mainland."; mos_whale_edq = 31; + changequest(18116, 18117); close; } else if (mos_whale_edq == 31) { mes "[Aged Stranger]"; @@ -1438,7 +1457,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "Oh... Did you get all the"; mes "materials?"; next; - if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goat's_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) { + if (countitem(Log) > 29 && countitem(Tough_Vines) > 19 && countitem(Goats_Horn) > 19 && countitem(Sea_Otter_Leather) > 9) { mes "[Aged Stranger]"; mes "You found the right materials."; mes "Okay, I will start to make the"; @@ -1446,9 +1465,10 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ next; delitem Log,30; delitem Tough_Vines,20; - delitem Goat's_Horn,20; + delitem Goats_Horn,20; delitem Sea_Otter_Leather,10; mos_whale_edq = 34; + changequest(18117, 18118); mes "[Aged Stranger]"; mes "Wait for a moment until I make the"; mes "instrument successfully."; @@ -1495,6 +1515,7 @@ mosk_fild01,86,104,3 script Aged Stranger#npc 4_M_GUSLIMAN,{ mes "the ancestors of Moscovia."; getitem GUSLI, 1; mos_whale_edq = 35; + changequest(18118, 18119); next; mes "[Aged Stranger]"; mes "I am the last person who has"; @@ -1696,6 +1717,7 @@ S_AS_1: mes "With your ability to play, surely"; mes "you can win the admiration of all."; mos_whale_edq = 38; + changequest(18119, 18120); close; } mes "[Aged Stranger]"; @@ -1891,6 +1913,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ mes "banishing winter with magic,"; mes "announce that to me immediately."; mos_nowinter = 14; + changequest(18076, 18077); close; } } @@ -1934,6 +1957,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ mes "If you do that, I will arrest you immediately!"; mes "So take care of yourself."; mos_nowinter = 14; + changequest(18076, 18077); close; } mes "[Csar Alexsay III]"; @@ -2004,6 +2028,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ mes "I give it as an atonement"; mes "to make my people happy."; mos_nowinter = 21; + completequest(18079); getitem Old_Blue_Box,1; next; mes "[Csar Alexsay III]"; @@ -2111,6 +2136,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ mes "You have a heavy responsibility."; mes "Bring evidence of this whale island to me, to provide me with some relief. Now go."; mos_whale_edq = 18; + changequest(18112, 18113); close; } else if (mos_whale_edq > 17 && mos_whale_edq < 35) { mes "[Csar Alexsay III]"; @@ -2307,6 +2333,7 @@ mosk_in,131,92,3 script Csar Alexsay III#npc 4_M_RUSKING,{ getitem Old_Violet_Box,1; getexp RENEWAL_EXP?100000:1200000,0; mos_whale_edq = 41; + completequest(18120); close; } mes "[Csar Alexsay III]"; @@ -2558,6 +2585,7 @@ OnTouch: mes "Watch out! "+strcharinfo(PC_NAME)+"!"; mes "Ah... That... That is... What..."; mos_whale_edq = 13; + changequest(18108, 18109); close2; warp "mosk_fild01",95,93; end; @@ -2697,6 +2725,7 @@ function script F_MOS_1 { mes "Mikhail is such a timid boy. I guess he didn't leave this village."; mes "Please bring him to me, then~"; mos_swan = 1; + setquest(18060); close; } @@ -2751,6 +2780,7 @@ mosk_in,144,279,5 script Gallina#mos 4_F_RUSWOMAN1,{ mes "Well, now I have to get to work!"; mes "I'll make you my hotcakes someday. Please visit me later"; mos_swan = 100; + completequest(18069); getexp RENEWAL_EXP?90000:1000000,0; close; } @@ -2863,7 +2893,10 @@ mosk_in,148,274,1 script Anna#mos 4_F_RUSCHILD,{ next; mes "["+strcharinfo(PC_NAME)+"]"; mes "It's the only clue, I guess I'll go to ^3131FFInn 'Sticky Herb Tree'^000000?"; - if (mos_swan == 2) mos_swan = 3; + if (mos_swan == 2) { + mos_swan = 3; + changequest(18060, 18061); + } next; break; case 4: @@ -3084,6 +3117,7 @@ mosk_in,205,268,3 script Fire pot#mos HIDDEN_NPC,{ mes "- I need to know what's required for the paste."; mes "I'll ask that guy ^3131FFMr. Victor^000000 about them. -"; mos_swan = 12; + changequest(18064, 18065); close; break; case 2: @@ -3139,6 +3173,7 @@ mosk_in,205,268,3 script Fire pot#mos HIDDEN_NPC,{ mes "Now I'm gonna give this back to Mom."; donpcevent "Mikhail#mos::OnInit"; mos_swan = 25; + changequest(18068, 18069); delitem High_Strength_Adhesive,1; close; } @@ -3302,6 +3337,7 @@ mosk_in,135,191,5 script Landlord#mos 4_F_RUSWOMAN3,{ mes "I was unkind to make you stay here but wasn't it easier for you? hoho."; mes "When it gets dark, promise me to come here again. Hoho"; mos_swan = 7; + changequest(18061, 18062); close; break; case 3: @@ -3380,6 +3416,7 @@ mosk_in,141,212,3 script Pub Owner#mos 4_M_RUSBALD,{ mes "[Pub Owner]"; mes "You're welcome."; mos_swan = 8; + changequest(18062, 18063); close; } mes "[Pub Owner]"; @@ -3596,6 +3633,7 @@ mosk_in,147,202,3 script Victor#mos 4_M_RUSMAN2,{ mes "[Victor]"; mes "He might've just hidden himself somewhere, haha!"; mos_swan = 10; + changequest(18062, 18063); close; } else if (mos_swan == 10 || mos_swan == 11) { mes "[Victor]"; @@ -3633,6 +3671,7 @@ mosk_in,147,202,3 script Victor#mos 4_M_RUSMAN2,{ mes "[Victor]"; mes "You should bring ^3131FF'10 sticky herbs'^000000 and ^3131FF 1 medicine bowl^000000 to me."; mos_swan = 13; + changequest(18065, 18066); close; } else if (mos_swan > 12 && mos_swan < 23) { mes "[Victor]"; @@ -3664,6 +3703,7 @@ mosk_in,147,202,3 script Victor#mos 4_M_RUSMAN2,{ delitem Sticky_Herb,10; delitem Medicine_Bowl,1; mos_swan = 24; + changequest(18067, 18068); getitem High_Strength_Adhesive,1; close; } @@ -3730,6 +3770,7 @@ mosk_dun03,153,90,3 script Bubbling Swamp#mos1 CLEAR_NPC,{ mes "["+strcharinfo(PC_NAME)+"]"; mes "I don't see any traces of Mikhail. I think I should go back and check his house one more time."; mos_swan = 11; + changequest(18063, 18064); close; } else if (mos_swan == 11 && mos_swan == 12) { mes "- You can see a small muddy swamp -"; @@ -3748,6 +3789,7 @@ mosk_dun03,153,90,3 script Bubbling Swamp#mos1 CLEAR_NPC,{ if (mos_swan == 22) { getitem Sticky_Herb,1; mos_swan = 23; + changequest(18066, 18067); close; } getitem Sticky_Herb,1; @@ -4461,6 +4503,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "a 1, 2, or 3 carat"; mes "^ff00001 Diamond^000000."; mos_nowinter = 6; + changequest(18070, 18071); next; } else { mes "[Baba Yaga, the Horrible]"; @@ -4481,6 +4524,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "a 1, 2, or 3 carat"; mes "^ff0000Diamond^000000."; mos_nowinter = 7; + changequest(18070, 18072); next; } mes "[Baba Yaga, the Horrible]"; @@ -4496,7 +4540,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "Did you get"; mes "all of the items?"; next; - setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10; + setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Sticky_Mucus,10,Detonator,1,Boody_Red,5,Burning_Heart,10; for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) { if (countitem(.@n[.@i]) < .@n[.@i+1]) { .@f = 1; @@ -4541,6 +4585,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "contain people's speech."; mes "I must have this."; next; + changequest(18071, 18073); mes "[Baba Yaga, the Horrible]"; mes "I don't know how strong you are,"; mes "but I would like to recommend that"; @@ -4591,7 +4636,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "Did you get"; mes "all of them?"; next; - setarray .@n, Grasshopper's_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10; + setarray .@n, Grasshoppers_Leg,20,Spawn,5,Wing_Of_Red_Bat,20,Starsand_Of_Witch,10,Fine_Grit,10,Detonator,1,Boody_Red,5,Burning_Heart,10; for (.@i = 0; .@i < getarraysize(.@n); .@i += 2) { if (countitem(.@n[.@i]) < .@n[.@i+1]) { .@f = 1; @@ -4742,6 +4787,7 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "[Baba Yaga, the Horrible]"; mes "Take care of yourself, cough, cough."; mos_nowinter = 10; + changequest(18074, 18075); close; } mes "[Baba Yaga, the Horrible]"; @@ -4888,8 +4934,9 @@ mosk_in,215,46,5 script Baba Yaga, the Horrible 4_F_BABAYAGA,{ mes "If you do this, what the villagers want"; mes "will be happening,"; mes "forever."; - getitem Yaga_Secret_Medicine,1; mos_nowinter = 19; + changequest(18077, 18078); + getitem(Yaga_Secret_Medicine, 1); close; } else if (mos_nowinter == 19) { mes "[Baba Yaga, the Horrible]"; @@ -4935,6 +4982,7 @@ S_BY_1: mes "where it is."; mes "Could you please come back later?"; mos_nowinter = 5; + setquest(18070); close; } @@ -5472,6 +5520,7 @@ moscovia,224,190,0 script #nowinterplz CLEAR_NPC,{ delitem Yaga_Secret_Medicine,1; specialeffect EF_BARRIER; mos_nowinter = 20; + changequest(18078, 18079); next; mes "-You feel like your"; mes "body is heating up."; @@ -6166,7 +6215,10 @@ moscovia,196,71,3 script A Young Man#mos14 4_M_RUSMAN2,{ mes "I hope that winter never comes."; mes "It is my dream."; mos_middle = 1; - if (mos_kid == 1 && mos_elder == 1) mos_nowinter = 11; + if (mos_kid == 1 && mos_elder == 1) { + mos_nowinter = 11; + changequest(18075, 18076); + } close; } mes "[Fredek]"; @@ -6217,7 +6269,10 @@ moscovia,234,168,5 script A Man#mos15 4_M_RUSBALD,{ mes "But, design of coldness is"; mes "winter itself, isn't it?"; mos_elder = 1; - if (mos_kid == 1 && mos_middle == 1) mos_nowinter = 11; + if (mos_kid == 1 && mos_middle == 1) { + mos_nowinter = 11; + changequest(18075, 18076); + } close; } mes "[Gavrel]"; @@ -6267,7 +6322,10 @@ moscovia,228,80,3 script A Little Boy#mos16 4_M_RUSCHILD,{ mes "Do you think"; mes "the winter should come again?"; mos_kid = 1; - if (mos_middle == 1 && mos_elder == 1) mos_nowinter = 11; + if (mos_middle == 1 && mos_elder == 1) { + mos_nowinter = 11; + changequest(18075, 18076); + } close; } mes "[Rurik]"; @@ -6329,6 +6387,7 @@ OnTouch: mes "Here it is."; mes "That was easy to find."; mos_nowinter = 9; + changequest(18073, 18074); getitem Magic_Gourd_Bottle,1; close; } @@ -6337,6 +6396,7 @@ OnTouch: mes "Ah, I got it!"; mes "I better get out of here quickly."; mos_nowinter = 9; + changequest(18073, 18074); getitem Magic_Gourd_Bottle,1; close; } @@ -6503,6 +6563,7 @@ moscovia,211,93,3 script Irina#edq 4_F_RUSCHILD,{ mes "Shafka still keeps you warm!"; close; } + setquest(18121); mes "[Irina]"; mes "Do you want to make a Shafka hat?"; mes "Heheh. Good idea!"; @@ -6525,6 +6586,7 @@ moscovia,211,93,3 script Irina#edq 4_F_RUSCHILD,{ delitem Sea_Otter_Leather,20; delitem Spool,1; getitem Chullos,1; + completequest(18121); mes "[Irina]"; mes "Good, I made it. So, how about it?"; mes "Do you like it?"; @@ -6770,6 +6832,7 @@ mosk_dun01,167,160,3 script Gray Wolf#rus03 4_RUS_DWOLF,{ mes "I'm warning you again!"; mes "Unless you want to be killed, leave now."; rhea_rus_main = 3; + setquest(8136); emotion e_omg,1; specialeffect2 EF_HIT2; percentheal -50,0; @@ -6918,6 +6981,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ mes "Please don't forget about me."; donpcevent "Gray Wolf#rus05::OnDisable"; rhea_rus_main = 6; + changequest(8136, 8137); close; } else if (rhea_rus_main > 5 && rhea_rus_main < 8) { mes "[Girl's Voice]"; @@ -7084,6 +7148,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ mes "Stop! Where do you think you're going?!!!"; delitem Gold_Key,1; rhea_rus_main = 48; + changequest(8167, 8168); monster "mosk_dun01",45,256,"Koshei, the Immortal",1890,1,"Wall#rus04::OnMyMobDead"; donpcevent "Koshei#rus47::OnEnable"; close; @@ -7124,6 +7189,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ mes "[Gray Wolf]"; mes "I can't keep her alive for much longer. You must find Baba Yaga."; rhea_rus_main = 49; + changequest(8168, 8169); close2; donpcevent "Gray Wolf#rus05::OnDisable"; end; @@ -7258,6 +7324,7 @@ mosk_dun01,45,259,0 script Wall#rus04 HIDDEN_NPC,{ mes "[Maria Morebna]"; mes "It's been a long time since I've felt the sunlight, fresh wind and the scent of grass. I'm so grateful."; rhea_rus_main = 52; + completequest(8171); .@rus_food = rand(1,6); switch (rand(1,6)) { case 1: getitem Dex_Dish08,1; break; @@ -7350,15 +7417,15 @@ OnDisable: end; OnTimer3000: - announce "Koshei, the Immortal : I will kill all who disturb me!! Cry in terror weak humans!!!",bc_map,0xCE3131; + mapannounce "mosk_dun01","Koshei, the Immortal : I will kill all who disturb me!! Cry in terror weak humans!!!",bc_map,0xCE3131; end; OnTimer63000: - announce "Koshei, the Immortal : You worms, you mere monsters... I will curse all who are in my way!!",bc_map,0xCE3131; + mapannounce "mosk_dun01","Koshei, the Immortal : You worms, you mere monsters... I will curse all who are in my way!!",bc_map,0xCE3131; end; OnTimer150000: - announce "Koshei, the Immortal : Mankind! Cry in terror!! Hahahahahahahhahahah!!!",bc_map,0xCE3131; + mapannounce "mosk_dun01","Koshei, the Immortal : Mankind! Cry in terror!! Hahahahahahahhahahah!!!",bc_map,0xCE3131; end; OnTimer300000: @@ -7475,6 +7542,7 @@ moscovia,178,127,0 script The Blacksmith#rus06 1_M_SMITH,{ mes "Bahahaha~"; mes "I promise you, I'll explain when you bring the ^0000ff25 Steel^000000 to me. Please just get the Steel and come back."; rhea_rus_main = 7; + changequest(8137, 8138); close; } else if (rhea_rus_main == 7) { if (countitem(Steel) > 24) { @@ -7524,6 +7592,8 @@ moscovia,178,127,0 script The Blacksmith#rus06 1_M_SMITH,{ mes "And don't forget to wear these!"; delitem Steel,25; rhea_rus_main = 8; + // if (BaseClass != Job_Thief) + changequest(8138, 8139); if (BaseClass == Job_Merchant || BaseClass == Job_Swordman || BaseClass == Job_Thief || BaseClass == Job_Archer) getitem Iron_Boots01,1; else getitem Iron_Boots02,1; close; } mes "[The Blacksmith]"; @@ -7585,6 +7655,7 @@ moscovia,178,127,0 script The Blacksmith#rus06 1_M_SMITH,{ mes "Ah and you shouldn't be needing those Steel Boots anymore. Good luck!"; if (countitem(Iron_Boots01)) delitem Iron_Boots01,1; else delitem Iron_Boots02,1; rhea_rus_main = 9; + changequest(8139, 8154); close; } mes "[The Blacksmith]"; @@ -7753,6 +7824,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{ mes "[Vassili Grandpapa]"; mes "She disappeared soon... after Now all I have is Ryubaba. She is also pretty and smart but nothing can relieve the sadnesss in my heart from losing Mashenka..."; rhea_rus_ring = 1; + setquest(8140); close; } else if (rhea_rus_ring && rhea_rus_ring < 8) { mes "[Vassili Grandpapa]"; @@ -7879,6 +7951,7 @@ moscovia,206,81,0 script Vassili Grandpapa#rus07 4_M_05,{ mes "...It is my fault that this tragedy between my daughters happened. I will spend the rest of my life trying to make up for it..."; delitem Pointed_Wooden_Flute,1; rhea_rus_ring = 10; + completequest(8144); getitem Red_Ring,1; if (RENEWAL_EXP) { if (BaseLevel < 56) getexp 470,0; @@ -8073,6 +8146,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ mes "[Ryubaba]"; mes "Right... Let me finish talking. We tried searching for her but we couldn't find her. She must have been wearing the ring when she disappeared around the marsh."; rhea_rus_ring = 5; + changequest(8140, 8141); close; } else if (rhea_rus_ring > 4 && rhea_rus_ring < 7) { mes "[Ryubaba]"; @@ -8184,6 +8258,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ mes "[Ryubaba]"; mes "W, wait!!!"; rhea_rus_ring = 8; + changequest(8143, 8144); close2; warp "moscovia",203,80; end; @@ -8195,6 +8270,7 @@ moscovia,213,216,3 script Ryubaba#rus08 4_F_RUSWOMAN2,{ mes "I have to repent for my sins and atone for them for the rest of my life."; delitem Pointed_Wooden_Flute,1; rhea_rus_ring = 9; + completequest(8143); getitem Red_Ring,1; if (RENEWAL_EXP) { if (BaseLevel < 56) getexp 470,0; @@ -8367,6 +8443,7 @@ mosk_fild02,157,233,0 script Shepherdess#rus10 1_F_04,{ mes "[Shepherdess]"; mes "I am an excellent flute player! If you get me enough Pointed Branches, I will make a flute from them and play beautiful music for you. Please~!"; rhea_rus_ring = 6; + changequest(8141, 8142); close; } else if (rhea_rus_ring == 6) { if (countitem(Pointed_Branch) > 24) { @@ -8421,6 +8498,7 @@ mosk_fild02,157,233,0 script Shepherdess#rus10 1_F_04,{ mes "- ^0000ff'Pointed Wooden Flute'!!^000000 -"; delitem Pointed_Branch,25; rhea_rus_ring = 7; + changequest(8142, 8143); getitem Pointed_Wooden_Flute,1; close; } @@ -8544,6 +8622,7 @@ moscovia,166,145,1 script Worried Mother#rus19 4_F_RUSWOMAN3,{ mes "[Worried Mother]"; mes "Please, please find my daughter."; rhea_rus_hair = 1; + setquest(8145); close; } else if (rhea_rus_hair == 1) { mes "[Worried Mother]"; @@ -8567,6 +8646,7 @@ moscovia,166,145,1 script Worried Mother#rus19 4_F_RUSWOMAN3,{ mes "[Worried Mother]"; mes "I'm not sure where she would be but it has to be somewhere near water. Please, find where my daughter is. I beg of you."; rhea_rus_hair = 2; + changequest(8145, 8146); close; } else if (rhea_rus_hair > 1 && rhea_rus_hair < 9) { mes "[Worried Mother]"; @@ -8624,10 +8704,10 @@ OnTouch: mes "- You hear a splashing as -"; mes "- something gleaming -"; mes "- seems to stare at you!! -"; - next; + close2; specialeffect2 EF_FLASHER; - percentheal -100,0; - close; + unitkill getcharid(CHAR_ID_ACCOUNT); + end; } } else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) { mes "[Lusalka's Voice]"; @@ -8646,9 +8726,10 @@ OnTouch: close; } mes "-You seem to hear the splash but something gleaming raids on you!!-"; + close2; specialeffect2 EF_FLASHER; - percentheal -100,0; - close; + unitkill getcharid(CHAR_ID_ACCOUNT); + end; } } else if (rhea_rus_hair == 8) { mes "["+ strcharinfo(PC_NAME) +"]"; @@ -8780,6 +8861,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ mes "- ^0000ffgolden earrings^000000 -"; mes "- ^0000fffrom Lusalka!^000000 -"; rhea_rus_hair = 3; + changequest(8146, 8147); donpcevent "Lusalka#rus23::OnDisable"; close; } else if (rhea_rus_hair > 2 && rhea_rus_hair < 7) { @@ -8860,6 +8942,7 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ mes "W, who are you!? Ahkkk!!"; sc_start SC_BLIND,10000,0; rhea_rus_hair = 8; + completequest(8150); donpcevent "Lusalka#rus23::OnDisable"; close; } else if (rhea_rus_hair > 7) { @@ -8884,10 +8967,11 @@ mosk_fild02,124,202,3 script Lusalka#rus23 4_F_RUSGREEN,{ end; } mes "-When Lusalka watches you, you are blacked out-"; + close2; specialeffect2 EF_FLASHER; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); donpcevent "Lusalka#rus23::OnDisable"; - close; + end; OnInit: disablenpc "Lusalka#rus23"; @@ -8990,6 +9074,7 @@ prontera,228,279,3 script Wanderer#rus24 4_M_RUSMAN2,{ mes "me that he wanted"; mes "to travel to a desert."; rhea_rus_hair = 4; + changequest(8147, 8148); close; } else if (rhea_rus_hair > 3 && rhea_rus_hair < 7) { mes "[A Wanderer from a strange land]"; @@ -9068,6 +9153,7 @@ morocc,165,82,0 script Morroc Villager#rus25 1_M_02,{ mes "[Morroc Villager]"; mes "Yep that's gotta be who you're looking for. I can see his gloomy face right now... that poor sad man."; rhea_rus_hair = 5; + changequest(8148, 8149); close; } else if (rhea_rus_hair > 4 && rhea_rus_hair < 7) { mes "[Morroc Villager]"; @@ -9206,6 +9292,7 @@ moc_pryd04,126,120,0 script Soldier#rus26 4_M_RUSMAN1,{ mes "[A gloomy looking soldier]"; mes "Before the full moon, I will be back to Moscovia and meet her. I will come back so strong and happy that when I go to see her she will not suffer anymore."; rhea_rus_hair = 7; + changequest(8149, 8150); close; } else if (rhea_rus_hair == 7) { mes "[A gloomy looking soldier]"; @@ -9290,6 +9377,7 @@ OnTouch: mes "[Voice unidentified]"; mes "Show me what you can do."; rhea_rus_quiz = 1; + setquest(8151); close; } } @@ -9487,6 +9575,7 @@ mosk_fild02,243,270,0 script Marozka#rus31 4_M_LGTGRAND,{ mes "[Marozka]"; mes "That was a test of your strength. Now you must pass the test of mind and wisdom."; rhea_rus_quiz = 29; + changequest(8152, 8153); close; } else if (rhea_rus_quiz == 29) { if (getequipid(EQI_SHOES) != 2429) { @@ -9554,6 +9643,7 @@ mosk_fild02,243,270,0 script Marozka#rus31 4_M_LGTGRAND,{ mes "[Marozka]"; mes "I hope you help Maria with your strength and kindness."; rhea_rus_quiz = 30; + completequest(8153); getitem Golden_Thread,10; close; } @@ -9685,6 +9775,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe."; rhea_rus_main = 11; + changequest(8154, 8155); close; } else if (BaseClass == Job_Acolyte) { mes "[Baba Yaga]"; @@ -9693,6 +9784,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe."; rhea_rus_main = 16; + changequest(8154, 8157); close; } else if (BaseClass == Job_Thief) { mes "[Baba Yaga]"; @@ -9701,6 +9793,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe."; rhea_rus_main = 21; + changequest(8154, 8159); close; } else if (BaseClass == Job_Mage) { mes "[Baba Yaga]"; @@ -9709,6 +9802,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe."; rhea_rus_main = 26; + changequest(8154, 8161); close; } else if (BaseClass == Job_Swordman) { mes "[Baba Yaga]"; @@ -9717,6 +9811,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe."; rhea_rus_main = 31; + changequest(8154, 8163); close; } mes "[Baba Yaga]"; @@ -9725,6 +9820,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Ok! Move, move! You better be quick or I will find a way to punish you. Ehehehehehe."; rhea_rus_main = 36; + changequest(8154, 8165); close; } else if (rhea_rus_main > 10 && rhea_rus_main < 16) { mes "[Baba Yaga]"; @@ -9853,6 +9949,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "Here, help Maria with this key and watch out for Koshei. He is very dangerous. Kehehehehehe."; rhea_rus_main = 47; getitem Gold_Key,1; + changequest(8156, 8167); close; } else if (rhea_rus_main == 42) { mes "["+ strcharinfo(PC_NAME) +"]"; @@ -9867,6 +9964,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Here, help Maria with this key and watch out for Koshei. He is very dangerous. Kehehehehehe."; rhea_rus_main = 47; + changequest(8158, 8167); getitem Gold_Key,1; close; } else if (rhea_rus_main == 43) { @@ -9884,6 +9982,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "Here, help Maria with this key and watch out for Koshei. He is very dangerous. Kehehehehehe."; delitem Babayaga_Silver_Spoon,1; rhea_rus_main = 47; + changequest(8160, 8167); getitem Gold_Key,1; close; } @@ -9909,6 +10008,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Here, help Maria with this key and watch out for Koshei. He is very dangerous. Kehehehehehe."; rhea_rus_main = 47; + changequest(8162, 8167); getitem Gold_Key,1; close; } else if (rhea_rus_main == 45) { @@ -9924,6 +10024,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Here, help Maria with this key and watch out for Koshei. He is very dangerous. Kehehehehehe."; rhea_rus_main = 47; + changequest(8164, 8167); getitem Gold_Key,1; close; } else if (rhea_rus_main == 46) { @@ -9939,6 +10040,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Here, help Maria with this key and watch out for Koshei. He is very dangerous. Kehehehehehe."; rhea_rus_main = 47; + changequest(8166, 8167); getitem Gold_Key,1; close; } else if (rhea_rus_main > 46 && rhea_rus_main < 49) { @@ -9977,6 +10079,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ mes "[Baba Yaga]"; mes "Bring them to me quickly! Time is running out!"; rhea_rus_main = 50; + changequest(8169, 8170); close; } else if (rhea_rus_main == 50) { if (countitem(Holy_Water) && countitem(Water_Of_Darkness) && countitem(Leaf_Of_Yggdrasil) > 1 && countitem(Leaflet_Of_Hinal) > 9) { @@ -10029,6 +10132,7 @@ mosk_dun02,48,214,5 script Baba Yaga#rus32 4_F_BABAYAGA,{ delitem Leaf_Of_Yggdrasil,2; delitem Leaflet_Of_Hinal,10; rhea_rus_main = 51; + changequest(8170, 8171); close; } mes "[Baba Yaga]"; @@ -10381,6 +10485,7 @@ OnTouch: mes "["+ strcharinfo(PC_NAME) +"]"; mes "Ok, then. Let's get back to Baba Yaga..."; rhea_rus_main = 41; + changequest(8155, 8156); close; } else if (rhea_rus_main == 41) { mes "[Cow]"; @@ -10480,6 +10585,7 @@ OnTouch: mes "["+ strcharinfo(PC_NAME) +"]"; mes "Ok, then. Let's get back to Baba Yaga..."; rhea_rus_main = 41; + changequest(8155, 8156); close; } else if (rhea_rus_main == 41) { mes "[Cow]"; @@ -10568,6 +10674,7 @@ OnTouch: mes "["+ strcharinfo(PC_NAME) +"]"; mes "Ok, then. Let's get back to Baba Yaga..."; rhea_rus_main = 41; + changequest(8155, 8156); close; } else if (rhea_rus_main == 41) { mes "[Cow]"; @@ -10762,6 +10869,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{ mes "Hu, the job has been done."; mes "Let's get back to Baba Yaga."; rhea_rus_main = 42; + changequest(8157, 8158); close; } else if (rhea_rus_main == 20) { mes "["+ strcharinfo(PC_NAME) +"]"; @@ -10775,6 +10883,7 @@ mosk_dun02,65,232,0 script Noisy Coffin#rus36 4_NFCOFFIN,{ mes "Hu, the job has been done."; mes "Let's get back to Baba Yaga."; rhea_rus_main = 42; + changequest(8157, 8158); close; } else if (rhea_rus_main == 42) { mes "["+ strcharinfo(PC_NAME) +"]"; @@ -10833,6 +10942,7 @@ treasure01,165,58,0 script Old Treasure Box#rus37 HIDDEN_NPC,{ next; mes "- ^0000ff You find Baba Yaga's spoon !!^000000 -"; rhea_rus_main = 43; + changequest(8159, 8160); getitem Babayaga_Silver_Spoon,1; close; } else if (rhea_rus_main == 43) { @@ -11109,6 +11219,7 @@ amatsu,233,234,3 script Momotoro Publisher#rus42 4_F_JPN2,{ mes "Thank you for buying our books. If you need more books, contact us please."; Zeny -= 5000; rhea_rus_main = 27; + changequest(8161, 8162); getitem Book_Of_Magic,1; close; } else if (rhea_rus_main > 26 && rhea_rus_main < 31) { @@ -11379,6 +11490,7 @@ mosk_dun02,57,220,0 script House Ghost Jar#rus43 HIDDEN_NPC,{ mes "[House Ghost]"; mes "I will never forget your kindness of entertaining me."; rhea_rus_main = 45; + changequest(8163, 8164); close; } else if (rhea_rus_main == 45) { mes "[House Ghost]"; @@ -11754,6 +11866,7 @@ pay_dun04,163,186,0 script Ghost Tree#rus45 HIDDEN_NPC,{ next; mes "- ^0000ff You receive the best broom from Payon !!^000000 - "; rhea_rus_main = 46; + changequest(8165, 8166); close; } mes "[Ghost Tree]"; diff --git a/npc/quests/quests_nameless.txt b/npc/quests/quests_nameless.txt index f2e20c07f..0e0422530 100644 --- a/npc/quests/quests_nameless.txt +++ b/npc/quests/quests_nameless.txt @@ -2862,7 +2862,6 @@ que_temsky,99,100,6 script Pope#rachel2 4_F_ARUNA_POP,{ } que_temsky,100,93,0 script #em_sky_s FAKE_NPC,5,2,{ -//OnTouch2: OnTouch: if (aru_em == 21) { mes "^3355FFHigh Priest Zhed and High"; @@ -4252,7 +4251,6 @@ cmd_fild01,55,160,0 script Heap of Earth CLEAR_NPC,{ close; } -//OnTouch2: OnTouch: if (diamond_edq < 9) { mes "[Dorian]"; @@ -5162,7 +5160,6 @@ moc_ruins,152,147,5 script Ibrahim 4_M_JOB_HUNTER,3,3,{ mes "kept it well hidden..."; close; -//OnTouch2: OnTouch: if ((diamond_edq == 14) && (BaseLevel > 65)) { mes "[Ibrahim]"; @@ -6861,7 +6858,6 @@ prt_in,168,18,1 script Valdes 1_M_YOUNGKNIGHT,2,2,{ mes "It's like my life is over..."; close; -//OnTouch2: OnTouch: if (zdan_edq == 2) { mes "[Valdes]"; @@ -8702,7 +8698,6 @@ OnInit: $@mosnter = 0; end; -//OnTouch2: OnTouch: if (zdan_edq == 15) { mes "^FF0000*Creak Creak*^000000"; @@ -10174,7 +10169,7 @@ moc_fild18,108,116,0 script #treasure CLEAR_NPC,{ mes "protection to get the treasure.^000000"; next; input .@input$; - getpartymember(getcharid(1)); + getpartymember(getcharid(CHAR_ID_PARTY)); .@partymembercount = $@partymembercount; if (.@partymembercount > 1) { if (((.@input$ == "OpenSesame") && (treasure_nd == 9)) || ((.@input$ == "UnlockTreasure") && (treasure_nd == 10))) { @@ -11647,7 +11642,6 @@ OnTimer60000: gef_fild08,182,182,0 script #CallGhost FAKE_NPC,2,2,{ end; -//OnTouch2: OnTouch: if (jewel_nd == 21) { if (countitem(Unlucky_Emerald) > 0) { diff --git a/npc/quests/quests_prontera.txt b/npc/quests/quests_prontera.txt index d443d5712..03b119456 100644 --- a/npc/quests/quests_prontera.txt +++ b/npc/quests/quests_prontera.txt @@ -186,7 +186,7 @@ prt_in,38,108,4 script Teacher 1_M_INNKEEPER,{ delitem Hinalle,1; delitem Aloe,1; delitem Ment,1; - getitem 5012,1; //Ph.D_Hat + getitem(Ph_D_Hat, 1); mes "[Teacher]"; mes "I really really appreciate you what you've done for me. I'm truly grateful. I will give my precious item to you as promised."; next; diff --git a/npc/quests/quests_umbala.txt b/npc/quests/quests_umbala.txt index c02caf857..6fc89a0cf 100644 --- a/npc/quests/quests_umbala.txt +++ b/npc/quests/quests_umbala.txt @@ -529,12 +529,12 @@ um_in,44,71,2 script Utan Shaman 4_F_UMOLDWOMAN,{ .@success = 993; //Yellow_Live break; case 2: - .@consume = 946; //Snail's_Shell + .@consume = 946; //Snails_Shell .@amount = 20; .@success = 991; //Crystal_Blue break; case 3: - .@consume = 904; //Scorpion's_Tail + .@consume = 904; //Scorpions_Tail .@amount = 20; .@success = 990; //Boody_Red break; diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt index d11563b8d..c6c95bc17 100644 --- a/npc/quests/quests_veins.txt +++ b/npc/quests/quests_veins.txt @@ -4516,7 +4516,7 @@ veins,115,59,5 script Saraman 4_M_EINOLD,{ close; } else if (rachel_camel == 8) { - if ((countitem(Monster's_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) { + if ((countitem(Monsters_Feed) > 4) && (countitem(Yellow_Potion) > 0) && (countitem(Unripe_Apple) > 0) && (countitem(Empty_Bottle) > 0)) { mes "[Camel Farm Owner Saraman]"; mes "Oh good, you're back."; mes "Did you bring everything?"; @@ -4552,7 +4552,7 @@ veins,115,59,5 script Saraman 4_M_EINOLD,{ mes "ingredients. That's a good"; mes "amount to collect since that's"; mes "what Ms. Ivory usually orders."; - delitem Monster's_Feed,5; + delitem Monsters_Feed,5; delitem Yellow_Potion,1; delitem Unripe_Apple,1; delitem Empty_Bottle,1; diff --git a/npc/quests/seals/god_weapon_creation.txt b/npc/quests/seals/god_weapon_creation.txt index 87c231dd7..3f32461fa 100644 --- a/npc/quests/seals/god_weapon_creation.txt +++ b/npc/quests/seals/god_weapon_creation.txt @@ -89,7 +89,7 @@ gld_dun01,28,85,0 script Grunburti#1::GodDwarf 4_M_DWARF,{ mes "At least I was fortunate enough to find this cave. We Dwarves are most cozy living underground, after all."; close; case 3: - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); if (($God1 < $@god_check2) || ($God2 < $@god_check2) || ($God3 < $@god_check2) || ($God4 < $@god_check2)){ if (($God1 >= $@god_check1) && ($God2 >= $@god_check1) && ($God3 >= $@god_check1) && ($God4 >= $@god_check1) && (strcharinfo(PC_NAME) == getguildmaster(.@GID))) { mes "[Dwarf Grunburti]"; @@ -412,7 +412,7 @@ que_god01,154,112,4 script Grunburti#god 4_M_DWARF,{ mes "pity for you~"; close; } - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { mes "[Dwarf Grunburti]"; mes "How in the..."; diff --git a/npc/quests/seals/megingard_seal.txt b/npc/quests/seals/megingard_seal.txt index cf17a9619..228268602 100644 --- a/npc/quests/seals/megingard_seal.txt +++ b/npc/quests/seals/megingard_seal.txt @@ -1859,7 +1859,7 @@ morocc_in,146,179,0 script Employee#megin1 1_F_01,{ mes "^3355FFThe Inn Employee"; mes "knocks you out~^000000"; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } else { @@ -1897,7 +1897,8 @@ morocc_in,146,179,0 script Employee#megin1 1_F_01,{ mes "^3355FFThe Inn Employee"; mes "knocks you out~^000000"; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); + end; } else { mes "[Ms. Scary Inn Employee]"; @@ -1937,7 +1938,7 @@ morocc_in,146,179,0 script Employee#megin1 1_F_01,{ mes "^3355FFThe Inn Employee"; mes "knocks you out~^000000"; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } else { diff --git a/npc/quests/seals/sleipnir_seal.txt b/npc/quests/seals/sleipnir_seal.txt index 5722d8e08..d3982699c 100644 --- a/npc/quests/seals/sleipnir_seal.txt +++ b/npc/quests/seals/sleipnir_seal.txt @@ -247,10 +247,10 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else if (.@god_treasure1 < 348) getitem Helm_,1; else if (.@god_treasure1 < 400) getitem Gemmed_Sallet_,1; else if (.@god_treasure1 < 448) getitem Circlet_,1; - else if (.@god_treasure1 < 496) getitem Santa's_Hat,1; - else if (.@god_treasure1 < 544) getitem Big_Sis'_Ribbon,1; + else if (.@god_treasure1 < 496) getitem Santas_Hat,1; + else if (.@god_treasure1 < 544) getitem Big_Sis_Ribbon,1; else if (.@god_treasure1 < 592) getitem Sweet_Gents,1; - else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1; + else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1; else if (.@god_treasure1 < 688) getitem Western_Grace,1; else if (.@god_treasure1 < 736) getitem Fillet,1; else if (.@god_treasure1 < 784) getitem Holy_Bonnet,1; @@ -287,7 +287,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else getitem Apple_Of_Archer,1; } else if (.@god_treasure < 501) { - if (.@god_treasure1 < 80) getitem Adventurere's_Suit_,1; + if (.@god_treasure1 < 80) getitem Adventureres_Suit_,1; else if (.@god_treasure1 < 160) getitem Mantle_,1; else if (.@god_treasure1 < 240) getitem Coat_,1; else if (.@god_treasure1 < 320) getitem Mink_Coat,1; @@ -325,7 +325,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else if (.@god_treasure1 < 660) getitem Clip,1; else if (.@god_treasure1 < 770) getitem Rosary,1; else if (.@god_treasure1 < 880) getitem Mitten_Of_Presbyter,1; - else getitem Matyr's_Flea_Guard,1; + else getitem Matyrs_Flea_Guard,1; } else { if (.@god_treasure1 < 150) getitem Mr_Scream,1; @@ -360,7 +360,7 @@ que_god01,98,98,4 script Manager#G 1_F_04,{ else if (.@god_treasure1 < 496) getitem Spinx_Helm,1; else if (.@god_treasure1 < 544) getitem Corsair,1; else if (.@god_treasure1 < 592) getitem Sweet_Gents,1; - else if (.@god_treasure1 < 640) getitem Oldman's_Romance,1; + else if (.@god_treasure1 < 640) getitem Oldmans_Romance,1; else if (.@god_treasure1 < 688) getitem Western_Grace,1; else if (.@god_treasure1 < 736) getitem Spinx_Helm_,1; else if (.@god_treasure1 < 784) getitem Holy_Bonnet_,1; diff --git a/npc/quests/skills/hunter_skills.txt b/npc/quests/skills/hunter_skills.txt index b22360ec6..2d8aaf691 100644 --- a/npc/quests/skills/hunter_skills.txt +++ b/npc/quests/skills/hunter_skills.txt @@ -102,7 +102,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{ } } else if (qskill_hunter == 1) { - if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpy's_Feather) > 4 && countitem(Pet_Food) > 29) { + if (countitem(Cardinal_Jewel_) > 4 && countitem(Harpys_Feather) > 4 && countitem(Pet_Food) > 29) { mes "[Arpesto]"; mes "Hm? You're back?"; mes "Oh, did you bring"; @@ -222,7 +222,7 @@ pay_arche,109,169,3 script Arpesto 4_M_05,{ mes "sure you make good use"; mes "of that new skill. Take care~"; delitem Cardinal_Jewel_,5; - delitem Harpy's_Feather,5; + delitem Harpys_Feather,5; delitem Pet_Food,30; qskill_hunter = 100; skill "HT_PHANTASMIC",1,0; diff --git a/npc/quests/skills/knight_skills.txt b/npc/quests/skills/knight_skills.txt index 3e177243a..1230ecab9 100644 --- a/npc/quests/skills/knight_skills.txt +++ b/npc/quests/skills/knight_skills.txt @@ -332,7 +332,6 @@ prt_in,85,99,3 script Knight#kabuto 4_M_JOB_KNIGHT2,{ } prontera,69,351,0 script #tour HIDDEN_NPC,5,5,{ -//OnTouch2: OnTouch: if (KNGT_SK > 2) end; diff --git a/npc/quests/skills/merchant_skills.txt b/npc/quests/skills/merchant_skills.txt index ee84bd837..bee16543f 100644 --- a/npc/quests/skills/merchant_skills.txt +++ b/npc/quests/skills/merchant_skills.txt @@ -238,7 +238,7 @@ alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{ next; switch (select("That's why I came here.", "What about my cart?", "Two pairs is pitiful?")) { case 1: - if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animal's_Skin) > 19)) { + if ((countitem(Wooden_Block) > 49) && (countitem(Iron) > 9) && (countitem(Animals_Skin) > 19)) { mes "[Charlron]"; mes "Haha! Ok, ok!"; mes "With the things you brought"; @@ -246,7 +246,7 @@ alberta,119,221,6 script Charlron 1_M_PAY_ELDER,{ next; delitem Wooden_Block,50; delitem Iron,10; - delitem Animal's_Skin,20; + delitem Animals_Skin,20; skill "MC_CHANGECART",1,0; mes "[Charlron]"; mes "Congratulations."; diff --git a/npc/quests/skills/sage_skills.txt b/npc/quests/skills/sage_skills.txt index 06f79fba3..420477f4f 100644 --- a/npc/quests/skills/sage_skills.txt +++ b/npc/quests/skills/sage_skills.txt @@ -266,7 +266,7 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ close; } else if(SAG_SK == 1) { - if (countitem(Scorpion's_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snail's_Shell) < 10 || countitem(Scroll) < 4) { + if (countitem(Scorpions_Tail) < 10 || countitem(Horn) < 7 || countitem(Colorful_Shell) < 12 || countitem(Snails_Shell) < 10 || countitem(Scroll) < 4) { mes "[Mishuna]"; mes "Hm, you still haven't"; mes "gathered all of the materials"; @@ -333,10 +333,10 @@ yuno_in03,176,24,3 script Mischna 4_M_SAGE_C,{ mes "Creation skill by reviewing"; mes "your copy of Barmundt's scroll.^000000"; specialeffect2 EF_ABSORBSPIRITS; - delitem Scorpion's_Tail,10; // Scorpion_Tail + delitem Scorpions_Tail,10; delitem Horn,7; // Horn delitem Colorful_Shell,12; // Rainbow_Shell - delitem Snail's_Shell,10; // Snail's_Shell + delitem Snails_Shell,10; delitem Scroll,4; // Blank_Scroll SAG_SK = 2; skill "SA_CREATECON",1,0; diff --git a/npc/quests/skills/thief_skills.txt b/npc/quests/skills/thief_skills.txt index 6c56924f1..35cd38998 100644 --- a/npc/quests/skills/thief_skills.txt +++ b/npc/quests/skills/thief_skills.txt @@ -175,7 +175,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ close; } case 2: - if ((countitem(Grasshopper's_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { + if ((countitem(Grasshoppers_Leg) > 19) && ((JobLevel > 34) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { mes "[Alcouskou]"; mes "Okay! Let's practice!"; next; @@ -192,7 +192,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ mes "Great! -At this level,"; mes "I am sure you can increase"; mes "your skill on your own."; - delitem Grasshopper's_Leg,20; + delitem Grasshoppers_Leg,20; skill "TF_BACKSLIDING",1,0; close; } @@ -252,7 +252,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ mes "If not, I cannot teach you."; close; case 3: - if ((countitem(Zargon) > 0) && (countitem(Bear's_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { + if ((countitem(Zargon) > 0) && (countitem(Bears_Foot) > 0) && (countitem(Spawn) > 4) && ((JobLevel > 19) || (BaseJob == Job_Assassin || BaseJob == Job_Rogue))) { mes "[Alcouskou]"; mes "Wow, you have already prepared?"; mes "Great, I see promise in you. -"; @@ -283,7 +283,7 @@ moc_prydb1,154,128,4 script Alcouskou 2_M_THIEFMASTER,{ mes "I hope it aids you in the future."; mes ". . . . . Hope to see you soon"; delitem Zargon,1; - delitem Bear's_Foot,1; + delitem Bears_Foot,1; delitem Spawn,5; skill "TF_PICKSTONE",1,0; close; diff --git a/npc/quests/the_sign_quest.txt b/npc/quests/the_sign_quest.txt index 274848569..dd3750543 100644 --- a/npc/quests/the_sign_quest.txt +++ b/npc/quests/the_sign_quest.txt @@ -307,7 +307,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{ mes "know right away. For now,"; mes "please hold on to these pieces."; sign_q = 54; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; } else if (sign_q == 54) { if (rand(1,5) == 4) { @@ -736,19 +736,19 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{ mes "accept this as a token"; mes "of my gratitude. Good luck"; mes "on your travels, adventurer."; - if (checkweight(Star's_Sob,1) == 0) { + if (checkweight(Stars_Sob,1) == 0) { next; mes "^3355FFWait a second! Right now,"; mes "you have too many items in your inventory. Please come back after you've freed up more inventory space.^000000"; close; } - delitem Star's_Sob,1; + delitem Stars_Sob,1; sign_q = 202; getexp RENEWAL_EXP?10000:100000,0; getitem Old_Violet_Box,1; } else if (sign_q > 201) { - if (countitem(Star's_Sob) == 1) { + if (countitem(Stars_Sob) == 1) { mes "I'm sorry..."; mes "But I'm taking"; mes "back the Sobbing"; @@ -759,7 +759,7 @@ prt_in,227,45,0 script Archeologist#sign 1_M_SIGN1,{ mes "[Metz]"; mes "......"; mes "Farewell."; - delitem Star's_Sob,1; + delitem Stars_Sob,1; } else { mes "I guess I can't"; @@ -1305,8 +1305,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ delitem Fluff,100; if (countitem(Poison_Spore) > 49) { delitem Poison_Spore,50; - if (countitem(Scorpion's_Tail) > 29) { - delitem Scorpion's_Tail,30; + if (countitem(Scorpions_Tail) > 29) { + delitem Scorpions_Tail,30; if (countitem(Rotten_Bandage) > 19) { delitem Rotten_Bandage,20; if (countitem(Petite_DiablOfs_Horn) > 14) { @@ -1335,8 +1335,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ mes "..."; if (countitem(Poison_Spore) > 49) { delitem Poison_Spore,50; - if (countitem(Scorpion's_Tail) > 29) { - delitem Scorpion's_Tail,30; + if (countitem(Scorpions_Tail) > 29) { + delitem Scorpions_Tail,30; if (countitem(Rotten_Bandage) > 19) { delitem Rotten_Bandage,20; if (countitem(Petite_DiablOfs_Horn) > 14) { @@ -1364,8 +1364,8 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ case 6: mes "[Arian]"; mes "..."; - if (countitem(Scorpion's_Tail) > 29) { - delitem Scorpion's_Tail,30; + if (countitem(Scorpions_Tail) > 29) { + delitem Scorpions_Tail,30; if (countitem(Rotten_Bandage) > 19) { delitem Rotten_Bandage,20; if (countitem(Petite_DiablOfs_Horn) > 14) { @@ -1526,7 +1526,7 @@ morocc_in,115,154,5 script Rogue#sign 1_M_SIGNROGUE,{ else getexp 18000,0; } sign_q = 14; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; close; case 14: mes "[Arian]"; @@ -1910,7 +1910,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{ mes "Come and drink with me~"; } next; - if (countitem(Part_Of_Star's_Sob) > 0) { + if (countitem(Part_Of_Stars_Sob) > 0) { .@pay_point = 1; mes "["+ strcharinfo(PC_NAME) +"]"; mes "Sure..."; @@ -2381,7 +2381,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{ } if (.@pay_point > 29) { sign_q = 15; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 750,0; @@ -2425,7 +2425,7 @@ payon_in03,11,31,4 script Daewoon#sign 1_M_SIGNMONK2,{ } else if ((.@pay_point > 26) && (.@pay_point < 30)) { sign_q = 15; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 750,0; @@ -2826,7 +2826,7 @@ aldeba_in,155,101,3 script Sir Jore#sign 1_M_SIGNALCHE,7,7,{ mes "relying on a rumor..."; next; sign_q = 20; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; mes "[Sir Jore]"; mes "Thank you very much"; mes "for helping me. Now I can"; @@ -3680,7 +3680,7 @@ geffen_in,59,74,4 script Jesqurienne#sign 1_F_SIGNZISK,{ next; mes "[Jesqurienne]"; sign_q = 25; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; mes "Here..."; mes "My old friend, Metz, told"; mes "me to give this to someone"; @@ -4484,9 +4484,8 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "I'll freakin' beat you to near"; mes "freakin' death! Bam bam bam!"; close2; - percentheal -100,0; soundeffect "effect\\sign_noise.wav",1; - percentheal -99,0; + Hp = 1; warp "comodo",122,100; end; case 2: @@ -4747,7 +4746,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "go find someone named,"; mes "um, ''Bakerlan'' in Alberta."; sign_q = 35; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; else if (BaseLevel < 70) getexp 700,0; @@ -4784,7 +4783,7 @@ cmd_in02,88,51,4 script Strange Guy#sign 1_M_SIGNART,{ mes "go find someone named,"; mes "um, ''Bakerlan'' in Alberta."; sign_q = 35; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; Zeny += 20000; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 300,0; @@ -5166,8 +5165,8 @@ OnInit: end; OnEnable: - specialeffect EF_SUMMONSLAVE; enablenpc "s_dance#up"; + specialeffect EF_SUMMONSLAVE; end; OnDisable: @@ -5222,8 +5221,8 @@ OnInit: end; OnEnable: - specialeffect EF_SUMMONSLAVE; enablenpc "s_dance#down"; + specialeffect EF_SUMMONSLAVE; end; OnDisable: @@ -5299,8 +5298,8 @@ OnInit: OnEnable: - specialeffect EF_SUMMONSLAVE; enablenpc "s_dance#left"; + specialeffect EF_SUMMONSLAVE; end; OnDisable: @@ -5367,8 +5366,8 @@ OnInit: end; OnEnable: - specialeffect EF_SUMMONSLAVE; enablenpc "s_dance#right"; + specialeffect EF_SUMMONSLAVE; end; OnDisable: @@ -5441,8 +5440,8 @@ OnInit: end; OnEnable: - specialeffect EF_SUMMONSLAVE; enablenpc "s_dance#cen"; + specialeffect EF_SUMMONSLAVE; end; OnDisable: @@ -5572,7 +5571,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{ mes "my time is quite precious."; close; case 2: - if (countitem(Part_Of_Star's_Sob) < 5) { + if (countitem(Part_Of_Stars_Sob) < 5) { mes "[Bakerlan]"; mes "Hmm, I suppose you"; mes "still haven't completed"; @@ -5581,7 +5580,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{ mes "Starlight, you know..."; close; } - else if (countitem(Part_Of_Star's_Sob) == 5) { + else if (countitem(Part_Of_Stars_Sob) == 5) { mes "[Bakerlan]"; mes "Ah, now I see that"; mes "you speak the truth."; @@ -5656,7 +5655,7 @@ alberta_in,125,101,5 script Wealthy-looking Merchant 1_M_SIGNMCNT,{ mes "Now bring all of the stone pieces to Metz."; mes "He will tell you what you need to do next."; sign_q = 53; - getitem Part_Of_Star's_Sob,1; + getitem Part_Of_Stars_Sob,1; if (RENEWAL_EXP) { if (BaseLevel < 60) getexp 500,0; else if (BaseLevel < 70) getexp 800,0; @@ -6288,7 +6287,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ mes "everything ready..."; next; mes "[Melkaba]"; - if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bear's_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) { + if ((countitem(Royal_Jelly) < 10) || (countitem(Honey) < 20) || (countitem(Bears_Foot) < 30) || (countitem(Leaflet_Of_Hinal) < 1) || (countitem(Ment) < 1) || (countitem(Empty_Bottle) < 1)) { mes "Hmm, you're still"; mes "missing some of the"; mes "ingredients. Now, listen"; @@ -6359,7 +6358,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ Zeny -= 10000; delitem Royal_Jelly,10; delitem Honey,20; - delitem Bear's_Foot,30; + delitem Bears_Foot,30; delitem Leaflet_Of_Hinal,1; delitem Ment,1; delitem Empty_Bottle,1; @@ -6377,7 +6376,7 @@ alde_alche,169,162,7 script Alchemist#sign 4_M_ALCHE_B,{ specialeffect EF_PHARMACY_FAIL; delitem Royal_Jelly,10; delitem Honey,20; - delitem Bear's_Foot,30; + delitem Bears_Foot,30; delitem Leaflet_Of_Hinal,1; delitem Ment,1; delitem Empty_Bottle,1; @@ -6837,7 +6836,7 @@ yuno,330,100,4 script Knight#ss 4_M_JOB_KNIGHT2,{ } } else { - .@signid = getcharid(0,strcharinfo(PC_NAME)); + .@signid = getcharid(CHAR_ID_CHAR,strcharinfo(PC_NAME)); .@sign3 = .@signid & 65535; .@sign4 = .@signid >> 16; .@sign1 = 254; @@ -7280,7 +7279,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{ mes "[Engel]"; mes "Right. Let me guide you to a shortcut to the exit of these mines, just in case you don't know your way out of here. Good luck~"; delitem Picture_Letter,1; - delitem Part_Of_Star's_Sob,7; + delitem Part_Of_Stars_Sob,7; sign_q = 57; close2; warp "mjo_dun02",371,344; @@ -7387,7 +7386,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{ mes "While you were gone, I managed to restore this Sobbing Starlight. Why don't you go ahead and take a look?"; next; sign_q = 71; - getitem Star's_Sob,1; + getitem Stars_Sob,1; specialeffect2 EF_YUFITELHIT; next; mes "[Engel]"; @@ -7507,7 +7506,7 @@ mjo_dun02,88,295,4 script Flaming Spirit Man 4_M_03,{ if (countitem(Golden_Anvil) > 0) delitem Golden_Anvil,1; else if (countitem(Emperium_Anvil) > 0) delitem Emperium_Anvil,1; sign_q = 71; - getitem Star's_Sob,1; + getitem Stars_Sob,1; specialeffect2 EF_YUFITELHIT; close; } @@ -8637,7 +8636,7 @@ que_sign01,196,39,4 script Serin#serin 4_F_01,{ .@fail_s3 = rand(1,600); .@fail_s4 = rand(1,500); .@fail_s5 = rand(1,400); - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) { sign_q = 200; mes "[Serin]"; @@ -8830,7 +8829,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ } } else if (sign_q == 125) { - if (countitem(Serin's_Gold_Ring_) ==1) { + if (countitem(Serins_Gold_Ring_) ==1) { mes "[Serin]"; mes "If you think that"; mes "I can't summon Dark Lord"; @@ -8958,7 +8957,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ mes "Farewell, now."; mes "And good luck on"; mes "your travels, my friend..."; - delitem Witch's_Potion,1; + delitem Witchs_Potion,1; sign_q = 127; close; } @@ -8978,9 +8977,9 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ .@fail_s3 = rand(1,800); .@fail_s4 = rand(1,700); .@fail_s5 = rand(1,600); - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { if (((sign_sq == 0) && (.@fail_s3 == 356)) || ((sign_sq == 1) && (.@fail_s2 == 356)) || (.@fail_s1 == 356)) { - delitem Witch's_Potion,1; + delitem Witchs_Potion,1; sign_q = 200; mes "[Serin]"; mes "Even though you tried"; @@ -9027,7 +9026,7 @@ que_sign01,197,195,4 script Serin#witch 4_F_01,{ } else { if (((sign_sq == 0) && (.@fail_s5 == 356)) || ((sign_sq == 1) && (.@fail_s4 == 356)) || (.@fail_s3 == 356)) { - delitem Witch's_Potion,1; + delitem Witchs_Potion,1; sign_q = 200; mes "[Serin]"; mes "Even though you tried"; @@ -9220,7 +9219,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "I want you to have this ring. It's the only way I can properly express my gratitude for your aid so far."; sign_q = 85; sign_sq = 0; - getitem Serin's_Gold_Ring,1; + getitem Serins_Gold_Ring,1; close; } else { @@ -9272,7 +9271,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ close; } else if (sign_q == 92) { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "[Serin]"; mes "Ah, "+strcharinfo(PC_NAME)+"~"; mes "How is everything?"; @@ -9531,7 +9530,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "..."; mes "......"; mes ".........."; - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { next; switch(select("Give Serin her ring.", "Keep the ring.")) { case 1: @@ -9564,7 +9563,7 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "to forget her sadness. The tears streaked across her cheeks and"; mes "the faint smile on her lips tell you that her memories of you"; mes "will always remain in her heart.^000000"; - delitem Serin's_Gold_Ring_,1; + delitem Serins_Gold_Ring_,1; getexp RENEWAL_EXP?50000:500000,0; close; case 2: @@ -9730,23 +9729,23 @@ niflheim,313,70,4 script Pleasant-Featured Lady#s 4_F_01,{ mes "of her soul and memories that"; mes "you can still sense somehow."; mes "What could have happened to her?^000000"; - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { next; mes "^33555FFSuddenly, Serin's"; mes "gold ring sparkled"; mes "with a soft glow and"; mes "faded away.^000000"; - delitem Serin's_Gold_Ring,1; + delitem Serins_Gold_Ring,1; close; } close; } else { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "[Serin]"; mes "Thank you..."; emotion e_sob; - delitem Serin's_Gold_Ring,1; + delitem Serins_Gold_Ring,1; next; mes "^3355FFYou returned"; mes "Serin's gold ring.^000000"; @@ -9810,7 +9809,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } if (sign_q == 90) { - if (countitem(Serin's_Gold_Ring) == 1) { + if (countitem(Serins_Gold_Ring) == 1) { mes "That bastard stole"; mes "two spell books from me."; mes "You've brought one of them"; @@ -9835,7 +9834,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } else if (sign_q == 91) { - if (countitem(Witch's_Spell_Book) > 0) { + if (countitem(Witchs_Spell_Book) > 0) { mes "Once that fool stole my spell"; mes "books, he was cursed after he"; mes "cast those spells without my"; @@ -9913,7 +9912,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "that the Queen of the Dead"; mes "is searching for her lost mother, Angrboda. Now, if you could find where Angrboda has been"; mes "sealed away..."; - delitem Witch's_Spell_Book,1; + delitem Witchs_Spell_Book,1; sign_q = 92; close; } @@ -10024,12 +10023,12 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } else if (sign_q == 119) { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "This is Serin's gold ring?"; mes "Excellent, this has been"; mes "strongly infused with her"; mes "vibes. It's really tough to find something like this that resonates so strongly with its owner."; - delitem Serin's_Gold_Ring,1; + delitem Serins_Gold_Ring,1; sign_q = 120; close; } @@ -10206,8 +10205,8 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "of the vouchers I've"; mes "given you, alright?"; sign_q = 124; - getitem Witch's_Potion,1; - getitem Serin's_Gold_Ring_,1; + getitem Witchs_Potion,1; + getitem Serins_Gold_Ring_,1; getitem Seal_Of_Witch,5; close; } @@ -10242,7 +10241,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "the Witch's Medals that"; mes "I've lent to you, alright?"; sign_q = 124; - getitem Witch's_Potion,1; + getitem Witchs_Potion,1; getitem Seal_Of_Witch,5; close; } @@ -10255,7 +10254,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "these preparations..."; close; } - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { mes "You're finally"; mes "back. We might not"; mes "have enough time to"; @@ -10302,7 +10301,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ } } else if ((sign_q == 127) || (sign_q == 128)) { - if (countitem(Serin's_Gold_Ring_) == 1) { + if (countitem(Serins_Gold_Ring_) == 1) { if (countitem(Seal_Of_Witch) < 5) { mes "Hmmm...?"; mes "Where are all the"; @@ -10380,7 +10379,7 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "you so much for your"; mes "help. Once you finish here,"; mes "please visit our queen, Lady Hell. I believe she wants to see you for some reason..."; - if (countitem(Serin's_Gold_Ring_) == 1) sign_q = 129; + if (countitem(Serins_Gold_Ring_) == 1) sign_q = 129; else sign_q = 130; getexp RENEWAL_EXP?30000:300000,0; close; @@ -10409,8 +10408,8 @@ que_sign01,122,141,4 script Witch#s 4_F_NFDEADMGCIAN,{ mes "her for that. Though, it's"; mes "ironic that you failed your"; mes "ordeals for her sake..."; - if (countitem(Serin's_Gold_Ring) > 0) delitem Serin's_Gold_Ring,1; - if (countitem(Witch's_Potion) > 0) delitem Witch's_Potion,1; + if (countitem(Serins_Gold_Ring) > 0) delitem Serins_Gold_Ring,1; + if (countitem(Witchs_Potion) > 0) delitem Witchs_Potion,1; sign_q = 201; getexp RENEWAL_EXP?20000:200000,0; close; @@ -10443,7 +10442,7 @@ OnTouch: callfunc "F_UpdateSignVars"; if (sign_q == 83) { if (sign_sq == 2) { - if (countitem(Witch's_Spell_Book) > 0) { + if (countitem(Witchs_Spell_Book) > 0) { mes "[Kirkena]"; mes "W-what's this?"; mes "Why is it that"; @@ -10481,7 +10480,7 @@ OnTouch: mes "give you this. It will send"; mes "a living human back to one"; mes "of the towns in your realm."; - delitem Witch's_Spell_Book,1; + delitem Witchs_Spell_Book,1; sign_sq = 3; getitem Wing_Of_Crow,1; close; @@ -10588,7 +10587,7 @@ OnTouch: close; } else if (sign_q == 88) { - if (countitem(Serin's_Gold_Ring) > 0) { + if (countitem(Serins_Gold_Ring) > 0) { mes "[Kirkena]"; mes "As I expected,"; mes "there is something behind"; @@ -10764,7 +10763,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{ mes "invitation? Insolent mortal!"; mes "Go back to where you belong!^000000"; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; } else if (sign_q == 117) { @@ -10866,7 +10865,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{ mes "Now, I shall show"; mes "you something truly"; mes "interesting...^000000"; - delitem Star's_Sob,1; + delitem Stars_Sob,1; sign_q = 143; close; case 2: @@ -10914,7 +10913,7 @@ que_sign01,45,227,4 script Queen of the Dead 2_F_SIGN1,{ mes "Sobbing Starlight.^000000"; next; sign_q = 144; - getitem Lucifer's_Lament,1; + getitem Lucifers_Lament,1; mes "[Lady Hell]"; mes "^8C1717Although you may also know"; mes "this object as God's Tear Drop, keep in mind that history, as you humans know it, may actually be different than the truth.^000000"; @@ -10963,7 +10962,7 @@ niflheim,146,241,0 script Depressing Man 4_M_JOB_WIZARD,{ close; } else if (sign_q == 87) { - if (countitem(Serin's_Gold_Ring) > 1) { + if (countitem(Serins_Gold_Ring) > 1) { mes "[Gen]"; mes "You lookin' for"; mes "something? Crayu"; @@ -11737,12 +11736,12 @@ OnTouch: if (sign_q == 83) { if(sign_sq == 0) { sign_sq = 1; - getitem Witch's_Spell_Book,1; + getitem Witchs_Spell_Book,1; } } else if (sign_q == 90) { sign_q = 91; - getitem Witch's_Spell_Book,1; + getitem Witchs_Spell_Book,1; } close; } @@ -11978,11 +11977,11 @@ function script F_SignSeal { mes "more powerful to break the seal...^000000"; close; } - if (countitem(Girl's_Diary) || countitem(Rapture_Rose)) { + if (countitem(Girls_Diary) || countitem(Rapture_Rose)) { if (getarg(0) < 980) F_SealFail; } else if (countitem(Weeder_Knife) || countitem(Combat_Knife) || countitem(Princess_Knife) || countitem(Cursed_Dagger) || countitem(Lariat) || countitem(Kaiser_Knuckle)) { if (getarg(0) < 960) F_SealFail; } - else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mama's_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) { + else if (countitem(Bow_Of_Roguemaster) || countitem(Nagan) || countitem(Fire_Brand) || countitem(Forturn_Sword) || countitem(Mamas_Knife) || countitem(Bazerald) || countitem(Gungnir) || countitem(Berserk) || countitem(Counter_Dagger)) { if (getarg(0) < 940) F_SealFail; } else if (countitem(Ice_Falchon) || countitem(House_Auger) || countitem(Assasin_Dagger)) { if (getarg(0) < 920) F_SealFail; } @@ -12004,7 +12003,7 @@ function script F_SignSeal { if (getarg(0) < 760) F_SealFail; } else if (countitem(Sabbath) || countitem(Right_Epsilon) || countitem(Wizardy_Staff)) { if (getarg(0) < 740) F_SealFail; } - else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinus's_Spear)) { + else if (countitem(Slaughter) || countitem(Tomahawk) || countitem(Crescent_Scythe) || countitem(Longinuss_Spear)) { if (getarg(0) < 720) F_SealFail; } else if (countitem(Guillotine) || countitem(Brionac)) { if (getarg(0) < 700) F_SealFail; } @@ -12202,7 +12201,7 @@ que_sign01,46,56,0 script Fountain#sign HIDDEN_NPC,{ case 1: mes "..."; close2; - percentheal -100,0; + unitkill getcharid(CHAR_ID_ACCOUNT); end; case 2: mes "..."; @@ -12284,7 +12283,7 @@ OnTimer45000: geffen,119,48,0 script Fountain#s HIDDEN_NPC,{ callfunc "F_UpdateSignVars"; - if (countitem(Lucifer's_Lament) > 0) { + if (countitem(Lucifers_Lament) > 0) { mes "^3355FFAs you approach the fountain,"; mes "a strange light begins to emit from the Lucifer's Lament in your pocket and from something deep within"; mes "the fountain's water.^000000"; 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."; diff --git a/npc/woe-fe/agit_main.txt b/npc/woe-fe/agit_main.txt index 912063b8b..5ac5b8e9a 100644 --- a/npc/woe-fe/agit_main.txt +++ b/npc/woe-fe/agit_main.txt @@ -101,10 +101,10 @@ OnStartArena: // The Emperium has been broken. OnAgitBreak: - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); // Show and log error if an unguilded player breaks the Emperium. (Should NEVER happen) if (.@GID <= 0) { - .@notice$ = "Character "+strcharinfo(PC_NAME)+" ("+getcharid(0)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned."; + .@notice$ = "Character "+strcharinfo(PC_NAME)+" ("+getcharid(CHAR_ID_CHAR)+") broke the Emperium in Castle: "+strnpcinfo(NPC_NAME_HIDDEN)+" while guildless. No data will be saved and Emperium respawned."; logmes .@notice$; debugmes .@notice$; donpcevent "Agit#"+strnpcinfo(NPC_NAME_HIDDEN)+"::OnStartArena"; end; @@ -342,7 +342,7 @@ OnRecvCastle: } cutin "kafra_01",2; - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[Kafra Employee]"; mes "Welcome. ^ff0000" + getguildname(.@GID) + "^000000 Member."; mes "The Kafra Corporation will stay with you wherever you go."; @@ -969,7 +969,7 @@ OnRecvCastle: mes "There's a small lever. Will you pull it?"; next; if(select("Pull.", "Don't pull.") == 1) { - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { close2; warp .@destination$,.@coordinates[0],.@coordinates[1]; end; diff --git a/npc/woe-fe/aldeg_cas01.txt b/npc/woe-fe/aldeg_cas01.txt index 4472a0f46..5c76ca483 100644 --- a/npc/woe-fe/aldeg_cas01.txt +++ b/npc/woe-fe/aldeg_cas01.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("aldeg_cas01",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas01",1)) { warp "aldeg_cas01",218,170; end; } diff --git a/npc/woe-fe/aldeg_cas02.txt b/npc/woe-fe/aldeg_cas02.txt index 9a9182d96..e588909a1 100644 --- a/npc/woe-fe/aldeg_cas02.txt +++ b/npc/woe-fe/aldeg_cas02.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("aldeg_cas02",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas02",1)) { warp "aldeg_cas02",220,190; end; } diff --git a/npc/woe-fe/aldeg_cas03.txt b/npc/woe-fe/aldeg_cas03.txt index b4b1df558..a0076bfec 100644 --- a/npc/woe-fe/aldeg_cas03.txt +++ b/npc/woe-fe/aldeg_cas03.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("aldeg_cas03",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas03",1)) { warp "aldeg_cas03",205,186; end; } diff --git a/npc/woe-fe/aldeg_cas04.txt b/npc/woe-fe/aldeg_cas04.txt index c0289ec45..f96586f48 100644 --- a/npc/woe-fe/aldeg_cas04.txt +++ b/npc/woe-fe/aldeg_cas04.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("aldeg_cas04",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas04",1)) { warp "aldeg_cas04",116,217; end; } diff --git a/npc/woe-fe/aldeg_cas05.txt b/npc/woe-fe/aldeg_cas05.txt index 7a1747adb..79c5c77af 100644 --- a/npc/woe-fe/aldeg_cas05.txt +++ b/npc/woe-fe/aldeg_cas05.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("aldeg_cas05",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("aldeg_cas05",1)) { warp "aldeg_cas05",167,225; end; } diff --git a/npc/woe-fe/gefg_cas01.txt b/npc/woe-fe/gefg_cas01.txt index 65ae7f1e4..364222781 100644 --- a/npc/woe-fe/gefg_cas01.txt +++ b/npc/woe-fe/gefg_cas01.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("gefg_cas01",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas01",1)) { warp "gefg_cas01",197,36; end; } diff --git a/npc/woe-fe/gefg_cas02.txt b/npc/woe-fe/gefg_cas02.txt index 5229586df..5729b4033 100644 --- a/npc/woe-fe/gefg_cas02.txt +++ b/npc/woe-fe/gefg_cas02.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("gefg_cas02",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas02",1)) { warp "gefg_cas02",178,43; end; } diff --git a/npc/woe-fe/gefg_cas03.txt b/npc/woe-fe/gefg_cas03.txt index f52cce240..d74692200 100644 --- a/npc/woe-fe/gefg_cas03.txt +++ b/npc/woe-fe/gefg_cas03.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("gefg_cas03",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas03",1)) { warp "gefg_cas03",221,30; end; } diff --git a/npc/woe-fe/gefg_cas04.txt b/npc/woe-fe/gefg_cas04.txt index b15f87984..39141723f 100644 --- a/npc/woe-fe/gefg_cas04.txt +++ b/npc/woe-fe/gefg_cas04.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("gefg_cas04",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas04",1)) { warp "gefg_cas04",168,43; end; } diff --git a/npc/woe-fe/gefg_cas05.txt b/npc/woe-fe/gefg_cas05.txt index a7722d48b..caa9a10fc 100644 --- a/npc/woe-fe/gefg_cas05.txt +++ b/npc/woe-fe/gefg_cas05.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("gefg_cas05",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("gefg_cas05",1)) { warp "gefg_cas05",168,31; end; } diff --git a/npc/woe-fe/payg_cas01.txt b/npc/woe-fe/payg_cas01.txt index 0c5f54be1..d06883620 100644 --- a/npc/woe-fe/payg_cas01.txt +++ b/npc/woe-fe/payg_cas01.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("payg_cas01",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas01",1)) { warp "payg_cas01",54,144; end; } diff --git a/npc/woe-fe/payg_cas02.txt b/npc/woe-fe/payg_cas02.txt index 9666a147f..9b5b97811 100644 --- a/npc/woe-fe/payg_cas02.txt +++ b/npc/woe-fe/payg_cas02.txt @@ -53,14 +53,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("payg_cas02",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas02",1)) { warp "payg_cas02",278,251; end; } diff --git a/npc/woe-fe/payg_cas03.txt b/npc/woe-fe/payg_cas03.txt index 879866a62..10b859c8f 100644 --- a/npc/woe-fe/payg_cas03.txt +++ b/npc/woe-fe/payg_cas03.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("payg_cas03",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas03",1)) { warp "payg_cas03",9,263; end; } diff --git a/npc/woe-fe/payg_cas04.txt b/npc/woe-fe/payg_cas04.txt index a6732b5b8..46f4fbb6b 100644 --- a/npc/woe-fe/payg_cas04.txt +++ b/npc/woe-fe/payg_cas04.txt @@ -53,14 +53,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("payg_cas04",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas04",1)) { warp "payg_cas04",40,235; end; } diff --git a/npc/woe-fe/payg_cas05.txt b/npc/woe-fe/payg_cas05.txt index 7e5ce5aae..a2a35790a 100644 --- a/npc/woe-fe/payg_cas05.txt +++ b/npc/woe-fe/payg_cas05.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("payg_cas05",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("payg_cas05",1)) { warp "payg_cas05",243,27; end; } diff --git a/npc/woe-fe/prtg_cas01.txt b/npc/woe-fe/prtg_cas01.txt index 660dd11ef..33a564fe9 100644 --- a/npc/woe-fe/prtg_cas01.txt +++ b/npc/woe-fe/prtg_cas01.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("prtg_cas01",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas01",1)) { warp "prtg_cas01",96,173; end; } diff --git a/npc/woe-fe/prtg_cas02.txt b/npc/woe-fe/prtg_cas02.txt index 3333de0c2..6531b681f 100644 --- a/npc/woe-fe/prtg_cas02.txt +++ b/npc/woe-fe/prtg_cas02.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("prtg_cas02",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas02",1)) { warp "prtg_cas02",169,55; end; } diff --git a/npc/woe-fe/prtg_cas03.txt b/npc/woe-fe/prtg_cas03.txt index 9040cb697..2a3879f65 100644 --- a/npc/woe-fe/prtg_cas03.txt +++ b/npc/woe-fe/prtg_cas03.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("prtg_cas03",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas03",1)) { warp "prtg_cas03",181,215; end; } diff --git a/npc/woe-fe/prtg_cas04.txt b/npc/woe-fe/prtg_cas04.txt index 48c0f7026..3e0de365f 100644 --- a/npc/woe-fe/prtg_cas04.txt +++ b/npc/woe-fe/prtg_cas04.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("prtg_cas04",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas04",1)) { warp "prtg_cas04",258,247; end; } diff --git a/npc/woe-fe/prtg_cas05.txt b/npc/woe-fe/prtg_cas05.txt index 8ad8c6f77..56dc902a3 100644 --- a/npc/woe-fe/prtg_cas05.txt +++ b/npc/woe-fe/prtg_cas05.txt @@ -52,14 +52,14 @@ mes "ownership of this castle."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "[ Echoing Voice ]"; mes "Brave ones..."; mes "Do you wish to return to your honorable place?"; next; if(select("Return to the guild castle.", "Quit.") == 1) { close2; - if (getcharid(2) == getcastledata("prtg_cas05",1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata("prtg_cas05",1)) { warp "prtg_cas05",52,41; end; } diff --git a/npc/woe-se/agit_main_se.txt b/npc/woe-se/agit_main_se.txt index 9e01c6efd..c9b34f610 100644 --- a/npc/woe-se/agit_main_se.txt +++ b/npc/woe-se/agit_main_se.txt @@ -230,7 +230,7 @@ OnTreasureDied: mes "to conquer this stronghold?"; close; } - if (getcharid(2) != .@GID || strcharinfo(PC_NAME) != getguildmaster(.@GID)) { + if (getcharid(CHAR_ID_GUILD) != .@GID || strcharinfo(PC_NAME) != getguildmaster(.@GID)) { mes "[ Steward ]"; mes "Hmpf. Your threats don't"; mes "scare me! Guardians, drive"; @@ -619,7 +619,7 @@ OnStop: end; OnStartArena: - .@GID = getcharid(2); + .@GID = getcharid(CHAR_ID_GUILD); .@region$ = (compare(strnpcinfo(NPC_MAP),"arug"))?"Valfreyja":"Nithafjoll"; // Lower castle Economy .@Economy = getcastledata(strnpcinfo(NPC_MAP),2)-5; @@ -663,7 +663,7 @@ OnStartArena: mes "over this stronghold."; close; } - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) != getguildmaster(.@GID)) { mes .@n$; mes "As guardian of this"; @@ -854,7 +854,7 @@ OnInit: - script Kafra#template FAKE_NPC,{ cutin "kafra_01",2; .@GID = getcastledata(strnpcinfo(NPC_MAP),1); - if (getcharid(2) == .@GID && getgdskilllv(.@GID,10001)) { + if (getcharid(CHAR_ID_GUILD) == .@GID && getgdskilllv(.@GID,10001)) { mes "[Kafra Employee]"; mes "Welcome, proud member"; mes "of the ^FF0000"+getguildname(.@GID)+"^000000 Guild!"; @@ -967,7 +967,7 @@ OnInit: .@GID = getcastledata(strnpcinfo(NPC_MAP),1); .@num = atoi(charat(strnpcinfo(NPC_NAME_VISIBLE),0)); .@var$ = "$agit_"+strnpcinfo(NPC_NAME_HIDDEN); - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { mes "^3355FFYou will need the"; mes "following materials to"; mes "rebuild a destroyed"; @@ -1120,7 +1120,7 @@ OnEnable: .@GID = getcastledata(strnpcinfo(NPC_MAP),1); .@num = atoi(charat(strnpcinfo(NPC_NAME_VISIBLE),15)); .@var$ = "$agit_"+strnpcinfo(NPC_NAME_HIDDEN); - if (getcharid(2) == .@GID) { + if (getcharid(CHAR_ID_GUILD) == .@GID) { if (strcharinfo(PC_NAME) == getguildmaster(.@GID)) { if (getd(.@var$+"["+(.@num+1)+"]") == 2) { mes "^3355FFDemolished Fortress"; @@ -1707,7 +1707,7 @@ OnDisable: //== Link Flags (function) ================================= function script LinkFlag { - if (!getcharid(2) || getcharid(2) != getcastledata(strnpcinfo(NPC_MAP),1)) end; + if (!getcharid(CHAR_ID_GUILD) || getcharid(CHAR_ID_GUILD) != getcastledata(strnpcinfo(NPC_MAP),1)) end; if (getarg(0) == "Convenience Facility") { mes "^3355FFThis is the Stronghold"; mes "Teleport Service. Would"; @@ -1754,13 +1754,13 @@ function script ReturnFlag { mes "be recognized as its new owner."; close; } - if (getcharid(2) == .@GID && getarg(1,0)) { + if (getcharid(CHAR_ID_GUILD) == .@GID && getarg(1,0)) { mes "[ Ringing Voice ]"; mes "Courageous one,"; mes "do you wish to return"; mes "to your stronghold?"; next; - if(select("Return to the Stronghold", "Cancel") == 1 && getcharid(2) == getcastledata(getarg(0),1)) { + if(select("Return to the Stronghold", "Cancel") == 1 && getcharid(CHAR_ID_GUILD) == getcastledata(getarg(0),1)) { if (compare(getarg(0),"arug")) { if (getarg(0) == "arug_cas01") setarray .@i[0],67,193; else if (getarg(0) == "arug_cas02") setarray .@i[0],43,256; @@ -1814,7 +1814,7 @@ function script ReturnFlag { //== Guild Dungeon Warps =================================== - script Sunflower#template FAKE_NPC,{ - if (getcharid(2) == getcastledata(strnpcinfo(NPC_MAP),1)) { + if (getcharid(CHAR_ID_GUILD) == getcastledata(strnpcinfo(NPC_MAP),1)) { mes "- It's an amazingly huge sunflower; as big as a human! ... You feel something mysterious emanating from the flower. -"; next; switch(select("Hold the stem.", "Do nothing.")) { |