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, 44 insertions, 0 deletions

diff --git a/npc/025-4/julia.txt b/npc/025-4/julia.txt
new file mode 100644
index 00000000..1b64edeb
--- /dev/null
+++ b/npc/025-4/julia.txt
@@ -0,0 +1,44 @@
+
+025-4,89,21,0	script	Julia	NPC114,{
+    @Reward_Exp = 5000;
+
+    if (Rossy_Quest > 16 || FLAGS & FLAG_ROSSI_COMPLETED) goto L_End;
+    if (Rossy_Quest == 16) goto L_Done;
+    if (Rossy_Quest <= 15) goto L_Hmmm;
+    goto L_Done;
+
+L_Done:
+    mes "[Julia]";
+    mes "\"I heard some battle noises a few minutes ago. Are you here to save me?\"";
+    next;
+    menu
+        "Of course I'm here to save you, Rossy sent me here!", L_Next;
+
+L_Next:
+    mes "\"Rossy? My twin sister? I knew she was going to look for me. Thank you so much, here is a present for you.\"";
+    getinventorylist;
+    if (@inventorylist_count == 100)
+        goto L_TooMany;
+    getitem "BlackBoots", 1;
+    getexp @Reward_Exp, 0;
+    Rossy_Quest = 17;
+    mes "\"I'm out of here now, lets get out of this horrible cave.\"";
+    close;
+
+L_End:
+    mes "[Julia]";
+    mes "\"Lets get out of this horrible cave.\"";
+    close;
+
+L_Hmmm:
+    mes "[Julia]";
+    mes "\"Don't hurt me!\"";
+    close;
+
+L_TooMany:
+    mes "[Julia]";
+    mes "\"Oh, you don't have room for it. Come back when your backpack isn't full.\"";
+    next;
+    mes "\"I'll wait here until I can give your present to you!\"";
+    close;
+}