games/RedMew
games/RedMew
1
0
Fork 0
mirror of https://github.com/Refactorio/RedMew.git synced 2025-01-18 03:21:47 +02:00
Code Issues Releases Activity

Merge pull request #488 from iltar/fix-remaining-require

Browse Source 
Fixed a few left-over requires in Experience
This commit is contained in:
Lynn 2018-12-01 18:02:46 +01:00 committed by GitHub
commit 5b29219f61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
features/force_control.lua
View File

@ -119,13 +119,9 @@ function ForceControlBuilder.register_on_single_level(level, callback, lua_force
assert_type('number', level, 'level of function ForceControl.register_reward_on_single_level')
assert_type('function', callback, 'callback of function ForceControlBuilder.register_on_single_level')
ForceControlBuilder.register(
function(level_reached)
return level == level_reached
end,
callback,
lua_force_name
)
ForceControlBuilder.register(function(level_reached)
return level == level_reached
end, callback, lua_force_name)
end
---Always returns true

21
map_gen/Diggy/Feature/Experience.lua
View File

@ -51,13 +51,13 @@ local gain_xp_color = {r = 144, g = 202, b = 249}
local lose_xp_color = {r = 255, g = 0, b = 0}
local unlocked_color = {r = 255, g = 255, b = 255}
local locked_color = {r = 127, g = 127, b = 127}
local table_column_layout = {type = 'table', column_count = 2}
local level_up_formula = (function (level_reached)
local Config = require 'map_gen.Diggy.Config'.features.Experience
local difficulty_scale = floor(Config.difficulty_scale)
local level_fine_tune = floor(Config.xp_fine_tune)
local start_value = (floor(Config.first_lvl_xp) * 0.5)
local precision = (floor(Config.cost_precision))
local difficulty_scale = floor(config.difficulty_scale)
local level_fine_tune = floor(config.xp_fine_tune)
local start_value = (floor(config.first_lvl_xp) * 0.5)
local precision = (floor(config.cost_precision))
local function formula(level)
return (
difficulty_scale * (level) ^ 3
@ -69,7 +69,7 @@ local level_up_formula = (function (level_reached)
end
local value = formula(level_reached + 1)
local lower_value = formula(level_reached)
value = value - (value % (10 ^ (floor(log(value,10)) - precision)))
value = value - (value % (10 ^ (floor(log(value, 10)) - precision)))
if lower_value == 0 then
return value - lower_value
end
@ -155,7 +155,7 @@ function Experience.update_health_bonus(force, level_up)
force.character_health_bonus = old_modifier + health_bonus.active_modifier
end
-- declaration of variables to prevent table lookups @see Experience.register
-- declaration of variables to prevent table look ups @see Experience.register
local sand_rock_xp
local rock_huge_xp
@ -320,7 +320,7 @@ local function redraw_heading(data, header)
local header_caption = (head_condition) and 'Reward Item' or 'Reward Buff'
Gui.clear(frame)
local heading_table = frame.add({type = 'table', column_count = 2})
local heading_table = frame.add(table_column_layout)
apply_heading_style(heading_table.add({type = 'label', caption = 'Requirement'}).style, 100)
apply_heading_style(heading_table.add({type = 'label', caption = header_caption}).style, 220)
end
@ -357,7 +357,7 @@ local function redraw_table(data)
color = locked_color
end
local list = experience_scroll_pane.add({type = 'table', column_count = 2})
local list = experience_scroll_pane.add(table_column_layout)
local level_caption = ''
if first_item_for_level then
@ -389,7 +389,7 @@ local function redraw_buff(data)
local all_levels_shown = false
for name, effects in pairs(config.buffs) do
local list = buff_scroll_pane.add({type = 'table', column_count = 2})
local list = buff_scroll_pane.add(table_column_layout)
list.style.horizontal_spacing = 16
local level_caption = ''
@ -506,7 +506,6 @@ function Experience.register(cfg)
ForceControlBuilder.register_on_every_level(function (level_reached, force)
force.print(string_format('%s Leveled up to %d!', '## - ', level_reached))
force.play_sound{path='utility/new_objective', volume_modifier = 1 }
local Experience = require 'map_gen.Diggy.Feature.Experience'
Experience.update_inventory_slots(force, level_reached)
Experience.update_mining_speed(force, level_reached)
Experience.update_health_bonus(force, level_reached)