summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--db/constants.conf2
-rw-r--r--db/quest_db.conf4
-rw-r--r--db/re/map_zone_db.conf7
-rw-r--r--npc/011-3/_import.txt1
-rw-r--r--npc/011-3/rowboat.txt14
-rw-r--r--npc/011-4/_import.txt4
-rw-r--r--npc/011-4/boss.txt23
-rw-r--r--npc/011-4/chest.txt14
-rw-r--r--npc/011-4/docks.txt43
-rw-r--r--npc/011-4/mapflags.txt14
-rw-r--r--npc/014-2/_import.txt1
-rw-r--r--npc/014-2/dock.txt9
12 files changed, 135 insertions, 1 deletions
diff --git a/db/constants.conf b/db/constants.conf
index db79776a4..bcac8ddd4 100644
--- a/db/constants.conf
+++ b/db/constants.conf
@@ -1814,6 +1814,8 @@ constants_db: {
NPC_CRUSADER: 221
NPC_LEGACY_GUARD_A: 222
NPC_LOF_RICH: 223
+ NPC_SAVANNAH_BLUE: 224
+ NPC_SAVANNAH_GREEN: 225
NPC_BARD_DRUMS: 227
NPC_LOF_DOCTOR: 228
NPC_SWORDS_SIGN: 229
diff --git a/db/quest_db.conf b/db/quest_db.conf
index 78719e561..dbf3a4140 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -661,6 +661,10 @@ quest_db: (
Id: 311
Name: "SQuest_Easter"
},
+{
+ Id: 312
+ Name: "SQuest_ElliChest"
+},
// ID 400+: Event Quests
{
diff --git a/db/re/map_zone_db.conf b/db/re/map_zone_db.conf
index 1b3116b1a..9ffbd0808 100644
--- a/db/re/map_zone_db.conf
+++ b/db/re/map_zone_db.conf
@@ -561,6 +561,11 @@ zones: (
ArtisWarpCrystal: true
ReturnPotion: true
RentCart: true
+ DeathPotion: true
+ RidingMouboo: true
+ RidingTortuga: true
+ LegendaryMouboo: true
+ LegendaryTortuga: true
}
},
{
@@ -644,7 +649,7 @@ zones: (
LilitWarpCrystal: true
ArtisWarpCrystal: true
ReturnPotion: true
- DeathPotion: true
+ DeathPotion: true
}
mapflags: (
diff --git a/npc/011-3/_import.txt b/npc/011-3/_import.txt
index b931fb109..58e72bfe8 100644
--- a/npc/011-3/_import.txt
+++ b/npc/011-3/_import.txt
@@ -3,3 +3,4 @@
"npc/011-3/_mobs.txt",
"npc/011-3/_warps.txt",
"npc/011-3/flood.txt",
+"npc/011-3/rowboat.txt",
diff --git a/npc/011-3/rowboat.txt b/npc/011-3/rowboat.txt
new file mode 100644
index 000000000..8cbbfaddb
--- /dev/null
+++ b/npc/011-3/rowboat.txt
@@ -0,0 +1,14 @@
+// A barbarian in 56,87 offers to rent a rowboat. Maximum rent time is one day.
+// Allows to use the dock
+
+011-3,56,87,0 script Barbarian#Sv1 NPC_SAVANNAH_BLUE,{
+ mesn;
+ mesq l("I cannot rent rowboats yet.");
+ close;
+
+OnInit:
+ .sex=G_OTHER;
+ .distance=5;
+ end;
+}
+
diff --git a/npc/011-4/_import.txt b/npc/011-4/_import.txt
index 2841ca4db..1c5910d7c 100644
--- a/npc/011-4/_import.txt
+++ b/npc/011-4/_import.txt
@@ -1,3 +1,7 @@
// Map 011-4: Eternal Swamps - Navigation
// This file is generated automatically. All manually added changes will be removed when running the Converter.
"npc/011-4/_mobs.txt",
+"npc/011-4/boss.txt",
+"npc/011-4/chest.txt",
+"npc/011-4/docks.txt",
+"npc/011-4/mapflags.txt",
diff --git a/npc/011-4/boss.txt b/npc/011-4/boss.txt
new file mode 100644
index 000000000..72c70183c
--- /dev/null
+++ b/npc/011-4/boss.txt
@@ -0,0 +1,23 @@
+// TMW2 Script
+// Author:
+// Jesusalva
+// Description:
+// Tortuga Boss (exceptional)
+
+011-4,0,0,0 script #BossCtrl_011-4 NPC_HIDDEN,{
+ end;
+
+// Respawn every half hour
+OnTimer1800000:
+ stopnpctimer;
+OnInit:
+ areamonster "011-4", 20, 20, getmapinfo(MAPINFO_SIZE_X, "011-4"), getmapinfo(MAPINFO_SIZE_Y, "011-4"), strmobinfo(1, Tortuga), Tortuga, 1, "#BossCtrl_011-4::OnBossDeath";
+ end;
+
+OnBossDeath:
+ initnpctimer;
+ //announce_bosskill(getmap(), Tortuga);
+ fix_mobkill(Tortuga);
+ end;
+
+}
diff --git a/npc/011-4/chest.txt b/npc/011-4/chest.txt
new file mode 100644
index 000000000..4547eeb40
--- /dev/null
+++ b/npc/011-4/chest.txt
@@ -0,0 +1,14 @@
+// SQuest_ElliChest, which gives equipments but cannot be open before MK is down.
+// 265 68
+
+011-4,265,68,0 script Elli's Chest NPC_CHEST_BIG,{
+ mesn;
+ mesc l("This chest belongs to Elli and is not yet implemented.");
+ close;
+
+OnInit:
+ .sex=G_OTHER;
+ .distance=5;
+ end;
+}
+
diff --git a/npc/011-4/docks.txt b/npc/011-4/docks.txt
new file mode 100644
index 000000000..4e3ff1be0
--- /dev/null
+++ b/npc/011-4/docks.txt
@@ -0,0 +1,43 @@
+// There are three docks here, one which returns you to 014-2 and two which dismount
+// Those which dismount have two NPCs nearby to confirm the operation. If it did not
+// succeed (back'n'forth), you sink. Remember you MUST use a slide
+// Having a rowboat is never checked here, it can safely expire.
+// setmount 3; setmount 0;
+
+011-4,124,21,0 script #Dock0114A NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ dispbottom l("Sorry, you cannot leave.");
+ end;
+}
+
+
+011-4,85,66,0 script #Dock0114B1 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ dispbottom l("Sorry, visiting the Graveyard isn't permitted.");
+ end;
+}
+
+011-4,83,66,0 script #Dock0114B2 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ dispbottom l("Sorry, leaving the Graveyard isn't permitted.");
+ end;
+}
+
+
+011-4,236,71,0 script #Dock0114C1 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ dispbottom l("Sorry, visiting Elli's Tower isn't permitted.");
+ end;
+}
+
+011-4,238,71,0 script #Dock0114C2 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ dispbottom l("Sorry, leaving Elli's Tower isn't permitted.");
+ end;
+}
+
diff --git a/npc/011-4/mapflags.txt b/npc/011-4/mapflags.txt
new file mode 100644
index 000000000..5fd5f0b7d
--- /dev/null
+++ b/npc/011-4/mapflags.txt
@@ -0,0 +1,14 @@
+// Cannot use mounts here, except for rowboat; and no teleport, both items as mapflags
+// nosave as well
+011-4 mapflag zone Jail
+011-4 mapflag nosave 000-1,22,22
+011-4 mapflag nopet
+011-4 mapflag pvp_noguild
+011-4 mapflag nowarpto
+// You pretty much should be using ranged or magic weaponry
+011-4 mapflag weapon_damage_rate 15
+011-4 mapflag magic_damage_rate 30
+011-4 mapflag misc_damage_rate 30
+011-4 mapflag long_damage_rate 20
+011-4 mapflag short_damage_rate 5
+
diff --git a/npc/014-2/_import.txt b/npc/014-2/_import.txt
index 1ee7fb0b6..110e373b0 100644
--- a/npc/014-2/_import.txt
+++ b/npc/014-2/_import.txt
@@ -3,6 +3,7 @@
"npc/014-2/_mobs.txt",
"npc/014-2/_warps.txt",
"npc/014-2/carla.txt",
+"npc/014-2/dock.txt",
"npc/014-2/guards.txt",
"npc/014-2/mouboo.txt",
"npc/014-2/trap.txt",
diff --git a/npc/014-2/dock.txt b/npc/014-2/dock.txt
new file mode 100644
index 000000000..abda17afb
--- /dev/null
+++ b/npc/014-2/dock.txt
@@ -0,0 +1,9 @@
+// If you have a rowboat, you can sail in 014-2 22 96-97 to 011-4 123 21-22
+
+014-2,22,96,0 script #Dock0142 NPC_HIDDEN,0,1,{
+ end;
+OnTouch:
+ dispbottom l("Sorry, you cannot sail yet.");
+ end;
+}
+