Skip to content
Snippets Groups Projects
Commit 8d3a902a authored by DarkGod's avatar DarkGod
Browse files

Arena master is only reused if the master is the same version and same addons

parent ab708acf
No related branches found
No related tags found
No related merge requests found
......@@ -251,6 +251,24 @@ function table.values(t)
return tt
end
function table.same_values(t1, t2)
for _, e1 in ipairs(t1) do
local ok = false
for _, e2 in ipairs(t2) do
if e1 == e2 then ok = true break end
end
if not ok then return false end
end
for _, e2 in ipairs(t2) do
local ok = false
for _, e1 in ipairs(t1) do
if e1 == e2 then ok = true break end
end
if not ok then return false end
end
return true
end
function table.from_list(t, k, v)
local tt = {}
for i, e in ipairs(t) do tt[e[k or 1]] = e[v or 2] end
......
......@@ -408,7 +408,7 @@ function _M:generateMaster()
master = world.arena.master60 or nil
end
if master then
if master.version[1] == game.__mod_info.version[1] and master.version[2] == game.__mod_info.version[2] and master.version[3] == game.__mod_info.version[3] then
if master.version[1] == game.__mod_info.version[1] and master.version[2] == game.__mod_info.version[2] and master.version[3] == game.__mod_info.version[3] and table.same_values(master.addons or {}, table.keys(game.__mod_info.addons)) then
defmaster = false
else
defmaster = true
......
......@@ -208,6 +208,7 @@ return {
game.level.arena.rank = -1
-- game.player:die(game.player)
master.version = game.__mod_info.version
master.addons = table.keys(game.__mod_info.addons)
master.no_drops = true
master.energy.value = 0
master.player = nil
......
......@@ -26,3 +26,6 @@ love interrest. There must be a way of getting his rune off to use it
* mob/boss taht changes form during fight like in D3/a5
* steal some features of dungeonmans academy: "unknown loot" that can only be revealed by the next character
FIX AWESOME AURA !
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment