Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Changed more duplicates so the source is a floating/mapless npc. (bugreport:1335)

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@15798 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
brianluau 2012-03-26 18:57:18 +00:00
parent 91a9b75295
commit 4dda26754e
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
npc/kafras/dts_warper.txt
View File

@ -708,7 +708,7 @@ lighthalzen,163,60,4 script Kafra Voting Staff#lght 861,{
callfunc "F_VoteKafra",9; 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 callfunc "F_ClearGarbage"; //Clear outdated, unused variables
cutin "zonda_01",2; cutin "zonda_01",2;
mes "[Cool Event Corp. Voting Staff]"; mes "[Cool Event Corp. Voting Staff]";
@ -1100,6 +1100,7 @@ yuno,153,191,6 script Cool Event Staff#yuno::VotingStaffCCE 874,{
end; end;
} }
yuno,153,191,6 duplicate(VotingStaffCCE) Cool Event Staff#yuno 874
prontera,147,125,6 duplicate(VotingStaffCCE) Cool Event Staff#prt 874 prontera,147,125,6 duplicate(VotingStaffCCE) Cool Event Staff#prt 874
moc_ruins,104,133,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 874 moc_ruins,104,133,6 duplicate(VotingStaffCCE) Cool Event Staff#moc 874
geffen,117,37,6 duplicate(VotingStaffCCE) Cool Event Staff#gef 874 geffen,117,37,6 duplicate(VotingStaffCCE) Cool Event Staff#gef 874

1
npc/other/mail.txt
View File

@ -139,4 +139,3 @@ rachel,122,146,0 duplicate(MailBox) Post Box#ra 888
// Veins // Veins
//============================================================ //============================================================
veins,218,123,0 duplicate(MailBox) Post Box#ve 888 veins,218,123,0 duplicate(MailBox) Post Box#ve 888

3
npc/quests/The_Sign_Quest.txt
View File

@ -29,7 +29,7 @@
//============================================================ //============================================================
// The Sign (Part 1) // The Sign (Part 1)
//============================================================ //============================================================
prontera,147,305,0 script Sign#prontera::TheSign 111,{ - script Sign::TheSign 111,{
callfunc "F_UpdateSignVars"; callfunc "F_UpdateSignVars";
cutin "sign_01",4; cutin "sign_01",4;
mes "^3355FFNext^000000"; mes "^3355FFNext^000000";
@ -61,6 +61,7 @@ OnInit:
end; end;
} }
prontera,147,305,0 duplicate(TheSign) Sign#prontera 111
geffen,168,175,0 duplicate(TheSign) Sign#geffen 111 geffen,168,175,0 duplicate(TheSign) Sign#geffen 111
morocc,168,265,0 duplicate(TheSign) Sign#morroc 111 morocc,168,265,0 duplicate(TheSign) Sign#morroc 111
payon,160,183,0 duplicate(TheSign) Sign#payon 111 payon,160,183,0 duplicate(TheSign) Sign#payon 111

11
npc/quests/mrsmile.txt
View File

@ -5,7 +5,7 @@
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 1.4a //= 1.4a
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena 7.15 + //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= [Aegis Conversion] //= [Aegis Conversion]
//= Trade Clover, Fluff and Jellopy for a Mr. Smile mask. //= 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] //= 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 "[Smile Girl]";
mes "Hi ~ Hi ~"; mes "Hi ~ Hi ~";
mes "This is Smile Assistance."; mes "This is Smile Assistance.";
@ -95,12 +95,13 @@ prontera,157,187,4 script Smile Assistance#prt::SmileHelper 92,{
} }
// Additional Smile Assistance staff // 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 aldebaran,136,135,4 duplicate(SmileHelper) Smile Assistance#alde 92
geffen,119,107,4 duplicate(SmileHelper) Smile Assistance#gef 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 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 // Old changelog

5
npc/quests/quests_morocc.txt
View File

@ -5,7 +5,7 @@
//===== Current Version: ===================================== //===== Current Version: =====================================
//= 2.9 //= 2.9
//===== Compatible With: ===================================== //===== Compatible With: =====================================
//= rAthena 7.15 + //= rAthena SVN
//===== Description: ========================================= //===== Description: =========================================
//= [Aegis Conversion] //= [Aegis Conversion]
//= - Stop Post //= - 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,203,336,5 duplicate(MocConGuard) Continental Guard#07 707,3,3
moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 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); set .@area$,strnpcinfo(2);
if (.@area$ == "01") { set .@area$,"Prontera"; } if (.@area$ == "01") { set .@area$,"Prontera"; }
else if (.@area$ == "02") { set .@area$,"Geffen"; } else if (.@area$ == "02") { set .@area$,"Geffen"; }
@ -1203,6 +1203,7 @@ OnTouch:
end; 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 geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 997,3,3
payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 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 alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 998,3,3