mirror of
https://github.com/PHIDIAS0303/ExpCluster.git
synced 2026-07-26 18:36:23 +09:00
Merge branch 'explosivegaming:main' into aperx
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
Adds a command that opens the debug frame
|
Adds a command that opens the debug frame
|
||||||
]]
|
]]
|
||||||
|
|
||||||
local DebugView = require("modules.exp_legacy.modules.gui.debug.main_view") --- @dep modules.gui.debug.main_view
|
local DebugView = require("modules/exp_scenario/gui/debug/main_view")
|
||||||
local Commands = require("modules/exp_commands")
|
local Commands = require("modules/exp_commands")
|
||||||
|
|
||||||
--- Opens the debug gui.
|
--- Opens the debug gui.
|
||||||
|
|||||||
@@ -28,14 +28,8 @@ commands.lawnmower = Commands.new("lawnmower", { "exp-commands_lawnmower.descrip
|
|||||||
SelectArea:on_selection(function(event)
|
SelectArea:on_selection(function(event)
|
||||||
local player = assert(game.get_player(event.player_index))
|
local player = assert(game.get_player(event.player_index))
|
||||||
local area = AABB.expand(event.area)
|
local area = AABB.expand(event.area)
|
||||||
local area_size = AABB.size(area)
|
|
||||||
local surface = event.surface
|
local surface = event.surface
|
||||||
|
|
||||||
if area_size > 1000 then
|
|
||||||
player.print({ "exp-commands_lawnmower.area-too-large", 1000, area_size }, Commands.print_settings.error)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local entities = surface.find_entities_filtered{ area = area, type = "corpse" }
|
local entities = surface.find_entities_filtered{ area = area, type = "corpse" }
|
||||||
for _, entity in pairs(entities) do
|
for _, entity in pairs(entities) do
|
||||||
if (entity.name ~= "transport-caution-corpse" and entity.name ~= "invisible-transport-caution-corpse") then
|
if (entity.name ~= "transport-caution-corpse" and entity.name ~= "invisible-transport-caution-corpse") then
|
||||||
|
|||||||
@@ -75,14 +75,8 @@ commands.clear_blueprints = Commands.new("clear-blueprints", { "exp-commands_sur
|
|||||||
SelectArea:on_selection(function(event)
|
SelectArea:on_selection(function(event)
|
||||||
local player = assert(game.get_player(event.player_index))
|
local player = assert(game.get_player(event.player_index))
|
||||||
local area = AABB.expand(event.area)
|
local area = AABB.expand(event.area)
|
||||||
local area_size = AABB.size(area)
|
|
||||||
local surface = event.surface
|
local surface = event.surface
|
||||||
|
|
||||||
if area_size > 1000 then
|
|
||||||
player.print({ "exp-commands_surface.area-too-large", 1000, area_size }, Commands.print_settings.error)
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local entities = surface.find_entities_filtered{ type = "entity-ghost", area = area }
|
local entities = surface.find_entities_filtered{ type = "entity-ghost", area = area }
|
||||||
for _, entity in ipairs(entities) do
|
for _, entity in ipairs(entities) do
|
||||||
entity.destroy()
|
entity.destroy()
|
||||||
|
|||||||
@@ -105,7 +105,6 @@ description=Clean up biter corpse, decoratives and nuclear hole.
|
|||||||
arg-range=Range to clean up.
|
arg-range=Range to clean up.
|
||||||
enter=Entered selection mode, select the area to fill with water.
|
enter=Entered selection mode, select the area to fill with water.
|
||||||
exit=Exited selection mode.
|
exit=Exited selection mode.
|
||||||
area-too-large=Selected area is too large, must be less than __1__ tiles, selected __2__.
|
|
||||||
complete=__1__ tiles were handled.
|
complete=__1__ tiles were handled.
|
||||||
|
|
||||||
[exp-commands_locate]
|
[exp-commands_locate]
|
||||||
@@ -226,7 +225,6 @@ items=__1__ cleared all items on the ground of __2__.
|
|||||||
blueprints=__1__ cleared all blueprints on __2__.
|
blueprints=__1__ cleared all blueprints on __2__.
|
||||||
enter=Entered selection mode, select the area.
|
enter=Entered selection mode, select the area.
|
||||||
exit=Exited selection mode.
|
exit=Exited selection mode.
|
||||||
area-too-large=Selected area is too large, must be less than __1__, selected __2__.
|
|
||||||
complete=__1__ blueprint ghost were removed.
|
complete=__1__ blueprint ghost were removed.
|
||||||
|
|
||||||
[exp-commands_trains]
|
[exp-commands_trains]
|
||||||
|
|||||||
Reference in New Issue
Block a user