From 9e152bb446f17bb854f9174f12d56c6bb7c65dca Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Sun, 9 Dec 2012 16:28:05 +0000
Subject: [PATCH] It is impossible to teleport to Celia's room until she opens
 all the coffins

git-svn-id: http://svn.net-core.org/repos/t-engine4@6016 51575b47-30f0-44d4-a5cc-537603b46e54
---
 .../data/maps/zones/last-hope-mausoleum.lua   | 21 ++++++++++---------
 .../data/zones/last-hope-graveyard/zone.lua   |  4 ++++
 tiled-maps/last-hope-mausoleum.tmx            |  7 ++++++-
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/game/modules/tome/data/maps/zones/last-hope-mausoleum.lua b/game/modules/tome/data/maps/zones/last-hope-mausoleum.lua
index 200524f9fd..06e035c69f 100644
--- a/game/modules/tome/data/maps/zones/last-hope-mausoleum.lua
+++ b/game/modules/tome/data/maps/zones/last-hope-mausoleum.lua
@@ -27,9 +27,10 @@ defineTile("#", "HARDWALL")
 defineTile("*", "COFFIN", nil, nil, nil, nil, {type="coffin", subtype="chamber"})
 defineTile("+", "DOOR", nil, nil, nil, nil, {type="door", subtype="chamber"})
 defineTile("<", "UP", nil, nil, nil, nil, {type="stairs", subtype="stairs"})
-defineTile("_", "ALTAR")
+defineTile("_", "ALTAR", nil, nil, nil, {no_teleport=true})
+defineTile(";", "FLOOR", nil, nil, nil, {no_teleport=true})
 defineTile(".", "FLOOR")
-defineTile("@", "FLOOR", nil, "CELIA")
+defineTile("@", "FLOOR", nil, "CELIA", nil, {no_teleport=true})
 defineTile("L", "FLOOR", "CELIA_NOTE")
 
 -- addSpot section
@@ -47,13 +48,13 @@ return [[
 ##.*.#.*.#.*.#.*.#.*.#.*.#########################
 ##...#...#...#...#...#...#########################
 ##...#...#...#...#...#...#########################
-##...#...#...#...#...#...###...........###########
-###.###.###.###.###.###.###..#...._..#..##########
-###+###+###+###+###+###+###....._........#########
-<.L.......................+........@_.....########
-###+###+###+###+###+###+###....._........#########
-###.###.###.###.###.###.###..#...._..#..##########
-##...#...#...#...#...#...###...........###########
+##...#...#...#...#...#...###;;;;;;;;;;;###########
+###.###.###.###.###.###.###;;#;;;;_;;#;;##########
+###+###+###+###+###+###+###;;;;;_;;;;;;;;#########
+<.L.......................+;;;;;;;;@_;;;;;########
+###+###+###+###+###+###+###;;;;;_;;;;;;;;#########
+###.###.###.###.###.###.###;;#;;;;_;;#;;##########
+##...#...#...#...#...#...###;;;;;;;;;;;###########
 ##...#...#...#...#...#...#########################
 ##...#...#...#...#...#...#########################
 ##.*.#.*.#.*.#.*.#.*.#.*.#########################
@@ -62,4 +63,4 @@ return [[
 ##################################################
 ##################################################
 ##################################################
-##################################################]]
+##################################################]]
\ No newline at end of file
diff --git a/game/modules/tome/data/zones/last-hope-graveyard/zone.lua b/game/modules/tome/data/zones/last-hope-graveyard/zone.lua
index 1d0cde3389..dc96af94c5 100644
--- a/game/modules/tome/data/zones/last-hope-graveyard/zone.lua
+++ b/game/modules/tome/data/zones/last-hope-graveyard/zone.lua
@@ -142,6 +142,10 @@ return {
 	end,
 
 	open_all_coffins = function(who, celia)
+		for i = 0, game.level.map.w - 1 do for j = 0, game.level.map.h - 1 do
+			game.level.map.attrs(i, j, "no_teleport", false)
+		end end
+
 		local floor = game.zone:makeEntityByName(game.level, "terrain", "FLOOR")
 		local coffin_open = game.zone:makeEntityByName(game.level, "terrain", "COFFIN_OPEN")
 		local spot = game.level:pickSpotRemove{type="door", subtype="chamber"}
diff --git a/tiled-maps/last-hope-mausoleum.tmx b/tiled-maps/last-hope-mausoleum.tmx
index 726875cba8..0aef5536bb 100644
--- a/tiled-maps/last-hope-mausoleum.tmx
+++ b/tiled-maps/last-hope-mausoleum.tmx
@@ -22,6 +22,11 @@
     <property name="display" value="#"/>
    </properties>
   </tile>
+  <tile id="38">
+   <properties>
+    <property name="display" value=";"/>
+   </properties>
+  </tile>
   <tile id="73">
    <properties>
     <property name="display" value="&gt;"/>
@@ -40,7 +45,7 @@
  </tileset>
  <layer name="Terrain" width="50" height="25">
   <data encoding="base64" compression="zlib">
-   eJztlkEKwCAMBJO7IP6r/v87tuClYMBoIzbuYZBVD06CYiKiBAAAP4Jvch0t8koPpvc5vszw2NODFcy4WOeW50MQ1kc8onFu1TwI89q+XMpejxI790lep/TD2/3w8l6t8rDGk4eH/xUAAOxOAWBHRis=
+   eJwTZGBgEBzFo3gUj+IhhBmB2BdK04JPT38wMqC6g5r8UX8MTn+ok4Ap8Qst+cjuQ3czDw55cvzBT2M+tjDnwSFOarz4MKCmAVphfiLci89fIyU+hlv+GC7l1Wj9Mfj8MRzaV6N4FI/iUTzYMQCv4lJX
   </data>
  </layer>
  <objectgroup name="Actor" width="50" height="25">
-- 
GitLab