summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt87
-rw-r--r--db/quest_db.conf4
-rw-r--r--maps/re/003-1-1.mcachebin0 -> 860 bytes
-rw-r--r--npc/003-1-1/_import.txt4
-rw-r--r--npc/003-1-1/_mobs.txt5
-rw-r--r--npc/003-1-1/_warps.txt4
-rw-r--r--npc/003-1-3/_import.txt2
-rw-r--r--npc/003-1-3/_mobs.txt2
-rw-r--r--npc/003-1-3/_warps.txt2
-rw-r--r--npc/003-1/_import.txt1
-rw-r--r--npc/003-1/inac.txt22
-rw-r--r--npc/003-1/sewer.txt35
-rw-r--r--npc/005-5/_import.txt2
-rw-r--r--npc/005-5/_warps.txt2
-rw-r--r--npc/_import.txt1
-rw-r--r--npc/commands/music.txt2
17 files changed, 124 insertions, 52 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 011dc2d27..7683cd33a 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -15,6 +15,7 @@ map_list: (
"002-5",
"003-0-1",
"003-0",
+ "003-1-1",
"003-1-2",
"003-1-3",
"003-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index fedcf2166..a33388122 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -12,46 +12,47 @@
002-5 12
003-0-1 13
003-0 14
-003-1-2 15
-003-1-3 16
-003-1 17
-003-10 18
-003-13 19
-003-2 20
-003-3 21
-003-4-1 22
-003-4 23
-003-5 24
-003-6 25
-003-7 26
-003-8 27
-004-1 28
-004-2-1 29
-004-2 30
-005-1 31
-005-2-1 32
-005-2 33
-005-3 34
-005-4 35
-005-5 36
-005-6 37
-005-7 38
-007-1 39
-009-1 40
-010-1-1 41
-010-1 42
-010-2 43
-011-1 44
-011-2 45
-012-1 46
-012-2 47
-012-3 48
-014-1 49
-015-1 50
-boss 51
-botcheck 52
-sec_pri 53
-soren-2 54
-soren 55
-test 56
-testbg 57
+003-1-1 15
+003-1-2 16
+003-1-3 17
+003-1 18
+003-10 19
+003-13 20
+003-2 21
+003-3 22
+003-4-1 23
+003-4 24
+003-5 25
+003-6 26
+003-7 27
+003-8 28
+004-1 29
+004-2-1 30
+004-2 31
+005-1 32
+005-2-1 33
+005-2 34
+005-3 35
+005-4 36
+005-5 37
+005-6 38
+005-7 39
+007-1 40
+009-1 41
+010-1-1 42
+010-1 43
+010-2 44
+011-1 45
+011-2 46
+012-1 47
+012-2 48
+012-3 49
+014-1 50
+015-1 51
+boss 52
+botcheck 53
+sec_pri 54
+soren-2 55
+soren 56
+test 57
+testbg 58
diff --git a/db/quest_db.conf b/db/quest_db.conf
index c862d414c..aba11e30b 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -184,6 +184,10 @@ quest_db: (
Id: 61
Name: "TulimsharQuest_AnwarField"
},
+{
+ Id: 62
+ Name: "TulimsharQuest_Sewers"
+},
// ID 71 to 90: Halinarzo Quests
{
diff --git a/maps/re/003-1-1.mcache b/maps/re/003-1-1.mcache
new file mode 100644
index 000000000..1c5389f5f
--- /dev/null
+++ b/maps/re/003-1-1.mcache
Binary files differ
diff --git a/npc/003-1-1/_import.txt b/npc/003-1-1/_import.txt
new file mode 100644
index 000000000..3face4e13
--- /dev/null
+++ b/npc/003-1-1/_import.txt
@@ -0,0 +1,4 @@
+// Map 003-1-1: Tulimshar Sewers
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-1-1/_mobs.txt",
+"npc/003-1-1/_warps.txt",
diff --git a/npc/003-1-1/_mobs.txt b/npc/003-1-1/_mobs.txt
new file mode 100644
index 000000000..fe0c25ac8
--- /dev/null
+++ b/npc/003-1-1/_mobs.txt
@@ -0,0 +1,5 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-1-1: Tulimshar Sewers mobs
+003-1-1,108,76,68,75 monster Cave Maggot 1027,35,35000,300000
+003-1-1,85,72,65,72 monster Black Scorpion 1074,21,35000,300000
+003-1-1,80,87,71,71 monster Ratto 1005,32,35000,300000
diff --git a/npc/003-1-1/_warps.txt b/npc/003-1-1/_warps.txt
new file mode 100644
index 000000000..fb17c62bb
--- /dev/null
+++ b/npc/003-1-1/_warps.txt
@@ -0,0 +1,4 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-1-1: Tulimshar Sewers warps
+003-1-1,143,127,0 warp #003-1-1_143_127 0,0,003-1,115,111
+003-1-1,57,99,0 warp #003-1-1_57_99 0,0,003-1,56,84
diff --git a/npc/003-1-3/_import.txt b/npc/003-1-3/_import.txt
index 90753ead4..3c6504ea9 100644
--- a/npc/003-1-3/_import.txt
+++ b/npc/003-1-3/_import.txt
@@ -1,4 +1,4 @@
-// Map 003-1-3: magic school cave
+// Map 003-1-3: Magic School's Cave
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/003-1-3/_mobs.txt",
"npc/003-1-3/_warps.txt",
diff --git a/npc/003-1-3/_mobs.txt b/npc/003-1-3/_mobs.txt
index bbb8b825c..7f45cd824 100644
--- a/npc/003-1-3/_mobs.txt
+++ b/npc/003-1-3/_mobs.txt
@@ -1,5 +1,5 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-1-3: magic school cave mobs
+// Map 003-1-3: Magic School's Cave mobs
003-1-3,55,58,29,22 monster Cave Snake 1035,7,35000,150000
003-1-3,70,40,3,1 monster Small Topaz Bif 1101,1,35000,150000
003-1-3,54,54,54,54 monster Cave Maggot 1027,5,40000,200000
diff --git a/npc/003-1-3/_warps.txt b/npc/003-1-3/_warps.txt
index c8e143d02..a55641133 100644
--- a/npc/003-1-3/_warps.txt
+++ b/npc/003-1-3/_warps.txt
@@ -1,4 +1,4 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-1-3: magic school cave warps
+// Map 003-1-3: Magic School's Cave warps
003-1-3,83,82,0 warp #003-1-3_83_82 0,0,003-1,59,54
003-1-3,37,86,0 warp #003-1-3_37_86 0,0,003-1,25,46
diff --git a/npc/003-1/_import.txt b/npc/003-1/_import.txt
index 8bc084611..4d1007fc7 100644
--- a/npc/003-1/_import.txt
+++ b/npc/003-1/_import.txt
@@ -28,6 +28,7 @@
"npc/003-1/oldwell.txt",
"npc/003-1/sailors.txt",
"npc/003-1/sarah.txt",
+"npc/003-1/sewer.txt",
"npc/003-1/ship.txt",
"npc/003-1/shop.txt",
"npc/003-1/silvia.txt",
diff --git a/npc/003-1/inac.txt b/npc/003-1/inac.txt
index 8c05e6a3e..37ae82899 100644
--- a/npc/003-1/inac.txt
+++ b/npc/003-1/inac.txt
@@ -1,11 +1,27 @@
// TMW2 scripts.
// Author:
// Saulc
+// Jesusalva
003-1,55,82,0 script Inac NPC_PLAYER,{
-
-
-hello;
+ mesn;
+ mesq l("Many stories are told about this city sewers.");
+ next;
+ mesn;
+ mesq l("One of them is really crazy, though: They say that there is a legendary monster down there.");
+ next;
+ mesn;
+ mesq l("That's just nonsense though, I've been there thousands of times and saw no such thing.");
+ if (getq(TulimsharQuest_Sewers) > 0)
+ close;
+ next;
+ mesn;
+ mesq l("Anyway, there's a barrier to prevent monsters from attacking the city from below.");
+ next;
+ mesn;
+ mesq l("To enter on them, you need to be level 25 and use the following chant: \"Blame Saulc\". I don't know why, but that open doors!");
+ setq TulimsharQuest_Sewers, 1;
+ close;
OnInit:
.@npcId = getnpcid(0, .name$);
diff --git a/npc/003-1/sewer.txt b/npc/003-1/sewer.txt
new file mode 100644
index 000000000..269c56a01
--- /dev/null
+++ b/npc/003-1/sewer.txt
@@ -0,0 +1,35 @@
+// TMW2 scripts.
+// Author:
+// Jesusalva
+// Notes:
+// TW: Tulimshar, West
+// TE: Tulimshar, East
+
+003-1,56,84,0 script #Sewer-TW NPC_NO_SPRITE,{
+ if (getq(TulimsharQuest_Sewers) == 0) end;
+ if (BaseLevel < 25) end;
+
+ mes col("Descend into Tulimshar sewers?", 9);
+ if (askyesno() == ASK_YES) {
+ closedialog;
+ warp "003-1-1", 57, 100;
+ dispbottom l("Blame Saulc.");
+ end;
+ }
+ close;
+}
+
+003-1,115,111,0 script #Sewer-TE NPC_NO_SPRITE,{
+ if (getq(TulimsharQuest_Sewers) == 0) end;
+ if (BaseLevel < 25) end;
+
+ mes col("Descend into Tulimshar sewers?", 9);
+ if (askyesno() == ASK_YES) {
+ closedialog;
+ warp "003-1-1", 143, 128;
+ dispbottom l("Blame Saulc.");
+ end;
+ }
+ close;
+}
+
diff --git a/npc/005-5/_import.txt b/npc/005-5/_import.txt
index 0b82262ad..6bdc1356b 100644
--- a/npc/005-5/_import.txt
+++ b/npc/005-5/_import.txt
@@ -1,4 +1,4 @@
-// Map 005-5: Merchant Guild
+// Map 005-5: Candor Bank
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/005-5/_warps.txt",
"npc/005-5/cynric.txt",
diff --git a/npc/005-5/_warps.txt b/npc/005-5/_warps.txt
index 9d57c5ea5..b1f28d480 100644
--- a/npc/005-5/_warps.txt
+++ b/npc/005-5/_warps.txt
@@ -1,3 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 005-5: Merchant Guild warps
+// Map 005-5: Candor Bank warps
005-5,25,43,0 warp #005-5_25_43 0,0,005-1,39,69
diff --git a/npc/_import.txt b/npc/_import.txt
index 712a6ac23..e80546ff1 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -14,6 +14,7 @@
@include "npc/002-5/_import.txt"
@include "npc/003-0-1/_import.txt"
@include "npc/003-0/_import.txt"
+@include "npc/003-1-1/_import.txt"
@include "npc/003-1-2/_import.txt"
@include "npc/003-1-3/_import.txt"
@include "npc/003-1/_import.txt"
diff --git a/npc/commands/music.txt b/npc/commands/music.txt
index 6ad3f5dd3..7c1ad9ac5 100644
--- a/npc/commands/music.txt
+++ b/npc/commands/music.txt
@@ -41,7 +41,7 @@ OnInit:
htput(.hash, "ship", "bartk_forest_of_birches.ogg");
htput(.hash, "city", "bartk_adventure.ogg");
htput(.hash, "ghoul", "eric_matyas_ghouls.ogg");
- htput(.hash, "surreal", "eric matyas - surreal place.ogg");
+ htput(.hash, "surreal", "eric_matyas_surreal.ogg");
htput(.hash, "magic", "magick_real.ogg");
htput(.hash, "forest", "dariunas_forest.ogg");
htput(.hash, "mythica", "mythica.ogg");
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-03 01:45:38 +0000