summaryrefslogtreecommitdiff
path: root/npc
diff options
context:
space:
mode:
Diffstat (limited to 'npc')
-rw-r--r--npc/012-2/rakinorf.txt10
-rw-r--r--npc/024-1/_warps.txt1
-rw-r--r--npc/024-15/_import.txt3
-rw-r--r--npc/024-15/_warps.txt3
-rw-r--r--npc/_import.txt1
5 files changed, 17 insertions, 1 deletions
diff --git a/npc/012-2/rakinorf.txt b/npc/012-2/rakinorf.txt
index 5a8dd3283..1bd547a07 100644
--- a/npc/012-2/rakinorf.txt
+++ b/npc/012-2/rakinorf.txt
@@ -93,6 +93,7 @@ L_MainStory:
rif(.@n2 == 4, l("Where can I find the previous mayor?")),
rif(.@n2 == 6, l("Airlia told me you should lend me a Return Potion.")),
rif(.@n2 == 7, l("I think I'm ready.")),
+ rif(.@n == 6 && countitem(BrokenWarpCrystal), l("The warp crystal broke.")),
//rif(.@n == 6 && (!countitem(ReturnPotion)||@returnpotion_expiredate<gettimetick(2)), l("I need more return potions.")),
l("Ok, thanks.");
@@ -258,8 +259,15 @@ L_MainStory:
mes l("- Boss give more Job experience, but as long that you keep killing, you'll keep gaining.");
break;
- /*
case 9:
+ mesn;
+ mesq l("I don't have a spare. They're *hic* done by ANISE INC., their headquarters are in Frostia.");
+ next;
+ mesn;
+ mesq l("Frostia is a *hic* town way way north of here. They *hic* hate humans, so... Good luck?");
+ break;
+ /*
+ case 10:
if (countitem(ReturnPotion))
delitem ReturnPotion, countitem(ReturnPotion);
inventoryplace ReturnPotion, 5;
diff --git a/npc/024-1/_warps.txt b/npc/024-1/_warps.txt
index 19281ccbe..f69172d81 100644
--- a/npc/024-1/_warps.txt
+++ b/npc/024-1/_warps.txt
@@ -20,3 +20,4 @@ OnTouch:
024-1,105,34,0 warp #024-1_105_34 0,0,024-11,24,34
024-1,76,45,0 warp #024-1_76_45 0,0,024-12,31,34
024-1,50,54,0 warp #024-1_50_54 0,0,024-13,30,36
+024-1,64,30,0 warp #024-1_64_30 0,0,024-10,34,36
diff --git a/npc/024-15/_import.txt b/npc/024-15/_import.txt
new file mode 100644
index 000000000..b0a782a1e
--- /dev/null
+++ b/npc/024-15/_import.txt
@@ -0,0 +1,3 @@
+// Map 024-15: Frostia Indoors
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-15/_warps.txt",
diff --git a/npc/024-15/_warps.txt b/npc/024-15/_warps.txt
new file mode 100644
index 000000000..a197a5b19
--- /dev/null
+++ b/npc/024-15/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-15: Frostia Indoors warps
+024-15,25,39,0 warp #024-15_25_39 0,0,024-1,160,50
diff --git a/npc/_import.txt b/npc/_import.txt
index a19365ac0..0b043cfa5 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -146,6 +146,7 @@
@include "npc/024-12/_import.txt"
@include "npc/024-13/_import.txt"
@include "npc/024-14/_import.txt"
+@include "npc/024-15/_import.txt"
@include "npc/024-2/_import.txt"
@include "npc/024-3/_import.txt"
@include "npc/024-4/_import.txt"