Update Diggy scenario (#1493)

* Update Diggy scenario
* Add more features to Experience

Author: RedRafe

config.lua

@@ -507,10 +507,14 @@ storage.config = {
         },
         buffs = {
             -- define new buffs here, they are handed out for each level
-            -- double_level is the level interval for receiving a double bonus (Diggy default: 5 which equals every 5th level)
-            mining_speed = { value = 5, max = 20 },
+            -- double_level (optional): the level interval for receiving a double bonus (Diggy default: 5 which equals every 5th level)
+            -- level interval (optional): the interval to receive the bonus. Default is 1
+            mining_speed = { value = 20, max = 29 },
             inventory_slot = { value = 1, max = 100 },
             health_bonus = { value = 2.5, double_level = 5, max = 500 },
+            character_reach = { value = 1, max = 10, level_interval = 10 },
+            crafting_speed = { value = 0.1, max = 10 },
+            running_speed = { value = 0.025, max = 3 },
         },
         -- add or remove a table entry to add or remove an unlockable item from the market.
         unlockables = {
@@ -555,6 +559,7 @@ storage.config = {
             { level =  63, price =  250, name = 'rocket-launcher' },
             { level =  63, price =   40, name = 'rocket' },
             { level =  71, price =   80, name = 'explosive-rocket' },
+            { level =  75, price =  800, name = 'energy-shield-mk2-equipment' },
             { level =  78, price = 1000, name = 'satellite' },
             { level = 100, price = 2500, name = 'spidertron' },
         },

features/gui/experience.lua

@@ -46,6 +46,9 @@ local gui_toggled = {}
 local mining_efficiency = { active_modifier = 0, research_modifier = 0, level_modifier = 0 }
 local inventory_slots = { active_modifier = 0, research_modifier = 0, level_modifier = 0 }
 local health_bonus = { active_modifier = 0, research_modifier = 0, level_modifier = 0 }
+local character_reach = { active_modifier = 0, research_modifier = 0, level_modifier = 0 }
+local crafting_speed = { active_modifier = 0, research_modifier = 0, level_modifier = 0 }
+local running_speed = { active_modifier = 0, research_modifier = 0, level_modifier = 0 }
 
 -- Prevents table lookup thousands of times
 local rock_big_xp = config.XP['big-rock']
@@ -58,7 +61,10 @@ Global.register(
         health_bonus = health_bonus,
         force_sounds = force_sounds,
         gui_toggled = gui_toggled,
-        level_table = level_table
+        level_table = level_table,
+        character_reach = character_reach,
+        crafting_speed = crafting_speed,
+        running_speed = running_speed,
     },
     function(tbl)
         mining_efficiency = tbl.mining_efficiency
@@ -67,6 +73,9 @@ Global.register(
         force_sounds = tbl.force_sounds
         gui_toggled = tbl.gui_toggled
         level_table = tbl.level_table
+        character_reach = tbl.character_reach
+        crafting_speed = tbl.crafting_speed
+        running_speed = tbl.running_speed
     end
 )
 
@@ -187,6 +196,9 @@ local function update_modifier(params)
     if not buff or force[property] >= (buff.max or math.huge) then
         return
     end
+    if buff.level_interval and (level_up % buff.level_interval ~= 0) then
+        return
+    end
     if level_up > 0 then
         local value = formula(params)
         if buff.double_level and (level_up % buff.double_level) == 0 then
@@ -234,6 +246,9 @@ Public.update_main_frame = function(player)
     data.bonus_mining_speed.caption = '+ '..(player.force.manual_mining_speed_modifier * 100)..'%'
     data.bonus_inventory_slot.caption = '+ '..player.force.character_inventory_slots_bonus
     data.bonus_health_bonus.caption = '+ '..player.force.character_health_bonus..'%'
+    data.bonus_character_reach.caption = '+ '..(player.force.character_reach_distance_bonus)
+    data.bonus_crafting_speed.caption = '+ '..(player.force.manual_crafting_speed_modifier * 100)..'%'
+    data.bonus_running_speed.caption = '+ '..(player.force.character_running_speed_modifier * 100)..'%'
 
     for _, row in pairs(data.reward_list.children) do
         for _, item in pairs(row.children) do
@@ -295,9 +310,15 @@ Public.get_main_frame = function(player)
         data.bonus_mining_speed = label_pair(content, 'Manual mining speed', '---')
         data.bonus_inventory_slot = label_pair(content, 'Inventory slots', '---')
         data.bonus_health_bonus = label_pair(content, 'Max health', '---')
+        data.bonus_character_reach = label_pair(content, 'Character reach', '---')
+        data.bonus_crafting_speed = label_pair(content, 'Crafting speed', '---')
+        data.bonus_running_speed = label_pair(content, 'Running speed', '---')
         data.bonus_mining_speed.tooltip = { 'experience.gui_buff_mining', buffs.mining_speed.value, buffs.mining_speed.max * 100 }
         data.bonus_inventory_slot.tooltip = { 'experience.gui_buff_inv', buffs.inventory_slot.value, buffs.inventory_slot.max }
         data.bonus_health_bonus.tooltip = { 'experience.gui_buff_health', buffs.health_bonus.value, buffs.health_bonus.max }
+        data.bonus_character_reach.tooltip = { 'experience.gui_buff_character_reach', buffs.character_reach.value, buffs.character_reach.max }
+        data.bonus_crafting_speed.tooltip = { 'experience.gui_buff_crafting_speed', buffs.crafting_speed.value * 100, buffs.crafting_speed.max * 100 }
+        data.bonus_running_speed.tooltip = { 'experience.gui_buff_running_speed', buffs.running_speed.value * 100, buffs.running_speed.max * 100 }
     end
     do -- Rewards
         local toggled = gui_toggled[player.index].rewards
@@ -433,6 +454,9 @@ local function on_research_finished(event)
     Public.update_inventory_slots(force, 0)
     Public.update_mining_speed(force, 0)
     Public.update_health_bonus(force, 0)
+    Public.update_character_reach_bonus(force, 0)
+    Public.update_crafting_speed_bonus(force, 0)
+    Public.update_running_speed_bonus(force, 0)
 end
 
 ---Awards experience when a rocket has been launched based on percentage of total experience
@@ -538,6 +562,9 @@ local function on_nth_tick()
     Public.update_inventory_slots(force, 0)
     Public.update_mining_speed(force, 0)
     Public.update_health_bonus(force, 0)
+    Public.update_character_reach_bonus(force, 0)
+    Public.update_crafting_speed_bonus(force, 0)
+    Public.update_running_speed_bonus(force, 0)
 end
 
 local function on_init()
@@ -561,6 +588,9 @@ local function on_level_reached(level_reached, force)
     Public.update_inventory_slots(force, level_reached)
     Public.update_mining_speed(force, level_reached)
     Public.update_health_bonus(force, level_reached)
+    Public.update_character_reach_bonus(force, level_reached)
+    Public.update_crafting_speed_bonus(force, level_reached)
+    Public.update_running_speed_bonus(force, level_reached)
     Public.update_market_contents(force)
     play_level_up_sound(force)
 end
@@ -625,6 +655,54 @@ Public.update_health_bonus = function(force, level_up)
     }
 end
 
+---Updates a forces reach bonus. By removing active modifiers and re-adding
+---@param force LuaForce the force of which will be updated
+---@param level_up? number a level if updating as part of a level up
+Public.update_character_reach_bonus = function(force, level_up)
+    update_modifier{
+        buff = config.buffs['character_reach'],
+        force = force,
+        level_up = level_up,
+        modifier = character_reach,
+        property = 'character_reach_distance_bonus',
+    }
+    for _, reach_property in pairs({
+        'character_build_distance_bonus',
+        'character_item_drop_distance_bonus',
+        'character_reach_distance_bonus',
+        'character_resource_reach_distance_bonus',
+        'character_item_pickup_distance_bonus'
+    }) do
+        force[reach_property] = force.character_reach_distance_bonus
+    end
+end
+
+---Updates a forces crafting speed bonus. By removing active modifiers and re-adding
+---@param force LuaForce the force of which will be updated
+---@param level_up? number a level if updating as part of a level up
+Public.update_crafting_speed_bonus = function(force, level_up)
+    update_modifier{
+        buff = config.buffs['crafting_speed'],
+        force = force,
+        level_up = level_up,
+        modifier = crafting_speed,
+        property = 'manual_crafting_speed_modifier',
+    }
+end
+
+---Updates a forces running speed bonus. By removing active modifiers and re-adding
+---@param force LuaForce the force of which will be updated
+---@param level_up? number a level if updating as part of a level up
+Public.update_running_speed_bonus = function(force, level_up)
+    update_modifier{
+        buff = config.buffs['running_speed'],
+        force = force,
+        level_up = level_up,
+        modifier = running_speed,
+        property = 'character_running_speed_modifier',
+    }
+end
+
 -- ============================================================================
 
 Event.on_init(on_init)

features/market_chest.lua

@@ -133,7 +133,11 @@ Event.on_built(function(event)
 end)
 
 Event.on_destroyed(function(event)
-  local id = event.useful_id or event.entity.unit_number
+  local id = event.useful_id or (event.entity and event.entity.valid and event.entity.unit_number)
+  if not id then
+    return
+  end
+
   local data = b_get(this.chests, id)
   local inv = event.buffer
   if data and inv and inv.valid and inv.get_item_count { name = 'buffer-chest' } > 0 then

features/player_stats.lua

@@ -133,7 +133,7 @@ local function get_cause_name(cause)
             return name
         end
     end
-    return 'player_stats.unknown_death_cause'
+    return {'player_stats.unknown_death_cause'}
 end
 
 local function player_died(event)

locale/en/redmew_gui.cfg

@@ -146,6 +146,9 @@ float_xp_gained_rocket=Rocket launched! +__1__ XP
 gui_buff_health=+__1__ max health (up to: __2__)
 gui_buff_inv=+__1__ inventory slot(s) (up to: __2__)
 gui_buff_mining=+__1__% mining speed (up to: __2__%)
+gui_buff_character_reach=+__1__ reach (up to: __2__)
+gui_buff_crafting_speed=+__1__% crafting speed (up to: __2__%)
+gui_buff_running_speed=+__1__% running speed (up to: __2__%)
 gui_experience_button_tip=Experience
 gui_progress_bar=__1__% xp to next level
 gui_progress_caption=Progress to next level:

map_gen/maps/diggy/feature/alien_spawner.lua

@@ -150,6 +150,7 @@ local function spawn_aliens(aliens, force, surface, x, y)
                         force = force,
                         amount = amount
                     },
+                    move_stuck_players = true,
                 })
                 break
             end

map_gen/maps/diggy/feature/diggy_hole.lua

@@ -114,8 +114,6 @@ local function diggy_hole(entity)
         local predicted = random()
         if predicted < 0.2 then
             rocks[i] = {name = 'huge-rock', position = void_position}
-        elseif predicted < 0.6 then
-            rocks[i] = {name = 'big-rock', position = void_position}
         else
             rocks[i] = {name = 'big-rock', position = void_position}
         end

map_gen/maps/diggy/presets/danger_ores.lua

@@ -28,7 +28,11 @@ local config = {
             starting_items = {
                 {name = 'stone-wall', count = 12},
                 {name = 'iron-gear-wheel', count = 8},
-                {name = 'iron-plate', count = 16}
+                {name = 'iron-plate', count = 16},
+                {name = 'pistol', count = 1},
+                {name = 'firearm-magazine', count = 32},
+                {name = 'burner-mining-drill', count = 3},
+                {name = 'stone-furnace', count = 5},
             },
 
             -- 0.01 bonus equals 1% in game. This value is recommended to be tweaked for single player
@@ -70,7 +74,7 @@ local config = {
             robot_damage_per_mining_prod_level = 1,
 
             -- turn this setting on if you want to bring back landfill research, default is off due to griefing
-            allow_landfill_research = false,
+            allow_landfill_research = true,
         },
         -- adds the ability to collapse caves
         diggy_cave_collapse = {

map_gen/maps/diggy/presets/danger_ores_BnB.lua

@@ -28,7 +28,11 @@ local config = {
             starting_items = {
                 {name = 'stone-wall', count = 12},
                 {name = 'iron-gear-wheel', count = 8},
-                {name = 'iron-plate', count = 16}
+                {name = 'iron-plate', count = 16},
+                {name = 'pistol', count = 1},
+                {name = 'firearm-magazine', count = 32},
+                {name = 'burner-mining-drill', count = 3},
+                {name = 'stone-furnace', count = 5},
             },
 
             -- 0.01 bonus equals 1% in game. This value is recommended to be tweaked for single player
@@ -70,7 +74,7 @@ local config = {
             robot_damage_per_mining_prod_level = 1,
 
             -- turn this setting on if you want to bring back landfill research, default is off due to griefing
-            allow_landfill_research = false,
+            allow_landfill_research = true,
         },
         -- adds the ability to collapse caves
         diggy_cave_collapse = {

map_gen/maps/diggy/presets/normal.lua

@@ -28,7 +28,11 @@ local config = {
             starting_items = {
                 {name = 'stone-wall', count = 12},
                 {name = 'iron-gear-wheel', count = 8},
-                {name = 'iron-plate', count = 16}
+                {name = 'iron-plate', count = 16},
+                {name = 'pistol', count = 1},
+                {name = 'firearm-magazine', count = 32},
+                {name = 'burner-mining-drill', count = 3},
+                {name = 'stone-furnace', count = 5},
             },
 
             -- 0.01 bonus equals 1% in game. This value is recommended to be tweaked for single player
@@ -70,7 +74,7 @@ local config = {
             robot_damage_per_mining_prod_level = 1,
 
             -- turn this setting on if you want to bring back landfill research, default is off due to griefing
-            allow_landfill_research = false,
+            allow_landfill_research = true,
         },
         -- adds the ability to collapse caves
         diggy_cave_collapse = {