summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/map/maps.conf15
-rw-r--r--db/constants.conf13
-rw-r--r--db/map_index.txt19
-rw-r--r--db/re/map_cache.datbin11301 -> 13197 bytes
-rw-r--r--npc/008-1/_import.txt5
-rw-r--r--npc/008-1/_mobs.txt15
-rw-r--r--npc/008-1/_warps.txt13
-rw-r--r--npc/008-1/doors.txt6
-rw-r--r--npc/008-1/mapflags.txt1
-rw-r--r--npc/008-1/wateranimation.txt9
-rw-r--r--npc/008-2-0/_import.txt5
-rw-r--r--npc/008-2-0/_savepoints.txt11
-rw-r--r--npc/008-2-0/_warps.txt4
-rw-r--r--npc/008-2-0/mapflags.txt1
-rw-r--r--npc/008-2-1/_import.txt5
-rw-r--r--npc/008-2-1/_savepoints.txt11
-rw-r--r--npc/008-2-1/_warps.txt4
-rw-r--r--npc/008-2-1/mapflags.txt1
-rw-r--r--npc/008-2-10/_import.txt4
-rw-r--r--npc/008-2-10/_warps.txt4
-rw-r--r--npc/008-2-10/mapflags.txt1
-rw-r--r--npc/008-2-11/_import.txt5
-rw-r--r--npc/008-2-11/_savepoints.txt20
-rw-r--r--npc/008-2-11/_warps.txt3
-rw-r--r--npc/008-2-11/mapflags.txt1
-rw-r--r--npc/008-2-12/_import.txt4
-rw-r--r--npc/008-2-12/_warps.txt4
-rw-r--r--npc/008-2-12/mapflags.txt1
-rw-r--r--npc/008-2-13/_import.txt5
-rw-r--r--npc/008-2-13/_savepoints.txt38
-rw-r--r--npc/008-2-13/_warps.txt4
-rw-r--r--npc/008-2-13/mapflags.txt1
-rw-r--r--npc/008-2-14/_import.txt5
-rw-r--r--npc/008-2-14/_savepoints.txt11
-rw-r--r--npc/008-2-14/_warps.txt3
-rw-r--r--npc/008-2-14/mapflags.txt1
-rw-r--r--npc/008-2-2/_import.txt4
-rw-r--r--npc/008-2-2/_warps.txt6
-rw-r--r--npc/008-2-2/mapflags.txt1
-rw-r--r--npc/008-2-3/_import.txt4
-rw-r--r--npc/008-2-3/_warps.txt3
-rw-r--r--npc/008-2-3/mapflags.txt1
-rw-r--r--npc/008-2-4/_import.txt5
-rw-r--r--npc/008-2-4/_savepoints.txt11
-rw-r--r--npc/008-2-4/_warps.txt3
-rw-r--r--npc/008-2-4/mapflags.txt1
-rw-r--r--npc/008-2-5/_import.txt4
-rw-r--r--npc/008-2-5/_warps.txt3
-rw-r--r--npc/008-2-5/mapflags.txt1
-rw-r--r--npc/008-2-6/_import.txt4
-rw-r--r--npc/008-2-6/_warps.txt3
-rw-r--r--npc/008-2-6/mapflags.txt1
-rw-r--r--npc/008-2-7/_import.txt5
-rw-r--r--npc/008-2-7/_savepoints.txt11
-rw-r--r--npc/008-2-7/_warps.txt3
-rw-r--r--npc/008-2-7/mapflags.txt1
-rw-r--r--npc/008-2-8/_import.txt4
-rw-r--r--npc/008-2-8/_warps.txt3
-rw-r--r--npc/008-2-8/mapflags.txt1
-rw-r--r--npc/008-2-9/_import.txt5
-rw-r--r--npc/008-2-9/_savepoints.txt11
-rw-r--r--npc/008-2-9/_warps.txt3
-rw-r--r--npc/008-2-9/mapflags.txt1
-rw-r--r--npc/_import.txt15
-rw-r--r--npc/commands/debug-preset.txt6
-rw-r--r--npc/commands/warp.txt13
66 files changed, 381 insertions, 9 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index a8d9db96..c2b1fa3c 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -54,6 +54,21 @@ map_list: (
"001-2-8",
"001-2-9",
"008-1",
+ "008-2-0",
+ "008-2-1",
+ "008-2-10",
+ "008-2-11",
+ "008-2-12",
+ "008-2-13",
+ "008-2-14",
+ "008-2-2",
+ "008-2-3",
+ "008-2-4",
+ "008-2-5",
+ "008-2-6",
+ "008-2-7",
+ "008-2-8",
+ "008-2-9",
"test",
"testbg",
)
diff --git a/db/constants.conf b/db/constants.conf
index 956af0c3..cc5fcb62 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -3581,14 +3581,14 @@ constants_db: {
PC_PARTY: 1
PC_GUILD: 2
PC_MAP: 3
-
+
comment__: "strnpcinfo"
NPC_NAME: 0
NPC_NAME_VISIBLE: 1
NPC_NAME_HIDDEN: 2
NPC_NAME_UNIQUE: 3
NPC_MAP: 4
-
+
comment__: "getcharid"
CHAR_ID_CHAR: 0
CHAR_ID_PARTY: 1
@@ -3776,7 +3776,6 @@ constants_db: {
RIGHTDOWN: 7
comment__: "npcs"
- NPC_EMPTY: -1
NPC_KNIVES: 100
NPC_DEMON_MAN: 101
NPC_HAT_BOX: 102
@@ -3885,6 +3884,14 @@ constants_db: {
NPC_KATJA_TREE: 911
NPC_DAN_NOTE: 912
NPC_OFFSET_NO_SPRITE: 998
+
+ comment__: "special npcs"
+ NPC_EMPTY: -1
+ NPC_WARP: 45
+ NPC_WARP_HIDDEN: 139
+ NPC_UNUSED__MOBTOMB: 565
+ NPC_WARP_DEBUG: 722
+ NPC_UNUSED__FLAG: 722
NPC_NO_SPRITE: 999
NPC_HIDDEN: 32767
diff --git a/db/map_index.txt b/db/map_index.txt
index 70ea7529..8317b00d 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -51,5 +51,20 @@
001-2-8 51
001-2-9 52
008-1 53
-test 54
-testbg 55
+008-2-0 54
+008-2-1 55
+008-2-10 56
+008-2-11 57
+008-2-12 58
+008-2-13 59
+008-2-14 60
+008-2-2 61
+008-2-3 62
+008-2-4 63
+008-2-5 64
+008-2-6 65
+008-2-7 66
+008-2-8 67
+008-2-9 68
+test 69
+testbg 70
diff --git a/db/re/map_cache.dat b/db/re/map_cache.dat
index 180c17c5..cbe84d9d 100644
--- a/db/re/map_cache.dat
+++ b/db/re/map_cache.dat
Binary files differ
diff --git a/npc/008-1/_import.txt b/npc/008-1/_import.txt
index 4b78a0e8..38da1dae 100644
--- a/npc/008-1/_import.txt
+++ b/npc/008-1/_import.txt
@@ -1,2 +1,7 @@
// Map 008-1: Hurnscald
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-1/_mobs.txt",
+"npc/008-1/_warps.txt",
+"npc/008-1/doors.txt",
+"npc/008-1/mapflags.txt",
+"npc/008-1/wateranimation.txt",
diff --git a/npc/008-1/_mobs.txt b/npc/008-1/_mobs.txt
new file mode 100644
index 00000000..e8835c09
--- /dev/null
+++ b/npc/008-1/_mobs.txt
@@ -0,0 +1,15 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-1: Hurnscald mobs
+008-1,99,39,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,100,42,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,102,40,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,105,41,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,101,44,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,104,43,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,109,40,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,108,42,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,106,44,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,109,44,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,111,42,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,112,44,0,0 monster Manana Tree 1017,1,420000,240000
+008-1,112,39,0,0 monster Manana Tree 1017,1,420000,240000
diff --git a/npc/008-1/_warps.txt b/npc/008-1/_warps.txt
new file mode 100644
index 00000000..44b0db66
--- /dev/null
+++ b/npc/008-1/_warps.txt
@@ -0,0 +1,13 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-1: Hurnscald warps
+008-1,105,76,0 warp #008-1_105_76 0,0,008-2-0,26,23
+008-1,102,79,0 warp #008-1_102_79 0,0,008-2-0,23,34
+008-1,88,71,0 warp #008-1_88_71 0,0,008-2-1,33,42
+008-1,90,66,0 warp #008-1_90_66 0,0,008-2-1,38,27
+008-1,65,55,0 warp #008-1_65_55 0,0,008-2-2,28,33
+008-1,89,58,0 warp #008-1_89_58 0,0,008-2-6,27,32
+008-1,101,55,0 warp #008-1_101_55 0,0,008-2-7,36,28
+008-1,121,71,0 warp #008-1_121_71 1,0,008-2-8,36,38
+008-1,72,68,0 warp #008-1_72_68 0,0,008-2-9,30,34
+008-1,102,69,0 warp #008-1_102_69 0,0,008-2-10,37,33
+008-1,110,56,0 warp #008-1_110_56 0,0,008-2-12,30,31
diff --git a/npc/008-1/doors.txt b/npc/008-1/doors.txt
new file mode 100644
index 00000000..de8ed1d8
--- /dev/null
+++ b/npc/008-1/doors.txt
@@ -0,0 +1,6 @@
+008-1,104,27,0 script CottageDoor NPC_WARP,0,0,{
+ end;
+
+OnTouch:
+ dispbottom(l("Locked."));
+}
diff --git a/npc/008-1/mapflags.txt b/npc/008-1/mapflags.txt
new file mode 100644
index 00000000..f2680964
--- /dev/null
+++ b/npc/008-1/mapflags.txt
@@ -0,0 +1 @@
+008-1 mapflag town
diff --git a/npc/008-1/wateranimation.txt b/npc/008-1/wateranimation.txt
new file mode 100644
index 00000000..8b66f637
--- /dev/null
+++ b/npc/008-1/wateranimation.txt
@@ -0,0 +1,9 @@
+// Evol scripts.
+// Author:
+// gumi
+// Reid
+// Description:
+// Water animations, splash, fishes, etc...
+
+008-1,139,32,0 duplicate(#water_animation0) #water_animation16 NPC_WATER_SPLASH
+008-1,140,40,0 duplicate(#water_animation0) #water_animation17 NPC_WATER_SPLASH
diff --git a/npc/008-2-0/_import.txt b/npc/008-2-0/_import.txt
new file mode 100644
index 00000000..f2ecc3b8
--- /dev/null
+++ b/npc/008-2-0/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-0: Chez Celestia
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-0/_savepoints.txt",
+"npc/008-2-0/_warps.txt",
+"npc/008-2-0/mapflags.txt",
diff --git a/npc/008-2-0/_savepoints.txt b/npc/008-2-0/_savepoints.txt
new file mode 100644
index 00000000..d9055b64
--- /dev/null
+++ b/npc/008-2-0/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-0: Chez Celestia saves
+008-2-0,37,27,0 script #save_008-2-0_37_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-0/_warps.txt b/npc/008-2-0/_warps.txt
new file mode 100644
index 00000000..72a8ab12
--- /dev/null
+++ b/npc/008-2-0/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-0: Chez Celestia warps
+008-2-0,26,22,0 warp #008-2-0_26_22 0,0,008-1,105,75
+008-2-0,22,34,0 warp #008-2-0_22_34 0,0,008-1,101,79
diff --git a/npc/008-2-0/mapflags.txt b/npc/008-2-0/mapflags.txt
new file mode 100644
index 00000000..93df75f4
--- /dev/null
+++ b/npc/008-2-0/mapflags.txt
@@ -0,0 +1 @@
+008-2-0 mapflag town
diff --git a/npc/008-2-1/_import.txt b/npc/008-2-1/_import.txt
new file mode 100644
index 00000000..1e5137a7
--- /dev/null
+++ b/npc/008-2-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-1: Merchant Guild
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-1/_savepoints.txt",
+"npc/008-2-1/_warps.txt",
+"npc/008-2-1/mapflags.txt",
diff --git a/npc/008-2-1/_savepoints.txt b/npc/008-2-1/_savepoints.txt
new file mode 100644
index 00000000..66730940
--- /dev/null
+++ b/npc/008-2-1/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-1: Merchant Guild saves
+008-2-1,42,27,0 script #save_008-2-1_42_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-1/_warps.txt b/npc/008-2-1/_warps.txt
new file mode 100644
index 00000000..e47cbf73
--- /dev/null
+++ b/npc/008-2-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-1: Merchant Guild warps
+008-2-1,37,27,0 warp #008-2-1_37_27 0,0,008-1,89,66
+008-2-1,33,43,0 warp #008-2-1_33_43 0,0,008-1,88,72
diff --git a/npc/008-2-1/mapflags.txt b/npc/008-2-1/mapflags.txt
new file mode 100644
index 00000000..78899489
--- /dev/null
+++ b/npc/008-2-1/mapflags.txt
@@ -0,0 +1 @@
+008-2-1 mapflag town
diff --git a/npc/008-2-10/_import.txt b/npc/008-2-10/_import.txt
new file mode 100644
index 00000000..994726eb
--- /dev/null
+++ b/npc/008-2-10/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-10: Hurnscald City Hall
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-10/_warps.txt",
+"npc/008-2-10/mapflags.txt",
diff --git a/npc/008-2-10/_warps.txt b/npc/008-2-10/_warps.txt
new file mode 100644
index 00000000..25390f95
--- /dev/null
+++ b/npc/008-2-10/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-10: Hurnscald City Hall warps
+008-2-10,37,34,0 warp #008-2-10_37_34 0,0,008-1,102,70
+008-2-10,37,25,0 warp #008-2-10_37_25 1,0,008-2-11,36,27
diff --git a/npc/008-2-10/mapflags.txt b/npc/008-2-10/mapflags.txt
new file mode 100644
index 00000000..7635bed5
--- /dev/null
+++ b/npc/008-2-10/mapflags.txt
@@ -0,0 +1 @@
+008-2-10 mapflag town
diff --git a/npc/008-2-11/_import.txt b/npc/008-2-11/_import.txt
new file mode 100644
index 00000000..84ad9ceb
--- /dev/null
+++ b/npc/008-2-11/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-11: Hurnscald City Hall
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-11/_savepoints.txt",
+"npc/008-2-11/_warps.txt",
+"npc/008-2-11/mapflags.txt",
diff --git a/npc/008-2-11/_savepoints.txt b/npc/008-2-11/_savepoints.txt
new file mode 100644
index 00000000..c3cf65fc
--- /dev/null
+++ b/npc/008-2-11/_savepoints.txt
@@ -0,0 +1,20 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-11: Hurnscald City Hall saves
+008-2-11,25,27,0 script #save_008-2-11_25_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+008-2-11,45,27,0 script #save_008-2-11_45_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-11/_warps.txt b/npc/008-2-11/_warps.txt
new file mode 100644
index 00000000..6c8c4732
--- /dev/null
+++ b/npc/008-2-11/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-11: Hurnscald City Hall warps
+008-2-11,37,28,0 warp #008-2-11_37_28 1,0,008-2-10,36,26
diff --git a/npc/008-2-11/mapflags.txt b/npc/008-2-11/mapflags.txt
new file mode 100644
index 00000000..3e084fc0
--- /dev/null
+++ b/npc/008-2-11/mapflags.txt
@@ -0,0 +1 @@
+008-2-11 mapflag town
diff --git a/npc/008-2-12/_import.txt b/npc/008-2-12/_import.txt
new file mode 100644
index 00000000..88a854e4
--- /dev/null
+++ b/npc/008-2-12/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-12: Hurnscald Clinic
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-12/_warps.txt",
+"npc/008-2-12/mapflags.txt",
diff --git a/npc/008-2-12/_warps.txt b/npc/008-2-12/_warps.txt
new file mode 100644
index 00000000..e44e7154
--- /dev/null
+++ b/npc/008-2-12/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-12: Hurnscald Clinic warps
+008-2-12,30,32,0 warp #008-2-12_30_32 0,0,008-1,110,57
+008-2-12,36,27,0 warp #008-2-12_36_27 1,0,008-2-13,35,31
diff --git a/npc/008-2-12/mapflags.txt b/npc/008-2-12/mapflags.txt
new file mode 100644
index 00000000..b52526a7
--- /dev/null
+++ b/npc/008-2-12/mapflags.txt
@@ -0,0 +1 @@
+008-2-12 mapflag town
diff --git a/npc/008-2-13/_import.txt b/npc/008-2-13/_import.txt
new file mode 100644
index 00000000..a4b0330e
--- /dev/null
+++ b/npc/008-2-13/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-13: Hurnscald Clinic
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-13/_savepoints.txt",
+"npc/008-2-13/_warps.txt",
+"npc/008-2-13/mapflags.txt",
diff --git a/npc/008-2-13/_savepoints.txt b/npc/008-2-13/_savepoints.txt
new file mode 100644
index 00000000..5c8fc22d
--- /dev/null
+++ b/npc/008-2-13/_savepoints.txt
@@ -0,0 +1,38 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-13: Hurnscald Clinic saves
+008-2-13,29,27,0 script #save_008-2-13_29_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+008-2-13,32,27,0 script #save_008-2-13_32_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+008-2-13,29,31,0 script #save_008-2-13_29_31 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
+008-2-13,32,31,0 script #save_008-2-13_32_31 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-13/_warps.txt b/npc/008-2-13/_warps.txt
new file mode 100644
index 00000000..f9681284
--- /dev/null
+++ b/npc/008-2-13/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-13: Hurnscald Clinic warps
+008-2-13,36,32,0 warp #008-2-13_36_32 1,0,008-2-12,35,28
+008-2-13,25,26,0 warp #008-2-13_25_26 1,0,008-2-14,24,30
diff --git a/npc/008-2-13/mapflags.txt b/npc/008-2-13/mapflags.txt
new file mode 100644
index 00000000..be0ed6a2
--- /dev/null
+++ b/npc/008-2-13/mapflags.txt
@@ -0,0 +1 @@
+008-2-13 mapflag town
diff --git a/npc/008-2-14/_import.txt b/npc/008-2-14/_import.txt
new file mode 100644
index 00000000..29a984e8
--- /dev/null
+++ b/npc/008-2-14/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-14: Hurnscald Clinic
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-14/_savepoints.txt",
+"npc/008-2-14/_warps.txt",
+"npc/008-2-14/mapflags.txt",
diff --git a/npc/008-2-14/_savepoints.txt b/npc/008-2-14/_savepoints.txt
new file mode 100644
index 00000000..cbb6fd12
--- /dev/null
+++ b/npc/008-2-14/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-14: Hurnscald Clinic saves
+008-2-14,31,27,0 script #save_008-2-14_31_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-14/_warps.txt b/npc/008-2-14/_warps.txt
new file mode 100644
index 00000000..241626bb
--- /dev/null
+++ b/npc/008-2-14/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-14: Hurnscald Clinic warps
+008-2-14,25,31,0 warp #008-2-14_25_31 1,0,008-2-13,24,27
diff --git a/npc/008-2-14/mapflags.txt b/npc/008-2-14/mapflags.txt
new file mode 100644
index 00000000..4f5bd95c
--- /dev/null
+++ b/npc/008-2-14/mapflags.txt
@@ -0,0 +1 @@
+008-2-14 mapflag town
diff --git a/npc/008-2-2/_import.txt b/npc/008-2-2/_import.txt
new file mode 100644
index 00000000..5a896da0
--- /dev/null
+++ b/npc/008-2-2/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-2: The Rusty Pick
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-2/_warps.txt",
+"npc/008-2-2/mapflags.txt",
diff --git a/npc/008-2-2/_warps.txt b/npc/008-2-2/_warps.txt
new file mode 100644
index 00000000..8410ef2b
--- /dev/null
+++ b/npc/008-2-2/_warps.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-2: The Rusty Pick warps
+008-2-2,28,34,0 warp #008-2-2_28_34 0,0,008-1,65,56
+008-2-2,52,25,0 warp #008-2-2_52_25 1,0,008-2-3,66,28
+008-2-2,24,29,0 warp #008-2-2_24_29 0,0,008-2-4,43,28
+008-2-2,52,32,0 warp #008-2-2_52_32 0,0,008-2-5,24,25
diff --git a/npc/008-2-2/mapflags.txt b/npc/008-2-2/mapflags.txt
new file mode 100644
index 00000000..8f90e197
--- /dev/null
+++ b/npc/008-2-2/mapflags.txt
@@ -0,0 +1 @@
+008-2-2 mapflag town
diff --git a/npc/008-2-3/_import.txt b/npc/008-2-3/_import.txt
new file mode 100644
index 00000000..ed172cc7
--- /dev/null
+++ b/npc/008-2-3/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-3: The Rusty Pick
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-3/_warps.txt",
+"npc/008-2-3/mapflags.txt",
diff --git a/npc/008-2-3/_warps.txt b/npc/008-2-3/_warps.txt
new file mode 100644
index 00000000..957ed686
--- /dev/null
+++ b/npc/008-2-3/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-3: The Rusty Pick warps
+008-2-3,67,29,0 warp #008-2-3_67_29 1,0,008-2-2,51,26
diff --git a/npc/008-2-3/mapflags.txt b/npc/008-2-3/mapflags.txt
new file mode 100644
index 00000000..947a2df3
--- /dev/null
+++ b/npc/008-2-3/mapflags.txt
@@ -0,0 +1 @@
+008-2-3 mapflag town
diff --git a/npc/008-2-4/_import.txt b/npc/008-2-4/_import.txt
new file mode 100644
index 00000000..8ab4d742
--- /dev/null
+++ b/npc/008-2-4/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-4: The Rusty Pick
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-4/_savepoints.txt",
+"npc/008-2-4/_warps.txt",
+"npc/008-2-4/mapflags.txt",
diff --git a/npc/008-2-4/_savepoints.txt b/npc/008-2-4/_savepoints.txt
new file mode 100644
index 00000000..103787d1
--- /dev/null
+++ b/npc/008-2-4/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-4: The Rusty Pick saves
+008-2-4,25,27,0 script #save_008-2-4_25_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-4/_warps.txt b/npc/008-2-4/_warps.txt
new file mode 100644
index 00000000..2d8336f7
--- /dev/null
+++ b/npc/008-2-4/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-4: The Rusty Pick warps
+008-2-4,44,28,0 warp #008-2-4_44_28 0,0,008-2-2,25,29
diff --git a/npc/008-2-4/mapflags.txt b/npc/008-2-4/mapflags.txt
new file mode 100644
index 00000000..cd86a1e4
--- /dev/null
+++ b/npc/008-2-4/mapflags.txt
@@ -0,0 +1 @@
+008-2-4 mapflag town
diff --git a/npc/008-2-5/_import.txt b/npc/008-2-5/_import.txt
new file mode 100644
index 00000000..74e70e1c
--- /dev/null
+++ b/npc/008-2-5/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-5: The Rusty Pick
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-5/_warps.txt",
+"npc/008-2-5/mapflags.txt",
diff --git a/npc/008-2-5/_warps.txt b/npc/008-2-5/_warps.txt
new file mode 100644
index 00000000..21b7f527
--- /dev/null
+++ b/npc/008-2-5/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-5: The Rusty Pick warps
+008-2-5,24,24,0 warp #008-2-5_24_24 0,0,008-2-2,52,31
diff --git a/npc/008-2-5/mapflags.txt b/npc/008-2-5/mapflags.txt
new file mode 100644
index 00000000..435dd353
--- /dev/null
+++ b/npc/008-2-5/mapflags.txt
@@ -0,0 +1 @@
+008-2-5 mapflag town
diff --git a/npc/008-2-6/_import.txt b/npc/008-2-6/_import.txt
new file mode 100644
index 00000000..4630df43
--- /dev/null
+++ b/npc/008-2-6/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-6: Two Guys One Bed
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-6/_warps.txt",
+"npc/008-2-6/mapflags.txt",
diff --git a/npc/008-2-6/_warps.txt b/npc/008-2-6/_warps.txt
new file mode 100644
index 00000000..98944d50
--- /dev/null
+++ b/npc/008-2-6/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-6: Two Guys One Bed warps
+008-2-6,27,33,0 warp #008-2-6_27_33 0,0,008-1,89,59
diff --git a/npc/008-2-6/mapflags.txt b/npc/008-2-6/mapflags.txt
new file mode 100644
index 00000000..c07673a4
--- /dev/null
+++ b/npc/008-2-6/mapflags.txt
@@ -0,0 +1 @@
+008-2-6 mapflag town
diff --git a/npc/008-2-7/_import.txt b/npc/008-2-7/_import.txt
new file mode 100644
index 00000000..263e5dcf
--- /dev/null
+++ b/npc/008-2-7/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-7: Hurnscald Apothecary
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-7/_savepoints.txt",
+"npc/008-2-7/_warps.txt",
+"npc/008-2-7/mapflags.txt",
diff --git a/npc/008-2-7/_savepoints.txt b/npc/008-2-7/_savepoints.txt
new file mode 100644
index 00000000..f3faa80f
--- /dev/null
+++ b/npc/008-2-7/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-7: Hurnscald Apothecary saves
+008-2-7,25,27,0 script #save_008-2-7_25_27 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-7/_warps.txt b/npc/008-2-7/_warps.txt
new file mode 100644
index 00000000..3eb8538a
--- /dev/null
+++ b/npc/008-2-7/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-7: Hurnscald Apothecary warps
+008-2-7,36,29,0 warp #008-2-7_36_29 0,0,008-1,101,56
diff --git a/npc/008-2-7/mapflags.txt b/npc/008-2-7/mapflags.txt
new file mode 100644
index 00000000..caeb89e9
--- /dev/null
+++ b/npc/008-2-7/mapflags.txt
@@ -0,0 +1 @@
+008-2-7 mapflag town
diff --git a/npc/008-2-8/_import.txt b/npc/008-2-8/_import.txt
new file mode 100644
index 00000000..d3346591
--- /dev/null
+++ b/npc/008-2-8/_import.txt
@@ -0,0 +1,4 @@
+// Map 008-2-8: Hurnscald Forge
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-8/_warps.txt",
+"npc/008-2-8/mapflags.txt",
diff --git a/npc/008-2-8/_warps.txt b/npc/008-2-8/_warps.txt
new file mode 100644
index 00000000..7e791e85
--- /dev/null
+++ b/npc/008-2-8/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-8: Hurnscald Forge warps
+008-2-8,37,39,0 warp #008-2-8_37_39 1,0,008-1,120,72
diff --git a/npc/008-2-8/mapflags.txt b/npc/008-2-8/mapflags.txt
new file mode 100644
index 00000000..2bdbedb9
--- /dev/null
+++ b/npc/008-2-8/mapflags.txt
@@ -0,0 +1 @@
+008-2-8 mapflag town
diff --git a/npc/008-2-9/_import.txt b/npc/008-2-9/_import.txt
new file mode 100644
index 00000000..aade14bd
--- /dev/null
+++ b/npc/008-2-9/_import.txt
@@ -0,0 +1,5 @@
+// Map 008-2-9: Jack's Abode
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/008-2-9/_savepoints.txt",
+"npc/008-2-9/_warps.txt",
+"npc/008-2-9/mapflags.txt",
diff --git a/npc/008-2-9/_savepoints.txt b/npc/008-2-9/_savepoints.txt
new file mode 100644
index 00000000..e2aae529
--- /dev/null
+++ b/npc/008-2-9/_savepoints.txt
@@ -0,0 +1,11 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-9: Jack's Abode saves
+008-2-9,26,31,0 script #save_008-2-9_26_31 NPC_SAVE_POINT,{
+ savepointparticle .map$, .x, .y, CURRENT_INN;
+ close;
+
+OnInit:
+ .distance = 2;
+ .sex = G_OTHER;
+ end;
+}
diff --git a/npc/008-2-9/_warps.txt b/npc/008-2-9/_warps.txt
new file mode 100644
index 00000000..7021feae
--- /dev/null
+++ b/npc/008-2-9/_warps.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 008-2-9: Jack's Abode warps
+008-2-9,30,35,0 warp #008-2-9_30_35 0,0,008-1,72,69
diff --git a/npc/008-2-9/mapflags.txt b/npc/008-2-9/mapflags.txt
new file mode 100644
index 00000000..e637ae03
--- /dev/null
+++ b/npc/008-2-9/mapflags.txt
@@ -0,0 +1 @@
+008-2-9 mapflag town
diff --git a/npc/_import.txt b/npc/_import.txt
index 953aa389..1f8a3f29 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -53,5 +53,20 @@
@include "npc/001-2-8/_import.txt"
@include "npc/001-2-9/_import.txt"
@include "npc/008-1/_import.txt"
+@include "npc/008-2-0/_import.txt"
+@include "npc/008-2-1/_import.txt"
+@include "npc/008-2-10/_import.txt"
+@include "npc/008-2-11/_import.txt"
+@include "npc/008-2-12/_import.txt"
+@include "npc/008-2-13/_import.txt"
+@include "npc/008-2-14/_import.txt"
+@include "npc/008-2-2/_import.txt"
+@include "npc/008-2-3/_import.txt"
+@include "npc/008-2-4/_import.txt"
+@include "npc/008-2-5/_import.txt"
+@include "npc/008-2-6/_import.txt"
+@include "npc/008-2-7/_import.txt"
+@include "npc/008-2-8/_import.txt"
+@include "npc/008-2-9/_import.txt"
@include "npc/test/_import.txt"
@include "npc/testbg/_import.txt"
diff --git a/npc/commands/debug-preset.txt b/npc/commands/debug-preset.txt
index a0112e58..40f61261 100644
--- a/npc/commands/debug-preset.txt
+++ b/npc/commands/debug-preset.txt
@@ -72,10 +72,10 @@ function script DoRoutine {
}
}
- if (getarg(2, 0) && getargcount() >= 3)
+ if (getargcount() >= 3)
.@value = max(getarg(2), .@value);
- if (getarg(3, 0) && getargcount() >= 4)
+ if (getargcount() >= 4)
.@value = min(getarg(3), .@value);
return .@value;
@@ -166,7 +166,7 @@ function script DoRoutine {
/* (j) */
case 107: /* k => skill */
.@k = max(1, min(32767, .@a));
- skill .@k, parsev(getskilllv(.@k), .@args$[1], 0, 10);
+ skill .@k, parsev(getskilllv(.@k), .@args$[1], 0, 10), 0;
break;
case 108: /* l => luk */
.@base = readparam(bLuk);
diff --git a/npc/commands/warp.txt b/npc/commands/warp.txt
index 5bfb8c01..e64b87db 100644
--- a/npc/commands/warp.txt
+++ b/npc/commands/warp.txt
@@ -91,7 +91,18 @@ OnInit:
"^SECOND|^DECK2$", "000-2-1 53 33", // second deck
"^HOLD$", "000-2-2 43 30", // hold
"^NARD", "000-2-3 21 27", // nard's room
- "^ALIG|^HID", "000-2-4 36 29"; // alige's hideout
+ "^ALIG|^HID", "000-2-4 36 29", // alige's hideout
+
+ // WOODLAND
+ "^HURN", "008-1 79 64", // hurnscald: town square
+ "^CELE", "008-2-0 25 27", // hurnscald: celestia
+ "^HMER", "008-2-1 33 39", // hurnscald: merchant guild
+ "^RUST", "008-2-2 37 30", // hurnscald: inn
+ "^ARRO|^ARCH", "008-2-6 27 29", // hurnscald: archery shop
+ "^A?POT", "008-2-7 34 27", // hurnscald: potion shop
+ "^HBLA", "008-2-8 36 34", // hurnscald: forge
+ "^HHAL|^HCIT", "008-2-10 36 31", // hurnscald: city hall
+ "HOSP|CLIN", "008-2-13 25 31"; // hurnscald: clinic / hospital
.count = getarraysize(.aliases$[0]);