summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/Changelog.txt2
-rw-r--r--npc/cities/rachel.txt15
-rw-r--r--npc/warps/cities/rachel.txt2
3 files changed, 13 insertions, 6 deletions
diff --git a/npc/Changelog.txt b/npc/Changelog.txt
index cd960c442..f87d12853 100644
--- a/npc/Changelog.txt
+++ b/npc/Changelog.txt
@@ -1,6 +1,8 @@
Date Added
======
2007/04/12
+ * Merged duplicate Rachel Temple entrance into one NPC [Playtester]
+ - we need to add a quest that you need to enter later
* Some 11.1 and 11.2 spawn updates [Playtester]
* Added Cool Corp Event Staff in Rachel [Playtester]
- some skilled script dev should combine them into one function, though
diff --git a/npc/cities/rachel.txt b/npc/cities/rachel.txt
index b93f055f1..390ce8ad8 100644
--- a/npc/cities/rachel.txt
+++ b/npc/cities/rachel.txt
@@ -588,17 +588,22 @@ ra_temple,119,179,3 script #door1 45,2,2,{
OnTouch:
mes "** The door is locked. **";
next;
- menu "Kick it",-,"Take out your weapon",L_weap;
+ menu "Kick it",-,"Take out your weapon",L_weap,"Pray to the goddess",L_enter;
emotion 23;
mes "[Bishop Nema]";
mes "Please stop!";
close;
- end;
- L_weap:
- emotion 23;
- close;
+L_weap:
+ emotion 23;
+ close;
+
+L_enter:
+ mes "** The door opens. **";
+ close2;
+ warp "ra_temin",169,22;
+ end;
}
ra_temple,116,174,3 script Bishop Nema 920,{
diff --git a/npc/warps/cities/rachel.txt b/npc/warps/cities/rachel.txt
index 664c5295b..a9ecd75e2 100644
--- a/npc/warps/cities/rachel.txt
+++ b/npc/warps/cities/rachel.txt
@@ -62,7 +62,7 @@ ra_temsky,62,139,0 warp rasky006 1,1,ra_temsky,91,143
//Rachel Temple
ra_temple,119,21,0 warp rachel002 1,1,rachel,149,244
-ra_temple,119,181,0 warp rachel003 1,1,ra_temin,169,22
+//ra_temple,119,181,0 warp rachel003 1,1,ra_temin,169,22
ra_temin,169,17,0 warp rachel004 1,1,ra_temple,119,176
ra_temin,206,93,0 warp rachel005 1,1,ra_temin,312,257
ra_temin,312,252,0 warp rachel006 1,1,ra_temin,206,88