From 724689654645963229a431708f292664cbe8a998 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 5 May 2019 00:29:24 -0300
Subject: Anise Inc. (024-15)

---
 conf/map/maps.conf     |   1 +
 db/map_index.txt       |  33 +++++++++++++++++----------------
 db/re/item_db.conf     |   1 +
 maps/re/024-1.mcache   | Bin 1173 -> 1180 bytes
 maps/re/024-15.mcache  | Bin 0 -> 96 bytes
 npc/012-2/rakinorf.txt |  10 +++++++++-
 npc/024-1/_warps.txt   |   1 +
 npc/024-15/_import.txt |   3 +++
 npc/024-15/_warps.txt  |   3 +++
 npc/_import.txt        |   1 +
 10 files changed, 36 insertions(+), 17 deletions(-)
 create mode 100644 maps/re/024-15.mcache
 create mode 100644 npc/024-15/_import.txt
 create mode 100644 npc/024-15/_warps.txt

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 66663f2be..3da613a26 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -147,6 +147,7 @@ map_list: (
     "024-12",
     "024-13",
     "024-14",
+    "024-15",
     "024-2",
     "024-3",
     "024-4",
diff --git a/db/map_index.txt b/db/map_index.txt
index 74ac2c631..6edf5c8a5 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -144,19 +144,20 @@
 024-12 144
 024-13 145
 024-14 146
-024-2 147
-024-3 148
-024-4 149
-024-5 150
-024-6 151
-024-7 152
-024-8 153
-024-9 154
-boss 155
-botcheck 156
-guilds 157
-sec_pri 158
-soren-2 159
-soren 160
-test 161
-testbg 162
+024-15 147
+024-2 148
+024-3 149
+024-4 150
+024-5 151
+024-6 152
+024-7 153
+024-8 154
+024-9 155
+boss 156
+botcheck 157
+guilds 158
+sec_pri 159
+soren-2 160
+soren 161
+test 162
+testbg 163
diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index f75fa960e..bcebed97f 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -10942,6 +10942,7 @@ item_db: (
 	Subtype: "W_DAGGER"
 },
 // Insert new weapons above this line
+// ID 3600 to 3610 SYSTEM RESERVED FOR LEGENDARY WEAPONS
 {
 	Id: 3600
 	AegisName: "Lightbringer"
diff --git a/maps/re/024-1.mcache b/maps/re/024-1.mcache
index aac76e450..fc05782ba 100644
Binary files a/maps/re/024-1.mcache and b/maps/re/024-1.mcache differ
diff --git a/maps/re/024-15.mcache b/maps/re/024-15.mcache
new file mode 100644
index 000000000..8ac285e8f
Binary files /dev/null and b/maps/re/024-15.mcache differ
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"
-- 
cgit v1.2.3-70-g09d2