summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--conf/map/maps.conf1
-rw-r--r--db/map_index.txt209
-rw-r--r--maps/re/003-2-1.mcachebin0 -> 115 bytes
-rw-r--r--npc/003-2-1/_import.txt5
-rw-r--r--npc/003-2-1/_mobs.txt3
-rw-r--r--npc/003-2-1/_warps.txt6
-rw-r--r--npc/003-2-1/demure.txt30
-rw-r--r--npc/003-2-1/mapflags.txt1
-rw-r--r--npc/003-2/_import.txt1
-rw-r--r--npc/003-2/hiddenwarp.txt16
-rw-r--r--npc/_import.txt1
11 files changed, 164 insertions, 109 deletions
diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index c46e1b3fa..498794660 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -30,6 +30,7 @@ map_list: (
"003-1",
"003-10",
"003-13",
+ "003-2-1",
"003-2",
"003-3",
"003-4-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index ffcf1c19a..0296ba89f 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -27,107 +27,108 @@
003-1 27
003-10 28
003-13 29
-003-2 30
-003-3 31
-003-4-1 32
-003-4 33
-003-5 34
-003-6 35
-003-7 36
-003-8 37
-004-1 38
-004-2-1 39
-004-2 40
-005-1-1 41
-005-1 42
-005-2-1 43
-005-2 44
-005-3 45
-005-4 46
-005-5 47
-005-6 48
-005-7 49
-006-1 50
-007-1 51
-008-0 52
-008-1 53
-008-2 54
-009-1 55
-009-2 56
-009-3 57
-009-4 58
-009-5 59
-010-1-1 60
-010-1 61
-010-2 62
-011-1 63
-011-2 64
-012-1 65
-012-2 66
-012-3 67
-012-4 68
-012-5 69
-012-6 70
-012-7 71
-014-1 72
-014-2-1 73
-014-2 74
-014-3 75
-014-4 76
-014-5 77
-015-1 78
-015-2 79
-015-3 80
-015-4 81
-015-5 82
-015-6 83
-015-7 84
-016-1 85
-016-6 86
-016-7 87
-017-1 88
-017-2-1 89
-017-2-2 90
-017-2 91
-017-3 92
-017-4 93
-017-5 94
-017-6 95
-018-1-1 96
-018-1 97
-018-2-1 98
-018-2-2 99
-018-2-3 100
-018-2-4 101
-018-2 102
-018-3 103
-018-4-1 104
-018-4-2 105
-018-4 106
-018-5 107
-019-1-1 108
-019-1 109
-019-2 110
-019-3 111
-019-4-1 112
-019-4 113
-020-1 114
-020-2 115
-020-3 116
-020-4 117
-020-5 118
-021-1 119
-021-2 120
-021-3 121
-021-4 122
-022-1 123
-023-1 124
-023-2 125
-024-1 126
-boss 127
-botcheck 128
-sec_pri 129
-soren-2 130
-soren 131
-test 132
-testbg 133
+003-2-1 30
+003-2 31
+003-3 32
+003-4-1 33
+003-4 34
+003-5 35
+003-6 36
+003-7 37
+003-8 38
+004-1 39
+004-2-1 40
+004-2 41
+005-1-1 42
+005-1 43
+005-2-1 44
+005-2 45
+005-3 46
+005-4 47
+005-5 48
+005-6 49
+005-7 50
+006-1 51
+007-1 52
+008-0 53
+008-1 54
+008-2 55
+009-1 56
+009-2 57
+009-3 58
+009-4 59
+009-5 60
+010-1-1 61
+010-1 62
+010-2 63
+011-1 64
+011-2 65
+012-1 66
+012-2 67
+012-3 68
+012-4 69
+012-5 70
+012-6 71
+012-7 72
+014-1 73
+014-2-1 74
+014-2 75
+014-3 76
+014-4 77
+014-5 78
+015-1 79
+015-2 80
+015-3 81
+015-4 82
+015-5 83
+015-6 84
+015-7 85
+016-1 86
+016-6 87
+016-7 88
+017-1 89
+017-2-1 90
+017-2-2 91
+017-2 92
+017-3 93
+017-4 94
+017-5 95
+017-6 96
+018-1-1 97
+018-1 98
+018-2-1 99
+018-2-2 100
+018-2-3 101
+018-2-4 102
+018-2 103
+018-3 104
+018-4-1 105
+018-4-2 106
+018-4 107
+018-5 108
+019-1-1 109
+019-1 110
+019-2 111
+019-3 112
+019-4-1 113
+019-4 114
+020-1 115
+020-2 116
+020-3 117
+020-4 118
+020-5 119
+021-1 120
+021-2 121
+021-3 122
+021-4 123
+022-1 124
+023-1 125
+023-2 126
+024-1 127
+boss 128
+botcheck 129
+sec_pri 130
+soren-2 131
+soren 132
+test 133
+testbg 134
diff --git a/maps/re/003-2-1.mcache b/maps/re/003-2-1.mcache
new file mode 100644
index 000000000..f7deec5b5
--- /dev/null
+++ b/maps/re/003-2-1.mcache
Binary files differ
diff --git a/npc/003-2-1/_import.txt b/npc/003-2-1/_import.txt
index 4e3c5e472..a23c26c01 100644
--- a/npc/003-2-1/_import.txt
+++ b/npc/003-2-1/_import.txt
@@ -1,3 +1,6 @@
-// Map 003-2-1: First Deck
+// Map 003-2-1: #Leave-Complaints
// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/003-2-1/_mobs.txt",
"npc/003-2-1/_warps.txt",
+"npc/003-2-1/demure.txt",
+"npc/003-2-1/mapflags.txt",
diff --git a/npc/003-2-1/_mobs.txt b/npc/003-2-1/_mobs.txt
new file mode 100644
index 000000000..6ea4a4961
--- /dev/null
+++ b/npc/003-2-1/_mobs.txt
@@ -0,0 +1,3 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 003-2-1: #Leave-Complaints mobs
+003-2-1,46,45,16,11 monster Green Dragon 1195,5,3600,36000
diff --git a/npc/003-2-1/_warps.txt b/npc/003-2-1/_warps.txt
index 01b8d9348..c66a782ba 100644
--- a/npc/003-2-1/_warps.txt
+++ b/npc/003-2-1/_warps.txt
@@ -1,5 +1,3 @@
// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 003-2-1: First Deck warps
-003-2-1,19,28,0 warp #003-2-1_19_28 0,0,005-1,193,109
-003-2-1,33,28,0 warp #003-2-1_33_28 0,0,003-2-0,20,27
-003-2-1,31,25,0 warp #003-2-1_31_25 0,0,003-2-2,72,29
+// Map 003-2-1: #Leave-Complaints warps
+003-2-1,47,33,0 warp #003-2-1_47_33 1,0,003-2,28,40
diff --git a/npc/003-2-1/demure.txt b/npc/003-2-1/demure.txt
new file mode 100644
index 000000000..4ee1d67b1
--- /dev/null
+++ b/npc/003-2-1/demure.txt
@@ -0,0 +1,30 @@
+// TMW2 Script
+// Author:
+// Crazyfefe
+// Jesusalva
+
+005-1,66,62,0 script Demure GM NPC_HIDDEN,{
+ // Let's try without freeloop
+ mesn any("NotSoBot", "Demure");
+ if (rand(1,5) <= 2)
+ mes "Blame Saulc";
+
+ .@mx=rand(6,12);
+ for (.@i = 0; .@i < .@mx; ++.@i) {
+ mes "leave Complaints";
+ if (rand(1,5) == 3)
+ mes "";
+ if (.@i == 10) {
+ next;
+ mesn any("NotSoBot", "Demure");
+ mes any("leave Complaints", "Blame Saulc");
+ }
+ }
+ if (rand(1,5) >= 4)
+ mes "Blame Saulc";
+ close;
+
+OnInit:
+ .distance=5;
+ end;
+}
diff --git a/npc/003-2-1/mapflags.txt b/npc/003-2-1/mapflags.txt
new file mode 100644
index 000000000..f66ee6606
--- /dev/null
+++ b/npc/003-2-1/mapflags.txt
@@ -0,0 +1 @@
+003-2-1 mapflag nopenalty
diff --git a/npc/003-2/_import.txt b/npc/003-2/_import.txt
index 9363412fd..f6711989e 100644
--- a/npc/003-2/_import.txt
+++ b/npc/003-2/_import.txt
@@ -3,5 +3,6 @@
"npc/003-2/_warps.txt",
"npc/003-2/eistein.txt",
"npc/003-2/estard.txt",
+"npc/003-2/hiddenwarp.txt",
"npc/003-2/lua.txt",
"npc/003-2/mapflags.txt",
diff --git a/npc/003-2/hiddenwarp.txt b/npc/003-2/hiddenwarp.txt
new file mode 100644
index 000000000..7a3a6654e
--- /dev/null
+++ b/npc/003-2/hiddenwarp.txt
@@ -0,0 +1,16 @@
+// TMW2 Script
+// Author:
+// Crazyfefe
+// Jesusalva
+// This warp is enabled after waiting for lua
+
+003-2,28,41,0 script #LeaveComplaints NPC_HIDDEN,0,0,{
+ end;
+
+OnTouch:
+ if ((BaseLevel >= 50 && getq(General_Narrator) >= 2) || is_gm())
+ warp "003-2-1", 47, 34;
+ else
+ npctalk3 l("Complaints Depto. temporaly closed, come back later");
+ end;
+}
diff --git a/npc/_import.txt b/npc/_import.txt
index 46e71f2e7..712af135a 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -29,6 +29,7 @@
@include "npc/003-1/_import.txt"
@include "npc/003-10/_import.txt"
@include "npc/003-13/_import.txt"
+@include "npc/003-2-1/_import.txt"
@include "npc/003-2/_import.txt"
@include "npc/003-3/_import.txt"
@include "npc/003-4-1/_import.txt"
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-06 23:10:35 +0000