diff --git a/game/engine/Zone.lua b/game/engine/Zone.lua index 85d82c13d26b830d552ce73d5724e26d6fb86dc1..e172ae403cac0d2a11f58e149934b6736dc4b451 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 3b307a90460a95ded31886ed6ef764bfea6551b7..3f8bfadd944ad5435651ce0678bf198091517bf8 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 85ae4ead0ad94f5e620e5b07dc62b2f79eeb4dc2..fa669b596296b7f61ffb9f7f824cf3ec1918de1b 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 1d94ce38946b1599db1392c22700d5f53f910a23..4d0c80508bb8c21f86f8aa40f3a5d6e16bd3fcbe 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 d98123aac119d75b276792438ccb621538691a2d..697816b240e10a4dce68eddad9195824597c7bb1 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()