diff options
author | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 19:33:15 +0200 |
---|---|---|
committer | Jessica Tölke <jtoelke@mail.upb.de> | 2011-09-08 19:33:15 +0200 |
commit | cba4de9a5f7b9de412b9f458c80904cee9764a85 (patch) | |
tree | 94a402b645140a7bb9fbfa467a73cfb30d880a56 /world/map/npc | |
parent | 9b55c082ae28bf4fb14b074ad62bb2b4449977a8 (diff) | |
download | serverdata-cba4de9a5f7b9de412b9f458c80904cee9764a85.tar.gz serverdata-cba4de9a5f7b9de412b9f458c80904cee9764a85.tar.bz2 serverdata-cba4de9a5f7b9de412b9f458c80904cee9764a85.tar.xz serverdata-cba4de9a5f7b9de412b9f458c80904cee9764a85.zip |
Tutorial: small fixes and adjustments
Tanisha: goto L_CleanUp whenever no players are in the area anymore
and have one maggot in the area permanently
Hasan: small typing error fixed
Diffstat (limited to 'world/map/npc')
-rw-r--r-- | world/map/npc/042-1/hasan.txt | 2 | ||||
-rw-r--r-- | world/map/npc/042-2/tanisha.txt | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt index 8cdc690d..0393e697 100644 --- a/world/map/npc/042-1/hasan.txt +++ b/world/map/npc/042-1/hasan.txt @@ -239,7 +239,7 @@ OnTouch: warp "042-1.gat", 115, 76; // implicitly, $@ScorpionFighter is nonzero if ($@ScorpionFighter == getcharid(3)) - message strcharinfo(0), "Hasan: \" " + strcharinfo(0) + "! Please help me!\""; + message strcharinfo(0), "Hasan: \"" + strcharinfo(0) + "! Please help me!\""; if ($@ScorpionFighter && $@ScorpionFighter != getcharid(3)) // is this reachable? message strcharinfo(0), "Hasan: \"Hey! Stop right there!\""; diff --git a/world/map/npc/042-2/tanisha.txt b/world/map/npc/042-2/tanisha.txt index c3c0d199..cc5d307a 100644 --- a/world/map/npc/042-2/tanisha.txt +++ b/world/map/npc/042-2/tanisha.txt @@ -209,7 +209,7 @@ L_Sleep: set @Maggot_Kills, 0; set @time, 0; if (getareausers("042-2.gat", 30, 85, 36, 89) == 0) - stopnpctimer; + goto L_CleanUp; goto L_Close; L_Fail: @@ -245,6 +245,7 @@ L_CleanUp: killmonster "042-2.gat", "Tanisha::OnMaggotDeath"; set $@Maggot_Hunters, 0; stopnpctimer; + areamonster "042-2.gat", 30, 85, 36, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; end; OnTick: @@ -276,7 +277,7 @@ OnMaggotDeath: set @Maggot_Kills, 0; set @time, 0; if (getareausers("042-2.gat", 30, 85, 36, 89) == 0) - stopnpctimer; + goto L_CleanUp; end; L_Close: @@ -285,4 +286,5 @@ L_Close: OnInit: set $@Maggot_MaxHunters, 4; + areamonster "042-2.gat", 30, 85, 36, 89, "", 1002, 1, "Tanisha::OnMaggotDeath"; } |