summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/npc/013-2/notes.txt2
-rw-r--r--world/map/npc/027-2/caretaker.txt21
2 files changed, 6 insertions, 17 deletions
diff --git a/world/map/npc/013-2/notes.txt b/world/map/npc/013-2/notes.txt
index 2f569334..9b9f46dc 100644
--- a/world/map/npc/013-2/notes.txt
+++ b/world/map/npc/013-2/notes.txt
@@ -29,7 +29,7 @@
next;
set @style, rand(20);
set @color, rand(12);
- setlook LOOK_HAIR_STYLE, @style + 1;
+ setlook LOOK_HAIR_STYLE, @style;
setlook LOOK_HAIR_COLOR, @color + 1;
close;
}
diff --git a/world/map/npc/027-2/caretaker.txt b/world/map/npc/027-2/caretaker.txt
index 05c887cd..593a91a8 100644
--- a/world/map/npc/027-2/caretaker.txt
+++ b/world/map/npc/027-2/caretaker.txt
@@ -105,21 +105,10 @@ L_Give_New_Letter_Real:
L_Close:
close;
-
-OnTimer3000:
- monster "027-2.gat", 29, 21, "Caretaker's Wife", 1044, 1, "Caretaker::OnWifeDeath";
- stopnpctimer;
- 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!";
- gmcommand "@ban +5mn " + strcharinfo(0);
- initnpctimer;
+}
+027-2.gat,28,22,0|script|Joan|409,
+{
+ mes "[Joan]";
+ mes "...";
end;
}