summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoffee <coffee@coffee-EP45-UD3L.(none)>2011-09-03 11:21:01 -0300
committercoffee <coffee@coffee-EP45-UD3L.(none)>2011-09-03 11:21:01 -0300
commitf40581c8718e979306a98dafca01bc517b7e51bd (patch)
treeb28149a86523b4855932a4c5cd2a6a99853456d4
parent666d2337f36f761b19e410dad0dc7a6ad1953d1f (diff)
downloadserverdata-f40581c8718e979306a98dafca01bc517b7e51bd.tar.gz
serverdata-f40581c8718e979306a98dafca01bc517b7e51bd.tar.bz2
serverdata-f40581c8718e979306a98dafca01bc517b7e51bd.tar.xz
serverdata-f40581c8718e979306a98dafca01bc517b7e51bd.zip
Small fix in hasan and spawn the caretaker's wife in oninit label.
-rw-r--r--world/map/npc/027-2/caretaker.txt4
-rw-r--r--world/map/npc/042-1/hasan.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index 2cc64ec1..3a53fb99 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -120,6 +120,10 @@ OnTimer3000:
setnpctimer 0;
end;
+onInit:
+ monster "027-2.gat", 29, 21, "Caretaker's Wife", 1044, 1, "Caretaker::OnWifeDeath";
+ end;
+
OnWifeDeath:
mapannounce "027-2.gat", "NO! YOU KILLED MY WIFE!", 0;
gmcommand "@l I killed the caretaker's wife!";
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 5e9dfdc5..dd549c13 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -203,7 +203,7 @@ onScorpionDeath:
if (strcharinfo(0) != $@ScorpionFighter$) goto L_SummonAgain;
set $@scorp, 0;
if (hasan != 3)
- close;
+ end;
set hasan, 4;
message strcharinfo(0), "You saved Hasan.";
set $@ScorpionTimer, 0;