From 82696e4c08ba0aad44277f88ee97321f8c08a61a Mon Sep 17 00:00:00 2001 From: MewMew Date: Sun, 13 Oct 2019 12:57:54 +0200 Subject: [PATCH] fixes, global to local --- functions/basic_markets.lua | 2 +- maps/mountain_fortress_v2/locomotive.lua | 14 ++++++++------ maps/mountain_fortress_v2/main.lua | 6 +++--- maps/mountain_fortress_v2/terrain.lua | 2 +- modules/biter_pets.lua | 2 +- modules/explosives.lua | 2 ++ 6 files changed, 16 insertions(+), 12 deletions(-) diff --git a/functions/basic_markets.lua b/functions/basic_markets.lua index 08f062c6..0e39bfb5 100644 --- a/functions/basic_markets.lua +++ b/functions/basic_markets.lua @@ -92,7 +92,7 @@ market.logistic = { ["fast-splitter"] = {value = 48, rarity = 4}, ["express-splitter"] = {value = 128, rarity = 7}, ["loader"] = {value = 256, rarity = 2}, - ["fast-loader'"] = {value = 512, rarity = 5}, + ["fast-loader"] = {value = 512, rarity = 5}, ["express-loader"] = {value = 768, rarity = 8}, ["burner-inserter"] = {value = 4, rarity = 1}, ["inserter"] = {value = 8, rarity = 1}, diff --git a/maps/mountain_fortress_v2/locomotive.lua b/maps/mountain_fortress_v2/locomotive.lua index 538720ec..dfca4605 100644 --- a/maps/mountain_fortress_v2/locomotive.lua +++ b/maps/mountain_fortress_v2/locomotive.lua @@ -34,17 +34,19 @@ end local function accelerate() if not global.locomotive then return end if not global.locomotive.valid then return end - if global.locomotive.get_driver() then return end - global.locomotive_driver = global.locomotive.surface.create_entity({name = "character", position = global.locomotive.position, force = "player"}) - global.locomotive_driver.driving = true - global.locomotive_driver.riding_state = {acceleration = defines.riding.acceleration.accelerating, direction = defines.riding.direction.straight} + if global.locomotive.get_driver() then return end + local driver = global.locomotive.surface.create_entity({name = "character", position = global.locomotive.position, force = "player"}) + driver.driving = true + driver.riding_state = {acceleration = defines.riding.acceleration.accelerating, direction = defines.riding.direction.straight} end local function remove_acceleration() if not global.locomotive then return end if not global.locomotive.valid then return end - if global.locomotive_driver then global.locomotive_driver.destroy() end - global.locomotive_driver = nil + local driver = global.locomotive.get_driver() + if not driver then return end + if driver.player then return end + driver.destroy() end local function set_player_spawn_and_refill_fish() diff --git a/maps/mountain_fortress_v2/main.lua b/maps/mountain_fortress_v2/main.lua index 2e22f525..ab3fdc66 100644 --- a/maps/mountain_fortress_v2/main.lua +++ b/maps/mountain_fortress_v2/main.lua @@ -2,13 +2,13 @@ --require "modules.flashlight_toggle_button" --require "modules.biter_noms_you" -require "modules.biter_pets" require "modules.biter_evasion_hp_increaser" require "modules.wave_defense.main" --require "modules.dense_rocks" require "functions.soft_reset" require "functions.basic_markets" require "modules.biters_yield_coins" +require "modules.biter_pets" require "modules.no_deconstruction_of_neutral_entities" require "modules.explosives" require "modules.rocks_broken_paint_tiles" @@ -91,7 +91,7 @@ end local function protect_train(event) if event.entity.force.index ~= 1 then return end --Player Force - if event.entity == global.locomotive or event.entity == global.locomotive_cargo then + if event.entity == global.locomotive_cargo then if event.cause then if event.cause.force.index == 2 then return @@ -136,7 +136,7 @@ local function hidden_biter(entity) end local function hidden_biter_pet(event) - if math.random(1, 1024) ~= 1 then return end + if math.random(1, 2048) ~= 1 then return end wave_defense_set_unit_raffle(math.sqrt(event.entity.position.x ^ 2 + event.entity.position.y ^ 2) * 0.42) local unit if math.random(1,3) == 1 then diff --git a/maps/mountain_fortress_v2/terrain.lua b/maps/mountain_fortress_v2/terrain.lua index 3efe6328..1a12588c 100644 --- a/maps/mountain_fortress_v2/terrain.lua +++ b/maps/mountain_fortress_v2/terrain.lua @@ -284,7 +284,7 @@ local function process_chunk(surface, left_top) if left_top.y > 32 then game.forces.player.chart(surface, {{left_top.x, left_top.y},{left_top.x + 31, left_top.y + 31}}) end if left_top.y == 64 and left_top.x == 64 then local p = global.locomotive.position - for _, entity in pairs(surface.find_entities_filtered({area = {{p.x - 3, p.y - 4},{p.x + 3, p.y + 8}}, force = "neutral"})) do entity.destroy() end + for _, entity in pairs(surface.find_entities_filtered({area = {{p.x - 3, p.y - 4},{p.x + 3, p.y + 10}}, type = "simple-entity"})) do entity.destroy() end end if left_top.y < 0 then rock_chunk(surface, left_top) return end if left_top.y > 96 then out_of_map(surface, left_top) return end diff --git a/modules/biter_pets.lua b/modules/biter_pets.lua index b3a59829..bbaf36a4 100644 --- a/modules/biter_pets.lua +++ b/modules/biter_pets.lua @@ -29,7 +29,7 @@ local function tame_unit_effects(player, entity) a = 1 }, scale = 1.05, - font = "default-game", + font = "default-large-semibold", alignment = "center", scale_with_zoom = false } diff --git a/modules/explosives.lua b/modules/explosives.lua index 1a17c36a..b517011f 100644 --- a/modules/explosives.lua +++ b/modules/explosives.lua @@ -95,6 +95,7 @@ end local function damage_entity(entity, cell) if not entity.valid then return true end if not entity.health then return true end + if entity.health <= 0 then return true end if not entity.destructible then return true end if not entity.minable then return true end --if global.explosion_cells_reflect[entity.name] then @@ -111,6 +112,7 @@ local function damage_entity(entity, cell) cell.health = cell.health - damage_required if not entity then return true end if not entity.valid then return true end + if entity.health <= 0 then return true end damage_required = math.floor(entity.health * (damage_required / damage_dealt)) + 1 end end