From 4348edd50886cd1e1c86b27925c26ed9641841d7 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 30 Jul 2010 23:53:21 +0000
Subject: [PATCH] Changed level.ups[1] and level.downs[1] to level.default_up
and level.default_down. *You must update your module, probably in
Game:changeLevel()*
git-svn-id: http://svn.net-core.org/repos/t-engine4@957 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engine/Zone.lua | 4 ++--
game/modules/example/class/Game.lua | 4 ++--
game/modules/tome/class/Game.lua | 4 ++--
game/modules/tome/class/generator/actor/Sandworm.lua | 4 ++--
game/modules/tome/data/general/encounters/arda-fareast.lua | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/game/engine/Zone.lua b/game/engine/Zone.lua
index 85d82c13d2..e172ae403c 100644
--- a/game/engine/Zone.lua
+++ b/game/engine/Zone.lua
@@ -518,8 +518,8 @@ function _M:newLevel(level_data, lev, old_lev, game)
for i = 1, #spots do print("[NEW LEVEL] spot", spots[i].x, spots[i].y, spots[i].type, spots[i].subtype) end
- level.ups = {{x=ux, y=uy}}
- level.downs = {{x=dx, y=dy}}
+ level.default_up = {x=ux, y=uy}
+ level.default_down = {x=dx, y=dy}
level.spots = spots
-- Generate objects
diff --git a/game/modules/example/class/Game.lua b/game/modules/example/class/Game.lua
index 3b307a9046..3f8bfadd94 100644
--- a/game/modules/example/class/Game.lua
+++ b/game/modules/example/class/Game.lua
@@ -167,9 +167,9 @@ function _M:changeLevel(lev, zone)
self.zone:getLevel(self, lev, old_lev)
if lev > old_lev then
- self.player:move(self.level.ups[1].x, self.level.ups[1].y, true)
+ self.player:move(self.level.default_up.x, self.level.default_up.y, true)
else
- self.player:move(self.level.downs[1].x, self.level.downs[1].y, true)
+ self.player:move(self.level.default_down.x, self.level.default_down.y, true)
end
self.level:addEntity(self.player)
end
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index 85ae4ead0a..fa669b5962 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -321,9 +321,9 @@ function _M:changeLevel(lev, zone)
self.player.last_wilderness = self.zone.short_name
else
if lev > old_lev then
- self.player:move(self.level.ups[1].x, self.level.ups[1].y, true)
+ self.player:move(self.level.default_up.x, self.level.default_up.y, true)
else
- self.player:move(self.level.downs[1].x, self.level.downs[1].y, true)
+ self.player:move(self.level.default_down.x, self.level.default_down.y, true)
end
end
self.player.changed = true
diff --git a/game/modules/tome/class/generator/actor/Sandworm.lua b/game/modules/tome/class/generator/actor/Sandworm.lua
index 1d94ce3894..4d0c80508b 100644
--- a/game/modules/tome/class/generator/actor/Sandworm.lua
+++ b/game/modules/tome/class/generator/actor/Sandworm.lua
@@ -47,8 +47,8 @@ function _M:generate()
end
-- Always add one near the stairs
- self:placeWorm(self.level.ups[1])
- self:placeWorm(self.level.downs[1])
+ self:placeWorm(self.level.default_up)
+ self:placeWorm(self.level.default_down)
end
function _M:placeWorm(s)
diff --git a/game/modules/tome/data/general/encounters/arda-fareast.lua b/game/modules/tome/data/general/encounters/arda-fareast.lua
index d98123aac1..697816b240 100644
--- a/game/modules/tome/data/general/encounters/arda-fareast.lua
+++ b/game/modules/tome/data/general/encounters/arda-fareast.lua
@@ -109,8 +109,8 @@ newEntity{
x = sx,
y = sy,
}
- level.downs = level.ups
- level.ups = {{x=sx, y=sy}}
+ level.default_down = level.default_up
+ level.default_up = {x=sx, y=sy}
end,
})
game.player:runStop()
--
GitLab