diff options
| -rw-r--r-- | npc/003-1/eugene.txt | 8 | ||||
| -rw-r--r-- | npc/functions/clientversion.txt | 12 | ||||
| -rw-r--r-- | npc/functions/main.txt | 2 |
3 files changed, 16 insertions, 6 deletions
diff --git a/npc/003-1/eugene.txt b/npc/003-1/eugene.txt index a0bf2da47..1f221a375 100644 --- a/npc/003-1/eugene.txt +++ b/npc/003-1/eugene.txt @@ -14,9 +14,6 @@ 003-1,80,127,0 script Eugene NPC_EUGENE,{ - .BaitID = SmallTentacles; - .BaitCount = 10; - narrator S_LAST_NEXT, l("You see a raijin boy, sitting on the edge of the dock."), l("He's holding a fishing rod, while gazing out at the sea."); @@ -70,7 +67,7 @@ L_CheckItems: delitem .BaitID, .BaitCount; getitem FishingRod, 1; getitem FishingGuideVolI, 1; - getexp 50, 5; + getexp 62, 5; setq TulimsharQuests_Fishman, 2; close; @@ -97,6 +94,9 @@ L_QuestDone: close; OnInit: + .BaitID = SmallTentacles; + .BaitCount = 10; + tradertype(NST_MARKET); sellitem FishBox, 1250, 5; sellitem CommonCarp, -1, 3; diff --git a/npc/functions/clientversion.txt b/npc/functions/clientversion.txt index 31d841fa2..96922d2b1 100644 --- a/npc/functions/clientversion.txt +++ b/npc/functions/clientversion.txt @@ -9,7 +9,7 @@ function script checkclientversion { // Skip any update for newcomers - if (isin("000-0", 0, 0, 40, 40)) { + if (getmap() ~= "000-0*") { UPDATE=gettimetick(2); } @@ -23,15 +23,25 @@ function script checkclientversion { mesc l("You might have been affected. Please, select your desired language."); asklanguage(LANG_IN_SHIP); } + // Report client version for debugging purposes if (is_admin() && UPDATE < 1528369855) { UPDATE=1528369855; dispbottom l("Client Version: @@", ClientVersion); // This is to debug UPDATE system. } + // New skills introduced if (UPDATE < 1531786864) { UPDATE=1531786864; skill TMW2_FAKESKILL, 1, 0; skill TMW2_FAKESKILL2, 1, 0; } + // Update new quest exp, and make sure you have the extended basic skills with you + if (UPDATE < 1545228412) { + UPDATE=1545228412; + adddefaultskills; + if (getq(TulimsharQuests_Fishman) == 2) + getexp 12, 0; + + } diff --git a/npc/functions/main.txt b/npc/functions/main.txt index 8ddcd631b..a05d07276 100644 --- a/npc/functions/main.txt +++ b/npc/functions/main.txt @@ -256,7 +256,7 @@ function script any_of { ///////////////////////////////////////////// function script getmap { - if (getmapxy(.@mapName$, .@xpos, .@ypos, 0) != 0) + if (getmapxy(.@mapName$, .@xpos, .@ypos, getarg(0,0)) != 0) return false; return .@mapName$; } |