From 346cb1bbfd69fa6aa0ea6d5857daf25b792693c1 Mon Sep 17 00:00:00 2001
From: Hachem_Muche <Hachem_Muche@stanfordalumni.org>
Date: Thu, 30 Mar 2017 14:57:16 -0700
Subject: [PATCH] Remove debugging code. Neater
---
game/modules/tome/class/Game.lua | 4 +-
game/modules/tome/class/GameState.lua | 112 --------------------------
2 files changed, 2 insertions(+), 114 deletions(-)
diff --git a/game/modules/tome/class/Game.lua b/game/modules/tome/class/Game.lua
index f95415654a..6d369e1e73 100644
--- a/game/modules/tome/class/Game.lua
+++ b/game/modules/tome/class/Game.lua
@@ -1101,7 +1101,7 @@ function _M:changeLevelReal(lev, zone, params)
list[#list+1] = {i, j}
end
end end
- if #list > 0 then list = rng.table(list) x, y = unpack(list) end
+ if #list > 0 then x, y = unpack((rng.table(list))) end
elseif params.auto_level_stair then
-- Dirty but quick
local list = {}
@@ -1111,7 +1111,7 @@ function _M:changeLevelReal(lev, zone, params)
list[#list+1] = {i, j}
end
end end
- if #list > 0 then list = rng.table(list) x, y = unpack(list) end
+ if #list > 0 then x, y = unpack((rng.table(list))) end
end
-- if self.level.exited then -- use the last location, if defined
diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index 6f3ce20042..0be96c7db9 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -3046,115 +3046,3 @@ function _M:unlockTalentCheck(tid, who)
end
return false, self.unlocked_talents[tid]
end
-
-function _M:startEventsOld()
- if not game.zone.events then print("No zone events loaded") return end
-
- if not game.zone.assigned_events then
- local levels = {}
- if game.zone.events_by_level then
- levels[game.level.level] = {}
- else
- for i = 1, game.zone.max_level do levels[i] = {} end
- end
-
- -- Generate the events list for this zone, eventually loading from group files
- local evts, mevts = {}, {}
- for i, e in ipairs(game.zone.events) do
- if e.name then if e.minor then mevts[#mevts+1] = e else evts[#evts+1] = e end
- elseif e.group then
- local f, err = loadfile(self:eventBaseName("groups/", e.group))
- if not f then error(err) end
- setfenv(f, setmetatable({level=game.level, zone=game.zone}, {__index=_G}))
- local list = f()
- for j, ee in ipairs(list) do
- if e.percent_factor and ee.percent then ee.percent = math.floor(ee.percent * e.percent_factor) end
- if e.forbid then ee.forbid = table.append(ee.forbid or {}, e.forbid) end
- if ee.name then if ee.minor then mevts[#mevts+1] = ee else evts[#evts+1] = ee end end
- end
- end
- end
-
- -- Randomize the order they are checked as
- table.shuffle(evts)
- print("[STARTEVENTS] Zone events list:")
- table.print(evts)
- table.shuffle(mevts)
- table.print(mevts)
- for i, e in ipairs(evts) do
- -- If we allow it, try to find a level to host it
- if (e.always or rng.percent(e.percent) or (e.special and e.special() == true)) and (not e.unique or not self:doneEvent(e.name)) then
- local lev = nil
- local forbid = e.forbid or {}
- forbid = table.reverse(forbid)
- if game.zone.events_by_level then
- lev = game.level.level
- else
- if game.zone.events.one_per_level then
- local list = {}
- for i = 1, #levels do if #levels[i] == 0 and not forbid[i] then list[#list+1] = i end end
- if #list > 0 then
- lev = rng.table(list)
- end
- else
- if forbid then
- local t = table.genrange(1, game.zone.max_level, true)
- t = table.minus_keys(t, forbid)
- lev = rng.table(table.keys(t))
- else
- lev = rng.range(1, game.zone.max_level)
- end
- end
- end
-
- if lev then
- lev = levels[lev]
- lev[#lev+1] = e.name
- end
- end
- end
- for i, e in ipairs(mevts) do
- local forbid = e.forbid or {}
- forbid = table.reverse(forbid)
-
- local start, stop = 1, game.zone.max_level
- if game.zone.events_by_level then start, stop = game.level.level, game.level.level end
- for lev = start, stop do
- if rng.percent(e.percent) and not forbid[lev] then
- local lev = levels[lev]
- lev[#lev+1] = e.name
-
- if e.max_repeat then
- local nb = 1
- local p = e.percent
- while nb <= e.max_repeat do
- if rng.percent(p) then
- lev[#lev+1] = e.name
- nb = nb + 1
- else
- break
- end
- p = p / 2
- end
- end
- end
- end
- end
-
- game.zone.assigned_events = levels
- end
-
- return function()
- print("[STARTEVENTS] Assigned events list:")
- table.print(game.zone.assigned_events)
-
- for i, e in ipairs(game.zone.assigned_events[game.level.level] or {}) do
- local f, err = loadfile(self:eventBaseName("", e))
- if not f then error(err) end
- setfenv(f, setmetatable({level=game.level, zone=game.zone, event_id=e.name, Map=Map}, {__index=_G}))
- f()
- end
- game.zone.assigned_events[game.level.level] = {}
- if game.zone.events_by_level then game.zone.assigned_events = nil end
- end
-end
--
GitLab