Skip to content
Snippets Groups Projects
Commit 14b61b78 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'Randboss-gen' into 'master' 

1.7 Tree based rare+ gen

Changes how rare+ enemies are generated to be based off trees instead of scattered talents. This serves two main purposes:  
1. Fix an issue where the third and fourth talents in trees are extremely rarely taken (by rough simulations by Shibari, about 3% of the time for 3rd and 2% for 4th in High Peak).  
2. Make randbosses feel slightly more coherent and easier to evaluate at a glance.  

The tree system works by assigning major and minor trees, with major trees seeing randbosses taking 3 to 4 talents and minor  trees only 1 to 2 with reduced point investment. Biasing based on whether a tree starts locked or unlocked for a class and by whether a tree is generic or class is currently not implemented, but could be desirable. (Previous randboss generation did not bias by these factors either.)  

Current tuning for balance is based around randboss level and is as follows:  
* Rares:  
  * Major trees: first between 8-10, second between 25-35, third between 50-70  
  * Minor trees: two by base, third around 12-30, fourth around 40-80  
* Unique randboss:  
  * Major trees:  one by base, second around 20-40, third around 50-90  
  * Minor trees:  one by base, second around 11-14, third around 30-60, fourth rarely around 70-90  
* Boss randboss:  
  * Major trees:  one by base, second around 11-23, third around 35-75, fourth rarely around 80-90  
  * Minor trees:  one by base, second around 12-20, third around 40-80  

Note that the amount of trees of each type is slightly randomized, thus why level ranges are provided. Lines 2171-2181 contain the exact functions for numbers of each type of tree at each level if specifics are desired.

See merge request !634
parents d882fa7f 617a04a5
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
game/modules/tome/class/GameState.lua
+ 109
− 55
View file @ 14b61b78
......@@ -2097,10 +2097,11 @@ function _M:applyRandomClass(b, data, instant)
if data.autolevel ~= false then b.autolevel = data.autolevel or "random_boss" end
-- Class talent categories
for tt, d in pairs(mclass.talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) end
for tt, d in pairs(mclass.unlockable_talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) end
for tt, d in pairs(class.talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) end
for tt, d in pairs(class.unlockable_talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) end
local ttypes = {}
for tt, d in pairs(mclass.talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) ttypes[tt] = table.clone(d) end
for tt, d in pairs(mclass.unlockable_talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) ttypes[tt] = table.clone(d) end
for tt, d in pairs(class.talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) ttypes[tt] = table.clone(d) end
for tt, d in pairs(class.unlockable_talents_types or {}) do b:learnTalentType(tt, true) b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d[2]) ttypes[tt] = table.clone(d) end
-- Non-class talent categories
if data.add_trees then
......@@ -2109,9 +2110,11 @@ function _M:applyRandomClass(b, data, instant)
if type(d) ~= "number" then d = rng.range(1, 3)*0.1 end
b:learnTalentType(tt, true)
b:setTalentTypeMastery(tt, (b:getTalentTypeMastery(tt) or 1) + d)
ttypes[tt] = table.clone(d)
end
end
end
-- Add starting equipment
local apply_resolvers = function(k, resolver)
if type(resolver) == "table" and resolver.__resolver then
......@@ -2158,76 +2161,127 @@ function _M:applyRandomClass(b, data, instant)
local t = b:getTalentFromId(tid)
if not t.no_npc_use and not t.no_npc_autolevel and (not t.random_boss_rarity or rng.chance(t.random_boss_rarity)) and not (t.rnd_boss_restrict and t.rnd_boss_restrict(b, t, data) ) then
local max = (t.points == 1) and 1 or math.ceil(t.points * 1.2)
local step = max / 50
local step = max / 70
tres[1][tid] = v + math.ceil(step * data.level)
end
end
-- Select additional talents from the class
local known_types = {}
for tt, d in pairs(b.talents_types) do
known_types[tt] = b:numberKnownTalent(tt)
-- learn talents based on trees: focus trees we take 3-4 talents from with a decent amount of point investment, shallow trees we only take 1 or 2 with not many points
-- ideally rares should feel different even within the same class based on what focus trees they get
local nb_focus, nb_shallow = 0, 0
local rank = b.rank
if rank <= 3.2 then --rare
nb_focus = math.floor(0.2 + rng.float(0.25, 0.35)*(math.max(0,data.level))^0.55) -- first around 8-10, second around 25-35, third around 50-70
nb_shallow = 2 + math.floor(0.25 + rng.float(0.1, 0.2)*(math.max(0,data.level))^0.6) -- third around 12-30, fourth 40-80
elseif rank >= 4 then --boss/elite boss
nb_focus = 1 + math.floor(0.25 + rng.float(0.18, 0.33)*(math.max(0,data.level-4))^0.5) -- second around 11-23, third around 35-75, fourth around 80-90 rarely
nb_shallow = 1 + math.floor(0.33 + rng.float(0.125, 0.2)*(math.max(0,data.level-3))^0.6) -- second around 12-20, third 40-80
else --unique
nb_focus = 1 + math.floor(0.2 + rng.float(0.15, 0.3)*(math.max(0,data.level-10))^0.5) -- second around 20-40, third around 50-90
nb_shallow = 1 + math.floor(0.7 + rng.float(0.125, 0.2)*(math.max(0,data.level-8))^0.6) -- second around 11-14, third around 30-60, fourth around 70-90 rarely
end
print("Adding "..nb_focus.." primary trees to boss")
print("Adding "..nb_shallow.." secondary trees to boss")
local list = {}
for _, t in pairs(b.talents_def) do
if b.talents_types[t.type[1]] then
local tt_choices = {}
for tt, d in pairs(ttypes) do
d.tt = tt
table.insert(tt_choices, d)
end
local fails = 0
local focus_trees = {}
local shallow_trees = {}
local tt, tt_idx, tt_def
local t, t_idx
while #focus_trees < nb_focus or #shallow_trees < nb_shallow do
local ok = false
while not ok do
tt = rng.tableRemove(tt_choices)
if not tt or not tt.tt then break end
if not (tt.tt=="technique/combat-training" or tt.tt=="cunning/survival") then ok=true end
end
if not ok then break end
tt = tt.tt
tt_def = tt and b:knowTalentType(tt) and b.talents_types_def[tt]
if not tt_def then break end
print("[applyRandomClass] Attempting to add tree "..tt.." to boss")
local t_choices = {}
local nb_known = b:numberKnownTalent(tt)
for i, t in ipairs(tt_def.talents) do
local ok = true
if t.no_npc_use or t.not_on_random_boss then
known_types[t.type[1]] = known_types[t.type[1]] + 1 -- allows higher tier talents to be learnt
else
local ok = true
if t.rnd_boss_restrict and t.rnd_boss_restrict(b, t, data) then
nb_known = nb_known + 1 -- treat as known to allow later talents to be learned
print(" * Random boss forbade talent because talent not allowed on random bosses", t.name, t.id, data.level)
ok = false
end
if t.rnd_boss_restrict and t.rnd_boss_restrict(b, t, data) and ok then
print(" * Random boss forbade talent because of special talent restriction", t.name, t.id, data.level)
nb_known = nb_known + 1 -- treat as known to allow later talents to be learned
ok = false
end
if t.random_boss_rarity and rng.percent(t.random_boss_rarity) and ok then
print(" * Random boss forbade talent because of random boss rarity random chance", t.name, t.id, data.level)
nb_known = nb_known + 1 -- treat as known to allow later talents to be learned
ok = false
end
if data.check_talents_level and rawget(t, 'require') and ok then
local req = t.require
if type(req) == "function" then req = req(b, t) end
if req and req.level and util.getval(req.level, 1) > math.ceil(data.level) then
print(" * Random boss forbade talent because of level", t.name, t.id, data.level)
ok = false
print("[applyRandomClass] Random boss forbade talent because of special talent restriction", t.name, t.id, data.level)
end
if data.check_talents_level and rawget(t, 'require') then
local req = t.require
if type(req) == "function" then req = req(b, t) end
if req and req.level and util.getval(req.level, 1) > math.ceil(data.level/2) then
print("[applyRandomClass] Random boss forbade talent because of level", t.name, t.id, data.level)
ok = false
end
if ok then
table.insert(t_choices, t)
end
end
print(" Talent choices for "..tt..":") for i, t in ipairs(t_choices) do print("\t", i, t.id, t.name) end
if #t_choices <= 2 or #focus_trees >= nb_focus then
if #t_choices > 0 and #shallow_trees < nb_shallow then
table.insert(shallow_trees, tt) -- record that we added the tree as a minor tree
max_talents_from_tree = rng.percent(65) and 2 or 1
print("Adding secondary tree "..tt.." to boss with "..max_talents_from_tree.." talents")
for i = max_talents_from_tree,1,-1 do
local t = table.remove(t_choices, 1)
if not t then break end
local max = (t.points == 1) and 1 or math.ceil(t.points * 1.2)
local step = max / 60
local lev = math.max(1, math.round(rng.float(0.75,1.15)*math.ceil(step * data.level)))
print(#shallow_trees, " * talent:", t.id, lev)
if instant then -- affected by game difficulty settings
if b:getTalentLevelRaw(t) < lev then b:learnTalent(t.id, true, lev - b:getTalentLevelRaw(t.id)) end
if t.mode == "sustained" and data.auto_sustain then b:forceUseTalent(t, {ignore_energy=true}) end
else -- applied when added to the level (unaffected by game difficulty settings)
b.learn_tids[t.id] = lev
end
end
if t.type[1]:find("/other$") then
print("[applyRandomClass] Random boss forbase talent because category /other", t.name, t.id, t.type[1])
ok = false
end
if ok then list[t.id] = true end
else
print("Tree "..tt.." rejected")
end
end
end
local nb = 4 + 0.38*data.level^.75 -- = 11 at level 50
nb = math.max(rng.range(math.floor(nb * 0.7), math.ceil(nb * 1.3)), 1)
print("Adding "..nb.." random class talents to boss")
local count, fails = 0, 0
while count < nb do
local tid = rng.tableIndex(list, b.learn_tids)
if not tid or fails > nb * 5 then break end
local t = b:getTalentFromId(tid)
if t then
if t.type[2] and known_types[t.type[1]] < t.type[2] - 1 then -- not enough of talents of type
fails = fails + 1
else -- ok to add
count = count + 1
else
table.insert(focus_trees, tt) --record that we added the tree as a major tree
local max_talents_from_tree = rng.percent(75) and 4 or 3
print("Adding primary tree "..tt.." to boss with "..max_talents_from_tree.." talents")
for i = max_talents_from_tree,1,-1 do
local t = table.remove(t_choices, 1)
if not t then break end
local max = (t.points == 1) and 1 or math.ceil(t.points * 1.2)
local step = max / 50
local lev = math.ceil(step * data.level)
print(count, " * talent:", tid, lev)
local lev = math.max(1, math.round(rng.float(0.75,1.25)*math.ceil(step * data.level)))
print(#focus_trees, " * talent:", t.id, lev)
if instant then -- affected by game difficulty settings
if b:getTalentLevelRaw(tid) < lev then b:learnTalent(tid, true, lev - b:getTalentLevelRaw(tid)) end
if t.mode == "sustained" and data.auto_sustain then b:forceUseTalent(tid, {ignore_energy=true}) end
if b:getTalentLevelRaw(t) < lev then b:learnTalent(t.id, true, lev - b:getTalentLevelRaw(t.id)) end
if t.mode == "sustained" and data.auto_sustain then b:forceUseTalent(t, {ignore_energy=true}) end
else -- applied when added to the level (unaffected by game difficulty settings)
b.learn_tids[tid] = lev
b.learn_tids[t.id] = lev
end
known_types[t.type[1]] = known_types[t.type[1]] + 1
list[tid] = nil
end
else list[tid] = nil
end
end
print(" ** Finished adding", count, "of", nb, "random class talents")
end
print(" ** Finished adding", #focus_trees, "of", nb_focus, "primary class trees") for i, tt in ipairs(focus_trees) do print("\t * ", tt) end
print(" ** Finished adding", #shallow_trees, "of", nb_shallow, "secondary class trees") for i, tt in ipairs(shallow_trees) do print("\t * ", tt) end
return true
end
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment