From 674e95993fca8961a8c07b553f4c3941b8f53d7f Mon Sep 17 00:00:00 2001 From: grilledham Date: Sat, 7 Nov 2020 19:26:09 +0000 Subject: [PATCH] Revert "Crash Site: Enemy combat robots now explode when they timeout" --- .../{events.lua => entity_died_events.lua} | 15 --------------- map_gen/maps/crash_site/scenario.lua | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) rename map_gen/maps/crash_site/{events.lua => entity_died_events.lua} (97%) diff --git a/map_gen/maps/crash_site/events.lua b/map_gen/maps/crash_site/entity_died_events.lua similarity index 97% rename from map_gen/maps/crash_site/events.lua rename to map_gen/maps/crash_site/entity_died_events.lua index 3d4d75e1..7a18d846 100644 --- a/map_gen/maps/crash_site/events.lua +++ b/map_gen/maps/crash_site/entity_died_events.lua @@ -365,7 +365,6 @@ local function do_bot_spawn(entity_name, entity, event) end end --- Drops coins when biter/spitter spawners and worms are killed local function do_coin_drop(entity_name, entity) local position = entity.position local bounds = entity_drop_amount[entity_name] @@ -479,17 +478,3 @@ Event.add( set_timeout_in_ticks(1, spawn_player, player) end ) - -Event.add( - defines.events.on_combat_robot_expired, - function(event) - - local entity = event.robot - local position = entity.position - if entity.force.name == 'enemy' then - entity.surface.create_entity{name = "cluster-grenade", position=position, target=position, speed=1} - end - - end -) - diff --git a/map_gen/maps/crash_site/scenario.lua b/map_gen/maps/crash_site/scenario.lua index 0f46d800..bbbe4955 100644 --- a/map_gen/maps/crash_site/scenario.lua +++ b/map_gen/maps/crash_site/scenario.lua @@ -1,5 +1,5 @@ require 'map_gen.maps.crash_site.blueprint_extractor' -require 'map_gen.maps.crash_site.events' +require 'map_gen.maps.crash_site.entity_died_events' require 'map_gen.maps.crash_site.weapon_balance' local b = require 'map_gen.shared.builders'