games/RedMew
games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2024-12-12 10:04:40 +02:00
Code Issues Releases Activity

Merge pull request #1063 from grilledham/fix-remove-evolution_scale_formula

Browse Source 
Remove evolution_scale_formula.
This commit is contained in:
grilledham 2020-05-30 16:44:52 +01:00 committed by GitHub
commit c9660efcc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
map_gen/shared/hail_hydra.lua
View File

@ -29,7 +29,6 @@ end
local primitives = {
evolution_scale = (hail_hydra_conf.evolution_scale ~= nil) and hail_hydra_conf.evolution_scale or 1,
evolution_scale_formula = formula,
online_player_scale_enabled = hail_hydra_conf.online_player_scale_enabled,
online_player_scale = hail_hydra_conf.online_player_scale,
enabled = nil
@ -88,7 +87,7 @@ local on_died =
player_scale = (num_online_players - primitives.online_player_scale) * 0.01
end
local evolution_scaled = primitives.evolution_scale_formula(force.evolution_factor)
local evolution_scaled = formula(force.evolution_factor)
local evolution_factor = evolution_scaled + evolution_scaled * player_scale
local cause = event.cause
@ -112,7 +111,7 @@ local on_died =
local max = amount.max
max = (max ~= nil and max >= min) and max or min
if max ~= min then
amount = (max - min) * (evolution_factor / primitives.evolution_scale_formula(1)) + min
amount = (max - min) * (evolution_factor / formula(1)) + min
else
amount = min
end