diff --git a/PHI-CL/data/b/gm-vp-c.lua b/PHI-CL/data/b/gm-vp-c.lua index 5195e39..a4f0025 100644 --- a/PHI-CL/data/b/gm-vp-c.lua +++ b/PHI-CL/data/b/gm-vp-c.lua @@ -452,7 +452,7 @@ local items = { ['asteroid-collector'] = true, ['crusher'] = true, -- SPACE_AGE 10 - ['scrap'] = true, + ['space-platform-foundation'] = true, ['iron-bacteria'] = true, ['copper-bacteria'] = true, ['biter-egg'] = true, @@ -467,7 +467,6 @@ local items = { ['spoilage'] = true, ['thruster'] = true, ['calcite'] = true, - ['space-platform-foundation'] = true, -- SPACE_AGE 25 -- SPACE_AGE 30 ['quantum-processor'] = true, @@ -479,6 +478,7 @@ local items = { ['lithium-plate'] = true, ['superconductor'] = true, ['supercapacitor'] = true, + ['scrap'] = true, }, ['tips_and_tricks_item'] = { ['quality'] = true, @@ -524,7 +524,6 @@ local items = { -- SPACE_AGE RESOURCE_GENERATION 10 'vulcanus-volcanism', 'calcite', - 'scrap', }, ['hidden'] = { -- QUALITY ENTITY 0 @@ -616,7 +615,6 @@ local items = { ['ammoniacal-solution'] = 'fluid', ['lava'] = 'fluid', -- SPACE_AGE FLUID 5 - ['holmium-solution'] = 'fluid', -- SPACE_AGE ITEM 0 ['capture-robot-rocket'] = 'ammo', ['space-platform-starter-pack'] = 'space-platform-starter-pack', @@ -625,7 +623,7 @@ local items = { ['fulgora_islands'] = 'autoplace-control', ['calcite'] = 'autoplace-control', ['sulfuric_acid_geyser'] = 'autoplace-control', - ['scrap'] = 'autoplace-control', + ['space-platform'] = 'surface', -- SPACE_AGE MAP_GENERATION 5 ['gleba_stone'] = 'autoplace-control', ['aquilo_crude_oil'] = 'autoplace-control', @@ -637,11 +635,10 @@ local items = { ['vulcanus_volcanism'] = 'autoplace-control', ['gleba_water'] = 'autoplace-control', ['crater-cliff'] = 'cliff', - ['space-platform'] = 'surface', + ['cliff-vulcanus'] = 'cliff', -- SPACE_AGE MAP_GENERATION 15 ['cliff-fulgora'] = 'cliff', ['cliff-gleba'] = 'cliff', - ['cliff-vulcanus'] = 'cliff', -- SPACE_AGE TILE 0 ['empty-space'] = 'tile', ['space-platform-foundation'] = 'tile', diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua index e679865..06184c0 100644 --- a/PHI-CL/data/b/gm-vp.lua +++ b/PHI-CL/data/b/gm-vp.lua @@ -276,9 +276,9 @@ end -- GM-VP H 1 QUALITY ENTITY -- GM-VP H 66 SPACE_AGE ENTITY --- GM-VP H 6 SPACE_AGE FLUID +-- GM-VP H 5 SPACE_AGE FLUID -- GM-VP H 2 SPACE_AGE ITEM --- GM-VP H 18 SPACE_AGE MAP_GENERATION +-- GM-VP H 17 SPACE_AGE MAP_GENERATION -- GM-VP H 3 SPACE_AGE TILE -- GM-VP H 1 SPACE_AGE TOOL if items['hidden'] then @@ -293,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 13 SPACE_AGE RESOURCE_GENERATION +-- GM-VP H 12 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 +314,14 @@ if data.raw['resource'] and data.raw['resource']['tungsten-ore'] and data.raw['r nauvis_setting['tungsten-ore'] = {} end +-- GM-VP C 1 SPACE_AGE RESOURCE_GENERATION +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 = "(control:tungsten_ore:size > 0) * (1000 * ((1 + vulcanus_tungsten_ore_region) * random_penalty_between(0.9, 1, 1) - 1))" + data.raw['resource']['tungsten-ore'].autoplace.richness_expression = "vulcanus_tungsten_ore_region * random_penalty_between(0.9, 1, 1) * 10000 * vulcanus_starting_area_multiplier * control:tungsten_ore:richness / vulcanus_tungsten_ore_size" + nauvis_control['tungsten_ore'] = {} + nauvis_setting['tungsten-ore'] = {} +end + -- GM-VP C 1 SPACE_AGE RESOURCE_GENERATION if data.raw['resource'] and data.raw['resource']['lithium-brine'] and data.raw['resource']['lithium-brine'].autoplace then data.raw['resource']['lithium-brine'].autoplace.probability_expression = "(control:lithium_brine:size > 0) * (max(aquilo_starting_lithium_brine * 0.02, min(aquilo_starting_mask, aquilo_lithium_brine_spots) * 0.012))"