From 23aa12e81e5fe556e46e50e76e11a38002986a74 Mon Sep 17 00:00:00 2001 From: wushin Date: Wed, 5 Nov 2014 11:09:12 -0600 Subject: NPCs on 008-* fixed --- world/map/npc/008-1/andra.txt | 2 +- world/map/npc/008-1/annualeaster.txt | 10 +++++----- world/map/npc/008-1/diryn.txt | 2 +- world/map/npc/008-1/dock.txt | 6 +++--- world/map/npc/008-1/george.txt | 2 +- world/map/npc/008-1/hinnak.txt | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/world/map/npc/008-1/andra.txt b/world/map/npc/008-1/andra.txt index 25a7684a..989005f0 100644 --- a/world/map/npc/008-1/andra.txt +++ b/world/map/npc/008-1/andra.txt @@ -1,6 +1,6 @@ // Andra asks for your help to keep the soil fertile. The best way to do it is planting, so she asks for water and seeds. When she plants the seeds, some plants are spawned. -008-1.gat,36,26,0|script|Andra|201, +008-1.gat,36,26,0|script|Andra|201 { set @water_amount, 1; set @seeds_amount, 4; diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt index d42be802..698aa65f 100644 --- a/world/map/npc/008-1/annualeaster.txt +++ b/world/map/npc/008-1/annualeaster.txt @@ -9,7 +9,7 @@ // the event in these days. -function|script|AnnualEasterEvent|, +function|script|AnnualEasterEvent { if ((gettimetick(2)-TUT_var < 5*7*86400) || (BaseLevel < 40)) //player must be created at least 5 weeks ago goto L_EndTooYoung; @@ -113,21 +113,21 @@ L_End1: return; } -008-1.gat,65,40,0|script|#TestEgg0|375, +008-1.gat,65,40,0|script|#TestEgg0|375 { set @EasterEggID, 0; callfunc("AnnualEasterEvent"); end; } -008-1.gat,65,40,0|script|#TestEgg1|375, +008-1.gat,65,40,0|script|#TestEgg1|375 { set @EasterEggID, 1; callfunc("AnnualEasterEvent"); end; } -008-1.gat,65,40,0|script|#TestEgg2|375, +008-1.gat,65,40,0|script|#TestEgg2|375 { set @EasterEggID, 2; callfunc("AnnualEasterEvent"); @@ -135,7 +135,7 @@ L_End1: } -008-1.gat,59,38,0|script|#AnnualEaster|-1, +008-1.gat,59,38,0|script|#AnnualEaster|-1 { end; diff --git a/world/map/npc/008-1/diryn.txt b/world/map/npc/008-1/diryn.txt index 2755866c..d0630074 100644 --- a/world/map/npc/008-1/diryn.txt +++ b/world/map/npc/008-1/diryn.txt @@ -2,7 +2,7 @@ // Author: Wombat, wushin // cost depending on level and adapted to new scripting guidelines: Jenalya -008-1.gat,81,82,0|script|Diryn the Traveler|103, +008-1.gat,81,82,0|script|Diryn the Traveler|103 { set @NpcName$, "Diryn"; set @NpcTravelBit, $@hurnscald_bit; diff --git a/world/map/npc/008-1/dock.txt b/world/map/npc/008-1/dock.txt index 240cdc15..d24355bd 100644 --- a/world/map/npc/008-1/dock.txt +++ b/world/map/npc/008-1/dock.txt @@ -1,18 +1,18 @@ // The ferry dock -008-1.gat,134,63,0|script|Ferry Schedule#5|397, +008-1.gat,134,63,0|script|Ferry Schedule#5|397 { callfunc "FerryManifest"; end; } -008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3, +008-1.gat,147,64,0|script|Hurnscald Koga|395,8,3 { callfunc "BoardFerry"; close; } -008-1.gat,120,44,0|script|#HurnscaldDock|127, +008-1.gat,120,44,0|script|#HurnscaldDock|127 { end; OnCommandArrive: diff --git a/world/map/npc/008-1/george.txt b/world/map/npc/008-1/george.txt index df89f52c..af36f75f 100644 --- a/world/map/npc/008-1/george.txt +++ b/world/map/npc/008-1/george.txt @@ -1,6 +1,6 @@ // -008-1.gat,136,36,0|script|George#pirate|138, +008-1.gat,136,36,0|script|George#pirate|138 { set @halloween_npc_id, $@halloween_npc_george; callfunc "TrickOrTreat"; diff --git a/world/map/npc/008-1/hinnak.txt b/world/map/npc/008-1/hinnak.txt index f3ada878..36a8d3f5 100644 --- a/world/map/npc/008-1/hinnak.txt +++ b/world/map/npc/008-1/hinnak.txt @@ -5,7 +5,7 @@ // // Variables used: Nibble 1 of QUEST_Hurnscald (previously QUEST_Scythe_state) -008-1.gat,101,30,0|script|Hinnak|142, +008-1.gat,101,30,0|script|Hinnak|142 { callfunc "ClearVariables"; -- cgit v1.2.3-70-g09d2