From 7ec7411f6e631d69a3b2e1286d1e069138c3c860 Mon Sep 17 00:00:00 2001 From: Jesusaves Date: Tue, 28 Jul 2020 22:49:17 -0300 Subject: Heat waves and the Volcano B1F --- conf/map/maps.conf | 1 + db/map_index.txt | 337 +++++++++++++++++++++++----------------------- maps/re/007-1.mcache | Bin 2092 -> 2101 bytes maps/re/007-2.mcache | Bin 0 -> 236 bytes npc/007-1/_warps.txt | 1 + npc/007-2/_config.txt | 18 +++ npc/007-2/_import.txt | 5 + npc/007-2/_mobs.txt | 10 ++ npc/007-2/_warps.txt | 3 + npc/_import.txt | 1 + npc/functions/dungeon.txt | 35 +++++ npc/scripts.conf | 1 + 12 files changed, 244 insertions(+), 168 deletions(-) create mode 100644 maps/re/007-2.mcache create mode 100644 npc/007-2/_config.txt create mode 100644 npc/007-2/_import.txt create mode 100644 npc/007-2/_mobs.txt create mode 100644 npc/007-2/_warps.txt create mode 100644 npc/functions/dungeon.txt diff --git a/conf/map/maps.conf b/conf/map/maps.conf index b0f23164c..592550975 100644 --- a/conf/map/maps.conf +++ b/conf/map/maps.conf @@ -66,6 +66,7 @@ map_list: ( "006-4", "006-5", "007-1", + "007-2", "008-0", "008-1", "008-2", diff --git a/db/map_index.txt b/db/map_index.txt index 515f990ea..dc099597c 100644 --- a/db/map_index.txt +++ b/db/map_index.txt @@ -63,171 +63,172 @@ 006-4 63 006-5 64 007-1 65 -008-0 66 -008-1 67 -008-2 68 -009-1 69 -009-2 70 -009-3 71 -009-4 72 -009-5 73 -009-6 74 -009-7 75 -010-1-1 76 -010-1 77 -010-2 78 -011-1 79 -011-2 80 -011-3 81 -012-1 82 -012-2 83 -012-3 84 -012-4 85 -012-5 86 -012-6 87 -012-7 88 -012-8 89 -013-1 90 -014-1 91 -014-2-1 92 -014-2 93 -014-3 94 -014-4 95 -014-5-1 96 -014-5 97 -015-1 98 -015-2 99 -015-3 100 -015-4 101 -015-5 102 -015-6 103 -015-7 104 -015-8-1 105 -015-8 106 -016-1 107 -016-6 108 -016-7 109 -017-1 110 -017-10 111 -017-2-1 112 -017-2-2 113 -017-2 114 -017-3 115 -017-4 116 -017-5 117 -017-6 118 -017-7 119 -017-8 120 -018-1-1 121 -018-1 122 -018-2-1 123 -018-2-2 124 -018-2-3 125 -018-2-4 126 -018-2-5 127 -018-2-6 128 -018-2-7 129 -018-2-8 130 -018-2 131 -018-3 132 -018-4-1 133 -018-4-2 134 -018-4 135 -018-5-0 136 -018-5-1 137 -018-5-2 138 -018-5-3 139 -018-5-4 140 -018-5-boss 141 -018-5 142 -018-6-0 143 -018-6-1 144 -018-6-2 145 -018-6-3 146 -019-1-1 147 -019-1 148 -019-2 149 -019-3 150 -019-4-1 151 -019-4 152 -020-1 153 -020-2 154 -020-3 155 -020-4 156 -020-5 157 -020-6 158 -020-7-1 159 -020-7-2 160 -020-7 161 -021-0 162 -021-1 163 -021-2 164 -021-3 165 -021-4 166 -022-1 167 -023-1 168 -023-2 169 -023-3-1 170 -023-3-2 171 -023-3 172 -024-1 173 -024-10 174 -024-11 175 -024-12 176 -024-13 177 -024-14 178 -024-15 179 -024-16 180 -024-2 181 -024-3 182 -024-4 183 -024-5 184 -024-6 185 -024-7 186 -024-8 187 -024-9 188 -025-1 189 -025-2-1 190 -025-2 191 -025-3 192 -026-0 193 -027-1 194 -027-2 195 -027-3 196 -027-4 197 -042-0 198 -042-1 199 -042-10 200 -042-11 201 -042-2 202 -042-3 203 -042-4 204 -042-5 205 -042-6 206 -042-7 207 -042-8 208 -042-9 209 -boss 210 -botcheck 211 -guilds 212 -maze0 213 -maze1 214 -maze10 215 -maze11 216 -maze12 217 -maze13 218 -maze14 219 -maze15 220 -maze2 221 -maze3 222 -maze4 223 -maze5 224 -maze6 225 -maze7 226 -maze8 227 -maze9 228 -sec_pri 229 -soren-2 230 -soren 231 -test 232 -testbg 233 +007-2 66 +008-0 67 +008-1 68 +008-2 69 +009-1 70 +009-2 71 +009-3 72 +009-4 73 +009-5 74 +009-6 75 +009-7 76 +010-1-1 77 +010-1 78 +010-2 79 +011-1 80 +011-2 81 +011-3 82 +012-1 83 +012-2 84 +012-3 85 +012-4 86 +012-5 87 +012-6 88 +012-7 89 +012-8 90 +013-1 91 +014-1 92 +014-2-1 93 +014-2 94 +014-3 95 +014-4 96 +014-5-1 97 +014-5 98 +015-1 99 +015-2 100 +015-3 101 +015-4 102 +015-5 103 +015-6 104 +015-7 105 +015-8-1 106 +015-8 107 +016-1 108 +016-6 109 +016-7 110 +017-1 111 +017-10 112 +017-2-1 113 +017-2-2 114 +017-2 115 +017-3 116 +017-4 117 +017-5 118 +017-6 119 +017-7 120 +017-8 121 +018-1-1 122 +018-1 123 +018-2-1 124 +018-2-2 125 +018-2-3 126 +018-2-4 127 +018-2-5 128 +018-2-6 129 +018-2-7 130 +018-2-8 131 +018-2 132 +018-3 133 +018-4-1 134 +018-4-2 135 +018-4 136 +018-5-0 137 +018-5-1 138 +018-5-2 139 +018-5-3 140 +018-5-4 141 +018-5-boss 142 +018-5 143 +018-6-0 144 +018-6-1 145 +018-6-2 146 +018-6-3 147 +019-1-1 148 +019-1 149 +019-2 150 +019-3 151 +019-4-1 152 +019-4 153 +020-1 154 +020-2 155 +020-3 156 +020-4 157 +020-5 158 +020-6 159 +020-7-1 160 +020-7-2 161 +020-7 162 +021-0 163 +021-1 164 +021-2 165 +021-3 166 +021-4 167 +022-1 168 +023-1 169 +023-2 170 +023-3-1 171 +023-3-2 172 +023-3 173 +024-1 174 +024-10 175 +024-11 176 +024-12 177 +024-13 178 +024-14 179 +024-15 180 +024-16 181 +024-2 182 +024-3 183 +024-4 184 +024-5 185 +024-6 186 +024-7 187 +024-8 188 +024-9 189 +025-1 190 +025-2-1 191 +025-2 192 +025-3 193 +026-0 194 +027-1 195 +027-2 196 +027-3 197 +027-4 198 +042-0 199 +042-1 200 +042-10 201 +042-11 202 +042-2 203 +042-3 204 +042-4 205 +042-5 206 +042-6 207 +042-7 208 +042-8 209 +042-9 210 +boss 211 +botcheck 212 +guilds 213 +maze0 214 +maze1 215 +maze10 216 +maze11 217 +maze12 218 +maze13 219 +maze14 220 +maze15 221 +maze2 222 +maze3 223 +maze4 224 +maze5 225 +maze6 226 +maze7 227 +maze8 228 +maze9 229 +sec_pri 230 +soren-2 231 +soren 232 +test 233 +testbg 234 diff --git a/maps/re/007-1.mcache b/maps/re/007-1.mcache index 868a57f86..5e7a0766c 100644 Binary files a/maps/re/007-1.mcache and b/maps/re/007-1.mcache differ diff --git a/maps/re/007-2.mcache b/maps/re/007-2.mcache new file mode 100644 index 000000000..40605c524 Binary files /dev/null and b/maps/re/007-2.mcache differ diff --git a/npc/007-1/_warps.txt b/npc/007-1/_warps.txt index ff417a276..fd3d5007f 100644 --- a/npc/007-1/_warps.txt +++ b/npc/007-1/_warps.txt @@ -2,3 +2,4 @@ // Map 007-1: Tulimshar Mining Camp warps 007-1,56,37,0 warp #007-1_56_37 0,0,004-1,33,110 007-1,90,52,0 warp #007-1_90_52 0,0,004-1,92,115 +007-1,99,190,0 warp #007-1_99_190 1,0,007-2,64,66 diff --git a/npc/007-2/_config.txt b/npc/007-2/_config.txt new file mode 100644 index 000000000..66bb09a31 --- /dev/null +++ b/npc/007-2/_config.txt @@ -0,0 +1,18 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 007-2: Tulimshar Volcano Underground conf + +007-2,48,32,0 script #007-2_48_32 NPC_CHEST,{ + TreasureBox(); + specialeffect(.dir == 0 ? 24 : 25, AREA, getnpcid()); // closed ? opening : closing + close; +OnInit: + .distance=2; + end; +} + +007-2,65,66,0 script #007-2_65_66 NPC_HIDDEN,3,0,{ + end; +OnTouch: + doevent "#DungeonCore::OnHeat"; + end; +} diff --git a/npc/007-2/_import.txt b/npc/007-2/_import.txt new file mode 100644 index 000000000..33fc5a24b --- /dev/null +++ b/npc/007-2/_import.txt @@ -0,0 +1,5 @@ +// Map 007-2: Tulimshar Volcano Underground +// This file is generated automatically. All manually added changes will be removed when running the Converter. +"npc/007-2/_config.txt", +"npc/007-2/_mobs.txt", +"npc/007-2/_warps.txt", diff --git a/npc/007-2/_mobs.txt b/npc/007-2/_mobs.txt new file mode 100644 index 000000000..ef8ee3370 --- /dev/null +++ b/npc/007-2/_mobs.txt @@ -0,0 +1,10 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 007-2: Tulimshar Volcano Underground mobs +007-2,49,78,48,19 monster Red Scorpion 1072,12,25000,25000,Tycoon::OnKillRedScorpion +007-2,47,76,48,19 monster Fire Goblin 1067,12,25000,25000 +007-2,51,75,48,19 monster Red Slime 1092,20,25000,25000 +007-2,45,73,48,19 monster Angry Red Scorpion 1130,12,25000,25000 +007-2,45,37,48,19 monster Lava Slime 1097,16,25000,25000 +007-2,40,33,46,19 monster Red Mushroom 1042,6,25000,25000 +007-2,36,31,44,15 monster Fire Fairy 1183,12,25000,25000 +007-2,49,23,31,10 monster Red Slime Mother 1240,3,35000,25000 diff --git a/npc/007-2/_warps.txt b/npc/007-2/_warps.txt new file mode 100644 index 000000000..3817f2709 --- /dev/null +++ b/npc/007-2/_warps.txt @@ -0,0 +1,3 @@ +// This file is generated automatically. All manually added changes will be removed when running the Converter. +// Map 007-2: Tulimshar Volcano Underground warps +007-2,65,65,0 warp #007-2_65_65 1,0,007-1,98,189 diff --git a/npc/_import.txt b/npc/_import.txt index 247b906e5..07df2a223 100644 --- a/npc/_import.txt +++ b/npc/_import.txt @@ -65,6 +65,7 @@ @include "npc/006-4/_import.txt" @include "npc/006-5/_import.txt" @include "npc/007-1/_import.txt" +@include "npc/007-2/_import.txt" @include "npc/008-0/_import.txt" @include "npc/008-1/_import.txt" @include "npc/008-2/_import.txt" diff --git a/npc/functions/dungeon.txt b/npc/functions/dungeon.txt new file mode 100644 index 000000000..0e83bed49 --- /dev/null +++ b/npc/functions/dungeon.txt @@ -0,0 +1,35 @@ +// TMW2 Script +// Authors: +// Jesusalva +// Description: +// Dungeon utilities + +- script #DungeonCore NPC_HIDDEN,{ + end; + +// Main initialization +OnInit: + setarray .heatmap$, "007-2"; + end; + +// Heartbeat for Heat effects +OnHeat: + // Did you left? + .@i=array_find(.heatmap$, getmap()); + if (.@i < 0) { + @heat$=""; + end; + } + + // First time seeing this + if (@heat$ != getmap()) { + @heat$=getmap(); + dispbottom l("This is a hot map, you're suffering damage over time."); + } + + // You are in a HEATMAP$, so suffer damage from heat + percentheal -5, 0; + addtimer2 5000, .name$+"::OnHeat"; + end; +} + diff --git a/npc/scripts.conf b/npc/scripts.conf index da22cb3a1..732a3626a 100644 --- a/npc/scripts.conf +++ b/npc/scripts.conf @@ -138,6 +138,7 @@ "npc/functions/gmbot.txt", "npc/functions/instances.txt", "npc/functions/captcha.txt", +"npc/functions/dungeon.txt", // Maps specific scripts @include "npc/_import.txt" -- cgit v1.2.3-60-g2f50