Merge branch 'master' into legacy

Override all files with 'master' version.

This version is meant to preserve git history as requested by bjorn.

1 files changed, 15 insertions, 0 deletions

diff --git a/npc/025-1/barrier.txt b/npc/025-1/barrier.txt
new file mode 100644
index 00000000..521a4b74
--- /dev/null
+++ b/npc/025-1/barrier.txt
@@ -0,0 +1,15 @@
+
+025-1,42,79,0	script	#JuliaBarrier	NPC45,1,1,{
+    if (Rossy_Quest > 14 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_Warp;
+    if (Rossy_Quest <= 13) goto L_Block;
+    if (Rossy_Quest == 14) message strcharinfo(0), "You hear distant screams of fear.";
+    goto L_Warp;
+
+L_Warp:
+    warp "025-3", 112, 97;
+    end;
+
+L_Block:
+    message strcharinfo(0), "You are too frightened by what you can hear coming out of the cave that you can't enter.";
+    end;
+}