From ae21ea3e73eb1ab4f2a387615af7de08145998f7 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Tue, 5 Jul 2011 23:00:03 +0000
Subject: [PATCH] oups
git-svn-id: http://svn.net-core.org/repos/t-engine4@3811 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/modules/tome/data/maps/zones/shertul-fortress.lua | 6 +++---
game/modules/tome/data/zones/shertul-fortress/grids.lua | 6 +++---
tiled-maps/shertul-fortress.tmx | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/game/modules/tome/data/maps/zones/shertul-fortress.lua b/game/modules/tome/data/maps/zones/shertul-fortress.lua
index b1c06ffc9c..3144ddb093 100644
--- a/game/modules/tome/data/maps/zones/shertul-fortress.lua
+++ b/game/modules/tome/data/maps/zones/shertul-fortress.lua
@@ -61,7 +61,7 @@ addSpot({40, 29}, "spawn", "farportal")
addZone({21, 23, 33, 35}, "zonename", "Control Room")
addZone({16, 26, 18, 32}, "zonename", "Portal Room")
addZone({13, 37, 23, 41}, "zonename", "Storage Room", {sort_drops=true,})
-addZone({38, 26, 44, 32}, "zonename", "Exploratory Farportal")
+addZone({38, 26, 45, 32}, "zonename", "Exploratory Farportal")
addZone({20, 16, 23, 20}, "zonename", "Library of Lost Mysteries")
addZone({15, 28, 19, 28}, "particle", "house_flamebeam")
addZone({15, 30, 19, 30}, "particle", "house_flamebeam", {reverse=true,})
@@ -97,8 +97,8 @@ return [[
======....=##########.............#####6#7#8################
=====.....=#####...###...........#####.......###############
====..==..=#####.*.##1...........4####.......###############
-=.........==####...##.............####...&&&.###############
-=<.......h.+............... ........+....&F&.###############
+=.........==####...##.............####...&&&.9##############
+=<.......h.+............... ........+....&F&..##############
====..==..==##.#...##.............####...&&&.###############
=====.....=###.#.*.###...........#####.......###############
======....=###.#...###...........#####.......###############
diff --git a/game/modules/tome/data/zones/shertul-fortress/grids.lua b/game/modules/tome/data/zones/shertul-fortress/grids.lua
index 204303b380..6af27424fd 100644
--- a/game/modules/tome/data/zones/shertul-fortress/grids.lua
+++ b/game/modules/tome/data/zones/shertul-fortress/grids.lua
@@ -67,8 +67,8 @@ It should automatically create a portal back, but it might not be near your arri
if not who.player then return end
local Dialog = require "engine.ui.Dialog"
local q = who:hasQuest("shertul-fortress")
--- if not q then Dialog:simplePopup("Exploratory Farportal", "The farportal seems to be inactive") return end
--- if not q:exploratory_energy(true) then Dialog:simplePopup("Exploratory Farportal", "The fortress does not have enough energy to power a trip through the portal.") return end
+ if not q then Dialog:simplePopup("Exploratory Farportal", "The farportal seems to be inactive") return end
+ if not q:exploratory_energy(true) then Dialog:simplePopup("Exploratory Farportal", "The fortress does not have enough energy to power a trip through the portal.") return end
Dialog:yesnoPopup("Exploratory Farportal", "Do you want to travel in the farportal? You can not know where you will end up.", function(ret) if ret then
local zone, boss = game.state:createRandomZone()
@@ -112,7 +112,7 @@ It should automatically create a portal back, but it might not be near your arri
self.explo_portal_on_die = nil
end
game:changeLevel(1, zone)
--- q:exploratory_energy()
+ q:exploratory_energy()
game.log("#VIOLET#You enter the swirling portal and in the blink of an eye you set foot in an unfamiliar zone, with no trace of the portal...")
end end)
end,
diff --git a/tiled-maps/shertul-fortress.tmx b/tiled-maps/shertul-fortress.tmx
index dc57ddc509..3eb5a47df8 100644
--- a/tiled-maps/shertul-fortress.tmx
+++ b/tiled-maps/shertul-fortress.tmx
@@ -127,7 +127,7 @@
</tileset>
<layer name="Terrain" width="60" height="60">
<data encoding="base64" compression="zlib">
- eJzt1k0KwjAQBeDs3HqYgJfoEVzqAT2QJ/DfE0ihhRCSOIn5e/EtHoG20Pma6bSTUmoSZj9ApFZ6MUMvvfTihl566cUNvfTSi5sS3kcHrppe3YGrlldbae0r7T05zD35a+7viN6Qa1Rv7HOgF8trv79X69jNc10P3rWeVK80rb12PS28z2V9Leu7kNdVj88b+vb8Yi3VC6H+lfTzfG5n1XGJ9N4reyU1+WaWq44c/WyeOxjJ4d0Ka9okWtacE+8xO48ZvdJ+NvdXGyva/qbMK9Nrv79I80r6PQrtL6L323wO3TdHP5dK6v8kvW5v7DFEb+g51HLl9Kb2Kb3jeVvNpR72t4fQK5vPqKGXXnpxQy+99OKGXnrpxQ299NKLm3/zfgCv0LQw
+ eJzt1skNwjAQBVDfuFJMJJpICRyhQAqiApawNIAiJZJlHDN2vH3zD18RCRLzMpMJvVKqF2bfQKRWejFDL7304oZeeunFDb300oubFN6hAldOb1eBK5e3M1Lal9p7sphr8ufsb4tel6tVr+99oBfLaz6/V+PcbeF7NXjnekK90pT2mvWU8D6m43M6vhJ5bfUseV3vnjXWVLPgml/JPI/XdkYdF0/vPbNXUtPSzrLVEWOe9WsHLePn90rvVljTJtAy5xz4G6PzqHnX9NhnnvX+duq7D7n6W2Jf6V7z+UXaV9L3kau/iN5f+9n1uzHmOVVC/0/Sa/f6nkP0uu5DLldMb+ic0tuet9ReqqG/NYRe2X5GDb300osbeumlFzf00ksvbuill17c/Jv3A4oHtJ8=
</data>
</layer>
<objectgroup color="#ff0000" name="Actor" width="60" height="60">
@@ -202,7 +202,7 @@
<property name="type" value=""zonename""/>
</properties>
</object>
- <object name="Farportal" x="1220" y="835" width="219" height="215">
+ <object name="Farportal" x="1220" y="835" width="247" height="217">
<properties>
<property name="subtype" value=""Exploratory Farportal""/>
<property name="type" value=""zonename""/>
--
GitLab