summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xdb/re/map_cache.datbin22639 -> 21834 bytes
-rw-r--r--npc/002-1/_import.txt5
-rw-r--r--npc/002-1/_mobs.txt4
-rw-r--r--npc/002-1/_savepoints.txt56
-rw-r--r--npc/002-1/_warps.txt3
-rw-r--r--npc/003-1/_import.txt2
-rw-r--r--npc/005-1/_import.txt2
7 files changed, 69 insertions, 3 deletions
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 170a49560..1a5c9482d 100755
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/002-1/_import.txt b/npc/002-1/_import.txt
index 1719d4e56..7812ced5f 100644
--- a/npc/002-1/_import.txt
+++ b/npc/002-1/_import.txt
@@ -1,2 +1,5 @@
-// Map 002-1: Tulimshar South
+// Map 002-1: Second Deck
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/002-1/_mobs.txt",
+"npc/002-1/_savepoints.txt",
+"npc/002-1/_warps.txt",
diff --git a/npc/002-1/_mobs.txt b/npc/002-1/_mobs.txt
new file mode 100644
index 000000000..d61678b25
--- /dev/null
+++ b/npc/002-1/_mobs.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 002-1: Second Deck mobs
+002-1,52,32,21,9 monster Piou 1002,3,30000,20000
+002-1,27,31,1,3 monster Maggot 1030,1,30000,20000
diff --git a/npc/002-1/_savepoints.txt b/npc/002-1/_savepoints.txt
new file mode 100644
index 000000000..f7c5ae4f3
--- /dev/null
+++ b/npc/002-1/_savepoints.txt
@@ -0,0 +1,56 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 002-1: Second Deck saves
+002-1,40,37,0 script #save_002-1_40_37 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, NO_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+002-1,46,37,0 script #save_002-1_46_37 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, NO_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+002-1,55,40,0 script #save_002-1_55_40 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, NO_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+002-1,46,25,0 script #save_002-1_46_25 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, NO_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+002-1,40,25,0 script #save_002-1_40_25 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, NO_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+002-1,40,27,0 script #save_002-1_40_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, NO_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/002-1/_warps.txt b/npc/002-1/_warps.txt
new file mode 100644
index 000000000..76473f7bf
--- /dev/null
+++ b/npc/002-1/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 002-1: Second Deck warps
+002-1,72,30,0 warp #002-1_72_30 0,0,005-2,31,26
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 30a433f21..25ef20d9e 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -12,6 +12,7 @@
"npc/003-1/itka.txt",
"npc/003-1/jakod.txt",
"npc/003-1/jerican.txt",
+"npc/003-1/lieutenantdausen.txt",
"npc/003-1/luca.txt",
"npc/003-1/mahoud.txt",
"npc/003-1/malivox.txt",
@@ -25,4 +26,3 @@
"npc/003-1/tamiloc.txt",
"npc/003-1/tinris.txt",
"npc/003-1/well.txt",
-"npc/003-1/lieutenantdausen.txt",
diff --git a/npc/005-1/_import.txt b/npc/005-1/_import.txt
index 4b268866d..2df3502fb 100644
--- a/npc/005-1/_import.txt
+++ b/npc/005-1/_import.txt
@@ -3,5 +3,5 @@
"npc/005-1/_mobs.txt",
"npc/005-1/_warps.txt",
"npc/005-1/ayasha.txt",
+"npc/005-1/movetest.txt",
"npc/005-1/warpcandorbattle.txt",
-"npc/005-1/movetest.txt", \ No newline at end of file