From 1d9c1b369b0536e94783f9666619fe15c5040457 Mon Sep 17 00:00:00 2001 From: PHIDIAS Date: Wed, 4 Jun 2025 20:48:29 +0900 Subject: [PATCH] . --- PHI-CL/control.lua | 4 ++-- PHI-CL/locale/en/locale.cfg | 21 +++++++++++++++++++++ PHI-CL/settings.lua | 2 +- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua index b139745..2df1bab 100644 --- a/PHI-CL/control.lua +++ b/PHI-CL/control.lua @@ -76,7 +76,7 @@ if settings.startup['PHI-CT'].value then script.on_event(defines.events.on_player_cheat_mode_disabled, hidden_recipe_enable) end -if (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value) or settings.startup['PHI-VP'].value then +if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '-' then script.on_nth_tick(3600, function(_) for _, s in pairs(game.surfaces) do local ec = s.find_entities_filtered{type='cargo-landing-pad', force='player'} @@ -130,7 +130,7 @@ script.on_nth_tick(3600, function(_) end) end -if settings.startup['PHI-CT'].value or settings.startup['PHI-MI'].value or (settings.startup['PHI-SA'].value and settings.startup['PHI-SA-GENERIC'].value) or settings.startup['PHI-VP'].value then +if settings.startup['PHI-CT'].value or settings.startup['PHI-MI'].value or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '-') then function gui_create(player) if player.gui.relative.inserter_config then player.gui.relative.inserter_config.destroy() diff --git a/PHI-CL/locale/en/locale.cfg b/PHI-CL/locale/en/locale.cfg index cb755b7..b281b52 100644 --- a/PHI-CL/locale/en/locale.cfg +++ b/PHI-CL/locale/en/locale.cfg @@ -163,6 +163,27 @@ PHI-CT-TILE-CHOICE=Map generation tile choice [string-mod-setting] PHI-GM-SAP=Space Age Plus PHI-GM-VP=Vanilla Plus +PHI-CT-TILE-CHOICE-landfill=[tile=landfill] Landfill +PHI-CT-TILE-CHOICE-stone-path=[tile=stone-path] Stone Path +PHI-CT-TILE-CHOICE-concrete=[tile=concrete] Concrete +PHI-CT-TILE-CHOICE-refined-concrete=[tile=refined-concrete] Refined Concrete +PHI-CT-TILE-CHOICE-water=[tile=water] Water +PHI-CT-TILE-CHOICE-water-mud=[tile=water-mud] Water Mud +PHI-CT-TILE-CHOICE-water-shallow=[tile=water-shallow] Water Shallow +PHI-CT-TILE-CHOICE-deepwater=[tile=deepwater] Deepwater +PHI-CT-TILE-CHOICE-deepwater-green=[tile=deepwater-green] Deepwater Green +PHI-CT-TILE-CHOICE-dirt-1=[tile=dirt-1] Dirt 1 +PHI-CT-TILE-CHOICE-dirt-2=[tile=dirt-2] Dirt 2 +PHI-CT-TILE-CHOICE-dirt-3=[tile=dirt-3] Dirt 3 +PHI-CT-TILE-CHOICE-dirt-4=[tile=dirt-4] Dirt 4 +PHI-CT-TILE-CHOICE-dirt-5=[tile=dirt-5] Dirt 5 +PHI-CT-TILE-CHOICE-dirt-6=[tile=dirt-6] Dirt 6 +PHI-CT-TILE-CHOICE-dirt-7=[tile=dirt-7] Dirt 7 +PHI-CT-TILE-CHOICE-dry-dirt=[tile=dry-dirt] Dry Dirt +PHI-CT-TILE-CHOICE-grass-1=[tile=grass-1] grass-1 +PHI-CT-TILE-CHOICE-grass-2=[tile=grass-2] grass-2 +PHI-CT-TILE-CHOICE-grass-3=[tile=grass-3] grass-3 +PHI-CT-TILE-CHOICE-grass-4=[tile=grass-4] grass-4 [mod-setting-description] PHI-MB-EQUIPMENT-SIZE=1x1 diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index a6c98d6..ba6eb4b 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -206,7 +206,7 @@ data:extend({ name = 'PHI-CT-TILE-CHOICE', setting_type = 'startup', default_value = 'grass-1', - allowed_values = {'landfill', 'stone-path', 'concrete', 'refined-concrete', 'lab-dark-1', 'lab-dark-2', 'lab-white', 'water', 'water-green', 'water-mud', 'water-shallow', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4'}, + allowed_values = {'landfill', 'stone-path', 'concrete', 'refined-concrete', 'water', 'water-mud', 'water-shallow', 'deepwater', 'deepwater-green', 'dirt-1', 'dirt-2', 'dirt-3', 'dirt-4', 'dirt-5', 'dirt-6', 'dirt-7', 'dry-dirt', 'grass-1', 'grass-2', 'grass-3', 'grass-4'}, localised_name = {'phi-cl.combine', {'mod-setting-name-prefix.PHI-CT-TILE-CHOICE'}, {'mod-setting-name.PHI-CT-TILE-CHOICE'}}, order = 'E02' }