diff options
| -rw-r--r-- | npc/quests/quests_morocc.txt | 29 | ||||
| -rw-r--r-- | src/map/status.h | 2 |
2 files changed, 15 insertions, 16 deletions
diff --git a/npc/quests/quests_morocc.txt b/npc/quests/quests_morocc.txt index 888e15fe6..ab77879a1 100644 --- a/npc/quests/quests_morocc.txt +++ b/npc/quests/quests_morocc.txt @@ -3,7 +3,7 @@ //===== By: ================================================== //= kobra_k88 //===== Current Version: ===================================== -//= 2.6 +//= 2.5 //===== Compatible With: ===================================== //= eAthena 7.15 + //===== Description: ========================================= @@ -29,7 +29,6 @@ //= Moved Dandelion's Request to a it's own file. //= Added support NPCs required to finish Gaebolg quest. //= 2.5 Fixed Group of Evil never re-enabling. [L0ne_W0lf] -//= 2.6 Removed Ontouch trigger area from NPCs. [brianluau] //============================================================ //==================================================================================// @@ -877,7 +876,7 @@ que_job01,70,84,1 script Girl#moc_ex002 882,{ // Continental Guard Quest // ============================================================ -moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,{ +moc_fild20,354,183,3 script Continental Guard#01::MocConGuard 707,3,3,{ if ((rebirth_moc_edq == 0) && (rebirth_moc_edq < 4)) { mes "[Continental Guard]"; mes "No commoners are allowed in the area beyond this point."; @@ -1064,15 +1063,15 @@ OnTouch: end; } -moc_fild20,354,174,3 duplicate(MocConGuard) Continental Guard#02 707 -moc_fild20,38,174,5 duplicate(MocConGuard) Continental Guard#03 707 -moc_fild20,38,183,5 duplicate(MocConGuard) Continental Guard#04 707 -moc_fild20,189,21,7 duplicate(MocConGuard) Continental Guard#05 707 -moc_fild20,200,21,7 duplicate(MocConGuard) Continental Guard#06 707 -moc_fild20,203,336,5 duplicate(MocConGuard) Continental Guard#07 707 -moc_fild20,215,336,3 duplicate(MocConGuard) Continental Guard#08 707 +moc_fild20,354,174,3 duplicate(MocConGuard) Continental Guard#02 707,3,3 +moc_fild20,38,174,5 duplicate(MocConGuard) Continental Guard#03 707,3,3 +moc_fild20,38,183,5 duplicate(MocConGuard) Continental Guard#04 707,3,3 +moc_fild20,189,21,7 duplicate(MocConGuard) Continental Guard#05 707,3,3 +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,{ +prontera,164,304,3 script Continental Messenger#01::ConMessenger 997,3,3,{ set .@area$,strnpcinfo(2); if (.@area$ == "01") { set .@area$,"Prontera"; } else if (.@area$ == "02") { set .@area$,"Geffen"; } @@ -1157,10 +1156,10 @@ OnTouch: end; } -geffen,128,90,3 duplicate(ConMessenger) Continental Messenger#02 997 -payon,200,113,3 duplicate(ConMessenger) Continental Messenger#03 997 -alberta,127,64,3 duplicate(ConMessenger) Continental Messenger#04 998 -aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998 +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 +aldebaran,135,128,3 duplicate(ConMessenger) Continental Messenger#05 998,3,3 morocc,176,103,3 script Continental Official 754,{ if (rebirth_moc_edq > 3) { diff --git a/src/map/status.h b/src/map/status.h index 21d2ba67d..937f80ff0 100644 --- a/src/map/status.h +++ b/src/map/status.h @@ -265,7 +265,7 @@ typedef enum sc_type { SC_SPEED, SC_DEFENCE, //SC_INCASPDRATE, - SC_INCFLEE2 = 247, + SC_INCFLEE2 = 248, SC_JAILED, SC_ENCHANTARMS, //250 SC_MAGICALATTACK, |