From 3e6f54cd72662f7887e0c05a35f06d36d811e14a Mon Sep 17 00:00:00 2001
From: PHIDIAS <phidias@aperx.org>
Date: Mon, 8 Jun 2026 00:07:13 +0900
Subject: [PATCH] .

---
 PHI-CL/data/b/gm-sap.lua | 10 ----------
 PHI-CL/data/b/gm-vp.lua  |  4 ++--
 PHI-CL/data/b/gm.lua     | 10 ++++++++++
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/PHI-CL/data/b/gm-sap.lua b/PHI-CL/data/b/gm-sap.lua
index 289f13e..e278c83 100644
--- a/PHI-CL/data/b/gm-sap.lua
+++ b/PHI-CL/data/b/gm-sap.lua
@@ -2,16 +2,6 @@ local mc = require('mc')
 
 mc.space_age()
 
--- GM-SAP C 2 SPACE_AGE RESOURCE
-for _, v in pairs({'lithium-brine', 'fluorine-vent'}) do
-    if data.raw.resource[v] then
-        data.raw.resource[v].infinite = true
-        data.raw.resource[v].minimum = math.max(60000, data.raw.resource[v].minimum or 0)
-        data.raw.resource[v].normal = math.max(300000, data.raw.resource[v].normal or 0)
-        data.raw.resource[v].infinite_depletion_amount = math.min(10, data.raw.resource[v].infinite_depletion_amount or 999)
-    end
-end
-
 -- GM-SAP C 16 SPACE_AGE ENTITY
 if data.raw['asteroid'] then
     for _, asteroid in pairs(data.raw['asteroid']) do
diff --git a/PHI-CL/data/b/gm-vp.lua b/PHI-CL/data/b/gm-vp.lua
index 2c3994f..b2463ae 100644
--- a/PHI-CL/data/b/gm-vp.lua
+++ b/PHI-CL/data/b/gm-vp.lua
@@ -316,8 +316,8 @@ end
 
 -- GM-VP C 1 SPACE_AGE RESOURCE_GENERATION
 if data.raw['resource'] and data.raw['resource']['scrap'] and data.raw['resource']['scrap'].autoplace then
-    data.raw['resource']['scrap'].autoplace.probability_expression = "(control:scrap:size > 0) * (1 - fulgora_starting_mask) * (min((fulgora_structure_cells < min(0.1 * frequency, 0.05 + 0.05 * frequency)) * (1 + fulgora_structure_subnoise) * abs_mult_height_over * fulgora_artificial_mask + (fulgora_spots_prebanding < (1.2 + 0.4 * linear_size)) * fulgora_vaults_and_starting_vault * 10, 0.5) * (1 - fulgora_road_paving_2c))"
-    data.raw['resource']['scrap'].autoplace.richness_expression = "(1 + fulgora_structure_subnoise) * 1000 * (7 / (6 + frequency) + 100 * fulgora_vaults_and_starting_vault) * richness"
+    data.raw['resource']['scrap'].autoplace.probability_expression = "(control:scrap:size > 0) * (1000 * ((1 + vulcanus_tungsten_ore_region) * random_penalty_between(0.9, 1, 1) - 1))"
+    data.raw['resource']['scrap'].autoplace.richness_expression = "vulcanus_tungsten_ore_region * random_penalty_between(0.9, 1, 1) * 10000 * vulcanus_starting_area_multiplier * control:scrap:richness / vulcanus_tungsten_ore_size"
     nauvis_control['scrap'] = {}
     nauvis_setting['scrap'] = {}
 end
diff --git a/PHI-CL/data/b/gm.lua b/PHI-CL/data/b/gm.lua
index f8893d6..fe04df7 100644
--- a/PHI-CL/data/b/gm.lua
+++ b/PHI-CL/data/b/gm.lua
@@ -25,6 +25,16 @@ if data.raw.recipe['foundation'] then
     data.raw.recipe['foundation'].results = {{type = 'item', name = 'foundation', amount = 1}}
 end
 
+-- GM-SAP C 2 SPACE_AGE RESOURCE
+for _, v in pairs({'lithium-brine', 'fluorine-vent'}) do
+    if data.raw.resource[v] then
+        data.raw.resource[v].infinite = true
+        data.raw.resource[v].minimum = math.max(60000, data.raw.resource[v].minimum or 0)
+        data.raw.resource[v].normal = math.max(300000, data.raw.resource[v].normal or 0)
+        data.raw.resource[v].infinite_depletion_amount = math.min(10, data.raw.resource[v].infinite_depletion_amount or 999)
+    end
+end
+
 -- GM C 1 BASE RECIPE
 if data.raw.recipe['atomic-bomb'] then
     for _, v in pairs(data.raw.recipe['atomic-bomb'].ingredients) do