summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-04-30 17:37:56 -0400
committermekolat <mekolat@users.noreply.github.com>2016-05-02 16:14:39 -0400
commit78d7c322b8eb4125a66d31fdab833e58b35f01ec (patch)
treec6fa5746fa6c160e95e7a50d0ab5c7e20384205f /world/map/npc
parentcd36a91d4484f973e4f63bf1a7bacaea700a7d46 (diff)
downloadserverdata-78d7c322b8eb4125a66d31fdab833e58b35f01ec.tar.gz
serverdata-78d7c322b8eb4125a66d31fdab833e58b35f01ec.tar.bz2
serverdata-78d7c322b8eb4125a66d31fdab833e58b35f01ec.tar.xz
serverdata-78d7c322b8eb4125a66d31fdab833e58b35f01ec.zip
add puppet check into easter annual quest
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/008-1/annualeaster.txt8
1 files changed, 6 insertions, 2 deletions
diff --git a/world/map/npc/008-1/annualeaster.txt b/world/map/npc/008-1/annualeaster.txt
index 1ec95cbe..23d7611a 100644
--- a/world/map/npc/008-1/annualeaster.txt
+++ b/world/map/npc/008-1/annualeaster.txt
@@ -129,10 +129,14 @@ OnSpawn:
set .@y, .loc[(.@e-1)+.loc[1]];
set .eID, .eID + 1; // give the egg an id
set .@name$, "#--Ee"+chr(3)+.eID;
- void puppet(strnpcinfo(3), .@x, .@y, .@name$, 375); // spawn the egg
- initnpctimer .@name$; // init puppeteer check timer
if (.eID == 2147483647)
set .eID, 0; // start over if id = 0x7FFFFFFF
+ if (puppet(strnpcinfo(3), .@x, .@y, .@name$, 375) < 1) goto L_RetrySpawn; // spawn the egg
+ initnpctimer .@name$; // init puppeteer check timer
+ end;
+
+L_RetrySpawn:
+ addnpctimer 0, strnpcinfo(0) + "::OnSpawn"; // schedule a spawn
end;
S_Spawn: