games/ComfyFactorio
games/ComfyFactorio
1
0
Fork 0
mirror of https://github.com/ComfyFactory/ComfyFactorio.git synced 2025-01-08 00:39:30 +02:00
Code Issues Releases Activity

rpg - fix xp modifiers and return lowest xp if xp is below

Browse Source
This commit is contained in:
Gerkiz 2021-03-01 21:50:49 +01:00
parent 291b71ae78
commit 9c97d54f6a
1 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
modules/rpg/main.lua
View File

@ -184,22 +184,24 @@ local get_cause_player = {
} }
local function on_entity_died(event) local function on_entity_died(event)
if not event.entity.valid then if not event.entity or not event.entity.valid then
return return
end end
local entity = event.entity
--Grant XP for hand placed land mines --Grant XP for hand placed land mines
if event.entity.last_user then if entity.last_user then
if event.entity.type == 'land-mine' then if entity.type == 'land-mine' then
if event.cause then if event.cause then
if event.cause.valid then if event.cause.valid then
if event.cause.force.index == event.entity.force.index then if event.cause.force.index == entity.force.index then
return return
end end
end end
end end
Functions.gain_xp(event.entity.last_user, 1) Functions.gain_xp(entity.last_user, 1)
Functions.reward_mana(event.entity.last_user, 1) Functions.reward_mana(entity.last_user, 1)
return return
end end
end end
@ -219,28 +221,25 @@ local function on_entity_died(event)
local biter_health_boost = BiterHealthBooster.get('biter_health_boost') local biter_health_boost = BiterHealthBooster.get('biter_health_boost')
local biter_health_boost_units = BiterHealthBooster.get('biter_health_boost_units') local biter_health_boost_units = BiterHealthBooster.get('biter_health_boost_units')
if not event.cause then if not event.cause or not event.cause.valid then
return return
end end
if not event.cause.valid then local cause = event.cause
return local type = cause.type
end
local type = event.cause.type
if not type then if not type then
goto continue goto continue
end end
if event.cause.force.index == 1 then if cause.force.index == 1 then
if die_cause[type] then if die_cause[type] then
if rpg_extra.rpg_xp_yield[event.entity.name] then if rpg_extra.rpg_xp_yield[entity.name] then
local amount = rpg_extra.rpg_xp_yield[event.entity.name] local amount = rpg_extra.rpg_xp_yield[entity.name]
amount = amount / 5 amount = amount / 5
if biter_health_boost then if biter_health_boost then
local health_pool = biter_health_boost_units[event.entity.unit_number] local health_pool = biter_health_boost_units[entity.unit_number]
if health_pool then if health_pool then
amount = amount * (health_pool[2] * 0.5 / 2) amount = amount * (1 / health_pool[2])
end end
end end
@ -256,15 +255,15 @@ local function on_entity_died(event)
::continue:: ::continue::
if event.cause.force.index == event.entity.force.index then if cause.force.index == entity.force.index then
return return
end end
if not get_cause_player[event.cause.type] then if not get_cause_player[cause.type] then
return return
end end
local players = get_cause_player[event.cause.type](event.cause) local players = get_cause_player[cause.type](cause)
if not players then if not players then
return return
end end
@ -274,12 +273,15 @@ local function on_entity_died(event)
--Grant modified XP for health boosted units --Grant modified XP for health boosted units
if biter_health_boost then if biter_health_boost then
if enemy_types[event.entity.type] then if enemy_types[entity.type] then
local health_pool = biter_health_boost_units[event.entity.unit_number] local health_pool = biter_health_boost_units[entity.unit_number]
if health_pool then if health_pool then
for _, player in pairs(players) do for _, player in pairs(players) do
if rpg_extra.rpg_xp_yield[event.entity.name] then if rpg_extra.rpg_xp_yield[entity.name] then
local amount = rpg_extra.rpg_xp_yield[event.entity.name] * (health_pool[2] * 0.5 / 2) local amount = rpg_extra.rpg_xp_yield[entity.name] * (1 / health_pool[2])
if amount < rpg_extra.rpg_xp_yield[entity.name] then
amount = rpg_extra.rpg_xp_yield[entity.name]
end
if rpg_extra.turret_kills_to_global_pool then if rpg_extra.turret_kills_to_global_pool then
local inserted = Functions.add_to_global_pool(amount, true) local inserted = Functions.add_to_global_pool(amount, true)
Functions.gain_xp(player, inserted, true) Functions.gain_xp(player, inserted, true)
@ -287,7 +289,7 @@ local function on_entity_died(event)
Functions.gain_xp(player, amount) Functions.gain_xp(player, amount)
end end
else else
Functions.gain_xp(player, 0.5 * (health_pool[2] * 0.5 / 2)) Functions.gain_xp(player, 0.5 * (1 / health_pool[2]))
end end
end end
return return
@ -297,8 +299,8 @@ local function on_entity_died(event)
--Grant normal XP --Grant normal XP
for _, player in pairs(players) do for _, player in pairs(players) do
if rpg_extra.rpg_xp_yield[event.entity.name] then if rpg_extra.rpg_xp_yield[entity.name] then
local amount = rpg_extra.rpg_xp_yield[event.entity.name] local amount = rpg_extra.rpg_xp_yield[entity.name]
if rpg_extra.turret_kills_to_global_pool then if rpg_extra.turret_kills_to_global_pool then
local inserted = Functions.add_to_global_pool(amount, true) local inserted = Functions.add_to_global_pool(amount, true)
Functions.gain_xp(player, inserted, true) Functions.gain_xp(player, inserted, true)
@ -535,7 +537,6 @@ local function on_entity_damaged(event)
end end
return return
end end
if not cause.player then if not cause.player then
return return
end end