diff --git a/game/modules/tome/class/Encounter.lua b/game/modules/tome/class/Encounter.lua
index e1c3c21e3d890145123df83400f8edc11cc42065..6dd532410eb90e7a6c19ad816521ec814f52a4d2 100644
--- a/game/modules/tome/class/Encounter.lua
+++ b/game/modules/tome/class/Encounter.lua
@@ -86,7 +86,7 @@ function _M:findSpot(who, what)
what = what or "block_move"
local spots = {}
for i = -1, 1 do for j = -1, 1 do if i ~= 0 or j ~= 0 then
- if not game.level.map:checkAllEntities(who.x + i, who.y + j, what, who) and game.level.map:checkAllEntities(who.x + i, who.y + j, "can_encounter", who) then
+ if not game.level.map:checkAllEntities(who.x + i, who.y + j, what, who) and game.level.map:checkAllEntities(who.x + i, who.y + j, "can_encounter", who) and not game.level.map:checkAllEntities(who.x + i, who.y + j, "change_level") then
spots[#spots+1] = {who.x + i, who.y + j}
end
end end end
diff --git a/game/modules/tome/data/maps/wilderness/eyal.lua b/game/modules/tome/data/maps/wilderness/eyal.lua
index 399853804168cd1127b248467eec15183932f566..cc1a417003cb8ac846edb0a35e8a7fdcab7e5c32 100644
--- a/game/modules/tome/data/maps/wilderness/eyal.lua
+++ b/game/modules/tome/data/maps/wilderness/eyal.lua
@@ -147,6 +147,7 @@ addSpot({167, 9}, "patrol", "orc-pride")
addSpot({155, 17}, "patrol", "orc-pride")
addSpot({132, 9}, "patrol", "orc-pride")
addSpot({45, 28}, "zone-pop", "zigur")
+addSpot({32, 23}, "zone-pop", "shertul-fortress")
-- addZone section
addZone({1, 1, 78, 46}, "zonename", "Maj'Eyal")
@@ -166,7 +167,7 @@ addZone({75, 6, 78, 9}, "world-encounter", "infinite-dungeon")
addZone({61, 8, 64, 10}, "world-encounter", "infinite-dungeon")
addZone({22, 3, 29, 7}, "world-encounter", "infinite-dungeon")
addZone({59, 41, 65, 46}, "world-encounter", "infinite-dungeon")
-addZone({38, 35, 53, 45}, "world-encounter", "mark-spellblaze")
+addZone({38, 35, 53, 46}, "world-encounter", "mark-spellblaze")
-- ASCII map section
return {
diff --git a/game/modules/tome/data/maps/zones/shertul-fortress.lua b/game/modules/tome/data/maps/zones/shertul-fortress.lua
index 3e4b8b86f35349000ce6092852653f8e75c70860..334136e1b889722c9eea79479901ed9160fe323c 100644
--- a/game/modules/tome/data/maps/zones/shertul-fortress.lua
+++ b/game/modules/tome/data/maps/zones/shertul-fortress.lua
@@ -33,9 +33,13 @@ defineTile(".", "OLD_FLOOR")
-- addSpot section
addSpot({11, 15}, "door", "weirdling")
addSpot({18, 17}, "portal", "back")
+addSpot({1, 15}, "stair", "up")
-- addZone section
addZone({10, 0, 29, 29}, "no-teleport")
+addZone({12, 12, 18, 17}, "zonename", "Control Room")
+addZone({1, 10, 9, 19}, "zonename", "Storage Room")
+addZone({13, 7, 17, 10}, "zonename", "Teleportation Control")
-- ASCII map section
return [[
diff --git a/game/modules/tome/data/zones/shertul-fortress/grids.lua b/game/modules/tome/data/zones/shertul-fortress/grids.lua
index c9b348c9be3e04b244dc84ea19dafbcf1d35c440..1762f788c94d557b8e387bfa72d04e2c367d7b90 100644
--- a/game/modules/tome/data/zones/shertul-fortress/grids.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/grids.lua
@@ -37,3 +37,11 @@ newEntity{
block_sight = true,
does_block_move = true,
}
+
+newEntity{
+ define_as = "TELEPORT_OUT",
+ name = "teleportation circle to the surface", image = "terrain/maze_teleport.png",
+ display = '>', color_r=255, color_g=0, color_b=255,
+ notice = true, show_tooltip = true,
+ change_level = 1, change_zone = "wilderness",
+}
diff --git a/game/modules/tome/data/zones/shertul-fortress/npcs.lua b/game/modules/tome/data/zones/shertul-fortress/npcs.lua
index 1302cee9f8fe02149195180996d2c4b8d35bd74c..c6ffc0b9e03792515d6c44321b9efde7a4a720b7 100644
--- a/game/modules/tome/data/zones/shertul-fortress/npcs.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/npcs.lua
@@ -71,11 +71,30 @@ newEntity{ base = "BASE_NPC_HORROR", define_as="WEIRDLING_BEAST",
resolvers.sustains_at_birth(),
on_die = function()
+ local g = game.zone:makeEntityByName(game.level, "terrain", "OLD_FLOOR")
local spot = game.level:pickSpot{type="door", subtype="weirdling"}
if spot then
- local g = game.zone:makeEntityByName(game.level, "terrain", "OLD_FLOOR")
game.zone:addEntity(game.level, g, "terrain", spot.x, spot.y)
- game.log("#LIGHT_RED#As the Weirdling beast falls it shrieks one last time and the door behind it shatters and exlpodes, revealing the room behind it.")
+ game.log("#LIGHT_RED#As the Weirdling beast falls it shrieks one last time and the door behind it shatters and exlpodes, revealing the room behind it. The stair up vanishes!")
end
+ local spot = game.level:pickSpot{type="stair", subtype="up"}
+ if spot then
+ game.zone:addEntity(game.level, g, "terrain", spot.x, spot.y)
+ end
+
+ -- Update the worldmap with a shortcut to here
+ local g = mod.class.Grid.new{
+ show_tooltip=true, always_remember = true,
+ name="Teleportation portal to the Sher'Tul Fortress",
+ display='>', color=colors.ANTIQUE_WHITE,
+ notice = true,
+ change_level=1, change_zone="shertul-fortress"
+ }
+ g:resolve() g:resolve(nil, true)
+ local level = game.memory_levels["wilderness-1"]
+ local spot = level:pickSpot{type="zone-pop", subtype="shertul-fortress"}
+ game.zone:addEntity(level, g, "terrain", spot.x, spot.y)
+ game.player.wild_x = spot.x
+ game.player.wild_y = spot.y
end,
}
diff --git a/game/modules/tome/data/zones/shertul-fortress/zone.lua b/game/modules/tome/data/zones/shertul-fortress/zone.lua
index 02d963a8025d79bd4ab5dacb5c9a983d4487f15a..7c1b5e4da2e9d486472dfc14dfbd030615d6c7fb 100644
--- a/game/modules/tome/data/zones/shertul-fortress/zone.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/zone.lua
@@ -19,6 +19,12 @@
return {
name = "Yiilkgur, the Sher'Tul Fortress",
+ display_name = function(x, y)
+ local zn = game.level.map.attrs(x or game.player.x, y or game.player.y, "zonename")
+ if zn then return "Yiilkgur, the Sher'Tul Fortress ("..zn..")"
+ else return "Yiilkgur, the Sher'Tul Fortress" end
+ end,
+ variable_zone_name = true,
actor_adjust_level = function(zone, level, e) return zone.base_level + e:getRankLevelAdjust() + level.level-1 + rng.range(-1,2) end,
level_range = {18, 25},
max_level = 1,
@@ -51,6 +57,10 @@ return {
for x = z.x1, z.x2 do for y = z.y1, z.y2 do
game.level.map.attrs(x, y, "no_teleport", true)
end end
+ elseif z.type == "zonename" then
+ for x = z.x1, z.x2 do for y = z.y1, z.y2 do
+ game.level.map.attrs(x, y, "zonename", z.subtype)
+ end end
end
end
end,
diff --git a/tiled-maps/eyal.tmx b/tiled-maps/eyal.tmx
index df414bea1f3efd8acb98b98b4b38b398bd592539..2ad5b497e07288548d55ffffc0cd92eb7c86bf08 100644
--- a/tiled-maps/eyal.tmx
+++ b/tiled-maps/eyal.tmx
@@ -477,6 +477,12 @@
<property name="type" value=""zone-pop""/>
</properties>
</object>
+ <object name="Sher'Tul Fortress portal" x="1027" y="741" width="24" height="20">
+ <properties>
+ <property name="subtype" value=""shertul-fortress""/>
+ <property name="type" value=""zone-pop""/>
+ </properties>
+ </object>
</objectgroup>
<objectgroup name="addZone" width="170" height="100" visible="0">
<object name="Maj'Eyal" x="34" y="40" width="2488" height="1456">