From 4370b3af58770385192e483bdf4409e280977849 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 27 May 2011 18:33:48 +0000
Subject: [PATCH] bleh
git-svn-id: http://svn.net-core.org/repos/t-engine4@3475 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engines/default/engine/Zone.lua | 7 +++----
game/modules/tome/class/Game.lua | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/game/engines/default/engine/Zone.lua b/game/engines/default/engine/Zone.lua
index 2ea02015cf..01365a2147 100644
--- a/game/engines/default/engine/Zone.lua
+++ b/game/engines/default/engine/Zone.lua
@@ -63,23 +63,22 @@ function _M:init(short_name, dynamic)
if self.on_setup then self:on_setup() end
- self:updateBaseLevel(true)
+ self:updateBaseLevel()
forceprint("Initiated zone", self.name, "with base_level", self.base_level)
else
- if self.update_base_level_on_enter then self:updateBaseLevel(false) end
+ if self.update_base_level_on_enter then self:updateBaseLevel() end
forceprint("Loaded zone", self.name, "with base_level", self.base_level)
end
end
--- Computes the current base level based on the zone infos
-function _M:updateBaseLevel(first)
+function _M:updateBaseLevel()
-- Determine a zone base level
self.base_level = self.level_range[1]
if self.level_scheme == "player" then
local plev = game:getPlayer().level
self.base_level = util.bound(plev, self.level_range[1], self.level_range[2])
end
- if self.on_setup_level then self:on_setup_level(first) end
end
--- Loads basic entities lists
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index fea76cb4bd..7e84605d53 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -329,7 +329,7 @@ function _M:loaded()
Actor.projectile_class = "mod.class.Projectile"
Zone:setup{
npc_class="mod.class.NPC", grid_class="mod.class.Grid", object_class="mod.class.Object", trap_class="mod.class.Trap",
- on_setup_level = function(zone)
+ on_setup = function(zone)
-- Increases zone level for higher difficulties
if not zone.__applied_difficulty then
zone.__applied_difficulty = true
--
GitLab