Aethyr Initial Version

20 files changed, 240 insertions, 86 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c3d262cf2..9575251dd 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -183,6 +183,7 @@ map_list: (
     "023-3-1",
     "023-3-2",
     "023-3",
+    "023-4",
     "024-1",
     "024-10",
     "024-11",
@@ -248,6 +249,8 @@ map_list: (
     "030-22",
     "030-23",
     "030-24",
+    "031-0",
+    "031-1",
     "042-0",
     "042-1",
     "042-10",
diff --git a/db/constants.conf b/db/constants.conf
index 3e1d6839a..7a359e043 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1846,6 +1846,8 @@ constants_db: {
 	NPC_DUCK_ELDER:			271
 	NPC_GUINEVERE: 			272
 	NPC_MANATREE:  			273
+	NPC_TRAP_B:             274
+	NPC_TRAP_ONLINE_B:      275
 
 	// TMW-BR Non Animated NPCs
 	NPC_SHOPPAKEP:          301
diff --git a/db/map_index.txt b/db/map_index.txt
index 26119e7f2..3fee629c3 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -180,88 +180,91 @@
 023-3-1 180
 023-3-2 181
 023-3 182
-024-1 183
-024-10 184
-024-11 185
-024-12 186
-024-13 187
-024-14 188
-024-15 189
-024-16 190
-024-2 191
-024-3 192
-024-4 193
-024-5 194
-024-6 195
-024-7 196
-024-8 197
-024-9 198
-025-1 199
-025-2-1 200
-025-2-2 201
-025-2-3 202
-025-2-4 203
-025-2 204
-025-3 205
-026-0 206
-026-1 207
-026-2 208
-027-0 209
-027-1 210
-027-2 211
-027-3 212
-027-4 213
-029-0 214
-029-1 215
-029-2 216
-029-3 217
-029-4 218
-029-5 219
-029-6 220
-029-7 221
-029-8 222
-029-9 223
-030-01 224
-030-02 225
-030-03 226
-030-04 227
-030-05 228
-030-06 229
-030-07 230
-030-08 231
-030-09 232
-030-10 233
-030-11 234
-030-12 235
-030-13 236
-030-14 237
-030-15 238
-030-16 239
-030-17 240
-030-18 241
-030-19 242
-030-20 243
-030-21 244
-030-22 245
-030-23 246
-030-24 247
-042-0 248
-042-1 249
-042-10 250
-042-11 251
-042-2 252
-042-3 253
-042-4 254
-042-5 255
-042-6 256
-042-7 257
-042-8 258
-042-9 259
-boss 260
-botcheck 261
-guilds 262
-sec_pri 263
-soren-2 264
-soren 265
-test 266
-testbg 267
+023-4 183
+024-1 184
+024-10 185
+024-11 186
+024-12 187
+024-13 188
+024-14 189
+024-15 190
+024-16 191
+024-2 192
+024-3 193
+024-4 194
+024-5 195
+024-6 196
+024-7 197
+024-8 198
+024-9 199
+025-1 200
+025-2-1 201
+025-2-2 202
+025-2-3 203
+025-2-4 204
+025-2 205
+025-3 206
+026-0 207
+026-1 208
+026-2 209
+027-0 210
+027-1 211
+027-2 212
+027-3 213
+027-4 214
+029-0 215
+029-1 216
+029-2 217
+029-3 218
+029-4 219
+029-5 220
+029-6 221
+029-7 222
+029-8 223
+029-9 224
+030-01 225
+030-02 226
+030-03 227
+030-04 228
+030-05 229
+030-06 230
+030-07 231
+030-08 232
+030-09 233
+030-10 234
+030-11 235
+030-12 236
+030-13 237
+030-14 238
+030-15 239
+030-16 240
+030-17 241
+030-18 242
+030-19 243
+030-20 244
+030-21 245
+030-22 246
+030-23 247
+030-24 248
+031-0 249
+031-1 250
+042-0 251
+042-1 252
+042-10 253
+042-11 254
+042-2 255
+042-3 256
+042-4 257
+042-5 258
+042-6 259
+042-7 260
+042-8 261
+042-9 262
+boss 263
+botcheck 264
+guilds 265
+sec_pri 266
+soren-2 267
+soren 268
+test 269
+testbg 270
diff --git a/maps/re/023-4.mcache b/maps/re/023-4.mcache
new file mode 100644
index 000000000..e171a8ab0
--- /dev/null
+++ b/maps/re/023-4.mcache
diff --git a/maps/re/031-0.mcache b/maps/re/031-0.mcache
new file mode 100644
index 000000000..00b3a39af
--- /dev/null
+++ b/maps/re/031-0.mcache
diff --git a/maps/re/031-1.mcache b/maps/re/031-1.mcache
new file mode 100644
index 000000000..20bf524d5
--- /dev/null
+++ b/maps/re/031-1.mcache
diff --git a/npc/023-3/logic.txt b/npc/023-3/logic.txt
index 0f0090e11..c9d63f7e3 100644
--- a/npc/023-3/logic.txt
+++ b/npc/023-3/logic.txt
@@ -87,10 +87,12 @@ OnTouch:
 		npctalkonce l("FIGHT!");
 		end;
 	}
-	if (getq(FrostiaQuest_Homunculus) >= 1) {
+	if (getq(FrostiaQuest_Homunculus) >= 1 && !is_sponsor()) {
 		npctalkonce l("I'm not going any closer to that cursed place!");
 		end;
 	}
+    if (getq(FrostiaQuest_Homunculus) >= 1)
+        end;
 	mesn;
 	mesq l("Congratulations in making this far, @@.", strcharinfo(0));
 	next;
@@ -182,6 +184,8 @@ OnInit:
 OnTouch:
 	.@q=getq(FrostiaQuest_Homunculus);
 	.@q2=getq(FrostiaQuest_Homunculus);
+    if (.@q)
+        end;
 	if ($@LOGIC_0233BOSS) {
 		dispbottom l("A powerful magic barrier repels you!");
 		slide 81, 86;
@@ -208,6 +212,34 @@ OnInit:
 	end;
 }
 
+// Aethyr Gateway
+023-3,26,219,0	script	#AethyrGate	NPC_HIDDEN,{
+	end;
+
+OnInit:
+    // In theory, pattern ID must be between 1~9
+    // To set $@p1$~$@p9$ with the PERL expression
+    // But as we're only using $@p0$ (full string)
+    // the value itself is meaningless
+    .pid=getnpcid();
+    debugmes "Aethyr: Pattern %d", .pid;
+    //I'm not going to learn PERL just for that
+    defpattern(.pid, "^(.*)$", "OnTalkNearby");
+    activatepset(.pid);
+    end;
+
+OnTalkNearby:
+    // not very obvious stuff by gumi, $@p0$ contains the whole string
+    // so we must cut it. Could use $@p1$ if perl was proper but... meh.
+    .@no_nick$ = strip(substr($@p0$, getstrlen(strcharinfo(PC_NAME)) + 3, getstrlen($@p0$) - 1));
+    .@message$ = strtoupper(.@no_nick$);
+
+    //0234_Password_BlackBox(.@message$);
+    callfunc "0234_Password_BlackBox", .@message$;
+    end;
+}
+
+
 // TODO: Spike traps and etc. at the corritor
 // TODO: Rolling Stone Trap
 
diff --git a/npc/023-4/_import.txt b/npc/023-4/_import.txt
new file mode 100644
index 000000000..5b4de2d7b
--- /dev/null
+++ b/npc/023-4/_import.txt
@@ -0,0 +1,5 @@
+// Map 023-4: Ice Caves
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/023-4/023-4_blackbox.txt",
+"npc/023-4/_warps.txt",
+"npc/023-4/traps.txt",
diff --git a/npc/023-4/_warps.txt b/npc/023-4/_warps.txt
new file mode 100644
index 000000000..b678b06be
--- /dev/null
+++ b/npc/023-4/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 023-4: Ice Caves warps
+023-4,42,70,0	warp	#023-4_42_70	0,0,023-3,93,220
+023-4,24,20,0	warp	#023-4_24_20	0,0,031-1,58,103
diff --git a/npc/023-4/traps.txt b/npc/023-4/traps.txt
new file mode 100644
index 000000000..9de778cc8
--- /dev/null
+++ b/npc/023-4/traps.txt
@@ -0,0 +1,58 @@
+// TMW2 Scripts
+// Author:
+//   Jesusalva
+// Description:
+//   Advanced Spike Traps
+
+/////////////////////////////
+023-4,60,51,0	script	#SpikeTrap	NPC_TRAP_B,1,1,{
+    end;
+
+OnInit:
+    .damage=0;
+    .time=0;
+    .goal=rand2(5,10);
+    initnpctimer;
+	end;
+
+OnTouch:
+OnTouchNPC:
+    if (.damage) {
+        if (playerattached()) {
+            percentheal -80, 0;
+        } else {
+            sc_start SC_WALKSPEED, 15000, 60;
+            sc_start SC_STUN, rand2(3000), 1;
+        }
+    }
+    specialeffect(11, AREA, strnpcinfo(0));
+    end;
+
+OnTimer1000:
+	.time+=1;
+    if (.time > .goal) {
+        .damage = !(.damage);
+        .time = 0;
+        if (.damage)
+            setnpcdisplay strnpcinfo(0), NPC_TRAP_ONLINE_B;
+        else
+            setnpcdisplay strnpcinfo(0), NPC_TRAP_B;
+    }
+    initnpctimer;
+    end;
+}
+
+023-4,50,60,0	duplicate(#SpikeTrap)	#SpikeTrap001	NPC_TRAP,1,1
+023-4,31,59,0	duplicate(#SpikeTrap)	#SpikeTrap002	NPC_TRAP,1,1
+023-4,31,48,0	duplicate(#SpikeTrap)	#SpikeTrap003	NPC_TRAP,1,1
+023-4,22,50,0	duplicate(#SpikeTrap)	#SpikeTrap004	NPC_TRAP,1,1
+023-4,39,39,0	duplicate(#SpikeTrap)	#SpikeTrap005	NPC_TRAP,1,1
+023-4,42,42,0	duplicate(#SpikeTrap)	#SpikeTrap006	NPC_TRAP,1,1
+023-4,52,44,0	duplicate(#SpikeTrap)	#SpikeTrap007	NPC_TRAP,1,1
+023-4,50,46,0	duplicate(#SpikeTrap)	#SpikeTrap008	NPC_TRAP,1,1
+023-4,47,28,0	duplicate(#SpikeTrap)	#SpikeTrap009	NPC_TRAP,1,1
+023-4,44,28,0	duplicate(#SpikeTrap)	#SpikeTrap010	NPC_TRAP,1,1
+023-4,42,25,0	duplicate(#SpikeTrap)	#SpikeTrap011	NPC_TRAP,1,1
+023-4,39,24,0	duplicate(#SpikeTrap)	#SpikeTrap012	NPC_TRAP,1,1
+
+
diff --git a/npc/024-1/_import.txt b/npc/024-1/_import.txt
index 604efcddb..b2f50daaf 100644
--- a/npc/024-1/_import.txt
+++ b/npc/024-1/_import.txt
@@ -1,5 +1,6 @@
 // Map 024-1: Frostia
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/024-1/_mobs.txt",
 "npc/024-1/_warps.txt",
 "npc/024-1/guard.txt",
 "npc/024-1/mapflags.txt",
diff --git a/npc/024-1/_mobs.txt b/npc/024-1/_mobs.txt
new file mode 100644
index 000000000..07c198b35
--- /dev/null
+++ b/npc/024-1/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 024-1: Frostia mobs
+024-1,98,43,76,22	monster	Pollet	1219,16,90000,30000
+024-1,96,77,78,21	monster	Iced Fluffy	1041,7,60000,30000
+024-1,89,120,21,22	monster	Azul Slime	1095,3,30000,30000
+024-1,145,70,25,36	monster	Rudolph Slime	1086,2,30000,30000
diff --git a/npc/031-0/_import.txt b/npc/031-0/_import.txt
new file mode 100644
index 000000000..bd877acfd
--- /dev/null
+++ b/npc/031-0/_import.txt
@@ -0,0 +1,4 @@
+// Map 031-0: Aethyr
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/031-0/_mobs.txt",
+"npc/031-0/_warps.txt",
diff --git a/npc/031-0/_mobs.txt b/npc/031-0/_mobs.txt
new file mode 100644
index 000000000..1e3d89b1f
--- /dev/null
+++ b/npc/031-0/_mobs.txt
@@ -0,0 +1,8 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 031-0: Aethyr mobs
+031-0,85,82,91,101	monster	Ice Maggot	1012,24,30000,30000
+031-0,108,59,36,33	monster	Moggun	1070,6,30000,30000
+031-0,48,53,44,35	monster	Water Fairy	1184,4,30000,30000
+031-0,94,120,30,30	monster	Santa Slime	1096,4,30000,30000
+031-0,36,34,5,5	monster	Wolvern	1037,1,30000,30000
+031-0,81,112,10,7	monster	Archant	1026,2,30000,30000
diff --git a/npc/031-0/_warps.txt b/npc/031-0/_warps.txt
new file mode 100644
index 000000000..45a2f72b2
--- /dev/null
+++ b/npc/031-0/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 031-0: Aethyr warps
+031-0,117,45,0	warp	#031-0_117_45	0,0,031-1,68,31
+031-0,15,60,0	warp	#031-0_15_60	0,0,031-1,25,26
diff --git a/npc/031-1/_import.txt b/npc/031-1/_import.txt
new file mode 100644
index 000000000..9de05ba63
--- /dev/null
+++ b/npc/031-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 031-1: Aethyr
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/031-1/_mobs.txt",
+"npc/031-1/_warps.txt",
diff --git a/npc/031-1/_mobs.txt b/npc/031-1/_mobs.txt
new file mode 100644
index 000000000..5601b8d1d
--- /dev/null
+++ b/npc/031-1/_mobs.txt
@@ -0,0 +1,7 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 031-1: Aethyr mobs
+031-1,56,62,52,44	monster	Pollet	1219,24,90000,30000
+031-1,68,82,43,23	monster	Iced Fluffy	1041,13,60000,30000
+031-1,89,40,15,16	monster	White Slime	1094,2,90000,30000
+031-1,24,59,10,44	monster	Wind Fairy	1185,1,75000,30000
+031-1,56,48,29,23	monster	Santa Slime	1096,7,30000,30000
diff --git a/npc/031-1/_warps.txt b/npc/031-1/_warps.txt
new file mode 100644
index 000000000..67101642c
--- /dev/null
+++ b/npc/031-1/_warps.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 031-1: Aethyr warps
+031-1,68,30,0	warp	#031-1_68_30	0,0,031-0,117,46
+031-1,58,104,0	warp	#031-1_58_104	0,0,023-4,24,21
+031-1,25,25,0	warp	#031-1_25_25	0,0,031-0,15,61
diff --git a/npc/_import.txt b/npc/_import.txt
index d07fe74a8..604c3efe3 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -182,6 +182,7 @@
 @include "npc/023-3-1/_import.txt"
 @include "npc/023-3-2/_import.txt"
 @include "npc/023-3/_import.txt"
+@include "npc/023-4/_import.txt"
 @include "npc/024-1/_import.txt"
 @include "npc/024-10/_import.txt"
 @include "npc/024-11/_import.txt"
@@ -247,6 +248,8 @@
 @include "npc/030-22/_import.txt"
 @include "npc/030-23/_import.txt"
 @include "npc/030-24/_import.txt"
+@include "npc/031-0/_import.txt"
+@include "npc/031-1/_import.txt"
 @include "npc/042-0/_import.txt"
 @include "npc/042-1/_import.txt"
 @include "npc/042-10/_import.txt"
diff --git a/npc/functions/main.txt b/npc/functions/main.txt
index 2818d1fb7..58ec36e00 100644
--- a/npc/functions/main.txt
+++ b/npc/functions/main.txt
@@ -371,6 +371,11 @@ function	script	isin	{
     return false;
 }
 
+// isat( map, x, y )
+function	script	isat	{
+    return isin(getarg(0), getarg(1), getarg(2), 0);
+}
+
 // Clear output of getinventorylist()
 // delinventorylist()
 function	script	delinventorylist	{