summaryrefslogtreecommitdiff
path: root/world/map/npc/008-1/annualeaster.txt
diff options
context:
space:
mode:
authormekolat <mekolat@users.noreply.github.com>2016-05-02 16:17:50 -0400
committermekolat <mekolat@users.noreply.github.com>2016-05-02 16:17:50 -0400
commitf8924867ee3e1020cb9fc73df98c22218a52ad2f (patch)
tree22bde1b4723e9a653722afd898354c3ef422e034 /world/map/npc/008-1/annualeaster.txt
parent2f97a15b49bf8c43ff9761e058b1a19a13856067 (diff)
parent3ad45c53e32f0700f68c429fd818372d9892c6d8 (diff)
downloadserverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.tar.gz
serverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.tar.bz2
serverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.tar.xz
serverdata-f8924867ee3e1020cb9fc73df98c22218a52ad2f.zip
Merge pull request #492 from mekolat/puppet-checks
Puppet checks
Diffstat (limited to 'world/map/npc/008-1/annualeaster.txt')
-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: