diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua index ccd7a04..8cece2a 100644 --- a/PHI-CL/data/b/gm-vp-c.lua +++ b/PHI-CL/data/b/gm-vp-c.lua @@ -512,24 +512,23 @@ local items = { ['hidden_resource'] = { -- SPACE_AGE RESOURCE_GENERATION 0 'vulcanus-coal', - 'tungsten-ore', 'sulfuric-acid-geyser', 'fulgora-islands', 'gleba-enemy-base', + 'fulgora-cliff', -- SPACE_AGE RESOURCE_GENERATION 5 - 'fluorine-vent', - 'lithium-brine', 'gleba-stone', 'aquilo-crude-oil', 'gleba-cliff', - -- SPACE_AGE RESOURCE_GENERATION 10 - 'fulgora-cliff', - 'vulcanus-volcanism', 'gleba-water', 'gleba-plants', + -- SPACE_AGE RESOURCE_GENERATION 10 + 'vulcanus-volcanism', 'calcite', - -- SPACE_AGE RESOURCE_GENERATION 15 'scrap', + 'fluorine-vent', + 'lithium-brine', + -- SPACE_AGE RESOURCE_GENERATION 15 }, ['hidden'] = { -- QUALITY ENTITY 0 @@ -1033,10 +1032,10 @@ local items = { ['recycling'] = true, -- SPACE_AGE 5 ['lightning-collector'] = true, - ['tungsten-carbide'] = true, - ['tungsten-steel'] = true, ['foundation'] = true, ['biochamber'] = true, + ['asteroid-productivity'] = true, + ['asteroid-reprocessing'] = true, -- SPACE_AGE 10 ['artificial-soil'] = true, ['overgrowth-soil'] = true, @@ -1050,19 +1049,19 @@ local items = { ['promethium-science-pack'] = true, ['advanced-asteroid-processing'] = true, -- SPACE_AGE 20 - ['holmium-processing'] = true, ['rail-support-foundations'] = true, - ['lithium-processing'] = true, - ['quantum-processor'] = true, ['captive-biter-spawner'] = true, - -- SPACE_AGE 25 - ['scrap-recycling-productivity'] = true, ['space-platform-thruster'] = true, ['space-platform'] = true, - ['asteroid-productivity'] = true, - ['asteroid-reprocessing'] = true, - -- SPACE_AGE 30 + ['scrap-recycling-productivity'] = true, + -- SPACE_AGE 25 ['bioflux-processing'] = true, + -- SPACE_AGE 30 + ['tungsten-carbide'] = true, + ['tungsten-steel'] = true, + ['holmium-processing'] = true, + ['lithium-processing'] = true, + ['quantum-processor'] = true, }, } diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index ef0a50e..eb80c8a 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -113,7 +113,6 @@ if items['technology_productivity'] then end data.raw.technology['automation-productivity'].icons[1].icon = '__base__/graphics/technology/automation-2.png' --- data.raw.technology['automation-productivity'].localised_name = {'phi-cl.combine', {'technology-name.automation'}, ''} -- GM-VP A 1 SPACE_AGE RESEARCH_EFFECT if data.raw.technology['automation'] and data.raw.technology['automation'].effects then @@ -294,7 +293,7 @@ end local nauvis_control = data.raw.planet and data.raw.planet['nauvis'] and data.raw.planet['nauvis'].map_gen_settings and data.raw.planet['nauvis'].map_gen_settings.autoplace_controls local nauvis_setting = data.raw.planet and data.raw.planet['nauvis'] and data.raw.planet['nauvis'].map_gen_settings and data.raw.planet['nauvis'].map_gen_settings.autoplace_settings and data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.entity and data.raw.planet['nauvis'].map_gen_settings.autoplace_settings.entity.settings --- GM-VP H 16 SPACE_AGE RESOURCE_GENERATION +-- GM-VP H 15 SPACE_AGE RESOURCE_GENERATION if items['hidden_resource'] and data.raw['resource'] then for _, v in pairs(items['hidden_resource']) do if data.raw['resource'][v] then @@ -314,6 +313,11 @@ if items['hidden_resource'] and data.raw['resource'] then end end +if data.raw['resource'] and data.raw['resource']['tungsten-ore'] and data.raw['resource']['tungsten-ore'].autoplace then + data.raw['resource']['tungsten-ore'].autoplace.probability_expression = "(var('control:tungsten_ore:size') > 0) * (clamp(var('default-coal-patches'), 0, 1))" + data.raw['resource']['tungsten-ore'].autoplace.richness_expression = "(var('control:tungsten_ore:size') > 0) * (1*var('control:tungsten_ore:richness')*(var('default-coal-patches'))*max((1000+distance)/2600,1))" +end + -- GM-VP H 95 SPACE_AGE TILE for _, v in pairs(data.raw['tile']) do if v.subgroup and (v.subgroup == 'vulcanus-tiles' or v.subgroup == 'gleba-tiles' or v.subgroup == 'gleba-water-tiles' or v.subgroup == 'fulgora-tiles' or v.subgroup == 'aquilo-tiles') then