From 78d7c322b8eb4125a66d31fdab833e58b35f01ec Mon Sep 17 00:00:00 2001 From: mekolat Date: Sat, 30 Apr 2016 17:37:56 -0400 Subject: add puppet check into easter annual quest --- world/map/npc/008-1/annualeaster.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'world') 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: -- cgit v1.2.3-70-g09d2