diff options
Diffstat (limited to 'npc')
| -rw-r--r-- | npc/kafras/dts_warper.txt | 3 | ||||
| -rw-r--r-- | npc/other/mail.txt | 1 | ||||
| -rw-r--r-- | npc/quests/The_Sign_Quest.txt | 3 | ||||
| -rw-r--r-- | npc/quests/mrsmile.txt | 11 | ||||
| -rw-r--r-- | npc/quests/quests_morocc.txt | 5 |
5 files changed, 13 insertions, 10 deletions
diff --git a/npc/kafras/dts_warper.txt b/npc/kafras/dts_warper.txt index 83d25102c..ad5a82ab5 100644 --- a/npc/kafras/dts_warper.txt +++ b/npc/kafras/dts_warper.txt @@ -708,7 +708,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{ callfunc "F_VoteKafra",9; } -yuno,153,191,6 script Cool Event Staff#yuno::VotingStaffCCE 874,{ +- script Cool Event Staff::VotingStaffCCE 874,{ callfunc "F_ClearGarbage"; //Clear outdated, unused variables cutin "zonda_01",2; mes "[Cool Event Corp. Voting Staff]"; @@ -1100,6 +1100,7 @@ yuno,153,191,6 script Cool Event Staff#yuno::VotingStaffCCE 874,{ end; } +yuno,153,191,6 duplicate(VotingStaffCCE) Cool Event Staff#yuno 874 prontera,147,125,6 duplicate(VotingStaffCCE) Cool Event Staff#prt 874 moc_ruins,104,133,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 874 geffen,117,37,6 duplicate(VotingStaffCCE) Cool Event Staff#gef 874 diff --git a/npc/other/mail.txt b/npc/other/mail.txt index 24db40c71..30324749e 100644 --- a/npc/other/mail.txt +++ b/npc/other/mail.txt @@ -139,4 +139,3 @@ rachel,122,146,0 duplicate(MailBox) Post Box#ra 888 // Veins //============================================================ veins,218,123,0 duplicate(MailBox) Post Box#ve 888 - diff --git a/npc/quests/The_Sign_Quest.txt b/npc/quests/The_Sign_Quest.txt index 837e1c7f4..e1350cdfe 100644 --- a/npc/quests/The_Sign_Quest.txt +++ b/npc/quests/The_Sign_Quest.txt @@ -29,7 +29,7 @@ //============================================================ // The Sign (Part 1) //============================================================ -prontera,147,305,0 script Sign#prontera::TheSign 111,{ +- script Sign::TheSign 111,{ callfunc "F_UpdateSignVars"; cutin "sign_01",4; mes "^3355FFNext^000000"; @@ -61,6 +61,7 @@ OnInit: end; } +prontera,147,305,0 duplicate(TheSign) Sign#prontera 111 geffen,168,175,0 duplicate(TheSign) Sign#geffen 111 morocc,168,265,0 duplicate(TheSign) Sign#morroc 111 payon,160,183,0 duplicate(TheSign) Sign#payon 111 diff --git a/npc/quests/mrsmile.txt b/npc/quests/mrsmile.txt index 4ac8c964f..faf2402f1 100644 --- a/npc/quests/mrsmile.txt +++ b/npc/quests/mrsmile.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 1.4a //===== Compatible With: ===================================== -//= rAthena 7.15 + +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= Trade Clover, Fluff and Jellopy for a Mr. Smile mask. @@ -14,7 +14,7 @@ //= 1.4a Fixed a little Typo error in duplicates. (bugreport:749) [Samuray22] //============================================================ -prontera,157,187,4 script Smile Assistance#prt::SmileHelper 92,{ +- script Smile Assistance::SmileHelper 92,{ mes "[Smile Girl]"; mes "Hi ~ Hi ~"; mes "This is Smile Assistance."; @@ -95,12 +95,13 @@ prontera,157,187,4 script Smile Assistance#prt::SmileHelper 92,{ } // Additional Smile Assistance staff -moc_ruins,59,154,3 duplicate(SmileHelper) Smile Assistance#moc 92 +alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 92 aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 92 geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 92 -alberta,113,53,4 duplicate(SmileHelper) Smile Assistance#alb 92 -payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 92 izlude,129,118,4 duplicate(SmileHelper) Smile Assistance#iz 92 +moc_ruins,59,154,3 duplicate(SmileHelper) Smile Assistance#moc 92 +payon,186,104,5 duplicate(SmileHelper) Smile Assistance#pay 92 +prontera,157,187,4 duplicate(SmileHelper) Smile Assistance#prt 92 //============================================================ // Old changelog diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 8e487250d..8628ff426 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -5,7 +5,7 @@ //===== Current Version: ===================================== //= 2.9 //===== Compatible With: ===================================== -//= rAthena 7.15 + +//= rAthena SVN //===== Description: ========================================= //= [Aegis Conversion] //= - Stop Post @@ -1118,7 +1118,7 @@ moc_fild20,200,21,7 duplicate(MocConGuard) Continental Guard#06 707,3,3 moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 707,3,3 moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 707,3,3 -prontera,164,304,3 script Continental Messenger#01::ConMessenger 997,3,3,{ +- script Continental Messenger#00::ConMessenger 997,3,3,{ set .@area$,strnpcinfo(2); if (.@area$ == "01") { set .@area$,"Prontera"; } else if (.@area$ == "02") { set .@area$,"Geffen"; } @@ -1203,6 +1203,7 @@ OnTouch: end; } +prontera,164,304,3 duplicate(ConMessenger) Continental Messenger#01 997,3,3 geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 997,3,3 payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 997,3,3 alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 998,3,3 |