diff --git a/PHI-CL/control.lua b/PHI-CL/control.lua index f0a86e1..5d3bf50 100644 --- a/PHI-CL/control.lua +++ b/PHI-CL/control.lua @@ -232,42 +232,6 @@ script.on_init(function() end storage_init() - - if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SS' then - if remote.interfaces.freeplay and remote.interfaces.freeplay.set_disable_crashsite then - remote.call('freeplay', 'set_disable_crashsite', true) - end - - local s_fl_0 = game.forces['player'].create_space_platform({name='spaceship', planet='nauvis', starter_pack='space-platform-starter-pack'}) - - if not s_fl_0 then - return - end - - s_fl_0.apply_starter_pack() - s_fl_0.hub.insert({name='asteroid-collector', count=1}) - s_fl_0.hub.insert({name='crusher', count=1}) - s_fl_0.hub.insert({name='assembling-machine-1', count=2}) - s_fl_0.hub.insert({name='inserter', count=10}) - s_fl_0.hub.insert({name='solar-panel', count=20}) - s_fl_0.hub.insert({name='space-platform-foundation', count=200}) - s_fl_0.hub.insert({name='electric-furnace', count=4}) - - for _, g in pairs(game.permissions.groups) do - g.set_allows_action(defines.input_action.land_at_planet, false) - end - - local tiles = {} - - for x = -7, 6 do - for y = -7, 10 do - table.insert(tiles, {name='space-platform-foundation', position={x, y}}) - end - end - - s_fl_0.surface.set_tiles(tiles) - storage.phi_cl.spaceship = s_fl_0 - end end) script.on_configuration_changed(function() @@ -287,12 +251,6 @@ end) if settings.startup['PHI-MI'].value or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value ~= '') then script.on_event(defines.events.on_player_created, function(event) gui_create(game.players[event.player_index]) - - if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SS' then - game.forces['player'].technologies['space-platform'].researched = true - game.players[event.player_index].teleport(storage.phi_cl.spaceship.surface.find_non_colliding_position('character', {x=0, y=0}, 32, 1) or {x=0, y=0}, storage.phi_cl.spaceship.surface.name) - game.forces['player'].set_surface_hidden('nauvis', true) - end end) if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SS' then diff --git a/PHI-CL/data.lua b/PHI-CL/data.lua index da0b12b..092f06d 100644 --- a/PHI-CL/data.lua +++ b/PHI-CL/data.lua @@ -848,7 +848,7 @@ if mods['space-age'] and settings.startup['PHI-SA'].value then data.raw['utility-constants'].default.rocket_lift_weight = settings.startup['PHI-SA-ROCKET-CAPACITY'].value * 1000000 end -if mods['space-age'] and ((settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-ENABLE-QUALITY'].value)) or (settings.startup['PHI-GM'].value and (settings.startup['PHI-GM'].value == 'SS' or settings.startup['PHI-GM'].value == 'VP'))) then +if mods['space-age'] and ((settings.startup['PHI-SA'].value and (not settings.startup['PHI-SA-ENABLE-QUALITY'].value)) or (settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP')) then for _, v in pairs({'quality-module', 'quality-module-2', 'quality-module-3'}) do if data.raw.technology[v] then data.raw.technology[v].hidden = true @@ -1093,7 +1093,7 @@ if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SAP }}) end -if settings.startup['PHI-GM'].value and (settings.startup['PHI-GM'].value == 'SS' or settings.startup['PHI-GM'].value == 'VP') then +if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP' then if mods['space-age'] then data.raw.quality['normal'].level = 0 data.raw.quality['normal'].beacon_power_usage_multiplier = 1 @@ -1588,38 +1588,7 @@ if settings.startup['PHI-GM'].value and (settings.startup['PHI-GM'].value == 'SS v.minable.results = {{type = 'item', name = 'wood', amount = 4}} end end - end -end -if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'SS' then - if mods['space-age'] then - for _, v in pairs(data.raw['mining-drill']) do - data.raw.item[v.name].hidden = true - data.raw.item[v.name].hidden_in_factoriopedia = true - data.raw.recipe[v.name].hidden = true - data.raw.recipe[v.name].hidden_in_factoriopedia = true - v.hidden = true - v.hidden_in_factoriopedia = true - end - - data.raw.technology['big-mining-drill'].hidden = true - data.raw.technology['big-mining-drill'].hidden_in_factoriopedia = true - data.raw.technology['oil-gathering'].hidden = true - data.raw.technology['oil-gathering'].hidden_in_factoriopedia = true - - data.raw['tile']['landfill'].hidden = true - data.raw['tile']['landfill'].hidden_in_factoriopedia = true - data.raw.item['landfill'].hidden = true - data.raw.item['landfill'].hidden_in_factoriopedia = true - data.raw.recipe['landfill'].hidden = true - data.raw.recipe['landfill'].hidden_in_factoriopedia = true - data.raw.technology['landfill'].hidden = true - data.raw.technology['landfill'].hidden_in_factoriopedia = true - end -end - -if settings.startup['PHI-GM'].value and settings.startup['PHI-GM'].value == 'VP' then - if mods['space-age'] then data.raw['tile']['empty-space'].hidden = true data.raw['tile']['empty-space'].hidden_in_factoriopedia = true data.raw['tile']['space-platform-foundation'].hidden = true diff --git a/PHI-CL/settings.lua b/PHI-CL/settings.lua index 3a00919..525b98d 100644 --- a/PHI-CL/settings.lua +++ b/PHI-CL/settings.lua @@ -226,3 +226,12 @@ if mods['space-age'] then data.raw['bool-setting']['PHI-SA-ENABLE-QUALITY'].localised_description = {'', '[virtual-signal=signal-any-quality]'} data.raw['int-setting']['PHI-SA-QUALITY'].localised_description = {'', '[item=quality-module-3] x 0.1'} end + +--[[ +if data.raw['string-setting']['PHI-GM'].value and data.raw['string-setting']['PHI-GM'].value == 'SS' then + data.raw['bool-setting']['PHI-MB'].value = true + data.raw['bool-setting']['PHI-MB-ENERGY'].value = true + data.raw['int-setting']['PHI-MB-ENERGY-POWER-TIER'].value = true + +end +]]