From b8e9e5b0208d2854524d35c3ffd6e095fd3a52c2 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Sun, 26 Apr 2026 16:03:31 -0600
Subject: [PATCH 01/18] chnaging the library, wardenclyffe and biolab
 knowledgecap calulcations to be in a knowVal function like univercity has
 anyways

changed a few vars to be shorter in the same code

BUG: fixed biolab's knowledge cap gain on the structure popup specifically when with high_pop and frost elemental. wasn't adjusted for high pop
---
 index.html      |   2 +-
 src/actions.js  | 128 ++++++++++++++++++++----------------------------
 src/condense.js |  16 ++++++
 src/main.js     | 126 ++++++++++++++---------------------------------
 4 files changed, 108 insertions(+), 164 deletions(-)
 create mode 100644 src/condense.js
diff --git a/index.html b/index.html
index d98d5baaee..7a3a96fb25 100644
--- a/index.html
+++ b/index.html
@@ -18,7 +18,7 @@
     <script src="https://unpkg.com/sortablejs@1.10.2/Sortable.min.js" integrity="sha384-6qM1TfKo1alBw3Uw9AWXnaY5h0G3ScEjxtUm4TwRJm7HRmDX8UfiDleTAEEg5vIe" crossorigin="anonymous"></script>
     <script src="https://unpkg.com/chart.js@3.8.2/dist/chart.min.js" integrity="sha384-z7c1KnSCkMpfoib43Lq1v2pokQC8cdqBWmH2qiyH2KkmNv60hACtZUjoCEkp1Y08" crossorigin="anonymous"></script>
     <script src="lib/lz-string.min.js"></script>
-    <script src="evolve/main.js" type="module"></script>
+    <script src="src/main.js" type="module"></script>
 </head>
 <body>
     <style>
diff --git a/src/actions.js b/src/actions.js
index 558c045d05..33a977b1c2 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -3764,7 +3764,21 @@ export const actions = {
                 Brick(offset){ return costMultiplier('library', offset, 15, 1.2); }
             },
             effect(){
-                let gain = 125;
+                let gain = actions.city.library.knowVal(1)
+                gain = +(gain).toFixed(0);
+
+                let muckVal2 = govActive('muckraker',2);
+                let know = muckVal2 ? (5 - muckVal2) : 5;
+                if (global.race['autoignition']){
+                    know -= traits.autoignition.vars()[0];
+                    if (know < 0){
+                        know = 0;
+                    }
+                }
+                return `<div>${loc('city_max_knowledge',[gain.toLocaleString()])}</div><div>${loc('city_library_effect',[know])}</div>`;
+            },
+            knowVal(count){
+                let gain=125;
                 if (global.race['nearsighted']){
                     gain *= 1 - (traits.nearsighted.vars()[0] / 100);
                 }
@@ -3795,43 +3809,15 @@ export const actions = {
                 let athVal = govActive('athleticism',2);
                 if (athVal){
                     gain *= 1 - (athVal / 100);
-                }
-                let muckVal1 = govActive('muckraker',1);
+                }let muckVal1 = govActive('muckraker',1);
                 if (muckVal1){
                     gain *= 1 + (muckVal1 / 100);
                 }
-                gain = +(gain).toFixed(0);
-                let muckVal2 = govActive('muckraker',2);
-                let know = muckVal2 ? (5 - muckVal2) : 5;
-                if (global.race['autoignition']){
-                    know -= traits.autoignition.vars()[0];
-                    if (know < 0){
-                        know = 0;
-                    }
-                }
-                return `<div>${loc('city_max_knowledge',[gain.toLocaleString()])}</div><div>${loc('city_library_effect',[know])}</div>`;
+                return gain*count
             },
             action(args){
                 if (payCosts($(this)[0])){
-                    let gain = 125;
-                    if (global.race['nearsighted']){
-                        gain *= 1 - (traits.nearsighted.vars()[0] / 100);
-                    }
-                    if (global.tech['science'] && global.tech.science >= 8){
-                        gain *= 1.4;
-                    }
-                    if (global.tech['anthropology'] && global.tech.anthropology >= 2){
-                        gain *= 1 + (faithTempleCount() * 0.05);
-                    }
-                    if (global.tech['science'] && global.tech.science >= 5){
-                        gain *= 1 + (workerScale(global.civic.scientist.workers,'scientist') * 0.12);
-                    }
-                    gain = +(gain).toFixed(1);
-                    global['resource']['Knowledge'].max += gain;
                     incrementStruct('library','city');
-                    if (global.tech['science'] && global.tech.science >= 3){
-                        global.civic.professor.impact = 0.5 + (global.city.library.count * 0.01)
-                    }
                     return true;
                 }
                 return false;
@@ -3862,41 +3848,14 @@ export const actions = {
                 Nanite(offset){ return global.race['deconstructor'] ? costMultiplier('wardenclyffe', offset, 50, 1.18) : 0; },
             },
             effect(){
-                let gain = 1000;
-                if (global.city.ptrait.includes('magnetic')){
-                    gain += planetTraits.magnetic.vars()[1];
-                }
-                if (global.tech['supercollider']){
-                    let ratio = global.tech['particles'] && global.tech['particles'] >= 3 ? 12.5: 25;
-                    gain *= (global.tech['supercollider'] / ratio) + 1;
-                }
-                if (global.space['satellite']){
-                    gain *= 1 + (global.space.satellite.count * 0.04);
-                }
-                let athVal = govActive('athleticism',2);
-                if (athVal){
-                    gain *= 1 - (athVal / 100);
-                }
+                let gain = actions.city.wardenclyffe.knowVal(1,0)
                 gain = +(gain).toFixed(0);
 
                 let desc = `<div>${loc('city_wardenclyffe_effect1',[jobScale(1),global.civic.scientist ? global.civic.scientist.name : loc('job_scientist')])}</div><div>${loc('city_max_knowledge',[gain.toLocaleString()])}</div>`;
                 if (global.city.powered){
-                    let pgain = global.tech['science'] >= 7 ? 2500 : 2000;
-                    if (global.city.ptrait.includes('magnetic')){
-                        pgain += planetTraits.magnetic.vars()[1];
-                    }
-                    if (global.space['satellite']){
-                        pgain *= 1 + (global.space.satellite.count * 0.04);
-                    }
-                    if (global.tech['supercollider']){
-                        let ratio = global.tech['particles'] && global.tech['particles'] >= 3 ? 12.5: 25;
-                        pgain *= (global.tech['supercollider'] / ratio) + 1;
-                    }
-                    let athVal = govActive('athleticism',2);
-                    if (athVal){
-                        pgain *= 1 - (athVal / 100);
-                    }
+                    let pgain = actions.city.wardenclyffe.knowVal(1,1)
                     pgain = +(pgain).toFixed(1);
+                    
                     if (global.tech.science >= 15){
                         desc = desc + `<div>${loc('city_wardenclyffe_effect4',[2])}</div>`;
                     }
@@ -3917,21 +3876,38 @@ export const actions = {
                 }
                 return desc;
             },
+            knowVal(count,pcount){
+                //calculate the knowledge cap bonus
+                let gain_base=1000;
+                if (global.city.ptrait.includes('magnetic')){
+                    gain_base += planetTraits.magnetic.vars()[1];
+                }
+
+                let gain = count * gain_base;//calculate the amount from non-powered
+                let powered_gain = global.tech['science'] >= 7 ? 1500 : 1000;
+                gain += (pcount * powered_gain);//from powered
+
+
+                if (global.tech['supercollider']){
+                    let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 12.5: 25;
+                    gain *= (global.tech['supercollider'] / ratio) + 1;
+                }
+                if (global.space['satellite']){
+                    gain *= 1 + (global.space.satellite.count * 0.04);
+                }
+                let athVal = govActive('athleticism',2);
+                if (athVal){
+                    gain *= 1 - (athVal / 100);
+                }
+                return gain
+            },
             powered(){ return powerCostMod(2); },
             action(args){
                 if (payCosts($(this)[0])){
-                    let gain = 1000;
                     incrementStruct('wardenclyffe','city');
                     global.civic.scientist.display = true;
                     global.civic.scientist.max += jobScale(1);
-                    if (powerOnNewStruct($(this)[0])){
-                        gain = global.tech['science'] >= 7 ? 2500 : 2000;
-                    }
-                    if (global.tech['supercollider']){
-                        let ratio = global.tech['particles'] && global.tech['particles'] >= 3 ? 12.5: 25;
-                        gain *= (global.tech['supercollider'] / ratio) + 1;
-                    }
-                    global['resource']['Knowledge'].max += gain;
+                    powerOnNewStruct($(this)[0]);
                     return true;
                 }
                 return false;
@@ -3959,7 +3935,12 @@ export const actions = {
                 Alloy(offset){ return costMultiplier('biolab', offset, 350, 1.3); }
             },
             effect(wiki){
-                let gain = 3000;
+                let gain = actions.city.biolab.knowVal(wiki);
+                gain = +(gain).toFixed(0);
+                return `<span>${loc('city_max_knowledge',[gain.toLocaleString()])}</span>, <span class="has-text-caution">${loc('minus_power',[$(this)[0].powered()])}</span>`;
+            },
+            knowVal(wiki){
+                let gain=3000;
                 if (global.portal['sensor_drone'] && global.tech['science'] >= 14){
                     gain *= 1 + (wiki ? global.portal.sensor_drone.on : p_on['sensor_drone']) * 0.02;
                 }
@@ -3973,10 +3954,9 @@ export const actions = {
                     gain *= 2.5;
                 }
                 if (global.race['elemental'] && traits.elemental.vars()[0] === 'frost'){
-                    gain *= 1 + (traits.elemental.vars()[4] * global.resource[global.race.species].amount / 100);
+                    gain *= 1 + highPopAdjust(traits.elemental.vars()[4] * global.resource[global.race.species].amount / 100);
                 }
-                gain = +(gain).toFixed(0);
-                return `<span>${loc('city_max_knowledge',[gain.toLocaleString()])}</span>, <span class="has-text-caution">${loc('minus_power',[$(this)[0].powered()])}</span>`;
+                return gain
             },
             powered(){ return powerCostMod(2); },
             action(args){
diff --git a/src/condense.js b/src/condense.js
new file mode 100644
index 0000000000..bd880be5cb
--- /dev/null
+++ b/src/condense.js
@@ -0,0 +1,16 @@
+let gain=3000;
+if (global.portal['sensor_drone'] && global.tech['science'] >= 14){
+    gain *= 1 + (wiki ? global.portal.sensor_drone.on : p_on['sensor_drone']) * 0.02;
+}
+if (global.tech['science'] >= 20){
+    gain *= 3;
+}
+if (global.tech['science'] >= 21){
+    gain *= 1.45;
+}
+if (global.tech['biotech'] >= 1){
+    gain *= 2.5;
+}
+if (global.race['elemental'] && traits.elemental.vars()[0] === 'frost'){
+    gain *= 1 + highPopAdjust(traits.elemental.vars()[4] * global.resource[global.race.species].amount / 100);
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index a7f7ee0f64..7c0087b627 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9262,95 +9262,62 @@ function midLoop(){
         if (global.race['wish'] && global.race['wishStats'] && global.race.wishStats.priest){
             lCaps['priest'] += jobScale(global.race.wishStats.priest);
         }
-        let pirate_alien2 = piracy('gxy_alien2');
+
+        //Knowledge structures!
+        let city=actions.city
         if (global.city['university']){
-            let gain = actions.city.university.knowVal() * global.city.university.count;
-            lCaps['professor'] += jobScale(global.city.university.count);
+            let univCount=global.city.university.count;
+
+            let gain = city.university.knowVal() * univCount;
+            lCaps['professor'] += jobScale(univCount);
             caps['Knowledge'] += gain;
             breakdown.c.Knowledge[loc('city_university')] = gain+'v';
         }
-        if (global.race['lone_survivor'] && global.tauceti['alien_outpost']){
-            lCaps['professor'] += jobScale(global.tauceti.alien_outpost.count);
-        }
         if (global.city['library']){
-            let shelving = 125;
-            if (global.race['nearsighted']){
-                shelving *= 1 - (traits.nearsighted.vars()[0] / 100);
-            }
-            if (global.race['studious']){
-                shelving *= 1 + (traits.studious.vars()[1] / 100);
-            }
-            let fathom = fathomCheck('elven');
-            if (fathom > 0){
-                shelving *= 1 + (traits.studious.vars(1)[1] / 100 * fathom);
-            }
-            if (global.tech['science'] && global.tech['science'] >= 8){
-                shelving *= 1.4;
-            }
-            if (global.tech['science'] && global.tech['science'] >= 5){
-                let sci_val = workerScale(global.civic.scientist.workers,'scientist');
-                if (global.race['high_pop']){
-                    sci_val = highPopAdjust(sci_val);
-                }
-                shelving *= 1 + (sci_val * 0.12);
-            }
-            if (global.tech['anthropology'] && global.tech['anthropology'] >= 2){
-                shelving *= 1 + faithTempleCount() * 0.05;
-            }
-            let teachVal = govActive('teacher',0);
-            if (teachVal){
-                shelving *= 1 + (teachVal / 100);
-            }
-            let athVal = govActive('athleticism',2);
-            if (athVal){
-                shelving *= 1 - (athVal / 100);
-            }
-            let muckVal = govActive('muckraker',1);
-            if (muckVal){
-                shelving *= 1 + (muckVal / 100);
-            }
-            let gain = Math.round(global.city.library.count * shelving);
+            let libCount=global.city.library.count
+
+            let gain = Math.round(city.library.knowVal(libCount));
             caps['Knowledge'] += gain;
             breakdown.c.Knowledge[loc('city_library')] = gain+'v';
+            
             if (global.tech['science'] && global.tech['science'] >= 3){
-                global.civic.professor.impact = 0.5 + (global.city.library.count * 0.01)
+                global.civic.professor.impact = 0.5 + (libCount * 0.01)
             }
         }
         if (global.city['wardenclyffe']){
-            let gain_base = 1000;
-            if (global.city.ptrait.includes('magnetic')){
-                gain_base += planetTraits.magnetic.vars()[1];
-            }
-            let gain = global.city['wardenclyffe'].count * gain_base;
-            lCaps['scientist'] += jobScale(global.city['wardenclyffe'].count);
-            let powered_gain = global.tech['science'] >= 7 ? 1500 : 1000;
-            gain += (p_on['wardenclyffe'] * powered_gain);
-            if (global.tech['supercollider']){
-                let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 12.5: 25;
-                gain *= (global.tech['supercollider'] / ratio) + 1;
-            }
-            if (global.space['satellite']){
-                gain *= 1 + (global.space.satellite.count * 0.04);
-            }
-            let athVal = govActive('athleticism',2);
-            if (athVal){
-                gain *= 1 - (athVal / 100);
-            }
+            let wardenCount=global.city['wardenclyffe'].count, pwardenCount=p_on['wardenclyffe'], label=wardenLabel();
+
+            lCaps['scientist'] += jobScale(wardenCount);
+
+            let gain=city.wardenclyffe.knowVal(wardenCount,pwardenCount)
             caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[wardenLabel()] = gain+'v';
+            breakdown.c.Knowledge[label] = gain+'v';
 
             if (global.race.universe === 'magic'){
-                let mana = global.city.wardenclyffe.count * spatialReasoning(8);
+                let mana = wardenCount * spatialReasoning(8);
                 caps['Mana'] += mana;
-                breakdown.c.Mana[wardenLabel()] = mana+'v';
+                breakdown.c.Mana[label] = mana+'v';
             }
 
             if (global.race['artifical']){
-                let gain = p_on['wardenclyffe'] * spatialReasoning(250);
+                let gain = pwardenCount * spatialReasoning(250);
                 caps['Food'] += gain;
-                breakdown.c.Food[wardenLabel()] = gain+'v';
+                breakdown.c.Food[label] = gain+'v';
             }
         }
+        if (global.city['biolab']){
+            let gain = p_on['biolab'] * city.biolab.knowVal()
+            caps['Knowledge'] += gain;
+            breakdown.c.Knowledge[loc('city_biolab')] = gain+'v';
+        }
+
+
+
+
+
+        if (global.race['lone_survivor'] && global.tauceti['alien_outpost']){
+            lCaps['professor'] += jobScale(global.tauceti.alien_outpost.count);
+        }
         if (global.race['logical']){
             let factor = global.tech.hasOwnProperty('high_tech') ? global.tech.high_tech : 0;
             factor += global.tech.hasOwnProperty('science') ? global.tech.science : 0;
@@ -9408,27 +9375,7 @@ function midLoop(){
                 breakdown.c.Mana[loc(global.race.universe === 'magic' ? 'tech_sanctum' : 'interstellar_laboratory_title')] = mana+'v';
             }
         }
-        if (global.city['biolab']){
-            let gain = 3000;
-            if (global.portal['sensor_drone'] && global.tech['science'] >= 14){
-                gain *= 1 + (p_on['sensor_drone'] * 0.02);
-            }
-            if (global.tech['science'] >= 20){
-                gain *= 3;
-            }
-            if (global.tech['science'] >= 21){
-                gain *= 1.45;
-            }
-            if (global.tech['biotech'] >= 1){
-                gain *= 2.5;
-            }
-            if (global.race['elemental'] && traits.elemental.vars()[0] === 'frost'){
-                gain *= 1 + highPopAdjust(traits.elemental.vars()[4] * global.resource[global.race.species].amount / 100);
-            }
-
-            caps['Knowledge'] += (p_on['biolab'] * gain);
-            breakdown.c.Knowledge[loc('city_biolab')] = (p_on['biolab'] * gain)+'v';
-        }
+        
         if (global.space['zero_g_lab'] && Math.min(support_on['zero_g_lab'],p_on['zero_g_lab']) > 0){
             let using = Math.min(support_on['zero_g_lab'],p_on['zero_g_lab']);
             let synd = syndicate('spc_enceladus');
@@ -9847,6 +9794,7 @@ function midLoop(){
             breakdown.c.Knowledge[loc('galaxy_telemetry_beacon_bd')] = gain+'v';
         }
         if (p_on['s_gate'] && gal_on['scavenger']){
+            let pirate_alien2 = piracy('gxy_alien2');
             let gain = gal_on['scavenger'] * Math.round(pirate_alien2 * 25000);
             caps['Knowledge'] += gain;
             breakdown.c.Knowledge[loc('galaxy_scavenger')] = gain+'v';

From 6e4771cfa231256c47b1c12c705e8c4aad16a89e Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Mon, 27 Apr 2026 21:57:28 -0600
Subject: [PATCH 02/18] I added more know vals for sme of the space knowlegdes

also organized a lot of midloop

and i am going through the organized stuff and simplifying it - This includes removing repeated math calculations (like calculate the value for the cap icnrease and the breakdown seperatley) and shortened variables (like using space_home = actions.space.spc_home, then calling space_home.garage instead of actions.space.spc_home.garage multiple times)
---
 src/condense.js |   16 -
 src/main.js     | 3284 +++++++++++++++++++++++++----------------------
 src/space.js    |   67 +-
 3 files changed, 1824 insertions(+), 1543 deletions(-)

diff --git a/src/condense.js b/src/condense.js
index bd880be5cb..e69de29bb2 100644
--- a/src/condense.js
+++ b/src/condense.js
@@ -1,16 +0,0 @@
-let gain=3000;
-if (global.portal['sensor_drone'] && global.tech['science'] >= 14){
-    gain *= 1 + (wiki ? global.portal.sensor_drone.on : p_on['sensor_drone']) * 0.02;
-}
-if (global.tech['science'] >= 20){
-    gain *= 3;
-}
-if (global.tech['science'] >= 21){
-    gain *= 1.45;
-}
-if (global.tech['biotech'] >= 1){
-    gain *= 2.5;
-}
-if (global.race['elemental'] && traits.elemental.vars()[0] === 'frost'){
-    gain *= 1 + highPopAdjust(traits.elemental.vars()[4] * global.resource[global.race.species].amount / 100);
-}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 7c0087b627..09946931e1 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8445,7 +8445,7 @@ function midLoop(){
         else {
             global.resource.Authority.display = false;
         }
-
+        
         if (global.race['unfathomable'] && global.city['captive_housing']){
             let strength = weaponTechModifer();
             let hunt = workerScale(global.civic.hunter.workers,'hunter')
@@ -8510,1693 +8510,1981 @@ function midLoop(){
                 }
             }
         }
+        
+        // A directory for caps (by The1stBurb) to help things be found and make sense
+        // please note -> if a structure is in multiple sections, the first non-conditional, or the first conditional, was used to place it
+        //     this may mean something is "in the wrong place" but its there for a reason
+        {
+        /*
+        Cap bonus:
+            Storage:
+                - City -> Shed
+                - Space -> Storehouse, Garage
+                - Interstellar -> Warehouse
+                - Portal -> Warehouse, Harbor
+                - Eden -> Warehouse
+                - Tauceti -> Repository
+            Crates:
+                - City -> Wharf, Storage_yard
+                - Space -> Munitions_depot, Garage
+                - Interstellar -> Cargo_yard
+                - Portal -> Arcology, Bazaar, Warehouse
+                - Galaxy -> Tp_depot, Gateway_depot
+                - Tauceti -> Colony, Repository
+                - Race / Gense / Challenge -> Warlord
+            
+            Containers:
+                - City -> Wharf, Warehouse
+                - Space -> Munitions_depot, Garage
+                - Interstellar -> Cargo_yard
+                - Portal -> Arcology, Bazaar, Warehouse
+                - Galaxy -> Tp_depot, Dateway_depot
+                - Tauceti -> Colony, Repository
+                - Race / Gense / Challenge -> Warlord
+
+            Money:
+                - City -> Bank, Casino, Cottage, Apartment
+                - Space -> Titan_bank, Spc_casino, Living_quarters
+                - Interstellar -> Exchange, Luxury_condo
+                - Portal -> Hell_casino, Arcology, Bazaar
+                - Galaxy -> Resort
+                - Eden -> Eternal_bank
+                - Tech -> Banking(4)
+            
+            Population:
+                - City -> Farm, Basic_housing, Cottage, Apartment, Lodge
+                - Space -> Living_quarters, Titan_quarters
+                - Portal -> Dig_demon, Arcology, Hovel
+                - Interstellar -> Habitat, Luxury_condo
+                - Galaxy -> Consulate, Embassy, Dormitory
+                - Eden -> Rectory
+                - Tauceti -> Tauceti_casino, Tau_housing, Colony
+                - Race / Gense /Challenge -> Lone_survivor(=1)
+            
+            Slave:
+                - City -> Slave_pen
+            
+            Captive_race:
+                - City -> Captive_housing
 
-        if (global.city['nanite_factory']){
-            let gain = global.city.nanite_factory.count * spatialReasoning(2500);
-            caps['Nanite'] += gain;
-            breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
-        }
-        if (p_on['transmitter'] && global.race['artifical']){
-            let gain = p_on['transmitter'] * spatialReasoning(100);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_transmitter')] = gain+'v';
+            Captive_cattle:
+                - City -> Captive_housing
+            
+            Nanite:
+                - City -> Nanite_factory
+
+            Knowledge:
+                - City -> University, Library, Wardenclyffe, Biolab, Shrine
+                - Space -> Satellite, Observatory, Exotic_lab, Decoder, World_controller
+                - Interstellar -> Laboratory
+                - Portal -> Archaeology, Sensor_drone, Twisted_lab
+                - Galaxy -> Symposium, Telemetry_beacon, Scavenger
+                - Tauceti -> Infectious_disease_lab, Womling_lab
+                - Race / Genes / Challenges -> Lone_survivor, Logical, Warlord
+                - Tech -> Isolation, Alien_outpost
+                - Misc -> Omniscience, Research_station
+            
+            Zen:
+                - City -> Meditation
+
+            Mana:
+                - City -> Wardenclyffe, Pylon
+                - Space -> Pylon
+                - Interstellar -> Laboratory
+
+            Food:
+                - City -> Wardenclyffe, Transmitter, Silo, Compost, Soul_well, Smokehouse
+                - Space -> Biodome
+                - Tauceti -> Tau_farm
+
+            Stone:
+                - City -> Rock_quarry
+            
+            Chrysotile:
+                - City -> Rock_quarry
+            
+            Lumber:
+                - City -> Lumber_yard, Graveyard, Sawmill
+
+            Oil:
+                - City -> Oil_well, Oil_depot
+                - Space -> Propellant_depot, Gas_storage
+                - Portal -> Pumpjack
+                - Interstellar -> Nexus, Xfer_station
+                - Tauceti -> Refueling_station, Orbital_platform
+
+            Uranium:
+                - City -> Oil_depot
+                - Space -> Gas_storage
+                - Interstellar -> Xfer_station
+                - Galaxy -> Gateway_depot
+
+            Iridium:
+                - Space -> Moon_base
+
+            Helium_3:
+                - City -> Oil_depot
+                - Space -> Propellant_depot, Gas_storage, Helium_mine
+                - Portal -> Pumpjack
+                - Interstellar -> Nexus, Xfer_station
+                - Tauceti -> Orbital_station, Refueling_station
+
+            Deuterium:
+                - Interstellar -> Nexus, Xfer_station
+            
+            Neutronium:
+                - Space -> Outpost
+                - Interstellar -> Cargo_yard, Neutron_miner
+                - Galaxy -> Gateway_depot
+
+            Infernite:
+                - Portal -> Fortress
+                - Interstellar -> Cargo_yard
+                - Galaxy -> Gateway_depot
+
+            Elerium:
+                - Space -> Exotic_lab, Space_station, Elerium_contain
+                - Interstellar -> Nexus
+                - Portal -> Shadow_mine
+                - Galaxy -> Gateway_station, Gateway_depot
+                - Eden -> Elerium_containment, Corruptor
+                - Tauceti -> Infectious_disease_lab
+
+            Nano_tube:
+                - Galaxy -> Gateway_depot
+
+            Water:
+                - Space -> Titan_spaceport
+
+            Materials:
+                - Tauceti -> Mining_pit
+            
+            Asphodel_Powder:
+                - Eden -> Encampment
+
+            Mtrade (Max trade routes):
+                - City -> Trade, Temple, Wharf, Storage_yard
+                - Space -> Ziggurat, Gps
+                - Portal -> Bazaar
+                - Galaxy (gt_route) -> Freighter, Super_freighter
+                - Race / Genes / Challenge -> Banana
+                - Tech -> Railway
+            
+            Sus:
+                - City -> Wardenclyffe, Scientist, Coal_power, Pylon, Conceal_ward
+                - Space -> Pylon
+                - Portal -> Soul_capacitor
+                - Tauceti -> Pylon
+                - Race / Genes / Challenge -> Casting, Transmute, Explosives, Military, Roguemagic, Nexus, Syphon
+            
+            Omniscience
+            Cipher
+
+        lCaps:
+            
+            - Professor -> University, Lone_survivor, Infectious_disease_lab, Twisted_lab
+            
+            - Scientist -> Wardenclyffe, Exotic_lab, Laboratory, Infectious_disease_lab, Twisted_lab, Wish
+
+            - Space_miner -> Space_station
+
+            - Craftsman -> Foundry, Fabrication, Tau_factory, Womling_station, Stellar_forge, Demon_forge, Sacred_smelter
+            
+            - Cement_worker -> Fabrication, Tau_factory, Hell_factory, Womling_station, Cement_plant, Eden_cement, Red_factory
+
+            - Hell_surveyor -> Carport
+
+            - Archaeologist -> Archaeology
+
+            - Ghost_trapper -> Ectoplasm_processor
+
+            - Elysium_miner -> Elsanite_mine
+
+            - Miner -> Mine, Dig_demon, Red_mine
+
+            - Coal_miner -> Coal_mine, Red_mine
+
+            - Banker -> Bank, Spc_casino, Hell_casino, Tauceti_casino
+
+            - Entertainer -> Amphitheatre, Casino, Spc_casino, Hell_casino, Tauceti_casino, Resort
+
+            - Garrison -> Garrison, Space_barracks, Cruiser, Brute, Wish, Starbase, Bunker, Fire_support_base, World_control / Occupation, Operating_base, Fob
+
+            - Colonist -> Living_quarters
+
+            - Titan_colonist -> Titan_quarters
+
+            - Priest -> Temple, Ziggurat, Rectory, Wish
+
+            - Pit_miner -> Mining_pit
+
+            - Torturer -> Captive_housing
+
+            - Crew -> Bolognium_ship, Scout_ship, Corvette_ship, Frigate_ship, Cruiser_ship, Dreadnought, Freighter, Super_freighter, Armed_miner, Scavenger, Transport
+        */
         }
-        if (global.city['pylon'] || global.space['pylon'] || global.tauceti['pylon']){
-            let gain = 0;
-            let name = 'city_pylon';
-            if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.space['pylon']){
-                gain = spatialReasoning(2) * global.space.pylon.count;
-                name = 'space_red_pylon';
+
+        let city=actions.city;
+        let space_home=actions.space.spc_home, space_titan=actions.space.spc_titan, space_red=actions.space.spc_red;
+        let portal=actions.portal;
+        let inter=actions.interstellar;
+        let eden=actions.eden;
+        let tau_home=actions.tauceti.tau_home;
+        let s_name=global.race.species;
+        //Res Caps ------------------
+        // Storage - General
+        {
+            if (global.city['shed']){
+                var multiplier = storageMultipler();
+                let label = global.tech['storage'] <= 2 ? loc('city_shed_title1') : (global.tech['storage'] >= 4 ? loc('city_shed_title3') : loc('city_shed_title2'));
+                let shed=city.shed;
+                for (const res of shed.res()){
+                    if (global.resource[res].display){
+                        let gain = global.city.shed.count * spatialReasoning(shed.val(res) * multiplier);
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
             }
-            else if (global.tech['isolation'] && global.tauceti['pylon']){
-                gain = spatialReasoning(2) * global.tauceti.pylon.count;;
-                name = 'tau_home_pylon';
+            if (global.interstellar['warehouse']){
+                var multiplier = storageMultipler();
+                let label = loc('interstellar_alpha_name');
+                let warehouse=inter.int_alpha.warehouse;
+                for (const res of warehouse.res()){
+                    if (global.resource[res].display){
+                        let gain = global.interstellar.warehouse.count * spatialReasoning(warehouse.val(res) * multiplier);
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
             }
-            else if (global.city['pylon']){
-                gain = spatialReasoning(5) * global.city.pylon.count;;
+            if (global.eden['warehouse']){
+                var multiplier = storageMultipler(global.race['warlord'] ? 1 : 0.2);
+                if (global.race['warlord'] && global.eden['corruptor']){
+                    multiplier *= 1 + (p_on['corruptor'] || 0) * (global.tech.asphodel >= 12 ? (global.tech.asphodel >= 13 ? 0.16 : 0.12) : 0.08);
+                }
+                let label = loc('eden_asphodel_name');
+                let warehouse=eden.eden_asphodel.warehouse;
+                for (const res of warehouse.res()){
+                    if (global.resource[res].display){
+                        let gain = global.eden.warehouse.count * spatialReasoning(warehouse.val(res) * multiplier);
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
             }
-
-            caps['Mana'] += gain;
-            breakdown.c.Mana[loc(name)] = gain+'v';
-        }
-        if (global.city['captive_housing']){
-            let houses = global.city.captive_housing.count;
-            global.city.captive_housing.raceCap = houses * (global.tech['unfathomable'] && global.tech.unfathomable >= 3 ? 3 : 2);
-            global.city.captive_housing.cattleCap = houses * 5;
-        }
-        if (global.city['farm']){
-            if (global.tech['farm']){
-                let pop = global.city.farm.count * actions.city.farm.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('city_farm')] = pop + 'v';
+            if (global.portal['warehouse']){
+                var multiplier = storageMultipler();
+                if (global.race['warlord'] && global.eden['corruptor'] && global.tech.asphodel >= 12){
+                    multiplier *= 1 + (p_on['corruptor'] || 0) * (global.tech.asphodel >= 13 ? 0.16 : 0.12);
+                }
+                let label = global.tech['storage'] <= 2 ? loc('city_shed_title1') : (global.tech['storage'] >= 4 ? loc('city_shed_title3') : loc('city_shed_title2'));
+                let warehouse=portal.prtl_wasteland.warehouse;
+                for (const res of warehouse.res()){
+                    if (global.resource[res].display){
+                        let gain = global.portal.warehouse.count * spatialReasoning(warehouse.val(res) * multiplier);
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
+                let cc_gain = global.portal.warehouse.count * (65 + global.portal.warehouse.rank * 35);
+                caps['Crates'] += cc_gain;
+                breakdown.c['Crates'][label] = cc_gain+'v';
+                caps['Containers'] += cc_gain;
+                breakdown.c['Containers'][label] = cc_gain+'v';
+            }
+            if (global.space['storehouse']){
+                var multiplier = tpStorageMultiplier('storehouse',false);
+                var h_multiplier = tpStorageMultiplier('storehouse',true);
+                let label = loc('space_storehouse_title');
+                let storehouse=space_titan.storehouse;
+                for (const res of storehouse.res()){
+                    if (global.resource[res].display){
+                        let heavy = storehouse.heavy(res);
+                        let gain = global.space.storehouse.count * spatialReasoning(storehouse.val(res) * (heavy ? h_multiplier : multiplier));
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
             }
-        }
-        if (global.city['wharf']){
-            let vol = global.tech['world_control'] ? 15 : 10;
-            if (global.tech['particles'] && global.tech['particles'] >= 2){
-                vol *= 2;
+            if (global.tauceti['repository']){
+                var multiplier = tpStorageMultiplier('repository');
+                let label = loc('tech_repository');
+                let repo=tau_home.repository;
+                let repo_count=global.tauceti.repository.count;
+                for (const res of repo.res()){
+                    if (global.resource[res].display){
+                        let gain = repo_count * spatialReasoning(repo.val(res) * multiplier);
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
+                if (global.tech['isolation']){
+                    let containers = 250;
+                    caps['Containers'] += (repo_count * containers);
+                    breakdown.c.Containers[loc('tech_repository')] = (repo_count * containers) + 'v';
+                    caps['Crates'] += (repo_count * containers);
+                    breakdown.c.Crates[loc('tech_repository')] = (repo_count * containers) + 'v';
+                }
+            }
+            if (global.space['garage']){
+                let garage=space_red.garage;
+
+                var multiplier = garage.multiplier(false);
+                var h_multiplier = garage.multiplier(true);
+                let label = loc('space_red_garage_title');
+                for (const res of garage.res()){
+                    if (global.resource[res].display){
+                        let heavy = garage.heavy(res);
+                        let gain = global.space.garage.count * spatialReasoning(garage.val(res) * (heavy ? h_multiplier : multiplier));
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
+            }
+            if (global.portal['harbor'] && p_on['harbor']){
+                let multiplier = 1;
+                if (global.race['warlord'] && global.eden['corruptor'] && global.tech?.asphodel >= 12){
+                    multiplier *= 1 + (p_on['corruptor'] || 0) * (global.tech.asphodel >= 13 ? 0.12 : 0.1);
+                }
+                let label = loc('portal_harbor_title');
+                let harbor=portal.prtl_lake.harbor;
+                for (const res of harbor.res()){
+                    if (global.resource[res].display){
+                        let gain = p_on['harbor'] * spatialReasoning(harbor.val(res) * multiplier);
+                        caps[res] += gain;
+                        breakdown.c[res][label] = gain+'v';
+                    }
+                };
             }
-            caps['Crates'] += (global.city.wharf.count * vol);
-            breakdown.c.Crates[loc('city_wharf')] = (global.city.wharf.count * vol) + 'v';
-            caps['Containers'] += (global.city.wharf.count * vol);
-            breakdown.c.Containers[loc('city_wharf')] = (global.city.wharf.count * vol) + 'v';
-        }
-        if (global.space['munitions_depot']){
-            let vol = 25;
-            caps['Crates'] += (global.space.munitions_depot.count * vol);
-            breakdown.c.Crates[loc('tech_munitions_depot')] = (global.space.munitions_depot.count * vol) + 'v';
-            caps['Containers'] += (global.space.munitions_depot.count * vol);
-            breakdown.c.Containers[loc('tech_munitions_depot')] = (global.space.munitions_depot.count * vol) + 'v';
         }
-        if (global.interstellar['cargo_yard']){
-            caps['Crates'] += (global.interstellar.cargo_yard.count * 50);
-            breakdown.c.Crates[loc('interstellar_cargo_yard_title')] = (global.interstellar.cargo_yard.count * 50) + 'v';
-            caps['Containers'] += (global.interstellar.cargo_yard.count * 50);
-            breakdown.c.Containers[loc('interstellar_cargo_yard_title')] = (global.interstellar.cargo_yard.count * 50) + 'v';
+        // Crates & Containters
+            // Crates Only
+        {
+            if (global.city['wharf']){
+                let vol = global.tech['world_control'] ? 15 : 10;
+                if (global.tech['particles'] && global.tech['particles'] >= 2){
+                    vol *= 2;
+                }
+                let wharf_count=global.city.wharf.count*vol;
+
+                caps['Crates'] += wharf_count;
+                breakdown.c.Crates[loc('city_wharf')] = (wharf_count) + 'v';
+                caps['Containers'] += wharf_count;
+                breakdown.c.Containers[loc('city_wharf')] = (wharf_count) + 'v';
+            }
+            if (global.space['munitions_depot']){
+                let vol = 25 * global.space.munition_depot.count;
+                caps['Crates'] += vol;
+                breakdown.c.Crates[loc('tech_munitions_depot')] = vol + 'v';
+                caps['Containers'] += vol;
+                breakdown.c.Containers[loc('tech_munitions_depot')] = vol + 'v';
+            }
+            if (global.city['storage_yard']){
+                let size = global.tech.container >= 3 ? 20 : 10;
+                if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
+                    size += 10;
+                }
+                if (global.tech['world_control']){
+                    size += 10;
+                }
+                if (global.tech['particles'] && global.tech['particles'] >= 2){
+                    size *= 2;
+                }
+                let stor_count=global.city['storage_yard'].count * size
+                caps['Crates'] += stor_count;
+                breakdown.c.Crates[loc('city_storage_yard')] = stor_count + 'v';
+            }
+            if (global.space['garage']){
+                let g_vol = global.tech['particles'] >= 4 ? 20 + global.tech['supercollider'] : 20;
+                if (global.tech['world_control'] || global.race['cataclysm']){
+                    g_vol += 10;
+                }
+                let g_count=(global.space.garage.count * g_vol)
+                caps['Containers'] += g_count;
+                breakdown.c.Containers[loc('space_red_garage_title')] = g_count + 'v';
+                if (global.race['cataclysm'] || global.race['orbit_decayed']){
+                    caps['Crates'] += g_count;
+                    breakdown.c.Crates[loc('space_red_garage_title')] = g_count + 'v';
+                }
+            }
+            if (global.tech['tp_depot']){
+                let tp_count=(global.tech.tp_depot * 50)
+                caps['Containers'] += tp_count;
+                breakdown.c.Containers[loc('galaxy_gateway_depot')] = tp_count + 'v';
+                caps['Crates'] += tp_count;
+                breakdown.c.Crates[loc('galaxy_gateway_depot')] = tp_count + 'v';
+            }
+            if (global.interstellar['cargo_yard']){
+                let cargo_count=global.interstellar.cargo_yard.count;
+                let c_count=cargo_count*50
 
-            let gain = (global.interstellar.cargo_yard.count * spatialReasoning(200));
-            caps['Neutronium'] += gain;
-            breakdown.c.Neutronium[loc('interstellar_cargo_yard_title')] = gain+'v';
+                caps['Crates'] += c_count;
+                breakdown.c.Crates[loc('interstellar_cargo_yard_title')] = c_count + 'v';
+                caps['Containers'] += c_count;
+                breakdown.c.Containers[loc('interstellar_cargo_yard_title')] = c_count + 'v';
 
-            gain = (global.interstellar.cargo_yard.count * spatialReasoning(150));
-            caps['Infernite'] += gain;
-            breakdown.c.Infernite[loc('interstellar_cargo_yard_title')] = gain+'v';
-        }
-        if (global.interstellar['neutron_miner'] && p_on['neutron_miner']){
-            let gain = (p_on['neutron_miner'] * spatialReasoning(500));
-            caps['Neutronium'] += gain;
-            breakdown.c.Neutronium[loc('interstellar_neutron_miner_title')] = gain+'v';
+                let gain = (cargo_count * spatialReasoning(200));
+                caps['Neutronium'] += gain;
+                breakdown.c.Neutronium[loc('interstellar_cargo_yard_title')] = gain+'v';
+
+                gain = (cargo_count * spatialReasoning(150));
+                caps['Infernite'] += gain;
+                breakdown.c.Infernite[loc('interstellar_cargo_yard_title')] = gain+'v';
+            }
         }
-        if (global.city['storage_yard']){
-            let size = global.tech.container >= 3 ? 20 : 10;
-            if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
-                size += 10;
+            // Containers Only
+            if (global.city['warehouse']){
+                let volume = global.tech['steel_container'] >= 2 ? 20 : 10;
+                if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
+                    volume += 10;
+                }
+                if (global.tech['world_control']){
+                    volume += 10;
+                }
+                if (global.tech['particles'] && global.tech['particles'] >= 2){
+                    volume *= 2;
+                }
+                let w_count=(global.city['warehouse'].count * volume)
+                caps['Containers'] += w_count;
+                breakdown.c.Containers[loc('city_warehouse')] = w_count + 'v';
             }
-            if (global.tech['world_control']){
-                size += 10;
+            //Both
+        {
+            if (p_on['arcology']){
+                let arcology=portal.prtl_ruins.arcology;
+                let a_count=p_on['arcology']
+                let a_title=loc('portal_arcology_title')
+
+                let pop = a_count * arcology.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][a_title] = pop + 'v';
+                lCaps['garrison'] += a_count * arcology.soldiers();
+
+                let c_gain=(a_coun * Math.round(quantum_level) * 10)
+                caps['Containers'] += c_gain;
+                breakdown.c.Containers[a_title] = c_gain + 'v';
+                caps['Crates'] += c_gain;
+                breakdown.c.Crates[a_title] = c_gain + 'v';
+
+                let sup = hellSupression('ruins');
+                let money = (a_count * spatialReasoning(bank_vault() * 8 * sup.supress));
+                caps['Money'] += money;
+                breakdown.c.Money[a_title] = money+'v';
+            }
+            if (global.portal['bazaar'] && global.portal['spire']){
+                let sb_count=global.portal.bazaar.count * global.portal.spire.count
+                let containers = (sb_count * 8);
+                caps['Containers'] += containers;
+                breakdown.c.Containers[loc('portal_bazaar_title')] = containers + 'v';
+                caps['Crates'] += containers;
+                breakdown.c.Crates[loc('portal_bazaar_title')] = containers + 'v';
+
+                let money = spatialReasoning(bank_vault() * sb_count / 3);
+                caps['Money'] += money;
+                breakdown.c.Money[loc('portal_bazaar_title')] = money+'v';
+            }
+            if (support_on['colony']){
+                let containers = support_on['colony'] * (global.tech['isolation'] ? 900 : 250);
+                caps['Containers'] += containers;
+                breakdown.c.Containers[loc('tau_home_colony')] = containers + 'v';
+                caps['Crates'] += containers;
+                breakdown.c.Crates[loc('tau_home_colony')] = containers + 'v';
+
+                let pop = support_on['colony'] * actions.tauceti.tau_home.colony.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc('tau_home_colony')] = pop + 'v';
             }
-            if (global.tech['particles'] && global.tech['particles'] >= 2){
-                size *= 2;
+            if (global.galaxy['gateway_depot']){
+                let g_count=global.galaxy.gateway_depot.count
+                let containers = g_count * (global.tech['world_control'] ? 150 : 100);
+                caps['Crates'] += containers;
+                breakdown.c.Crates[loc('galaxy_gateway_depot')] = containers + 'v';
+                caps['Containers'] += containers;
+                breakdown.c.Containers[loc('galaxy_gateway_depot')] = containers + 'v';
+
+                let label = loc('galaxy_gateway_depot');
+                let multiplier = gatewayStorage();
+
+                if (global.resource.Uranium.display){
+                    let gain = (g_count * (spatialReasoning(3000 * multiplier)));
+                    caps['Uranium'] += gain;
+                    breakdown.c.Uranium[label] = gain+'v';
+                }
+
+                if (global.resource.Nano_Tube.display){
+                    let gain = (g_count * (spatialReasoning(250000 * multiplier)));
+                    caps['Nano_Tube'] += gain;
+                    breakdown.c.Nano_Tube[label] = gain+'v';
+                }
+
+                if (global.resource.Neutronium.display){
+                    let gain = (g_count * (spatialReasoning(9001 * multiplier)));
+                    caps['Neutronium'] += gain;
+                    breakdown.c.Neutronium[label] = gain+'v';
+                }
+
+                if (global.resource.Infernite.display){
+                    let gain = (g_count * (spatialReasoning(6660 * multiplier)));
+                    caps['Infernite'] += gain;
+                    breakdown.c.Infernite[label] = gain+'v';
+                }
+
+                if (global.resource.Elerium.display && p_on['gateway_depot'] && p_on['s_gate']){
+                    let gain = (p_on['gateway_depot'] * (spatialReasoning(200)));
+                    caps['Elerium'] += gain;
+                    breakdown.c.Elerium[label] = gain+'v';
+                }
             }
-            caps['Crates'] += (global.city['storage_yard'].count * size);
-            breakdown.c.Crates[loc('city_storage_yard')] = (global.city['storage_yard'].count * size) + 'v';
         }
-        if (global.space['garage']){
-            let g_vol = global.tech['particles'] >= 4 ? 20 + global.tech['supercollider'] : 20;
-            if (global.tech['world_control'] || global.race['cataclysm']){
-                g_vol += 10;
-            }
-            caps['Containers'] += (global.space.garage.count * g_vol);
-            breakdown.c.Containers[loc('space_red_garage_title')] = (global.space.garage.count * g_vol) + 'v';
-            if (global.race['cataclysm'] || global.race['orbit_decayed']){
-                caps['Crates'] += (global.space.garage.count * g_vol);
-                breakdown.c.Crates[loc('space_red_garage_title')] = (global.space.garage.count * g_vol) + 'v';
+        // Money -HERE
+        {
+            if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
+                let vault = global.race['cataclysm'] || global.race['orbit_decayed'] ? bank_vault() * 4 : bank_vault();
+                let banks = global.race['cataclysm'] || global.race['orbit_decayed'] ? p_on['spaceport'] : global.city['bank'].count;
+
+                let gain = (banks * spatialReasoning(vault));
+                caps['Money'] += gain;
+
+                if (global.race['cataclysm'] || global.race['orbit_decayed']){
+                    breakdown.c.Money[loc('space_red_spaceport_title')] = gain+'v';
+                }
+                else {
+                    breakdown.c.Money[loc('city_bank')] = gain+'v';
+                }
+
+                if (global.interstellar['exchange']){
+                    if (global.eden['eternal_bank']){ banks += global.eden.eternal_bank.count * 2; }
+                    let g_vault = spatialReasoning(int_on['exchange'] * (vault * banks / 18));
+                    if (global.race['inflation']){
+                        g_vault *= 2;
+                    }
+                    if (global.tech.banking >= 13){
+                        if (global.galaxy['freighter']){
+                            g_vault *= 1 + (gal_on['freighter'] * 0.03);
+                        }
+                        if (global.galaxy['super_freighter']){
+                            g_vault *= 1 + (gal_on['super_freighter'] * 0.08);
+                        }
+                    }
+                    g_vault = Math.round(g_vault);
+                    caps['Money'] += g_vault;
+                    breakdown.c.Money[loc('interstellar_exchange_bd')] = g_vault+'v';
+                }
             }
-        }
-        if (global.tech['tp_depot']){
-            caps['Containers'] += (global.tech.tp_depot * 50);
-            breakdown.c.Containers[loc('galaxy_gateway_depot')] = (global.tech.tp_depot * 50) + 'v';
-            caps['Crates'] += (global.tech.tp_depot * 50);
-            breakdown.c.Crates[loc('galaxy_gateway_depot')] = (global.tech.tp_depot * 50) + 'v';
-        }
-        if (global.city['warehouse']){
-            let volume = global.tech['steel_container'] >= 2 ? 20 : 10;
-            if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
-                volume += 10;
+            if (global.eden['eternal_bank']){
+                let vault = bank_vault() * (global.race['warlord'] ? 20 : 10);
+                if (global.race['warlord'] && global.eden['corruptor'] && global.tech.asphodel >= 12){
+                    vault *= 1 + (p_on['corruptor'] || 0) * 0.08;
+                }
+                let banks = global.eden.eternal_bank.count;
+                let gain = (banks * spatialReasoning(vault));
+                caps['Money'] += gain;
+                breakdown.c.Money[loc('eden_eternal_bank_title')] = gain+'v';
             }
-            if (global.tech['world_control']){
-                volume += 10;
+            if (global.space['titan_bank']){
+                let vault = bank_vault() * 2;
+                let banks = global.space.titan_bank.count;
+                let gain = (banks * spatialReasoning(vault));
+                caps['Money'] += gain;
+                breakdown.c.Money[`${planetName().titan} ${loc('city_bank')}`] = gain+'v';
             }
-            if (global.tech['particles'] && global.tech['particles'] >= 2){
-                volume *= 2;
+            if (global.tauceti['colony'] && global.tech['isolation']){
+                let vault = bank_vault() * 25;
+                let gain = (global.tauceti.colony.count * spatialReasoning(vault));
+                caps['Money'] += gain;
+                breakdown.c.Money[loc('tau_home_colony')] = gain+'v';
             }
-            caps['Containers'] += (global.city['warehouse'].count * volume);
-            breakdown.c.Containers[loc('city_warehouse')] = (global.city['warehouse'].count * volume) + 'v';
-        }
-        if (global.city['rock_quarry']){
-            let gain = BHStorageMulti(global.city.rock_quarry.count * spatialReasoning(100));
-            caps['Stone'] += gain;
-            breakdown.c.Stone[loc('city_rock_quarry')] = gain+'v';
+            if (global.city['casino'] || global.space['spc_casino'] || global.tauceti['tauceti_casino'] || global.portal['hell_casino']){
+                let casinos = 0;
+                if (global.city['casino'] && global.city.casino.count > 0){
+                    casinos += global.city.casino.count;
+                }
+                if (global.space['spc_casino'] && global.space.spc_casino.count > 0){
+                    casinos += global.space.spc_casino.count;
+                }
+                if (global.tauceti['tauceti_casino'] && global.tauceti.tauceti_casino.count > 0){
+                    casinos += global.tauceti.tauceti_casino.count;
+                }
+                if (global.portal['hell_casino'] && global.portal.hell_casino.count > 0){
+                    casinos += global.portal.hell_casino.count;
+                }
 
-            caps['Chrysotile'] += gain;
-            breakdown.c.Chrysotile[loc('city_rock_quarry')] = gain+'v';
-        }
-        if (global.city['lumber_yard']){
-            let gain = BHStorageMulti(global.city.lumber_yard.count * spatialReasoning(100));
-            caps['Lumber'] += gain;
-            breakdown.c.Lumber[loc('city_lumber_yard')] = gain+'v';
-        }
-        else if (global.city['graveyard']){
-            let gain = BHStorageMulti(global.city.graveyard.count * spatialReasoning(100));
-            caps['Lumber'] += gain;
-            breakdown.c.Lumber[loc('city_graveyard')] = gain+'v';
-        }
-        if (global.city['sawmill']){
-            let gain = BHStorageMulti(global.city.sawmill.count * spatialReasoning(200));
-            caps['Lumber'] += gain;
-            breakdown.c.Lumber[loc('city_sawmill')] = gain+'v';
-        }
-        if (global.city['mine']){
-            lCaps['miner'] += jobScale(global.city.mine.count);
-        }
-        if (global.portal['dig_demon'] && global.race['warlord']){
-            let demons = global.portal.dig_demon.on * actions.portal.prtl_wasteland.dig_demon.citizens();
-            caps[global.race.species] += demons;
-            breakdown.c[global.race.species][loc('portal_dig_demon_title')] = demons + 'v';
-            lCaps['miner'] += demons;
-            global.civic.miner.max = demons;
-            global.civic.miner.workers = demons;
-            global.civic.miner.assigned = demons;
-        }
-        if (global.city['coal_mine']){
-            lCaps['coal_miner'] += jobScale(global.city.coal_mine.count);
-        }
-        if (global.city['bank']){
-            lCaps['banker'] += jobScale(global.city.bank.count);
-        }
-        if (global.city['amphitheatre']){
-            let athVal = govActive('athleticism',1);
-            lCaps['entertainer'] += jobScale(athVal ? (global.city.amphitheatre.count * athVal) : global.city.amphitheatre.count);
-        }
-        if (global.city['casino']){
-            if (global.tech['theatre'] && !global.race['joyless']){
-                lCaps['entertainer'] += jobScale(global.city.casino.count);
+                let vault = casinos * casino_vault();
+                caps['Money'] += vault;
+                breakdown.c.Money[structName('casino')] = vault+'v';
             }
-        }
-        if (global.space['spc_casino']){
-            if (global.tech['theatre'] && !global.race['joyless']){
-                lCaps['entertainer'] += jobScale(global.space.spc_casino.count);
+            if (global.galaxy['resort']){
+                let vault = p_on['resort'] * spatialReasoning(global.tech['world_control'] ? 1875000 : 1500000);
+                caps['Money'] += vault;
+                breakdown.c.Money[loc('galaxy_resort')] = vault+'v';
             }
-            if (global.race['orbit_decayed']){
-                lCaps['banker'] += jobScale(global.space.spc_casino.count);
+            if (global.tech['banking'] >= 4){
+                let cm = 250;
+                if (global.tech.banking >= 14){
+                    cm = 1000000;
+                }
+                else if (global.tech.banking >= 11){
+                    cm = 1000;
+                }
+                else if (global.tech.banking >= 6){
+                    cm = 600;
+                }
+                let gain = cm * (global.resource[global.race.species].amount + global.civic.garrison.workers);
+                if (global.race['high_pop']){
+                    gain = highPopAdjust(gain);
+                }
+                caps['Money'] += gain;
+                breakdown.c.Money[global.tech.banking >= 14 ? loc('tech_crypto_currency') : loc('tech_bonds')] = gain+'v';
             }
         }
-        if (global.portal['hell_casino']){
-            if (global.tech['theatre'] && !global.race['joyless']){
-                lCaps['entertainer'] += jobScale(global.portal.hell_casino.count * 3);
+        // Population
+        {
+            if (global.tauceti['tauceti_casino']){
+                if (global.tech['theatre'] && !global.race['joyless']){
+                    lCaps['entertainer'] += jobScale(global.tauceti.tauceti_casino.count);
+                }
+                if (global.tech['isolation']){
+                    lCaps['banker'] += jobScale(global.tauceti.tauceti_casino.count);
+
+                    let pop = p_on['tauceti_casino'] * actions.tauceti.tau_home.tauceti_casino.citizens();
+                    caps[global.race.species] += pop;
+                    breakdown.c[global.race.species][structName('casino')] = pop + 'v';
+                }
             }
-            lCaps['banker'] += jobScale(global.portal.hell_casino.count);
-        }
-        if (global.tauceti['tauceti_casino']){
-            if (global.tech['theatre'] && !global.race['joyless']){
-                lCaps['entertainer'] += jobScale(global.tauceti.tauceti_casino.count);
+            if (global.city['basic_housing']){
+                let pop = global.city.basic_housing.count * actions.city.basic_housing.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][housingLabel('small')] = pop + 'v';
             }
-            if (global.tech['isolation']){
-                lCaps['banker'] += jobScale(global.tauceti.tauceti_casino.count);
-
-                let pop = p_on['tauceti_casino'] * actions.tauceti.tau_home.tauceti_casino.citizens();
+            if (global.tauceti['tau_housing'] && global.tech['isolation']){
+                let pop = global.tauceti.tau_housing.count * actions.tauceti.tau_home.tau_housing.citizens();
                 caps[global.race.species] += pop;
-                breakdown.c[global.race.species][structName('casino')] = pop + 'v';
+                breakdown.c[global.race.species][housingLabel('small')] = pop + 'v';
             }
-        }
-        if (global.galaxy['resort']){
-            if (global.tech['theatre'] && !global.race['joyless']){
-                lCaps['entertainer'] += jobScale(p_on['resort'] * 2);
+            if (global.city['cottage']){
+                let pop = global.city.cottage.count * actions.city.cottage.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][housingLabel('medium')] = pop + 'v';
+                if (global.tech['home_safe']){
+                    let gain = (global.city['cottage'].count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
+                    caps['Money'] += gain;
+                    breakdown.c.Money[housingLabel('medium')] = gain+'v';
+                }
             }
-        }
-        if (global.city['cement_plant']){
-            lCaps['cement_worker'] += jobScale(global.city.cement_plant.count * 2);
-        }
-        if (global.eden['eden_cement']){
-            let ec = p_on['eden_cement'] || 0;
-            lCaps['cement_worker'] += jobScale(ec * 5);
-        }
-        if (global.race['orbit_decayed'] && p_on['red_factory']){
-            lCaps['cement_worker'] += jobScale(p_on['red_factory']);
-        }
-        if (global.race['parasite'] && !global.tech['isolation']){
-            lCaps['garrison'] += jobScale(traits.parasite.vars()[0]);
-        }
-        if (global.city['garrison']){
-            lCaps['garrison'] += global.city.garrison.on * actions.city.garrison.soldiers();
-        }
-        if (global.space['space_barracks'] && !global.race['fasting']){
-            let soldiers = actions.space.spc_red.space_barracks.soldiers();
-            lCaps['garrison'] += Math.round(global.space.space_barracks.on * soldiers);
-        }
-        if (global.interstellar['cruiser']){
-            let soldiers = actions.interstellar.int_proxima.cruiser.soldiers();
-            lCaps['garrison'] += int_on['cruiser'] * soldiers;
-        }
-        if (global.portal['brute']){
-            let soldiers = actions.portal.prtl_wasteland.brute.soldiers();
-            lCaps['garrison'] += global.portal.brute.on * soldiers;
-        }
-        if (global.race['wish'] && global.race['wishStats']){
-            lCaps['garrison'] += jobScale(global.race.wishStats.troop);
-        }
-        if (p_on['s_gate'] && global.galaxy['starbase']){
-            let soldiers = actions.galaxy.gxy_gateway.starbase.soldiers();
-            lCaps['garrison'] += p_on['starbase'] * soldiers;
-        }
-        if (global.eden['bunker']){
-            let soldiers = actions.eden.eden_asphodel.bunker.soldiers();
-            lCaps['garrison'] += support_on['bunker'] * soldiers;
-        }
-        if (global.eden['fire_support_base'] && global.eden.fire_support_base.count === 100){
-            lCaps['garrison'] += actions.eden.eden_elysium.fire_support_base.soldiers();
-        }
-        if (global.race['orbit_decayed'] && global.space.hasOwnProperty('red_mine')){
-            lCaps['miner'] += jobScale(support_on['red_mine']);
-            lCaps['coal_miner'] += jobScale(support_on['red_mine']);
-        }
-        if (!global.tech['world_control']){
-            let occ_amount = jobScale(global.civic.govern.type === 'federation' ? 15 : 20);
-            for (let i=2; i>=0; i--){
-                if (global.civic.foreign[`gov${i}`].occ){
-                    lCaps['garrison'] -= occ_amount;
-                    if (lCaps['garrison'] < 0){
-                        global.civic.foreign[`gov${i}`].occ = false;
-                        lCaps['garrison'] += occ_amount;
-                        global.civic.garrison.workers += occ_amount;
-                        messageQueue(loc('civics_garrison_autodeoccupy_desc',[govTitle(i)]),'danger',false,['spy']);
-                    }
+            if (global.city['apartment']){
+                let pop = p_on['apartment'] * actions.city.apartment.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][housingLabel('large')] = pop + 'v';
+                if (global.tech['home_safe']){
+                    let gain = (p_on['apartment']  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
+                    caps['Money'] += gain;
+                    breakdown.c.Money[housingLabel('large')] = gain+'v';
                 }
             }
-        }
-        if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {
-            caps['Slave'] = global.city.slave_pen.count * 4;
-            breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = global.city.slave_pen.count * 4 + 'v';
-
-            if (caps['Slave'] < global.resource.Slave.amount){
-                global.resource.Slave.amount = caps['Slave'];
+            if (global.eden['rectory']){
+                let pop = p_on['rectory'] * actions.eden.eden_asphodel.rectory.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc(`eden_rectory_title`)] = pop + 'v';
             }
-        }
-        if (global.race['calm'] && global.city['meditation']) {
-            caps['Zen'] = global.city.meditation.count * traits.calm.vars()[0];
-            breakdown.c.Zen[loc('city_meditation')] = global.city.meditation.count * traits.calm.vars()[0] + 'v';
-            global.resource.Zen.amount = (global.resource[global.race.species].amount * 2) + global.civic.garrison.workers;
-            if (global.resource.Zen.amount > global.resource.Zen.max){
-                global.resource.Zen.amount = global.resource.Zen.max;
+            if (p_on['s_gate'] && global.galaxy['consulate'] && global.galaxy.consulate.count >= 1){
+                let pop = actions.galaxy.gxy_alien1.consulate.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc('galaxy_consulate')] = pop + 'v';
             }
-            let zen = global.resource.Zen.amount / (global.resource.Zen.amount + 5000);
-            breakdown.c.Zen[loc('trait_calm_desc')] = `+${(zen * 100).toFixed(2)}%`;
-        }
-        if (global.city['basic_housing']){
-            let pop = global.city.basic_housing.count * actions.city.basic_housing.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][housingLabel('small')] = pop + 'v';
-        }
-        if (global.tauceti['tau_housing'] && global.tech['isolation']){
-            let pop = global.tauceti.tau_housing.count * actions.tauceti.tau_home.tau_housing.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][housingLabel('small')] = pop + 'v';
-        }
-        if (global.city['cottage']){
-            let pop = global.city.cottage.count * actions.city.cottage.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][housingLabel('medium')] = pop + 'v';
-            if (global.tech['home_safe']){
-                let gain = (global.city['cottage'].count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
-                caps['Money'] += gain;
-                breakdown.c.Money[housingLabel('medium')] = gain+'v';
+            if (p_on['s_gate'] && p_on['embassy'] && global.tech.xeno >= 11){
+                let pop = actions.galaxy.gxy_gorddon.embassy.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc('galaxy_embassy')] = pop + 'v';
             }
-        }
-        if (global.city['apartment']){
-            let pop = p_on['apartment'] * actions.city.apartment.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][housingLabel('large')] = pop + 'v';
-            if (global.tech['home_safe']){
-                let gain = (p_on['apartment']  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
-                caps['Money'] += gain;
-                breakdown.c.Money[housingLabel('large')] = gain+'v';
+            if (p_on['s_gate'] && p_on['embassy'] && global.galaxy['dormitory']){
+                let pop = p_on['dormitory'] * actions.galaxy.gxy_gorddon.dormitory.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc('galaxy_dormitory')] = pop + 'v';
             }
-        }
-        if (global.eden['rectory']){
-            let pop = p_on['rectory'] * actions.eden.eden_asphodel.rectory.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc(`eden_rectory_title`)] = pop + 'v';
-        }
-        if (p_on['s_gate'] && global.galaxy['consulate'] && global.galaxy.consulate.count >= 1){
-            let pop = actions.galaxy.gxy_alien1.consulate.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc('galaxy_consulate')] = pop + 'v';
-        }
-        if (p_on['s_gate'] && p_on['embassy'] && global.tech.xeno >= 11){
-            let pop = actions.galaxy.gxy_gorddon.embassy.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc('galaxy_embassy')] = pop + 'v';
-        }
-        if (p_on['s_gate'] && p_on['embassy'] && global.galaxy['dormitory']){
-            let pop = p_on['dormitory'] * actions.galaxy.gxy_gorddon.dormitory.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc('galaxy_dormitory')] = pop + 'v';
-        }
-        if (p_on['arcology']){
-            let pop = p_on['arcology'] * actions.portal.prtl_ruins.arcology.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc('portal_arcology_title')] = pop + 'v';
-            lCaps['garrison'] += p_on['arcology'] * actions.portal.prtl_ruins.arcology.soldiers();
-
-            caps['Containers'] += (p_on['arcology'] * Math.round(quantum_level) * 10);
-            breakdown.c.Containers[loc('portal_arcology_title')] = (p_on['arcology'] * Math.round(quantum_level) * 10) + 'v';
-            caps['Crates'] += (p_on['arcology'] * Math.round(quantum_level) * 10);
-            breakdown.c.Crates[loc('portal_arcology_title')] = (p_on['arcology'] * Math.round(quantum_level) * 10) + 'v';
-
-            let sup = hellSupression('ruins');
-            let money = (p_on['arcology'] * spatialReasoning(bank_vault() * 8 * sup.supress));
-            caps['Money'] += money;
-            breakdown.c.Money[loc('portal_arcology_title')] = money+'v';
-        }
-
-        if (global.portal['bazaar'] && global.portal['spire']){
-            let containers = (global.portal.bazaar.count * global.portal.spire.count * 8);
-            caps['Containers'] += containers;
-            breakdown.c.Containers[loc('portal_bazaar_title')] = containers + 'v';
-            caps['Crates'] += containers;
-            breakdown.c.Crates[loc('portal_bazaar_title')] = containers + 'v';
-
-            let money = spatialReasoning(bank_vault() * global.portal.spire.count * global.portal.bazaar.count / 3);
-            caps['Money'] += money;
-            breakdown.c.Money[loc('portal_bazaar_title')] = money+'v';
-        }
-
-        if (support_on['colony']){
-            let containers = global.tech['isolation'] ? 900 : 250;
-            caps['Containers'] += (support_on['colony'] * containers);
-            breakdown.c.Containers[loc('tau_home_colony')] = (support_on['colony'] * containers) + 'v';
-            caps['Crates'] += (support_on['colony'] * containers);
-            breakdown.c.Crates[loc('tau_home_colony')] = (support_on['colony'] * containers) + 'v';
-
-            let pop = support_on['colony'] * actions.tauceti.tau_home.colony.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc('tau_home_colony')] = pop + 'v';
-        }
-        if (p_on['operating_base']){
-            lCaps['garrison'] += Math.min(support_on['operating_base'],p_on['operating_base']) * actions.space.spc_enceladus.operating_base.soldiers();
-        }
-        if (p_on['fob']){
-            lCaps['garrison'] += actions.space.spc_triton.fob.soldiers();
-        }
-        if (global.space['living_quarters']){
-            let gain = Math.round(support_on['living_quarters'] * actions.space.spc_red.living_quarters.citizens());
-            caps[global.race.species] += gain;
-            lCaps['colonist'] += jobScale(support_on['living_quarters']);
-            breakdown.c[global.race.species][`${planetName().red}`] = gain + 'v';
+            if (global.space['living_quarters']){
+                let gain = Math.round(support_on['living_quarters'] * actions.space.spc_red.living_quarters.citizens());
+                caps[global.race.species] += gain;
+                lCaps['colonist'] += jobScale(support_on['living_quarters']);
+                breakdown.c[global.race.species][`${planetName().red}`] = gain + 'v';
 
-            if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['home_safe']){
-                let gain = (support_on['living_quarters'] * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 100000 : 50000) : 25000));
-                caps['Money'] += gain;
-                breakdown.c.Money[loc('space_red_living_quarters_title')] = gain+'v';
-            }
-        }
-        if (support_on['biodome'] && (global.race['artifical'] || global.race['orbit_decayed'])){
-            let gain = support_on['biodome'] * spatialReasoning(global.race['artifical'] ? 500 : 100);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('space_red_signal_tower_title')] = gain+'v';
-        }
-        if (global.space['titan_quarters']){
-            let gain = Math.round(support_on['titan_quarters'] * actions.space.spc_titan.titan_quarters.citizens());
-            caps[global.race.species] += gain;
-            lCaps['titan_colonist'] += jobScale(support_on['titan_quarters']);
-            breakdown.c[global.race.species][`${planetName().titan}`] = gain + 'v';
-        }
-
-        if (global.interstellar['habitat'] && p_on['habitat']){
-            let pop = p_on['habitat'] * actions.interstellar.int_alpha.habitat.citizens();
-            caps[global.race.species] += pop;
-            breakdown.c[global.race.species][loc('interstellar_habitat_title')] = pop + 'v';
-        }
-        if (global.interstellar['luxury_condo'] && p_on['luxury_condo']){
-            let cit = p_on['luxury_condo'] * actions.interstellar.int_alpha.luxury_condo.citizens();
-            caps[global.race.species] += cit;
-            breakdown.c[global.race.species][loc('tech_luxury_condo')] = cit + 'v';
-            let gain = (p_on['luxury_condo']  * spatialReasoning(750000));
-            caps['Money'] += gain;
-            breakdown.c.Money[loc('tech_luxury_condo')] = gain+'v';
-        }
-        if (global.city['lodge']){
-            let cit = global.city.lodge.count * actions.city.lodge.citizens();
-            caps[global.race.species] += cit;
-            breakdown.c[global.race.species][loc('city_lodge')] = cit + 'v';
-        }
-        if (global.portal['hovel']){
-            let cit = global.portal.hovel.count * actions.portal.prtl_wasteland.hovel.citizens();
-            caps[global.race.species] += cit;
-            breakdown.c[global.race.species][loc('portal_hovel_title')] = cit + 'v';
-        }
-        if (global.space['outpost']){
-            let gain = global.space['outpost'].count * spatialReasoning(500);
-            caps['Neutronium'] += gain;
-            breakdown.c.Neutronium[loc('space_gas_moon_outpost_title')] = gain+'v';
-        }
-        if (global.city['shed']){
-            var multiplier = storageMultipler();
-            let label = global.tech['storage'] <= 2 ? loc('city_shed_title1') : (global.tech['storage'] >= 4 ? loc('city_shed_title3') : loc('city_shed_title2'));
-            for (const res of actions.city.shed.res()){
-                if (global.resource[res].display){
-                    let gain = global.city.shed.count * spatialReasoning(actions.city.shed.val(res) * multiplier);
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
+                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['home_safe']){
+                    let gain = (support_on['living_quarters'] * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 100000 : 50000) : 25000));
+                    caps['Money'] += gain;
+                    breakdown.c.Money[loc('space_red_living_quarters_title')] = gain+'v';
                 }
-            };
+            }
+            if (global.space['titan_quarters']){
+                let gain = Math.round(support_on['titan_quarters'] * actions.space.spc_titan.titan_quarters.citizens());
+                caps[global.race.species] += gain;
+                lCaps['titan_colonist'] += jobScale(support_on['titan_quarters']);
+                breakdown.c[global.race.species][`${planetName().titan}`] = gain + 'v';
+            }
+            if (global.interstellar['habitat'] && p_on['habitat']){
+                let pop = p_on['habitat'] * actions.interstellar.int_alpha.habitat.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc('interstellar_habitat_title')] = pop + 'v';
+            }
+            if (global.interstellar['luxury_condo'] && p_on['luxury_condo']){
+                let cit = p_on['luxury_condo'] * actions.interstellar.int_alpha.luxury_condo.citizens();
+                caps[global.race.species] += cit;
+                breakdown.c[global.race.species][loc('tech_luxury_condo')] = cit + 'v';
+                let gain = (p_on['luxury_condo']  * spatialReasoning(750000));
+                caps['Money'] += gain;
+                breakdown.c.Money[loc('tech_luxury_condo')] = gain+'v';
+            }
+            if (global.city['lodge']){
+                let cit = global.city.lodge.count * actions.city.lodge.citizens();
+                caps[global.race.species] += cit;
+                breakdown.c[global.race.species][loc('city_lodge')] = cit + 'v';
+            }
+            if (global.portal['hovel']){
+                let cit = global.portal.hovel.count * actions.portal.prtl_wasteland.hovel.citizens();
+                caps[global.race.species] += cit;
+                breakdown.c[global.race.species][loc('portal_hovel_title')] = cit + 'v';
+            }
+            if (global.portal['dig_demon'] && global.race['warlord']){
+                let demons = global.portal.dig_demon.on * actions.portal.prtl_wasteland.dig_demon.citizens();
+                caps[global.race.species] += demons;
+                breakdown.c[global.race.species][loc('portal_dig_demon_title')] = demons + 'v';
+                lCaps['miner'] += demons;
+                global.civic.miner.max = demons;
+                global.civic.miner.workers = demons;
+                global.civic.miner.assigned = demons;
+            }
         }
-
         if (global.race['lone_survivor']){
             breakdown.c[global.race.species][loc('base')] = '1v';
             caps[global.race.species] = 1;
         }
+        // Slave
+            if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {
+                caps['Slave'] = global.city.slave_pen.count * 4;
+                breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = global.city.slave_pen.count * 4 + 'v';
 
-        if (global.interstellar['warehouse']){
-            var multiplier = storageMultipler();
-            let label = loc('interstellar_alpha_name');
-            for (const res of actions.interstellar.int_alpha.warehouse.res()){
-                if (global.resource[res].display){
-                    let gain = global.interstellar.warehouse.count * spatialReasoning(actions.interstellar.int_alpha.warehouse.val(res) * multiplier);
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
+                if (caps['Slave'] < global.resource.Slave.amount){
+                    global.resource.Slave.amount = caps['Slave'];
                 }
-            };
-        }
-
-        if (global.eden['warehouse']){
-            var multiplier = storageMultipler(global.race['warlord'] ? 1 : 0.2);
-            if (global.race['warlord'] && global.eden['corruptor']){
-                multiplier *= 1 + (p_on['corruptor'] || 0) * (global.tech.asphodel >= 12 ? (global.tech.asphodel >= 13 ? 0.16 : 0.12) : 0.08);
             }
-            let label = loc('eden_asphodel_name');
-            for (const res of actions.eden.eden_asphodel.warehouse.res()){
-                if (global.resource[res].display){
-                    let gain = global.eden.warehouse.count * spatialReasoning(actions.eden.eden_asphodel.warehouse.val(res) * multiplier);
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
-                }
-            };
-        }
+        // Captive Race / Cattle
+            if (global.city['captive_housing']){
+                let houses = global.city.captive_housing.count;
+                global.city.captive_housing.raceCap = houses * (global.tech['unfathomable'] && global.tech.unfathomable >= 3 ? 3 : 2);
+                global.city.captive_housing.cattleCap = houses * 5;
+            }
+        // Nanite
+            if (global.city['nanite_factory']){
+                let gain = global.city.nanite_factory.count * spatialReasoning(2500);
+                caps['Nanite'] += gain;
+                breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
+            }
+        // Knowledge
+        {
+            if (shrineBonusActive()){
+                let getShrineResult = getShrineBonus('know');
+                caps['Knowledge'] += getShrineResult.add;
+                breakdown.c.Knowledge[loc('city_shrine')] = getShrineResult.add+'v';
+            }
+            let city=actions.city
+            if (global.city['university']){
+                let univCount=global.city.university.count;
 
-        if (global.portal['warehouse']){
-            var multiplier = storageMultipler();
-            if (global.race['warlord'] && global.eden['corruptor'] && global.tech.asphodel >= 12){
-                multiplier *= 1 + (p_on['corruptor'] || 0) * (global.tech.asphodel >= 13 ? 0.16 : 0.12);
+                let gain = city.university.knowVal() * univCount;
+                lCaps['professor'] += jobScale(univCount);
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('city_university')] = gain+'v';
             }
-            let label = global.tech['storage'] <= 2 ? loc('city_shed_title1') : (global.tech['storage'] >= 4 ? loc('city_shed_title3') : loc('city_shed_title2'));
-            for (const res of actions.portal.prtl_wasteland.warehouse.res()){
-                if (global.resource[res].display){
-                    let gain = global.portal.warehouse.count * spatialReasoning(actions.portal.prtl_wasteland.warehouse.val(res) * multiplier);
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
-                }
-            };
-            let cc_gain = global.portal.warehouse.count * (65 + global.portal.warehouse.rank * 35);
-            caps['Crates'] += cc_gain;
-            breakdown.c['Crates'][label] = cc_gain+'v';
-            caps['Containers'] += cc_gain;
-            breakdown.c['Containers'][label] = cc_gain+'v';
-        }
-
-        if (global.space['storehouse']){
-            var multiplier = tpStorageMultiplier('storehouse',false);
-            var h_multiplier = tpStorageMultiplier('storehouse',true);
-            let label = loc('space_storehouse_title');
-            for (const res of actions.space.spc_titan.storehouse.res()){
-                if (global.resource[res].display){
-                    let heavy = actions.space.spc_titan.storehouse.heavy(res);
-                    let gain = global.space.storehouse.count * spatialReasoning(actions.space.spc_titan.storehouse.val(res) * (heavy ? h_multiplier : multiplier));
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
-                }
-            };
-        }
+            if (global.city['library']){
+                let libCount=global.city.library.count
 
-        if (global.tauceti['repository']){
-            var multiplier = tpStorageMultiplier('repository');
-            let label = loc('tech_repository');
-            for (const res of actions.tauceti.tau_home.repository.res()){
-                if (global.resource[res].display){
-                    let gain = global.tauceti.repository.count * spatialReasoning(actions.tauceti.tau_home.repository.val(res) * multiplier);
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
+                let gain = Math.round(city.library.knowVal(libCount));
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('city_library')] = gain+'v';
+                
+                if (global.tech['science'] && global.tech['science'] >= 3){
+                    global.civic.professor.impact = 0.5 + (libCount * 0.01)
                 }
-            };
-            if (global.tech['isolation']){
-                let containers = 250;
-                caps['Containers'] += (global.tauceti.repository.count * containers);
-                breakdown.c.Containers[loc('tech_repository')] = (global.tauceti.repository.count * containers) + 'v';
-                caps['Crates'] += (global.tauceti.repository.count * containers);
-                breakdown.c.Crates[loc('tech_repository')] = (global.tauceti.repository.count * containers) + 'v';
             }
-        }
+            if (global.city['wardenclyffe']){
+                let wardenCount=global.city['wardenclyffe'].count, pwardenCount=p_on['wardenclyffe'], label=wardenLabel();
 
-        if (global.tech['isolation'] && p_on['tau_farm'] && global.race['artifical']){
-            let gain = p_on['tau_farm'] * spatialReasoning(350);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('tau_home_tau_farm')] = gain+'v';
-        }
+                lCaps['scientist'] += jobScale(wardenCount);
 
-        if (global.galaxy['gateway_depot']){
-            let containers = global.tech['world_control'] ? 150 : 100;
-            caps['Crates'] += (global.galaxy.gateway_depot.count * containers);
-            breakdown.c.Crates[loc('galaxy_gateway_depot')] = (global.galaxy.gateway_depot.count * containers) + 'v';
-            caps['Containers'] += (global.galaxy.gateway_depot.count * containers);
-            breakdown.c.Containers[loc('galaxy_gateway_depot')] = (global.galaxy.gateway_depot.count * containers) + 'v';
+                let gain=city.wardenclyffe.knowVal(wardenCount,pwardenCount)
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[label] = gain+'v';
 
-            let label = loc('galaxy_gateway_depot');
-            let multiplier = gatewayStorage();
+                if (global.race.universe === 'magic'){
+                    let mana = wardenCount * spatialReasoning(8);
+                    caps['Mana'] += mana;
+                    breakdown.c.Mana[label] = mana+'v';
+                }
 
-            if (global.resource.Uranium.display){
-                let gain = (global.galaxy.gateway_depot.count * (spatialReasoning(3000 * multiplier)));
-                caps['Uranium'] += gain;
-                breakdown.c.Uranium[label] = gain+'v';
+                if (global.race['artifical']){
+                    let gain = pwardenCount * spatialReasoning(250);
+                    caps['Food'] += gain;
+                    breakdown.c.Food[label] = gain+'v';
+                }
             }
-
-            if (global.resource.Nano_Tube.display){
-                let gain = (global.galaxy.gateway_depot.count * (spatialReasoning(250000 * multiplier)));
-                caps['Nano_Tube'] += gain;
-                breakdown.c.Nano_Tube[label] = gain+'v';
+            if (global.city['biolab']){
+                let gain = p_on['biolab'] * city.biolab.knowVal()
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('city_biolab')] = gain+'v';
             }
-
-            if (global.resource.Neutronium.display){
-                let gain = (global.galaxy.gateway_depot.count * (spatialReasoning(9001 * multiplier)));
-                caps['Neutronium'] += gain;
-                breakdown.c.Neutronium[label] = gain+'v';
+            let space=actions.space;
+            if (global.space['satellite']){
+                let gain = global.space.satellite.count * space.spc_home.satellite.knowVal()//;
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('space_home_satellite_title')] = gain+'v';
             }
+            if (global.space['observatory'] && global.space.observatory.count > 0){
+                let gain = support_on['observatory'] * space.spc_moon.observatory.knowVal();
 
-            if (global.resource.Infernite.display){
-                let gain = (global.galaxy.gateway_depot.count * (spatialReasoning(6660 * multiplier)));
-                caps['Infernite'] += gain;
-                breakdown.c.Infernite[label] = gain+'v';
-            }
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('space_moon_observatory_title')] = gain+'v';
 
-            if (global.resource.Elerium.display && p_on['gateway_depot'] && p_on['s_gate']){
-                let gain = (p_on['gateway_depot'] * (spatialReasoning(200)));
-                caps['Elerium'] += gain;
-                breakdown.c.Elerium[label] = gain+'v';
+                if (global.race['cataclysm']){
+                    lCaps['professor'] += jobScale(support_on['observatory']);
+                }
             }
-        }
-
-        if (global.resource.Infernite.display && global.portal['fortress'] && !global.race['warlord']){
-            let gain = spatialReasoning(1000);
-            caps['Infernite'] += gain;
-            breakdown.c.Infernite[loc('portal_fortress_name')] = gain+'v';
-        }
+            if (support_on['exotic_lab']){
+                let exo_support=support_on['exotic_lab']
+                let el_gain = exo_support * spatialReasoning(10);
+                caps['Elerium'] += el_gain;
+                breakdown.c.Elerium[loc('space_red_exotic_lab_bd')] = el_gain+'v';
+                
+                let sci = space.spc_red.exotic_lab.knowVal()
+                let gain = exo_support * workerScale(global.civic.colonist.workers,'colonist') * sci;
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('tech_exotic_bd')] = gain+'v';
 
-        if (global.space['garage']){
-            var multiplier = actions.space.spc_red.garage.multiplier(false);
-            var h_multiplier = actions.space.spc_red.garage.multiplier(true);
-            let label = loc('space_red_garage_title');
-            for (const res of actions.space.spc_red.garage.res()){
-                if (global.resource[res].display){
-                    let heavy = actions.space.spc_red.garage.heavy(res);
-                    let gain = global.space.garage.count * spatialReasoning(actions.space.spc_red.garage.val(res) * (heavy ? h_multiplier : multiplier));
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
+                if (global.race['cataclysm'] || global.race['orbit_decayed']){
+                    lCaps['scientist'] += jobScale(exo_support);
                 }
-            };
-        }
-
-        if (global.portal['harbor'] && p_on['harbor']){
-            let multiplier = 1;
-            if (global.race['warlord'] && global.eden['corruptor'] && global.tech?.asphodel >= 12){
-                multiplier *= 1 + (p_on['corruptor'] || 0) * (global.tech.asphodel >= 13 ? 0.12 : 0.1);
             }
-            let label = loc('portal_harbor_title');
-            for (const res of actions.portal.prtl_lake.harbor.res()){
-                if (global.resource[res].display){
-                    let gain = p_on['harbor'] * spatialReasoning(actions.portal.prtl_lake.harbor.val(res) * multiplier);
-                    caps[res] += gain;
-                    breakdown.c[res][label] = gain+'v';
+            if (global.interstellar['laboratory'] && int_on['laboratory'] > 0){
+                if (global.tech.science >= 16){
+                    lCaps['scientist'] += jobScale(int_on['laboratory']);
                 }
-            };
-        }
+                let gain = (int_on['laboratory'] * 10000);
+                if (global.tech.science >= 15){
+                    gain *= 1 + ((global.race['cataclysm'] ? support_on['exotic_lab'] : global.city.wardenclyffe.count) * 0.02);
+                }
+                if (global.race['cataclysm'] && p_on['s_gate'] && gal_on['scavenger']){
+                    gain *= 1 + (gal_on['scavenger'] * piracy('gxy_alien2') * 0.75);
+                }
+                if (global.tech['science'] >= 21){
+                    gain *= 1.45;
+                }
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc(global.race.universe === 'magic' ? 'tech_sanctum' : 'interstellar_laboratory_title')] = gain+'v';
 
-        if (global.city['silo']){
-            let gain = BHStorageMulti(global.city['silo'].count * spatialReasoning(500));
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_silo')] = gain+'v';
-        }
-        if (global.city['compost']){
-            let gain = BHStorageMulti(global.city['compost'].count * spatialReasoning(200));
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_compost_heap')] = gain+'v';
-        }
-        if (global.city['soul_well']){
-            let gain = BHStorageMulti(global.city['soul_well'].count * spatialReasoning(500));
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_soul_well')] = gain+'v';
-        }
-        if (global.city['smokehouse']){
-            let gain = BHStorageMulti(global.city['smokehouse'].count * spatialReasoning(100));
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_smokehouse')] = gain+'v';
-        }
-        if (global.city['oil_well']){
-            let gain = (global.city['oil_well'].count * spatialReasoning(500));
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('city_oil_well')] = gain+'v';
-        }
-        if (global.city['oil_depot']){
-            let gain = (global.city['oil_depot'].count * spatialReasoning(1000));
-            gain *= global.tech['world_control'] ? 1.5 : 1;
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('city_oil_depot')] = gain+'v';
-            if (global.tech['uranium'] >= 2){
-                gain = (global.city['oil_depot'].count * spatialReasoning(250));
-                gain *= global.tech['world_control'] ? 1.5 : 1;
-                caps['Uranium'] += gain;
-                breakdown.c.Uranium[loc('city_oil_depot')] = gain+'v';
+                if (global.race.universe === 'magic'){
+                    let mana = int_on['laboratory'] * spatialReasoning(12);
+                    caps['Mana'] += mana;
+                    breakdown.c.Mana[loc(global.race.universe === 'magic' ? 'tech_sanctum' : 'interstellar_laboratory_title')] = mana+'v';
+                }
             }
-            if (global.resource['Helium_3'].display){
-                gain = (global.city['oil_depot'].count * spatialReasoning(400));
-                gain *= global.tech['world_control'] ? 1.5 : 1;
-                caps['Helium_3'] += gain;
-                breakdown.c.Helium_3[loc('city_oil_depot')] = gain+'v';
+            if (global.portal['sensor_drone']){
+                let gain = p_on['sensor_drone'] * (global.tech.infernite >= 6 ? 2500 : 1000);
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('portal_sensor_drone_title')] = gain+'v';
             }
-        }
-        if (global.space['propellant_depot']){
-            let gain = (global.space['propellant_depot'].count * spatialReasoning(1250));
-            gain *= global.tech['world_control'] ? 1.5 : 1;
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('space_home_propellant_depot_title')] = gain+'v';
-            if (global.resource['Helium_3'].display){
-                gain = (global.space['propellant_depot'].count * spatialReasoning(1000));
-                gain *= global.tech['world_control'] ? 1.5 : 1;
-                caps['Helium_3'] += gain;
-                breakdown.c.Helium_3[loc('space_home_propellant_depot_title')] = gain+'v';
+            if (global.portal['twisted_lab'] && global.portal.twisted_lab.count > 0 && global.race['absorbed']){
+                let baseVal = 6000 + global.portal.twisted_lab.rank * 2000;
+                let gain = (p_on['twisted_lab'] * baseVal * global.race.absorbed.length);
+                if (global.tech['supercollider'] && global.race['warlord']){
+                    let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 12.5: 25;
+                    gain *= (global.tech['supercollider'] / ratio) + 1;
+                }
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('portal_twisted_lab_title')] = gain+'v';
             }
-        }
-        if (p_on['orbital_station']){
-            let gain = (p_on['orbital_station'] * spatialReasoning(15000));
-            caps['Helium_3'] += gain;
-            breakdown.c.Helium_3[loc('tau_home_orbital_station')] = gain+'v';
-        }
-        if (p_on['refueling_station']){
-            let h_gain = (p_on['refueling_station'] * spatialReasoning(10000));
-            caps['Helium_3'] += h_gain;
-            breakdown.c.Helium_3[loc('tau_gas_refueling_station_title')] = h_gain+'v';
-
-            if (global.tech['tau_whale'] >= 2){
-                let o_gain = (p_on['refueling_station'] * spatialReasoning(6500));
-                caps['Oil'] += o_gain;
-                breakdown.c.Oil[loc('tau_gas_refueling_station_title')] = o_gain+'v';
-            }
-        }
-        if (p_on['orbital_platform']){
-            let gain = (p_on['orbital_platform'] * spatialReasoning(17500));
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('tau_red_orbital_platform')] = gain+'v';
-        }
-        if (global.space['gas_storage']){
-            let gain = (global.space['gas_storage'].count * spatialReasoning(3500));
-            gain *= global.tech['world_control'] ? 1.5 : 1;
-            caps['Oil'] += gain;
-            breakdown.c.Oil[`${planetName().gas} ${loc('depot')}`] = gain+'v';
-
-            gain = (global.space['gas_storage'].count * spatialReasoning(2500));
-            gain *= global.tech['world_control'] ? 1.5 : 1;
-            caps['Helium_3'] += gain;
-            breakdown.c.Helium_3[`${planetName().gas} ${loc('depot')}`] = gain+'v';
-
-            gain = (global.space['gas_storage'].count * spatialReasoning(1000));
-            gain *= global.tech['world_control'] ? 1.5 : 1;
-            caps['Uranium'] += gain;
-            breakdown.c.Uranium[`${planetName().gas} ${loc('depot')}`] = gain+'v';
-        }
-        if (p_on['xfer_station']){
-            let gain = (p_on['xfer_station'] * spatialReasoning(5000));
-            caps['Helium_3'] += gain;
-            breakdown.c.Helium_3[loc('interstellar_xfer_station_title')] = gain+'v';
-
-            gain = (p_on['xfer_station'] * spatialReasoning(4000));
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('interstellar_xfer_station_title')] = gain+'v';
-
-            gain = (p_on['xfer_station'] * spatialReasoning(2500));
-            caps['Uranium'] += gain;
-            breakdown.c.Uranium[loc('interstellar_xfer_station_title')] = gain+'v';
-
-            if (global.resource.Deuterium.display){
-                let deuterium_gain = p_on['xfer_station'] * spatialReasoning(2000);
-                caps['Deuterium'] += deuterium_gain;
-                breakdown.c.Deuterium[loc('interstellar_xfer_station_title')] = deuterium_gain+'v';
+            if (global.portal['archaeology']){
+                let sup = hellSupression('ruins');
+                let value = 250000;
+                if (global.race['high_pop']){
+                    value = highPopAdjust(value);
+                }
+                let gain = Math.round(value * sup.supress);
+                caps['Knowledge'] += (workerScale(global.civic.archaeologist.workers,'archaeologist') * gain);
+                breakdown.c.Knowledge[loc('portal_archaeology_bd')] = (workerScale(global.civic.archaeologist.workers,'archaeologist') * gain)+'v';
             }
-        }
-        if (global.space['helium_mine']){
-            let gain = (global.space['helium_mine'].count * spatialReasoning(100));
-            caps['Helium_3'] += gain;
-            breakdown.c.Helium_3[loc('space_moon_helium_mine_title')] = gain+'v';
-        }
-        if (global.portal['pumpjack']){
-            let gain = (global.portal.pumpjack.count * spatialReasoning(500));
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('portal_pumpjack_title')] = gain+'v';
-        }
-        if (global.portal['pumpjack']){
-            let gain = (global.portal.pumpjack.count * spatialReasoning(250));
-            caps['Helium_3'] += gain;
-            breakdown.c.Helium_3[loc('portal_pumpjack_title')] = gain+'v';
-        }
-        if (shrineBonusActive()){
-            let getShrineResult = getShrineBonus('know');
-            caps['Knowledge'] += getShrineResult.add;
-            breakdown.c.Knowledge[loc('city_shrine')] = getShrineResult.add+'v';
-        }
-        if (global.city['temple'] && global.genes['ancients'] && global.genes['ancients'] >= 2){
-            lCaps['priest'] += jobScale(templeCount());
-        }
-        if (global.space['ziggurat'] && global.genes['ancients'] && global.genes['ancients'] >= 4){
-            lCaps['priest'] += jobScale(templeCount(true));
-        }
-        if (global.eden['rectory'] && global.genes['ancients'] && global.genes['ancients'] >= 2 && p_on['rectory']){
-            lCaps['priest'] += jobScale(p_on['rectory']);
-        }
-        if (global.race['wish'] && global.race['wishStats'] && global.race.wishStats.priest){
-            lCaps['priest'] += jobScale(global.race.wishStats.priest);
-        }
-
-        //Knowledge structures!
-        let city=actions.city
-        if (global.city['university']){
-            let univCount=global.city.university.count;
-
-            let gain = city.university.knowVal() * univCount;
-            lCaps['professor'] += jobScale(univCount);
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('city_university')] = gain+'v';
-        }
-        if (global.city['library']){
-            let libCount=global.city.library.count
-
-            let gain = Math.round(city.library.knowVal(libCount));
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('city_library')] = gain+'v';
-            
-            if (global.tech['science'] && global.tech['science'] >= 3){
-                global.civic.professor.impact = 0.5 + (libCount * 0.01)
+            if (global.race['lone_survivor'] && global.tauceti['alien_outpost']){
+                lCaps['professor'] += jobScale(global.tauceti.alien_outpost.count);
             }
-        }
-        if (global.city['wardenclyffe']){
-            let wardenCount=global.city['wardenclyffe'].count, pwardenCount=p_on['wardenclyffe'], label=wardenLabel();
+            if (global.race['logical']){
+                let factor = global.tech.hasOwnProperty('high_tech') ? global.tech.high_tech : 0;
+                factor += global.tech.hasOwnProperty('science') ? global.tech.science : 0;
+                let gain = global.resource[global.race.species].amount * traits.logical.vars()[1] * factor;
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[races[global.race.species].name] = gain+'v';
+            }
+            if (global.race['warlord']){
+                let gain = (global.race?.absorbed?.length || 1) * 500000;
+                if (shrineBonusActive()){
+                    let shrineBonus = getShrineBonus('know');
+                    gain *= shrineBonus.mult;
+                }
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('portal_throne_of_evil_title')] = gain+'v';
 
-            lCaps['scientist'] += jobScale(wardenCount);
+                caps['Crates'] += 500;
+                breakdown.c.Crates[loc('portal_throne_of_evil_title')] = 500 + 'v';
+                caps['Containers'] += 500;
+                breakdown.c.Containers[loc('portal_throne_of_evil_title')] = 500 + 'v';
+            }
+            if (global.space['zero_g_lab'] && Math.min(support_on['zero_g_lab'],p_on['zero_g_lab']) > 0){
+                let using = Math.min(support_on['zero_g_lab'],p_on['zero_g_lab']);
+                let synd = syndicate('spc_enceladus');
+                let gain = Math.round(using * 10000 * synd);
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('tech_zero_g_lab')] = gain+'v';
+
+                if (global.resource.Cipher.display){
+                    let cipher = 10000 * using;
+                    caps['Cipher'] += cipher;
+                    breakdown.c.Cipher[loc('tech_zero_g_lab')] = cipher+'v';
+                }
+            }
+            if (p_on['embassy'] && global.galaxy['symposium']){
+                let dorm = 1750 * p_on['dormitory'];
+                let gtrade = 650 * global.galaxy.trade.cur;
+                let leave = 0;
+                if (global.tech.xeno >= 7){
+                    for (let j = 0; j < galaxy_ship_types.length; j++){
+                        const area = galaxy_ship_types[j].area;
+                        const region = galaxy_ship_types[j].region;
+                        if (area !== 'galaxy') { continue; }
+
+                        let crew = 0;
+                        for (const ship of gatewayArmada){
+                            crew += global.galaxy.defense[region][ship] * (actions[area]['gxy_gateway'][ship].ship.civ() + actions[area]['gxy_gateway'][ship].ship.mil());
+                        }
 
-            let gain=city.wardenclyffe.knowVal(wardenCount,pwardenCount)
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[label] = gain+'v';
+                        for (let i=0; i<galaxy_ship_types[j].ships.length; i++){
+                            const ship = galaxy_ship_types[j].ships[i];
+                            if (!gatewayArmada.includes(ship) && actions[area][region][ship].hasOwnProperty('ship') && gal_on[ship]){
+                                // Every ship with the 'ship' property has both civ() and mil() functions
+                                crew += gal_on[ship] * (actions[area][region][ship].ship.civ() + actions[area][region][ship].ship.mil());
+                            }
+                        }
 
-            if (global.race.universe === 'magic'){
-                let mana = wardenCount * spatialReasoning(8);
-                caps['Mana'] += mana;
-                breakdown.c.Mana[label] = mana+'v';
+                        if (region === 'gxy_gorddon'){
+                            leave += +highPopAdjust(crew).toFixed(2) * 300;
+                        }
+                        else {
+                            leave += +highPopAdjust(crew).toFixed(2) * 100 * piracy(region);
+                        }
+                    }
+                }
+                let pirate = piracy('gxy_gorddon');
+                let know = (dorm + gtrade + leave) * pirate * p_on['symposium'];
+                caps['Knowledge'] += know;
+                breakdown.c.Knowledge[loc('galaxy_symposium')] = know +'v';
             }
-
-            if (global.race['artifical']){
-                let gain = pwardenCount * spatialReasoning(250);
-                caps['Food'] += gain;
-                breakdown.c.Food[label] = gain+'v';
+            if (support_on['research_station']){
+                let attact = global.blood['attract'] ? global.blood.attract * 5 : 0;
+                let sci = 200 + attact;
+                if (global.tech['science'] && global.tech.science >= 22 && p_on['embassy'] && p_on['symposium']){
+                    sci *= 1 + (p_on['symposium'] * piracy('gxy_gorddon'));
+                }
+                let gain = support_on['research_station'] * highPopAdjust(global.civic.ghost_trapper.workers) * sci;
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('eden_research_station_title')] = gain+'v';
             }
-        }
-        if (global.city['biolab']){
-            let gain = p_on['biolab'] * city.biolab.knowVal()
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('city_biolab')] = gain+'v';
-        }
+            if (support_on['decoder']){
+                let titan_colonists = p_on['ai_colonist'] ? workerScale(global.civic.titan_colonist.workers,'titan_colonist') + jobScale(p_on['ai_colonist']) : workerScale(global.civic.titan_colonist.workers,'titan_colonist');
+                let gain = support_on['decoder'] * titan_colonists * 2500;
+                if (global.race['high_pop']){
+                    gain = highPopAdjust(gain);
+                }
+                if (p_on['ai_core2']){
+                    gain *= 1.25;
+                }
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('space_decoder_title')] = gain+'v';
+            }
+            if (p_on['s_gate'] && p_on['telemetry_beacon']){
+                let base_val = global.tech['telemetry'] ? 1200 : 800;
+                if (global.tech.science >= 17){
+                    base_val += gal_on['scout_ship'] * 25;
+                }
+                let gain = p_on['telemetry_beacon'] ** 2 * base_val;
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('galaxy_telemetry_beacon_bd')] = gain+'v';
+            }
+            if (p_on['s_gate'] && gal_on['scavenger']){
+                let pirate_alien2 = piracy('gxy_alien2');
+                let gain = gal_on['scavenger'] * Math.round(pirate_alien2 * 25000);
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('galaxy_scavenger')] = gain+'v';
+            }
+            if (global.tauceti['infectious_disease_lab']){
+                let gain = 39616;
+                if (global.tech['supercollider'] && global.tech['isolation']){
+                    let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 12.5: 25;
+                    gain *= (global.tech['supercollider'] / ratio) + 1;
+                }
+                caps['Knowledge'] += (p_on['infectious_disease_lab'] * Math.round(gain));
+                breakdown.c.Knowledge[actions.tauceti.tau_home.infectious_disease_lab.title()] = (p_on['infectious_disease_lab'] * gain)+'v';
 
+                if (global.tech['isolation']){
+                    let el_gain = support_on['infectious_disease_lab'] * spatialReasoning(375);
+                    caps['Elerium'] += el_gain;
+                    breakdown.c.Elerium[actions.tauceti.tau_home.infectious_disease_lab.title()] = el_gain+'v';
+                }
+            }
+            // Womlings
+            if (global.race['truepath'] && global.tauceti['overseer'] && global.tech['tau_red'] && global.tech.tau_red >= 5){
+                let pop = 0; let injured = global.tauceti.overseer.injured; let morale = 0; let loyal = 0; let prod = 0;
+
+                if (global.race['womling_friend']){
+                    loyal += 25 + (support_on['overseer'] * actions.tauceti.tau_red.overseer.val());
+                    morale += 75 + (support_on['womling_fun'] * actions.tauceti.tau_red.womling_fun.val());
+                }
+                else if (global.race['womling_god']){
+                    loyal += 75 + (support_on['overseer'] * actions.tauceti.tau_red.overseer.val());
+                    morale += 40 + (support_on['womling_fun'] * actions.tauceti.tau_red.womling_fun.val());
+                }
+                else if (global.race['womling_lord']){
+                    loyal += support_on['overseer'] * actions.tauceti.tau_red.overseer.val();
+                    morale += 30 + (support_on['womling_fun'] * actions.tauceti.tau_red.womling_fun.val());
+                }
+
+                let vil_pop = global.tech['womling_pop'] && global.tech.womling_pop >= 2 ? 6 : 5;
+                pop = support_on['womling_village'] * vil_pop;
+                let farmers = support_on['womling_farm'] * 2;
+                if (farmers > pop){ farmers = pop; }
+                let crop_per_farmer = global.tech['womling_pop'] ? 8 : 6;
+                if (global.tech['womling_gene']){ crop_per_farmer += 2; }
+                if (pop > farmers * crop_per_farmer){
+                    pop = farmers * crop_per_farmer;
+                }
+                let unemployed = pop - farmers - injured;
+
+                let scientist = 0;
+                if (support_on['womling_lab']){
+                    scientist = support_on['womling_lab'];
+                    if (scientist > unemployed){ scientist = unemployed; }
+                    unemployed -= scientist;
+
+                    let gain = scientist * Math.round(25000 * global.tauceti.overseer.prod / 100);
+                    caps['Knowledge'] += gain;
+                    breakdown.c.Knowledge[loc('interstellar_laboratory_title')] = gain+'v';
+
+                    if (Math.rand(0,10) < global.tauceti.womling_lab.scientist){
+                        global.tauceti.womling_lab.tech += Math.rand(0,global.tauceti.womling_lab.scientist + 1);
+                        let expo = global.stats.achieve['overlord'] && global.stats.achieve.overlord.l >= 5 ? 4.9 : 5;
+                        if (global.race['lone_survivor']){ expo -= 0.1; }
+                        if (global.tauceti.womling_lab.tech >= Math.round((global.tech.womling_tech + 2) ** expo)){
+                            global.tech.womling_tech++;
+                            global.tauceti.womling_lab.tech = 0;
+                            messageQueue(loc('tau_red_womling_advancement',[global.tech.womling_tech]),'advanced',false,['progress']);
+                            drawTech();
+                        }
+                    }
+                }
 
+                let miners = support_on['womling_mine'] * 6;
+                if (miners > unemployed){ miners = unemployed; }
+                unemployed -= miners;
 
+                let heal_chance = global.tech['tech_womling_firstaid'] ? 3 : 4;
+                if (Math.rand(0,10) === 0){
+                    let raw = Math.rand(0,miners + scientist);
+                    if (raw > injured){
+                        injured = raw;
+                    }
+                }
+                else if (injured > 0 && Math.rand(0,heal_chance) === 0){
+                    injured--;
+                }
 
+                if (global.tauceti.hasOwnProperty('womling_farm')){
+                    global.tauceti.womling_farm.farmers = farmers;
+                }
+                if (global.tauceti.hasOwnProperty('womling_mine')){
+                    global.tauceti.womling_mine.miners = miners;
+                }
+                if (global.tauceti.hasOwnProperty('womling_lab')){
+                    global.tauceti.womling_lab.scientist = scientist;
+                }
 
-        if (global.race['lone_survivor'] && global.tauceti['alien_outpost']){
-            lCaps['professor'] += jobScale(global.tauceti.alien_outpost.count);
-        }
-        if (global.race['logical']){
-            let factor = global.tech.hasOwnProperty('high_tech') ? global.tech.high_tech : 0;
-            factor += global.tech.hasOwnProperty('science') ? global.tech.science : 0;
-            let gain = global.resource[global.race.species].amount * traits.logical.vars()[1] * factor;
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[races[global.race.species].name] = gain+'v';
-        }
-        if (global.portal['sensor_drone']){
-            let gain = p_on['sensor_drone'] * (global.tech.infernite >= 6 ? 2500 : 1000);
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('portal_sensor_drone_title')] = gain+'v';
-        }
-        if (global.space['satellite']){
-            let gain = (global.space.satellite.count * (global.race['cataclysm'] || global.race['orbit_decayed'] ? 2000 : 750));
-            if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['supercollider']){
-                let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 5: 10;
-                gain *= (global.tech['supercollider'] / ratio) + 1;
+                loyal -= miners;
+                morale -= miners;
+                morale -= farmers;
+                morale -= injured;
+                if (loyal > 100){ loyal = 100; }
+                else if (loyal < 0){ loyal = 0; }
+                if (morale > 100){ morale = 100; }
+                else if (morale < 0){ morale = 0; }
+
+                prod = Math.round((loyal + morale) / 2);
+                global.tauceti.overseer.loyal = loyal;
+                global.tauceti.overseer.morale = morale;
+                global.tauceti.overseer.pop = pop;
+                global.tauceti.overseer.working = farmers + miners + scientist;
+                global.tauceti.overseer.injured = injured;
+                global.tauceti.overseer.prod = prod;
+            }
+            if (p_on['world_controller']){
+                let boost = 0.25;
+                if (global.interstellar['far_reach'] && p_on['far_reach'] > 0){
+                    boost += p_on['far_reach'] * 0.01;
+                }
+                if (global.tech.science >= 19){
+                    boost += 0.15;
+                }
+                let gain = Math.round(caps['Knowledge'] * boost);
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('space_dwarf_collider_title')] = gain+'v';
+            }
+            if (p_on['alien_outpost']){
+                let iso = 0;
+                if (global.tech['isolation']){
+                    iso = global.race['lone_survivor'] ? 3500000 : 6500000;
+                    caps['Knowledge'] += iso;
+                }
+                let boost = 0.2;
+                let gain = Math.round(caps['Knowledge'] * boost);
+                caps['Knowledge'] += gain;
+                breakdown.c.Knowledge[loc('tech_alien_outpost')] = gain+iso+'v';
             }
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('space_home_satellite_title')] = gain+'v';
         }
-        if (global.space['observatory'] && global.space.observatory.count > 0){
-            let gain = (support_on['observatory'] * 5000);
-            if (global.race['cataclysm'] && global.space['satellite'] && global.space.satellite.count > 0){
-                gain *= 1 + (global.space.satellite.count * 0.25);
+        // Zen
+            if (global.race['calm'] && global.city['meditation']) {
+                caps['Zen'] = global.city.meditation.count * traits.calm.vars()[0];
+                breakdown.c.Zen[loc('city_meditation')] = global.city.meditation.count * traits.calm.vars()[0] + 'v';
+                global.resource.Zen.amount = (global.resource[global.race.species].amount * 2) + global.civic.garrison.workers;
+                if (global.resource.Zen.amount > global.resource.Zen.max){
+                    global.resource.Zen.amount = global.resource.Zen.max;
+                }
+                let zen = global.resource.Zen.amount / (global.resource.Zen.amount + 5000);
+                breakdown.c.Zen[loc('trait_calm_desc')] = `+${(zen * 100).toFixed(2)}%`;
             }
+        // Mana
+            if (global.city['pylon'] || global.space['pylon'] || global.tauceti['pylon']){
+                let gain = 0;
+                let name = 'city_pylon';
+                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.space['pylon']){
+                    gain = spatialReasoning(2) * global.space.pylon.count;
+                    name = 'space_red_pylon';
+                }
+                else if (global.tech['isolation'] && global.tauceti['pylon']){
+                    gain = spatialReasoning(2) * global.tauceti.pylon.count;;
+                    name = 'tau_home_pylon';
+                }
+                else if (global.city['pylon']){
+                    gain = spatialReasoning(5) * global.city.pylon.count;;
+                }
 
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('space_moon_observatory_title')] = gain+'v';
-
-            if (global.race['cataclysm']){
-                lCaps['professor'] += jobScale(support_on['observatory']);
+                caps['Mana'] += gain;
+                breakdown.c.Mana[loc(name)] = gain+'v';
             }
-        }
-        if (global.interstellar['laboratory'] && int_on['laboratory'] > 0){
-            if (global.tech.science >= 16){
-                lCaps['scientist'] += jobScale(int_on['laboratory']);
+        // Food
+        {
+            if (p_on['transmitter'] && global.race['artifical']){
+                let gain = p_on['transmitter'] * spatialReasoning(100);
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('city_transmitter')] = gain+'v';
             }
-            let gain = (int_on['laboratory'] * 10000);
-            if (global.tech.science >= 15){
-                gain *= 1 + ((global.race['cataclysm'] ? support_on['exotic_lab'] : global.city.wardenclyffe.count) * 0.02);
+            if (global.city['farm'] && global.tech['farm']){
+                    let pop = global.city.farm.count * actions.city.farm.citizens();
+                    caps[global.race.species] += pop;
+                    breakdown.c[global.race.species][loc('city_farm')] = pop + 'v';
             }
-            if (global.race['cataclysm'] && p_on['s_gate'] && gal_on['scavenger']){
-                gain *= 1 + (gal_on['scavenger'] * piracy('gxy_alien2') * 0.75);
+            if (support_on['biodome'] && (global.race['artifical'] || global.race['orbit_decayed'])){
+                let gain = support_on['biodome'] * spatialReasoning(global.race['artifical'] ? 500 : 100);
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('space_red_signal_tower_title')] = gain+'v';
             }
-            if (global.tech['science'] >= 21){
-                gain *= 1.45;
+            if (global.tech['isolation'] && p_on['tau_farm'] && global.race['artifical']){
+                let gain = p_on['tau_farm'] * spatialReasoning(350);
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('tau_home_tau_farm')] = gain+'v';
             }
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc(global.race.universe === 'magic' ? 'tech_sanctum' : 'interstellar_laboratory_title')] = gain+'v';
-
-            if (global.race.universe === 'magic'){
-                let mana = int_on['laboratory'] * spatialReasoning(12);
-                caps['Mana'] += mana;
-                breakdown.c.Mana[loc(global.race.universe === 'magic' ? 'tech_sanctum' : 'interstellar_laboratory_title')] = mana+'v';
+            if (global.city['silo']){
+                let gain = BHStorageMulti(global.city['silo'].count * spatialReasoning(500));
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('city_silo')] = gain+'v';
             }
-        }
-        
-        if (global.space['zero_g_lab'] && Math.min(support_on['zero_g_lab'],p_on['zero_g_lab']) > 0){
-            let using = Math.min(support_on['zero_g_lab'],p_on['zero_g_lab']);
-            let synd = syndicate('spc_enceladus');
-            let gain = Math.round(using * 10000 * synd);
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('tech_zero_g_lab')] = gain+'v';
-
-            if (global.resource.Cipher.display){
-                let cipher = 10000 * using;
-                caps['Cipher'] += cipher;
-                breakdown.c.Cipher[loc('tech_zero_g_lab')] = cipher+'v';
+            if (global.city['compost']){
+                let gain = BHStorageMulti(global.city['compost'].count * spatialReasoning(200));
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('city_compost_heap')] = gain+'v';
             }
-        }
-        if (global.race['warlord']){
-            let gain = (global.race?.absorbed?.length || 1) * 500000;
-            if (shrineBonusActive()){
-                let shrineBonus = getShrineBonus('know');
-                gain *= shrineBonus.mult;
+            if (global.city['soul_well']){
+                let gain = BHStorageMulti(global.city['soul_well'].count * spatialReasoning(500));
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('city_soul_well')] = gain+'v';
             }
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('portal_throne_of_evil_title')] = gain+'v';
-
-            caps['Crates'] += 500;
-            breakdown.c.Crates[loc('portal_throne_of_evil_title')] = 500 + 'v';
-            caps['Containers'] += 500;
-            breakdown.c.Containers[loc('portal_throne_of_evil_title')] = 500 + 'v';
-        }
-        if (global.portal['twisted_lab'] && global.portal.twisted_lab.count > 0 && global.race['absorbed']){
-            let baseVal = 6000 + global.portal.twisted_lab.rank * 2000;
-            let gain = (p_on['twisted_lab'] * baseVal * global.race.absorbed.length);
-            if (global.tech['supercollider'] && global.race['warlord']){
-                let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 12.5: 25;
-                gain *= (global.tech['supercollider'] / ratio) + 1;
+            if (global.city['smokehouse']){
+                let gain = BHStorageMulti(global.city['smokehouse'].count * spatialReasoning(100));
+                caps['Food'] += gain;
+                breakdown.c.Food[loc('city_smokehouse')] = gain+'v';
             }
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('portal_twisted_lab_title')] = gain+'v';
         }
+        // Stone / Chrysotile
+            if (global.city['rock_quarry']){
+                let gain = BHStorageMulti(global.city.rock_quarry.count * spatialReasoning(100));
+                caps['Stone'] += gain;
+                breakdown.c.Stone[loc('city_rock_quarry')] = gain+'v';
 
-        //Omniscience
-        if (global.resource.Omniscience.display){
-            if (global.eden['research_station']){
-                let corruptor = 1;
-                if (global.race['warlord'] && global.eden['corruptor']){
-                    corruptor = 1 + (p_on['corruptor'] || 0) * 0.04;
-                }
-                let gain = (support_on['research_station'] || 0) * Math.round(777 * corruptor);
-                caps['Omniscience'] += gain;
-                breakdown.c.Omniscience[loc('eden_research_station_title')] = gain+'v';
+                caps['Chrysotile'] += gain;
+                breakdown.c.Chrysotile[loc('city_rock_quarry')] = gain+'v';
             }
-
-            if (global.race['warlord'] && global.portal['mortuary'] && global.portal['corpse_pile']){
-                let gain = global.portal.corpse_pile.count * (p_on['mortuary'] || 0) * (p_on['encampment'] || 0) * 2; 
-                caps['Omniscience'] += gain;
-                breakdown.c.Omniscience[loc('eden_encampment_title')] = gain+'v';
+        // Lumber
+        {
+            if (global.city['lumber_yard']){
+                let gain = BHStorageMulti(global.city.lumber_yard.count * spatialReasoning(100));
+                caps['Lumber'] += gain;
+                breakdown.c.Lumber[loc('city_lumber_yard')] = gain+'v';
             }
-            else if (p_on['ascension_trigger'] && global.eden.hasOwnProperty('encampment') && global.eden.encampment.asc){
-                let heatSink = actions.interstellar.int_sirius.ascension_trigger.heatSink();
-                heatSink = heatSink < 0 ? Math.abs(heatSink) : 0;
-                let omniscience = +(150 + (heatSink ** 0.95 / 10)).toFixed(0);
-
-                let gain = (p_on['encampment'] || 0) * omniscience;
-                caps['Omniscience'] += gain;
-                breakdown.c.Omniscience[loc('eden_encampment_title')] = gain+'v';
+            else if (global.city['graveyard']){
+                let gain = BHStorageMulti(global.city.graveyard.count * spatialReasoning(100));
+                caps['Lumber'] += gain;
+                breakdown.c.Lumber[loc('city_graveyard')] = gain+'v';
             }
-
-            if (global.eden['archive']){
-                let gain = (p_on['archive'] || 0) * 1013;
-                caps['Omniscience'] += gain;
-                breakdown.c.Omniscience[loc('eden_archive_bd')] = gain+'v';
+            if (global.city['sawmill']){
+                let gain = BHStorageMulti(global.city.sawmill.count * spatialReasoning(200));
+                caps['Lumber'] += gain;
+                breakdown.c.Lumber[loc('city_sawmill')] = gain+'v';
             }
         }
+        // Oil
+        {
+            if (global.city['oil_well']){
+                let gain = (global.city['oil_well'].count * spatialReasoning(500));
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('city_oil_well')] = gain+'v';
+            }
+            if (global.city['oil_depot']){
+                let gain = (global.city['oil_depot'].count * spatialReasoning(1000));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('city_oil_depot')] = gain+'v';
+                if (global.tech['uranium'] >= 2){
+                    gain = (global.city['oil_depot'].count * spatialReasoning(250));
+                    gain *= global.tech['world_control'] ? 1.5 : 1;
+                    caps['Uranium'] += gain;
+                    breakdown.c.Uranium[loc('city_oil_depot')] = gain+'v';
+                }
+                if (global.resource['Helium_3'].display){
+                    gain = (global.city['oil_depot'].count * spatialReasoning(400));
+                    gain *= global.tech['world_control'] ? 1.5 : 1;
+                    caps['Helium_3'] += gain;
+                    breakdown.c.Helium_3[loc('city_oil_depot')] = gain+'v';
+                }
+            }
+            if (global.space['propellant_depot']){
+                let gain = (global.space['propellant_depot'].count * spatialReasoning(1250));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('space_home_propellant_depot_title')] = gain+'v';
+                if (global.resource['Helium_3'].display){
+                    gain = (global.space['propellant_depot'].count * spatialReasoning(1000));
+                    gain *= global.tech['world_control'] ? 1.5 : 1;
+                    caps['Helium_3'] += gain;
+                    breakdown.c.Helium_3[loc('space_home_propellant_depot_title')] = gain+'v';
+                }
+            }
+            if (p_on['orbital_platform']){
+                let gain = (p_on['orbital_platform'] * spatialReasoning(17500));
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('tau_red_orbital_platform')] = gain+'v';
+            }
+            if (global.space['gas_storage']){
+                let gain = (global.space['gas_storage'].count * spatialReasoning(3500));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Oil'] += gain;
+                breakdown.c.Oil[`${planetName().gas} ${loc('depot')}`] = gain+'v';
 
-        if (global.tech['isolation'] && global.tauceti['alien_outpost'] && global.resource.Cipher.display){
-            let cipher = 200000;
-            caps['Cipher'] += cipher;
-            breakdown.c.Cipher[loc('tech_alien_outpost')] = cipher+'v';
-        }
+                gain = (global.space['gas_storage'].count * spatialReasoning(2500));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Helium_3'] += gain;
+                breakdown.c.Helium_3[`${planetName().gas} ${loc('depot')}`] = gain+'v';
 
-        if (global.portal['archaeology']){
-            let sup = hellSupression('ruins');
-            let value = 250000;
-            if (global.race['high_pop']){
-                value = highPopAdjust(value);
+                gain = (global.space['gas_storage'].count * spatialReasoning(1000));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Uranium'] += gain;
+                breakdown.c.Uranium[`${planetName().gas} ${loc('depot')}`] = gain+'v';
             }
-            let gain = Math.round(value * sup.supress);
-            caps['Knowledge'] += (workerScale(global.civic.archaeologist.workers,'archaeologist') * gain);
-            breakdown.c.Knowledge[loc('portal_archaeology_bd')] = (workerScale(global.civic.archaeologist.workers,'archaeologist') * gain)+'v';
-        }
-
-        if (p_on['embassy'] && global.galaxy['symposium']){
-            let dorm = 1750 * p_on['dormitory'];
-            let gtrade = 650 * global.galaxy.trade.cur;
-            let leave = 0;
-            if (global.tech.xeno >= 7){
-                for (let j = 0; j < galaxy_ship_types.length; j++){
-                    const area = galaxy_ship_types[j].area;
-                    const region = galaxy_ship_types[j].region;
-                    if (area !== 'galaxy') { continue; }
+            if (p_on['xfer_station']){
+                let gain = (p_on['xfer_station'] * spatialReasoning(5000));
+                gain = (p_on['xfer_station'] * spatialReasoning(4000));
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('interstellar_xfer_station_title')] = gain+'v';
 
-                    let crew = 0;
-                    for (const ship of gatewayArmada){
-                        crew += global.galaxy.defense[region][ship] * (actions[area]['gxy_gateway'][ship].ship.civ() + actions[area]['gxy_gateway'][ship].ship.mil());
-                    }
+                caps['Helium_3'] += gain;
+                breakdown.c.Helium_3[loc('interstellar_xfer_station_title')] = gain+'v';
 
-                    for (let i=0; i<galaxy_ship_types[j].ships.length; i++){
-                        const ship = galaxy_ship_types[j].ships[i];
-                        if (!gatewayArmada.includes(ship) && actions[area][region][ship].hasOwnProperty('ship') && gal_on[ship]){
-                            // Every ship with the 'ship' property has both civ() and mil() functions
-                            crew += gal_on[ship] * (actions[area][region][ship].ship.civ() + actions[area][region][ship].ship.mil());
-                        }
-                    }
+                gain = (p_on['xfer_station'] * spatialReasoning(2500));
+                caps['Uranium'] += gain;
+                breakdown.c.Uranium[loc('interstellar_xfer_station_title')] = gain+'v';
 
-                    if (region === 'gxy_gorddon'){
-                        leave += +highPopAdjust(crew).toFixed(2) * 300;
-                    }
-                    else {
-                        leave += +highPopAdjust(crew).toFixed(2) * 100 * piracy(region);
-                    }
+                if (global.resource.Deuterium.display){
+                    let deuterium_gain = p_on['xfer_station'] * spatialReasoning(2000);
+                    caps['Deuterium'] += deuterium_gain;
+                    breakdown.c.Deuterium[loc('interstellar_xfer_station_title')] = deuterium_gain+'v';
                 }
             }
-            let pirate = piracy('gxy_gorddon');
-            let know = (dorm + gtrade + leave) * pirate * p_on['symposium'];
-            caps['Knowledge'] += know;
-            breakdown.c.Knowledge[loc('galaxy_symposium')] = know +'v';
-        }
-
-        if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
-            let vault = global.race['cataclysm'] || global.race['orbit_decayed'] ? bank_vault() * 4 : bank_vault();
-            let banks = global.race['cataclysm'] || global.race['orbit_decayed'] ? p_on['spaceport'] : global.city['bank'].count;
-
-            let gain = (banks * spatialReasoning(vault));
-            caps['Money'] += gain;
+            if (global.portal['pumpjack']){
+                let gain = (global.portal.pumpjack.count * spatialReasoning(500));
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('portal_pumpjack_title')] = gain+'v';
 
-            if (global.race['cataclysm'] || global.race['orbit_decayed']){
-                breakdown.c.Money[loc('space_red_spaceport_title')] = gain+'v';
+                let gain = (global.portal.pumpjack.count * spatialReasoning(250));
+                caps['Helium_3'] += gain;
+                breakdown.c.Helium_3[loc('portal_pumpjack_title')] = gain+'v';
             }
-            else {
-                breakdown.c.Money[loc('city_bank')] = gain+'v';
+        }
+        // Uranium
+        // Iridium
+            if (p_on['moon_base']){
+                let gain = p_on['moon_base'] * spatialReasoning(500);
+                caps['Iridium'] += gain;
+                breakdown.c.Iridium[loc('space_moon_base_title')] = gain+'v';
+            }
+        // Helium 3
+        {
+            if (p_on['orbital_station']){
+                let gain = (p_on['orbital_station'] * spatialReasoning(15000));
+                caps['Helium_3'] += gain;
+                breakdown.c.Helium_3[loc('tau_home_orbital_station')] = gain+'v';
             }
+            if (p_on['refueling_station']){
+                let h_gain = (p_on['refueling_station'] * spatialReasoning(10000));
+                caps['Helium_3'] += h_gain;
+                breakdown.c.Helium_3[loc('tau_gas_refueling_station_title')] = h_gain+'v';
 
-            if (global.interstellar['exchange']){
-                if (global.eden['eternal_bank']){ banks += global.eden.eternal_bank.count * 2; }
-                let g_vault = spatialReasoning(int_on['exchange'] * (vault * banks / 18));
-                if (global.race['inflation']){
-                    g_vault *= 2;
-                }
-                if (global.tech.banking >= 13){
-                    if (global.galaxy['freighter']){
-                        g_vault *= 1 + (gal_on['freighter'] * 0.03);
-                    }
-                    if (global.galaxy['super_freighter']){
-                        g_vault *= 1 + (gal_on['super_freighter'] * 0.08);
-                    }
+                if (global.tech['tau_whale'] >= 2){
+                    let o_gain = (p_on['refueling_station'] * spatialReasoning(6500));
+                    caps['Oil'] += o_gain;
+                    breakdown.c.Oil[loc('tau_gas_refueling_station_title')] = o_gain+'v';
                 }
-                g_vault = Math.round(g_vault);
-                caps['Money'] += g_vault;
-                breakdown.c.Money[loc('interstellar_exchange_bd')] = g_vault+'v';
             }
-        }
-
-        if (global.eden['eternal_bank']){
-            let vault = bank_vault() * (global.race['warlord'] ? 20 : 10);
-            if (global.race['warlord'] && global.eden['corruptor'] && global.tech.asphodel >= 12){
-                vault *= 1 + (p_on['corruptor'] || 0) * 0.08;
+            if (global.space['helium_mine']){
+                let gain = (global.space['helium_mine'].count * spatialReasoning(100));
+                caps['Helium_3'] += gain;
+                breakdown.c.Helium_3[loc('space_moon_helium_mine_title')] = gain+'v';
             }
-            let banks = global.eden.eternal_bank.count;
-            let gain = (banks * spatialReasoning(vault));
-            caps['Money'] += gain;
-            breakdown.c.Money[loc('eden_eternal_bank_title')] = gain+'v';
-        }
+            if (p_on['nexus']){
+                let helium_gain = p_on['nexus'] * spatialReasoning(4000);
+                caps['Helium_3'] += helium_gain;
+                breakdown.c.Helium_3[loc('interstellar_nexus_title')] = helium_gain+'v';
 
-        if (global.space['titan_bank']){
-            let vault = bank_vault() * 2;
-            let banks = global.space.titan_bank.count;
-            let gain = (banks * spatialReasoning(vault));
-            caps['Money'] += gain;
-            breakdown.c.Money[`${planetName().titan} ${loc('city_bank')}`] = gain+'v';
-        }
+                let oil_gain = (p_on['nexus'] * spatialReasoning(3500));
+                caps['Oil'] += oil_gain;
+                breakdown.c.Oil[loc('interstellar_nexus_title')] = oil_gain+'v';
 
-        if (global.tauceti['colony'] && global.tech['isolation']){
-            let vault = bank_vault() * 25;
-            let gain = (global.tauceti.colony.count * spatialReasoning(vault));
-            caps['Money'] += gain;
-            breakdown.c.Money[loc('tau_home_colony')] = gain+'v';
-        }
+                let deuterium_gain = p_on['nexus'] * spatialReasoning(3000);
+                caps['Deuterium'] += deuterium_gain;
+                breakdown.c.Deuterium[loc('interstellar_nexus_title')] = deuterium_gain+'v';
 
-        if (global.city['casino'] || global.space['spc_casino'] || global.tauceti['tauceti_casino'] || global.portal['hell_casino']){
-            let casinos = 0;
-            if (global.city['casino'] && global.city.casino.count > 0){
-                casinos += global.city.casino.count;
+                let elerium_gain = p_on['nexus'] * spatialReasoning(25);
+                caps['Elerium'] += elerium_gain;
+                breakdown.c.Elerium[loc('interstellar_nexus_title')] = elerium_gain+'v';
             }
-            if (global.space['spc_casino'] && global.space.spc_casino.count > 0){
-                casinos += global.space.spc_casino.count;
+            if (p_on['s_gate'] && global.galaxy['gateway_station']){
+                let helium_gain = p_on['gateway_station'] * spatialReasoning(2000);
+                caps['Helium_3'] += helium_gain;
+                breakdown.c.Helium_3[loc('galaxy_gateway_station')] = helium_gain+'v';
+
+                let deuterium_gain = p_on['gateway_station'] * spatialReasoning(4500);
+                caps['Deuterium'] += deuterium_gain;
+                breakdown.c.Deuterium[loc('galaxy_gateway_station')] = deuterium_gain+'v';
+
+                let gain = p_on['gateway_station'] * spatialReasoning(50);
+                caps['Elerium'] += gain;
+                breakdown.c.Elerium[loc('galaxy_gateway_station')] = gain+'v';
             }
-            if (global.tauceti['tauceti_casino'] && global.tauceti.tauceti_casino.count > 0){
-                casinos += global.tauceti.tauceti_casino.count;
+        }
+        // Deuterium
+        // Neutronium
+        {
+            if (global.interstellar['neutron_miner'] && p_on['neutron_miner']){
+                let gain = (p_on['neutron_miner'] * spatialReasoning(500));
+                caps['Neutronium'] += gain;
+                breakdown.c.Neutronium[loc('interstellar_neutron_miner_title')] = gain+'v';
             }
-            if (global.portal['hell_casino'] && global.portal.hell_casino.count > 0){
-                casinos += global.portal.hell_casino.count;
+            if (global.space['outpost']){
+                let gain = global.space['outpost'].count * spatialReasoning(500);
+                caps['Neutronium'] += gain;
+                breakdown.c.Neutronium[loc('space_gas_moon_outpost_title')] = gain+'v';
             }
-
-            let vault = casinos * casino_vault();
-            caps['Money'] += vault;
-            breakdown.c.Money[structName('casino')] = vault+'v';
         }
-        if (global.galaxy['resort']){
-            let vault = p_on['resort'] * spatialReasoning(global.tech['world_control'] ? 1875000 : 1500000);
-            caps['Money'] += vault;
-            breakdown.c.Money[loc('galaxy_resort')] = vault+'v';
+        // Infernite
+        if (global.resource.Infernite.display && global.portal['fortress'] && !global.race['warlord']){
+            let gain = spatialReasoning(1000);
+            caps['Infernite'] += gain;
+            breakdown.c.Infernite[loc('portal_fortress_name')] = gain+'v';
         }
-        if (global.tech['banking'] >= 4){
-            let cm = 250;
-            if (global.tech.banking >= 14){
-                cm = 1000000;
+        // Elerium
+        {
+            if (p_on['space_station']){
+                lCaps['space_miner'] += jobScale(p_on['space_station'] * 3);
+                if (global.tech['asteroid'] >= 5){
+                    let gain = p_on['space_station'] * spatialReasoning(5);
+                    caps['Elerium'] += gain;
+                    breakdown.c.Elerium[loc('space_belt_station_title')] = gain+'v';
+                }
             }
-            else if (global.tech.banking >= 11){
-                cm = 1000;
+            if (p_on['elerium_contain']){
+                let el_gain = p_on['elerium_contain'] * spatialReasoning(100);
+                caps['Elerium'] += el_gain;
+                breakdown.c.Elerium[loc('space_dwarf_elerium_contain_title')] = el_gain+'v';
             }
-            else if (global.tech.banking >= 6){
-                cm = 600;
+            if (p_on['elerium_containment']){
+                let el_gain = p_on['elerium_containment'] * spatialReasoning(1000);
+                caps['Elerium'] += el_gain;
+                breakdown.c.Elerium[loc('eden_elerium_containment',[global.resource.Elerium.name])] = el_gain+'v';
             }
-            let gain = cm * (global.resource[global.race.species].amount + global.civic.garrison.workers);
-            if (global.race['high_pop']){
-                gain = highPopAdjust(gain);
+            if (p_on['shadow_mine']){
+                let el_gain = p_on['shadow_mine'] * spatialReasoning(200);
+                caps['Elerium'] += el_gain;
+                breakdown.c.Elerium[loc('portal_shadow_mine_title')] = el_gain+'v';
             }
-            caps['Money'] += gain;
-            breakdown.c.Money[global.tech.banking >= 14 ? loc('tech_crypto_currency') : loc('tech_bonds')] = gain+'v';
-        }
-        if (p_on['moon_base']){
-            let gain = p_on['moon_base'] * spatialReasoning(500);
-            caps['Iridium'] += gain;
-            breakdown.c.Iridium[loc('space_moon_base_title')] = gain+'v';
-        }
-        if (p_on['space_station']){
-            lCaps['space_miner'] += jobScale(p_on['space_station'] * 3);
-            if (global.tech['asteroid'] >= 5){
-                let gain = p_on['space_station'] * spatialReasoning(5);
-                caps['Elerium'] += gain;
-                breakdown.c.Elerium[loc('space_belt_station_title')] = gain+'v';
+            if (p_on['corruptor']){
+                let el_gain = p_on['corruptor'] * spatialReasoning(200);
+                caps['Elerium'] += el_gain;
+                breakdown.c.Elerium[loc('eden_corruptor_title')] = el_gain+'v';
             }
         }
-        if (support_on['exotic_lab']){
-            let el_gain = support_on['exotic_lab'] * spatialReasoning(10);
-            caps['Elerium'] += el_gain;
-            breakdown.c.Elerium[loc('space_red_exotic_lab_bd')] = el_gain+'v';
-            let sci = 500;
-            if (global.tech['science'] >= 13 && global.interstellar['laboratory']){
-                sci += int_on['laboratory'] * 25;
-            }
-            if (global.tech['ancient_study'] && global.tech['ancient_study'] >= 2){
-                sci += templeCount(true) * 15;
+        // Nano Tube
+        // Water
+            if (p_on['titan_spaceport']){
+                let water = p_on['titan_spaceport'] * spatialReasoning(250);
+                caps['Water'] += water;
+                breakdown.c.Water[loc('space_red_spaceport_title')] = water+'v';
+            }
+        // Materials
+            if (global.tauceti['mining_pit']){
+                lCaps['pit_miner'] += jobScale(support_on['mining_pit'] * (global.tech['isolation'] ? 6 : 8));
+                caps['Materials'] += support_on['mining_pit'] * 1000000;
+            }
+        // Asphodel Powder
+            if (global.eden['encampment']){
+                let powder = global.eden.encampment.count * spatialReasoning(250);
+                caps['Asphodel_Powder'] += powder;
+                breakdown.c.Asphodel_Powder[loc('eden_encampment_title')] = powder+'v';
+            }
+        // Trade
+        {
+            breakdown['t_route'] = {};
+            global.city.market.mtrade = 0;
+            if (global.race['banana']){
+                global.city.market.mtrade++;
+                breakdown.t_route[loc('base')] = 1;
             }
-            if (global.tech.mass >= 2){
-                let brain = workerScale(global.civic.scientist.workers,'scientist');
-                if (global.race['high_pop']){
-                    brain = highPopAdjust(brain);
+            if (global.city['trade']){
+                let routes = global.race['nomadic'] || global.race['xenophobic'] ? global.tech.trade : global.tech.trade + 1;
+                if (global.tech['trade'] && global.tech['trade'] >= 3){
+                    routes--;
+                }
+                if (global.race['flier']){
+                    routes += traits.flier.vars()[1];
+                }
+                global.city.market.mtrade += routes * global.city.trade.count;
+                breakdown.t_route[loc('city_trade')] = routes * global.city.trade.count;
+                if (global.tech['fanaticism'] && global.tech['fanaticism'] >= 3){
+                    let r_count = faithTempleCount();
+                    global.city.market.mtrade += r_count;
+                    breakdown.t_route[global.race['cataclysm'] ? loc('space_red_ziggurat_title') : structName('temple')] = r_count;
                 }
-                sci += p_on['mass_driver'] * brain;
-            }
-            if (global.race['cataclysm'] && support_on['observatory']){
-                sci *= 1 + (support_on['observatory'] * 0.25);
-            }
-            if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.portal['sensor_drone'] && global.tech['science'] >= 14){
-                sci *= 1 + (p_on['sensor_drone'] * 0.02);
             }
-            if (global.tech['science'] >= 21){
-                sci *= 1.45;
+            if (global.city['wharf']){
+                let r_count = global.city.wharf.count * 2;
+                global.city.market.mtrade += r_count;
+                breakdown.t_route[loc('city_wharf')] = r_count;
             }
-            if (global.race['high_pop']){
-                sci = highPopAdjust(sci);
+            if (global.space['gps'] && global.space.gps.count >= 4){
+                let r_count = global.space.gps.count * 2;
+                global.city.market.mtrade += global.space.gps.count * 2;
+                breakdown.t_route[loc('space_home_gps_title')] = r_count;
             }
-            let gain = support_on['exotic_lab'] * workerScale(global.civic.colonist.workers,'colonist') * sci;
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('tech_exotic_bd')] = gain+'v';
-
-            if (global.race['cataclysm'] || global.race['orbit_decayed']){
-                lCaps['scientist'] += jobScale(support_on['exotic_lab']);
+            if (global.city['storage_yard'] && global.tech['trade'] && global.tech['trade'] >= 3){
+                let r_count = global.city.storage_yard.count;
+                global.city.market.mtrade += r_count;
+                breakdown.t_route[loc('city_storage_yard')] = r_count;
             }
-        }
-
-        if (support_on['research_station']){
-            let attact = global.blood['attract'] ? global.blood.attract * 5 : 0;
-            let sci = 200 + attact;
-            if (global.tech['science'] && global.tech.science >= 22 && p_on['embassy'] && p_on['symposium']){
-                sci *= 1 + (p_on['symposium'] * piracy('gxy_gorddon'));
+            if (global.portal['bazaar'] && global.portal['spire']){
+                let r_count = global.portal.bazaar.count * global.portal.spire.count;
+                global.city.market.mtrade += r_count;
+                breakdown.t_route[loc('portal_bazaar_title')] = r_count;
             }
-            let gain = support_on['research_station'] * highPopAdjust(global.civic.ghost_trapper.workers) * sci;
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('eden_research_station_title')] = gain+'v';
-        }
-
-        if (global.tech['isolation'] && support_on['infectious_disease_lab']){
-            lCaps['professor'] += jobScale(support_on['infectious_disease_lab'] * 2);
-            lCaps['scientist'] += jobScale(support_on['infectious_disease_lab']);
-        }
-
-        if (global.race['warlord'] && p_on['twisted_lab']){
-            lCaps['professor'] += jobScale(p_on['twisted_lab'] * 3);
-            lCaps['scientist'] += jobScale(p_on['twisted_lab'] * 2);
-        }
-
-        if (global.race['wish'] && global.race['wishStats'] && global.race.wishStats.prof){
-            lCaps['scientist'] += jobScale(global.race.wishStats.prof);
-        }
-
-        if (support_on['decoder']){
-            let titan_colonists = p_on['ai_colonist'] ? workerScale(global.civic.titan_colonist.workers,'titan_colonist') + jobScale(p_on['ai_colonist']) : workerScale(global.civic.titan_colonist.workers,'titan_colonist');
-            let gain = support_on['decoder'] * titan_colonists * 2500;
-            if (global.race['high_pop']){
-                gain = highPopAdjust(gain);
+            if (global.tech['railway']){
+                let routes = 0;
+                if (global.race['cataclysm'] || global.race['orbit_decayed']){
+                    routes = global.space['gps'] ? Math.floor(global.space.gps.count / 3) : 0;
+                }
+                else if (global.race['warlord']){
+                    routes = 5;
+                }
+                else {
+                    routes = global.city['storage_yard'] ? Math.floor(global.city.storage_yard.count / 6) : 0;
+                }
+                if (global.stats.achieve['banana'] && global.stats.achieve.banana.l >= 2){
+                    routes++;
+                }
+                global.city.market.mtrade += global.tech['railway'] * routes;
+                breakdown.t_route[loc('arpa_projects_railway_title')] = global.tech['railway'] * routes;
             }
-            if (p_on['ai_core2']){
-                gain *= 1.25;
+            breakdown['gt_route'] = {};
+            if (global.galaxy['freighter']){
+                breakdown.gt_route[loc('galaxy_freighter')] = gal_on['freighter'] * 2;
+                lCaps['crew'] += global.galaxy.freighter.on * actions.galaxy.gxy_gorddon.freighter.ship.civ();
             }
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('space_decoder_title')] = gain+'v';
-        }
-        if (p_on['elerium_contain']){
-            let el_gain = p_on['elerium_contain'] * spatialReasoning(100);
-            caps['Elerium'] += el_gain;
-            breakdown.c.Elerium[loc('space_dwarf_elerium_contain_title')] = el_gain+'v';
-        }
-        if (p_on['elerium_containment']){
-            let el_gain = p_on['elerium_containment'] * spatialReasoning(1000);
-            caps['Elerium'] += el_gain;
-            breakdown.c.Elerium[loc('eden_elerium_containment',[global.resource.Elerium.name])] = el_gain+'v';
-        }
-        if (p_on['shadow_mine']){
-            let el_gain = p_on['shadow_mine'] * spatialReasoning(200);
-            caps['Elerium'] += el_gain;
-            breakdown.c.Elerium[loc('portal_shadow_mine_title')] = el_gain+'v';
-        }
-        if (p_on['corruptor']){
-            let el_gain = p_on['corruptor'] * spatialReasoning(200);
-            caps['Elerium'] += el_gain;
-            breakdown.c.Elerium[loc('eden_corruptor_title')] = el_gain+'v';
-        }
-        if (global.city['foundry']){
-            lCaps['craftsman'] += jobScale(global.city['foundry'].count);
-        }
-        if (support_on['fabrication']){
-            lCaps['craftsman'] += jobScale(support_on['fabrication']);
-            if (global.race['cataclysm']){
-                lCaps['cement_worker'] += jobScale(support_on['fabrication']);
+            if (global.galaxy['super_freighter']){
+                breakdown.gt_route[loc('galaxy_super_freighter')] = gal_on['super_freighter'] * 5;
+                lCaps['crew'] += global.galaxy.super_freighter.on * actions.galaxy.gxy_alien1.super_freighter.ship.civ();
             }
         }
-        if (global.tech['isolation'] && support_on['tau_factory']){
-            lCaps['craftsman'] += jobScale(support_on['tau_factory'] * 5);
-            lCaps['cement_worker'] += jobScale(support_on['tau_factory'] * 2);
-        }
-        if (global.race['warlord'] && p_on['hell_factory']){
-            lCaps['cement_worker'] += jobScale(p_on['hell_factory'] * 5);
-        }
-        if (p_on['womling_station']){
-            lCaps['craftsman'] += jobScale(p_on['womling_station'] * 1);
-            lCaps['cement_worker'] += jobScale(p_on['womling_station'] * 1);
-        }
-        if (p_on['stellar_forge']){
-            lCaps['craftsman'] += jobScale(p_on['stellar_forge'] * 2);
-        }
-        if (p_on['demon_forge']){
-            lCaps['craftsman'] += jobScale(p_on['demon_forge'] * actions.portal.prtl_wasteland.demon_forge.crafters());
-        }
-        if (global.tech['elysium'] && global.tech.elysium >= 18 && p_on['sacred_smelter']){
-            lCaps['craftsman'] += jobScale(p_on['sacred_smelter'] * 3);
-        }
-        if (global.portal['carport']){
-            lCaps['hell_surveyor'] += jobScale(global.portal.carport.count) - global.portal.carport.damaged;
-        }
-        if (p_on['archaeology']){
-            lCaps['archaeologist'] += jobScale(p_on['archaeology'] * 2);
-        }
-        if (support_on['ectoplasm_processor']){
-            lCaps['ghost_trapper'] += jobScale(support_on['ectoplasm_processor'] * 5);
-        }
-        if (p_on['elysanite_mine']){
-            lCaps['elysium_miner'] += jobScale(p_on['elysanite_mine'] * 2);
-        }
-        if (p_on['nexus']){
-            let helium_gain = p_on['nexus'] * spatialReasoning(4000);
-            caps['Helium_3'] += helium_gain;
-            breakdown.c.Helium_3[loc('interstellar_nexus_title')] = helium_gain+'v';
-
-            let oil_gain = (p_on['nexus'] * spatialReasoning(3500));
-            caps['Oil'] += oil_gain;
-            breakdown.c.Oil[loc('interstellar_nexus_title')] = oil_gain+'v';
+        // Sus
+            if (global.race['universe'] === 'magic' && global.race['witch_hunter']){
+                let sus = 0;
 
-            let deuterium_gain = p_on['nexus'] * spatialReasoning(3000);
-            caps['Deuterium'] += deuterium_gain;
-            breakdown.c.Deuterium[loc('interstellar_nexus_title')] = deuterium_gain+'v';
-
-            let elerium_gain = p_on['nexus'] * spatialReasoning(25);
-            caps['Elerium'] += elerium_gain;
-            breakdown.c.Elerium[loc('interstellar_nexus_title')] = elerium_gain+'v';
-        }
-        if (p_on['s_gate'] && global.galaxy['gateway_station']){
-            let helium_gain = p_on['gateway_station'] * spatialReasoning(2000);
-            caps['Helium_3'] += helium_gain;
-            breakdown.c.Helium_3[loc('galaxy_gateway_station')] = helium_gain+'v';
+                if (global.city['wardenclyffe']){
+                    let wiz = global.city.wardenclyffe.count;
+                    wiz += p_on['wardenclyffe'];
 
-            let deuterium_gain = p_on['gateway_station'] * spatialReasoning(4500);
-            caps['Deuterium'] += deuterium_gain;
-            breakdown.c.Deuterium[loc('galaxy_gateway_station')] = deuterium_gain+'v';
+                    if (global.tech['roguemagic'] && global.tech.roguemagic >= 6){
+                        wiz /= 2;
+                    }
 
-            let gain = p_on['gateway_station'] * spatialReasoning(50);
-            caps['Elerium'] += gain;
-            breakdown.c.Elerium[loc('galaxy_gateway_station')] = gain+'v';
-        }
-        if (p_on['s_gate'] && p_on['telemetry_beacon']){
-            let base_val = global.tech['telemetry'] ? 1200 : 800;
-            if (global.tech.science >= 17){
-                base_val += gal_on['scout_ship'] * 25;
-            }
-            let gain = p_on['telemetry_beacon'] ** 2 * base_val;
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('galaxy_telemetry_beacon_bd')] = gain+'v';
-        }
-        if (p_on['s_gate'] && gal_on['scavenger']){
-            let pirate_alien2 = piracy('gxy_alien2');
-            let gain = gal_on['scavenger'] * Math.round(pirate_alien2 * 25000);
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('galaxy_scavenger')] = gain+'v';
-        }
+                    breakdown.c.Sus[wardenLabel()] = wiz+'v';
+                    sus += wiz;
+                }
 
-        if (global.eden['encampment']){
-            let powder = global.eden.encampment.count * spatialReasoning(250);
-            caps['Asphodel_Powder'] += powder;
-            breakdown.c.Asphodel_Powder[loc('eden_encampment_title')] = powder+'v';
-        }
+                if (global.civic.scientist.workers > 0){
+                    let wiz = global.civic.scientist.workers;
+                    if (global.civic.govern.type === 'magocracy'){
+                        wiz /= 2;
+                    }
+                    wiz = highPopAdjust(wiz);
+                    breakdown.c.Sus[jobName('wizard')] = wiz+'v';
+                    sus += wiz;
+                }
 
-        breakdown['t_route'] = {};
-        global.city.market.mtrade = 0;
-        if (global.race['banana']){
-            global.city.market.mtrade++;
-            breakdown.t_route[loc('base')] = 1;
-        }
-        if (global.city['trade']){
-            let routes = global.race['nomadic'] || global.race['xenophobic'] ? global.tech.trade : global.tech.trade + 1;
-            if (global.tech['trade'] && global.tech['trade'] >= 3){
-                routes--;
-            }
-            if (global.race['flier']){
-                routes += traits.flier.vars()[1];
-            }
-            global.city.market.mtrade += routes * global.city.trade.count;
-            breakdown.t_route[loc('city_trade')] = routes * global.city.trade.count;
-            if (global.tech['fanaticism'] && global.tech['fanaticism'] >= 3){
-                let r_count = faithTempleCount();
-                global.city.market.mtrade += r_count;
-                breakdown.t_route[global.race['cataclysm'] ? loc('space_red_ziggurat_title') : structName('temple')] = r_count;
-            }
-        }
-        if (global.city['wharf']){
-            let r_count = global.city.wharf.count * 2;
-            global.city.market.mtrade += r_count;
-            breakdown.t_route[loc('city_wharf')] = r_count;
-        }
-        if (global.space['gps'] && global.space.gps.count >= 4){
-            let r_count = global.space.gps.count * 2;
-            global.city.market.mtrade += global.space.gps.count * 2;
-            breakdown.t_route[loc('space_home_gps_title')] = r_count;
-        }
-        if (global.city['storage_yard'] && global.tech['trade'] && global.tech['trade'] >= 3){
-            let r_count = global.city.storage_yard.count;
-            global.city.market.mtrade += r_count;
-            breakdown.t_route[loc('city_storage_yard')] = r_count;
-        }
-        if (global.portal['bazaar'] && global.portal['spire']){
-            let r_count = global.portal.bazaar.count * global.portal.spire.count;
-            global.city.market.mtrade += r_count;
-            breakdown.t_route[loc('portal_bazaar_title')] = r_count;
-        }
-        if (global.tech['railway']){
-            let routes = 0;
-            if (global.race['cataclysm'] || global.race['orbit_decayed']){
-                routes = global.space['gps'] ? Math.floor(global.space.gps.count / 3) : 0;
-            }
-            else if (global.race['warlord']){
-                routes = 5;
-            }
-            else {
-                routes = global.city['storage_yard'] ? Math.floor(global.city.storage_yard.count / 6) : 0;
-            }
-            if (global.stats.achieve['banana'] && global.stats.achieve.banana.l >= 2){
-                routes++;
-            }
-            global.city.market.mtrade += global.tech['railway'] * routes;
-            breakdown.t_route[loc('arpa_projects_railway_title')] = global.tech['railway'] * routes;
-        }
-        if (p_on['titan_spaceport']){
-            let water = p_on['titan_spaceport'] * spatialReasoning(250);
-            caps['Water'] += water;
-            breakdown.c.Water[loc('space_red_spaceport_title')] = water+'v';
-        }
+                if (global.city['coal_power'] && !global.race['environmentalist']){
+                    let mana_engine = p_on['coal_power'];
 
-        if (global.tauceti['mining_pit']){
-            lCaps['pit_miner'] += jobScale(support_on['mining_pit'] * (global.tech['isolation'] ? 6 : 8));
-            caps['Materials'] += support_on['mining_pit'] * 1000000;
-        }
+                    if (global.tech['roguemagic'] && global.tech.roguemagic >= 6){
+                        mana_engine /= 2;
+                    }
 
-        if (global.civic.torturer.display && global.tech['unfathomable'] && global.tech.unfathomable >= 2){
-            lCaps['torturer'] = global.city.captive_housing.count;
-        }
+                    breakdown.c.Sus[loc('city_mana_engine')] = mana_engine+'v';
+                    sus += mana_engine;
+                }
 
-        if (global.race['universe'] === 'magic' && global.race['witch_hunter']){
-            let sus = 0;
+                if (global.city['pylon'] || global.space['pylon'] || global.tauceti['pylon']){
+                    let p_count = 0;
+                    let name = 'city_pylon';
+                    if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.space['pylon']){
+                        p_count = global.space.pylon.count;
+                        name = 'space_red_pylon';
+                    }
+                    else if (global.tech['isolation'] && global.tauceti['pylon']){
+                        p_count = global.tauceti.pylon.count;
+                        name = 'tau_home_pylon';
+                    }
+                    else if (global.city['pylon']){
+                        p_count = global.city.pylon.count;
+                    }
 
-            if (global.city['wardenclyffe']){
-                let wiz = global.city.wardenclyffe.count;
-                wiz += p_on['wardenclyffe'];
+                    if (global.tech['roguemagic'] && global.tech.roguemagic >= 5){
+                        p_count /= 3;
+                    }
 
-                if (global.tech['roguemagic'] && global.tech.roguemagic >= 6){
-                    wiz /= 2;
+                    breakdown.c.Sus[loc(name)] = p_count+'v';
+                    sus += p_count;
                 }
 
-                breakdown.c.Sus[wardenLabel()] = wiz+'v';
-                sus += wiz;
-            }
+                if (global.race['casting']){
+                    let ritual = global.race.casting.total;
+                    if (global.tech['roguemagic'] && global.tech.roguemagic >= 2){
+                        if (global.tech.roguemagic >= 4){
+                            ritual /= 4;
+                        }
 
-            if (global.civic.scientist.workers > 0){
-                let wiz = global.civic.scientist.workers;
-                if (global.civic.govern.type === 'magocracy'){
-                    wiz /= 2;
+                        ritual -= highPopAdjust(global.civic.priest.workers);
+                        if (ritual < 0){
+                            ritual = 0;
+                        }
+                    }
+                    breakdown.c.Sus[loc('tech_rituals')] = ritual+'v';
+                    sus += ritual;
                 }
-                wiz = highPopAdjust(wiz);
-                breakdown.c.Sus[jobName('wizard')] = wiz+'v';
-                sus += wiz;
-            }
 
-            if (global.city['coal_power'] && !global.race['environmentalist']){
-                let mana_engine = p_on['coal_power'];
-
-                if (global.tech['roguemagic'] && global.tech.roguemagic >= 6){
-                    mana_engine /= 2;
+                if (global.race['totTransmute'] && global.race.totTransmute > 0){
+                    let transmute = global.race.totTransmute / 5;
+                    breakdown.c.Sus[loc('tech_alchemy')] = transmute+'v';
+                    sus += transmute;
                 }
 
-                breakdown.c.Sus[loc('city_mana_engine')] = mana_engine+'v';
-                sus += mana_engine;
-            }
-
-            if (global.city['pylon'] || global.space['pylon'] || global.tauceti['pylon']){
-                let p_count = 0;
-                let name = 'city_pylon';
-                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.space['pylon']){
-                    p_count = global.space.pylon.count;
-                    name = 'space_red_pylon';
+                let mtech = 0;
+                if (global.tech['explosives']){
+                    mtech += 4;
                 }
-                else if (global.tech['isolation'] && global.tauceti['pylon']){
-                    p_count = global.tauceti.pylon.count;
-                    name = 'tau_home_pylon';
+                if (global.tech['military']){
+                    if (global.tech.military >= 10){
+                        mtech += 28;
+                    }
+                    else if (global.tech.military >= 9){
+                        mtech += 24;
+                    }
+                    else if (global.tech.military >= 8){
+                        mtech += 20;
+                    }
+                    else if (global.tech.military >= 7){
+                        mtech += 16;
+                    }
+                    else if (global.tech.military >= 6){
+                        mtech += 12;
+                    }
+                    else if (global.tech.military >= 4){
+                        mtech += 8;
+                    }
+                    else if (global.tech.military >= 3){
+                        mtech += 4;
+                    }
                 }
-                else if (global.city['pylon']){
-                    p_count = global.city.pylon.count;
+                breakdown.c.Sus[loc('witch_hunter_magic_tech')] = mtech+'v';
+                sus += mtech;
+
+                if (!global.tech['roguemagic']){
+                    breakdown.c.Sus[loc('overt')] = (sus*4)+'v';
+                    sus *= 5;
                 }
 
-                if (global.tech['roguemagic'] && global.tech.roguemagic >= 5){
-                    p_count /= 3;
+                if (global.tech['nexus']){
+                    let nexus = global.tech['nexus'] * 0.15;
+                    breakdown.c.Sus[loc('arpa_projects_nexus_title')] = nexus+'v';
+                    sus += nexus;
                 }
 
-                breakdown.c.Sus[loc(name)] = p_count+'v';
-                sus += p_count;
-            }
+                if (global.tech['syphon']){
+                    let syphon = global.tech['syphon'] * 2.5;
+                    breakdown.c.Sus[loc('arpa_syphon_title')] = syphon+'v';
+                    sus += syphon;
+                }
 
-            if (global.race['casting']){
-                let ritual = global.race.casting.total;
-                if (global.tech['roguemagic'] && global.tech.roguemagic >= 2){
-                    if (global.tech.roguemagic >= 4){
-                        ritual /= 4;
-                    }
+                if (global.portal.hasOwnProperty('soul_capacitor')){
+                    let capacitors = p_on['soul_capacitor'] || 0;
+                    global.portal.soul_capacitor['ecap'] = 2500000 * capacitors;
+                    breakdown.c.Sus[loc('portal_soul_capacitor_title')] = (capacitors / 3)+'v';
+                    sus += capacitors / 3;
+                }
 
-                    ritual -= highPopAdjust(global.civic.priest.workers);
-                    if (ritual < 0){
-                        ritual = 0;
+                if (global.tech['roguemagic'] && global.tech.roguemagic >= 3 && global.city['conceal_ward']){
+                    let wards = global.city.conceal_ward.count;
+                    if (global.tech.roguemagic >= 8){
+                        wards *= 1.25;
                     }
+                    breakdown.c.Sus[loc('city_conceal_ward')] = -(wards)+'v';
+                    sus -= wards;
                 }
-                breakdown.c.Sus[loc('tech_rituals')] = ritual+'v';
-                sus += ritual;
-            }
 
-            if (global.race['totTransmute'] && global.race.totTransmute > 0){
-                let transmute = global.race.totTransmute / 5;
-                breakdown.c.Sus[loc('tech_alchemy')] = transmute+'v';
-                sus += transmute;
-            }
+                if (sus < 0){ sus = 0; }
+                sus = Math.floor(sus);
+                global.resource.Sus.amount = sus;
 
-            let mtech = 0;
-            if (global.tech['explosives']){
-                mtech += 4;
-            }
-            if (global.tech['military']){
-                if (global.tech.military >= 10){
-                    mtech += 28;
+                if (sus >= 50 && !global.race['witch_hunter_warned']){
+                    global.race['witch_hunter_warned'] = 1;
+                    messageQueue(loc('witch_hunter_warning'),'danger',false,['progress']);
                 }
-                else if (global.tech.military >= 9){
-                    mtech += 24;
+                else if (sus >= 80 && global.race['witch_hunter_warned'] && global.race.witch_hunter_warned === 1){
+                    global.race.witch_hunter_warned = 2;
+                    messageQueue(loc('witch_hunter_warning2'),'danger',false,['progress']);
                 }
-                else if (global.tech.military >= 8){
-                    mtech += 20;
+
+                if (sus >= 100){
+                    global.civic.foreign.gov0.hstl = 100;
+                    global.civic.foreign.gov1.hstl = 100;
+                    global.civic.foreign.gov2.hstl = 100;
+                    if (global.race['truepath']){
+                        global.civic.foreign.gov3.hstl = 100;
+                    }
                 }
-                else if (global.tech.military >= 7){
-                    mtech += 16;
+            }
+        // Omniscience
+            if (global.resource.Omniscience.display){
+                if (global.eden['research_station']){
+                    let corruptor = 1;
+                    if (global.race['warlord'] && global.eden['corruptor']){
+                        corruptor = 1 + (p_on['corruptor'] || 0) * 0.04;
+                    }
+                    let gain = (support_on['research_station'] || 0) * Math.round(777 * corruptor);
+                    caps['Omniscience'] += gain;
+                    breakdown.c.Omniscience[loc('eden_research_station_title')] = gain+'v';
                 }
-                else if (global.tech.military >= 6){
-                    mtech += 12;
+
+                if (global.race['warlord'] && global.portal['mortuary'] && global.portal['corpse_pile']){
+                    let gain = global.portal.corpse_pile.count * (p_on['mortuary'] || 0) * (p_on['encampment'] || 0) * 2; 
+                    caps['Omniscience'] += gain;
+                    breakdown.c.Omniscience[loc('eden_encampment_title')] = gain+'v';
                 }
-                else if (global.tech.military >= 4){
-                    mtech += 8;
+                else if (p_on['ascension_trigger'] && global.eden.hasOwnProperty('encampment') && global.eden.encampment.asc){
+                    let heatSink = actions.interstellar.int_sirius.ascension_trigger.heatSink();
+                    heatSink = heatSink < 0 ? Math.abs(heatSink) : 0;
+                    let omniscience = +(150 + (heatSink ** 0.95 / 10)).toFixed(0);
+
+                    let gain = (p_on['encampment'] || 0) * omniscience;
+                    caps['Omniscience'] += gain;
+                    breakdown.c.Omniscience[loc('eden_encampment_title')] = gain+'v';
                 }
-                else if (global.tech.military >= 3){
-                    mtech += 4;
+
+                if (global.eden['archive']){
+                    let gain = (p_on['archive'] || 0) * 1013;
+                    caps['Omniscience'] += gain;
+                    breakdown.c.Omniscience[loc('eden_archive_bd')] = gain+'v';
                 }
             }
-            breakdown.c.Sus[loc('witch_hunter_magic_tech')] = mtech+'v';
-            sus += mtech;
-
-            if (!global.tech['roguemagic']){
-                breakdown.c.Sus[loc('overt')] = (sus*5-sus)+'v';
-                sus *= 5;
+        //Cipher
+            if (global.tech['isolation'] && global.tauceti['alien_outpost'] && global.resource.Cipher.display){
+                let cipher = 200000;
+                caps['Cipher'] += cipher;
+                breakdown.c.Cipher[loc('tech_alien_outpost')] = cipher+'v';
             }
+        
 
-            if (global.tech['nexus']){
-                let nexus = global.tech['nexus'] * 0.15;
-                breakdown.c.Sus[loc('arpa_projects_nexus_title')] = nexus+'v';
-                sus += nexus;
+        //Labor caps --------------
+        //Professor
+        {
+            if (global.tech['isolation'] && support_on['infectious_disease_lab']){
+                lCaps['professor'] += jobScale(support_on['infectious_disease_lab'] * 2);
+                lCaps['scientist'] += jobScale(support_on['infectious_disease_lab']);
             }
-
-            if (global.tech['syphon']){
-                let syphon = global.tech['syphon'] * 2.5;
-                breakdown.c.Sus[loc('arpa_syphon_title')] = syphon+'v';
-                sus += syphon;
+            if (global.race['warlord'] && p_on['twisted_lab']){
+                lCaps['professor'] += jobScale(p_on['twisted_lab'] * 3);
+                lCaps['scientist'] += jobScale(p_on['twisted_lab'] * 2);
             }
-
-            if (global.portal.hasOwnProperty('soul_capacitor')){
-                let capacitors = p_on['soul_capacitor'] || 0;
-                global.portal.soul_capacitor['ecap'] = 2500000 * capacitors;
-                breakdown.c.Sus[loc('portal_soul_capacitor_title')] = (capacitors / 3)+'v';
-                sus += capacitors / 3;
+        }
+        //Scientist
+        {
+            if (global.race['wish'] && global.race['wishStats'] && global.race.wishStats.prof){
+                lCaps['scientist'] += jobScale(global.race.wishStats.prof);
             }
-
-            if (global.tech['roguemagic'] && global.tech.roguemagic >= 3 && global.city['conceal_ward']){
-                let wards = global.city.conceal_ward.count;
-                if (global.tech.roguemagic >= 8){
-                    wards *= 1.25;
+        }
+        //Space_miner
+        //Craftsman
+        {
+            if (global.city['foundry']){
+                lCaps['craftsman'] += jobScale(global.city['foundry'].count);
+            }
+            if (support_on['fabrication']){
+                lCaps['craftsman'] += jobScale(support_on['fabrication']);
+                if (global.race['cataclysm']){
+                    lCaps['cement_worker'] += jobScale(support_on['fabrication']);
                 }
-                breakdown.c.Sus[loc('city_conceal_ward')] = -(wards)+'v';
-                sus -= wards;
             }
-
-            if (sus < 0){ sus = 0; }
-            sus = Math.floor(sus);
-            global.resource.Sus.amount = sus;
-
-            if (sus >= 50 && !global.race['witch_hunter_warned']){
-                global.race['witch_hunter_warned'] = 1;
-                messageQueue(loc('witch_hunter_warning'),'danger',false,['progress']);
+            if (global.tech['isolation'] && support_on['tau_factory']){
+                lCaps['craftsman'] += jobScale(support_on['tau_factory'] * 5);
+                lCaps['cement_worker'] += jobScale(support_on['tau_factory'] * 2);
             }
-            else if (sus >= 80 && global.race['witch_hunter_warned'] && global.race.witch_hunter_warned === 1){
-                global.race.witch_hunter_warned = 2;
-                messageQueue(loc('witch_hunter_warning2'),'danger',false,['progress']);
+            if (global.race['warlord'] && p_on['hell_factory']){
+                lCaps['cement_worker'] += jobScale(p_on['hell_factory'] * 5);
             }
-
-            if (sus >= 100){
-                global.civic.foreign.gov0.hstl = 100;
-                global.civic.foreign.gov1.hstl = 100;
-                global.civic.foreign.gov2.hstl = 100;
-                if (global.race['truepath']){
-                    global.civic.foreign.gov3.hstl = 100;
-                }
+            if (p_on['womling_station']){
+                lCaps['craftsman'] += jobScale(p_on['womling_station'] * 1);
+                lCaps['cement_worker'] += jobScale(p_on['womling_station'] * 1);
+            }
+            if (p_on['stellar_forge']){
+                lCaps['craftsman'] += jobScale(p_on['stellar_forge'] * 2);
+            }
+            if (p_on['demon_forge']){
+                lCaps['craftsman'] += jobScale(p_on['demon_forge'] * actions.portal.prtl_wasteland.demon_forge.crafters());
+            }
+            if (global.tech['elysium'] && global.tech.elysium >= 18 && p_on['sacred_smelter']){
+                lCaps['craftsman'] += jobScale(p_on['sacred_smelter'] * 3);
             }
         }
-
-        breakdown['gt_route'] = {};
-        if (global.galaxy['freighter']){
-            breakdown.gt_route[loc('galaxy_freighter')] = gal_on['freighter'] * 2;
-        }
-        if (global.galaxy['super_freighter']){
-            breakdown.gt_route[loc('galaxy_super_freighter')] = gal_on['super_freighter'] * 5;
-        }
-        if (global.galaxy['bolognium_ship']){
-            lCaps['crew'] += global.galaxy.bolognium_ship.on * actions.galaxy.gxy_gateway.bolognium_ship.ship.civ();
-        }
-        if (global.galaxy['scout_ship']){
-            lCaps['crew'] += global.galaxy.scout_ship.on * actions.galaxy.gxy_gateway.scout_ship.ship.civ();
-        }
-        if (global.galaxy['corvette_ship']){
-            lCaps['crew'] += global.galaxy.corvette_ship.on * actions.galaxy.gxy_gateway.corvette_ship.ship.civ();
-        }
-        if (global.galaxy['frigate_ship']){
-            lCaps['crew'] += global.galaxy.frigate_ship.on * actions.galaxy.gxy_gateway.frigate_ship.ship.civ();
-        }
-        if (global.galaxy['cruiser_ship']){
-            lCaps['crew'] += global.galaxy.cruiser_ship.on * actions.galaxy.gxy_gateway.cruiser_ship.ship.civ();
-        }
-        if (global.galaxy['dreadnought']){
-            lCaps['crew'] += global.galaxy.dreadnought.on * actions.galaxy.gxy_gateway.dreadnought.ship.civ();
-        }
-        if (global.galaxy['freighter']){
-            lCaps['crew'] += global.galaxy.freighter.on * actions.galaxy.gxy_gorddon.freighter.ship.civ();
-        }
-        if (global.galaxy['super_freighter']){
-            lCaps['crew'] += global.galaxy.super_freighter.on * actions.galaxy.gxy_alien1.super_freighter.ship.civ();
+        //Cement_worker
+        {
+            if (global.city['cement_plant']){
+                lCaps['cement_worker'] += jobScale(global.city.cement_plant.count * 2);
+            }
+            if (global.eden['eden_cement']){
+                let ec = p_on['eden_cement'] || 0;
+                lCaps['cement_worker'] += jobScale(ec * 5);
+            }
+            if (global.race['orbit_decayed'] && p_on['red_factory']){
+                lCaps['cement_worker'] += jobScale(p_on['red_factory']);
+            }
         }
-        if (global.galaxy['armed_miner']){
-            lCaps['crew'] += global.galaxy.armed_miner.on * actions.galaxy.gxy_alien2.armed_miner.ship.civ();
+        //Hell_surveyor
+            if (global.portal['carport']){
+                lCaps['hell_surveyor'] += jobScale(global.portal.carport.count) - global.portal.carport.damaged;
+            }
+        //Archaeologist
+            if (p_on['archaeology']){
+                lCaps['archaeologist'] += jobScale(p_on['archaeology'] * 2);
+            }
+        //Ghost_trapper
+            if (support_on['ectoplasm_processor']){
+                lCaps['ghost_trapper'] += jobScale(support_on['ectoplasm_processor'] * 5);
+            }
+        //Elysium_miner
+            if (p_on['elysanite_mine']){
+                lCaps['elysium_miner'] += jobScale(p_on['elysanite_mine'] * 2);
+            }
+        //Miner
+        {
+            if (global.city['mine']){
+                lCaps['miner'] += jobScale(global.city.mine.count);
+            }
+            if (global.race['orbit_decayed'] && global.space.hasOwnProperty('red_mine')){
+                lCaps['miner'] += jobScale(support_on['red_mine']);
+                lCaps['coal_miner'] += jobScale(support_on['red_mine']);
+            }
         }
-        if (global.galaxy['scavenger']){
-            lCaps['crew'] += global.galaxy.scavenger.on * actions.galaxy.gxy_alien2.scavenger.ship.civ();
+        //Coal_miner
+        {
+            if (global.city['coal_mine']){
+                lCaps['coal_miner'] += jobScale(global.city.coal_mine.count);
+            }
         }
-        if (global.portal['transport']){
-            lCaps['crew'] += global.portal.transport.on * actions.portal.prtl_lake.transport.ship.civ();
+        //Banker
+        {
+            if (global.city['bank']){
+                lCaps['banker'] += jobScale(global.city.bank.count);
+            }
+            if (global.portal['hell_casino']){
+                if (global.tech['theatre'] && !global.race['joyless']){
+                    lCaps['entertainer'] += jobScale(global.portal.hell_casino.count * 3);
+                }
+                lCaps['banker'] += jobScale(global.portal.hell_casino.count);
+            }
         }
-
-        if (global.tauceti['infectious_disease_lab']){
-            let gain = 39616;
-            if (global.tech['supercollider'] && global.tech['isolation']){
-                let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 12.5: 25;
-                gain *= (global.tech['supercollider'] / ratio) + 1;
+        //Entertaitner
+        {
+            if (global.city['amphitheatre']){
+                let athVal = govActive('athleticism',1);
+                lCaps['entertainer'] += jobScale(athVal ? (global.city.amphitheatre.count * athVal) : global.city.amphitheatre.count);
             }
-            caps['Knowledge'] += (p_on['infectious_disease_lab'] * Math.round(gain));
-            breakdown.c.Knowledge[actions.tauceti.tau_home.infectious_disease_lab.title()] = (p_on['infectious_disease_lab'] * gain)+'v';
-
-            if (global.tech['isolation']){
-                let el_gain = support_on['infectious_disease_lab'] * spatialReasoning(375);
-                caps['Elerium'] += el_gain;
-                breakdown.c.Elerium[actions.tauceti.tau_home.infectious_disease_lab.title()] = el_gain+'v';
+            if (global.city['casino'] && global.tech['theatre'] && !global.race['joyless']){
+                    lCaps['entertainer'] += jobScale(global.city.casino.count);
+            }
+            if (global.space['spc_casino']){
+                if (global.tech['theatre'] && !global.race['joyless']){
+                    lCaps['entertainer'] += jobScale(global.space.spc_casino.count);
+                }
+                if (global.race['orbit_decayed']){
+                    lCaps['banker'] += jobScale(global.space.spc_casino.count);
+                }
+            }
+            if (global.galaxy['resort'] && global.tech['theatre'] && !global.race['joyless']){
+                    lCaps['entertainer'] += jobScale(p_on['resort'] * 2);
             }
         }
-
-        // Womlings
-        if (global.race['truepath'] && global.tauceti['overseer'] && global.tech['tau_red'] && global.tech.tau_red >= 5){
-            let pop = 0; let injured = global.tauceti.overseer.injured; let morale = 0; let loyal = 0; let prod = 0;
-
-            if (global.race['womling_friend']){
-                loyal += 25 + (support_on['overseer'] * actions.tauceti.tau_red.overseer.val());
-                morale += 75 + (support_on['womling_fun'] * actions.tauceti.tau_red.womling_fun.val());
+        //Garrison
+        {
+            if (global.race['parasite'] && !global.tech['isolation']){
+                lCaps['garrison'] += jobScale(traits.parasite.vars()[0]);
             }
-            else if (global.race['womling_god']){
-                loyal += 75 + (support_on['overseer'] * actions.tauceti.tau_red.overseer.val());
-                morale += 40 + (support_on['womling_fun'] * actions.tauceti.tau_red.womling_fun.val());
+            if (global.city['garrison']){
+                lCaps['garrison'] += global.city.garrison.on * actions.city.garrison.soldiers();
             }
-            else if (global.race['womling_lord']){
-                loyal += support_on['overseer'] * actions.tauceti.tau_red.overseer.val();
-                morale += 30 + (support_on['womling_fun'] * actions.tauceti.tau_red.womling_fun.val());
+            if (global.space['space_barracks'] && !global.race['fasting']){
+                let soldiers = actions.space.spc_red.space_barracks.soldiers();
+                lCaps['garrison'] += Math.round(global.space.space_barracks.on * soldiers);
             }
-
-            let vil_pop = global.tech['womling_pop'] && global.tech.womling_pop >= 2 ? 6 : 5;
-            pop = support_on['womling_village'] * vil_pop;
-            let farmers = support_on['womling_farm'] * 2;
-            if (farmers > pop){ farmers = pop; }
-            let crop_per_farmer = global.tech['womling_pop'] ? 8 : 6;
-            if (global.tech['womling_gene']){ crop_per_farmer += 2; }
-            if (pop > farmers * crop_per_farmer){
-                pop = farmers * crop_per_farmer;
+            if (global.interstellar['cruiser']){
+                let soldiers = actions.interstellar.int_proxima.cruiser.soldiers();
+                lCaps['garrison'] += int_on['cruiser'] * soldiers;
             }
-            let unemployed = pop - farmers - injured;
-
-            let scientist = 0;
-            if (support_on['womling_lab']){
-                scientist = support_on['womling_lab'];
-                if (scientist > unemployed){ scientist = unemployed; }
-                unemployed -= scientist;
-
-                let gain = scientist * Math.round(25000 * global.tauceti.overseer.prod / 100);
-                caps['Knowledge'] += gain;
-                breakdown.c.Knowledge[loc('interstellar_laboratory_title')] = gain+'v';
-
-                if (Math.rand(0,10) < global.tauceti.womling_lab.scientist){
-                    global.tauceti.womling_lab.tech += Math.rand(0,global.tauceti.womling_lab.scientist + 1);
-                    let expo = global.stats.achieve['overlord'] && global.stats.achieve.overlord.l >= 5 ? 4.9 : 5;
-                    if (global.race['lone_survivor']){ expo -= 0.1; }
-                    if (global.tauceti.womling_lab.tech >= Math.round((global.tech.womling_tech + 2) ** expo)){
-                        global.tech.womling_tech++;
-                        global.tauceti.womling_lab.tech = 0;
-                        messageQueue(loc('tau_red_womling_advancement',[global.tech.womling_tech]),'advanced',false,['progress']);
-                        drawTech();
+            if (global.portal['brute']){
+                let soldiers = actions.portal.prtl_wasteland.brute.soldiers();
+                lCaps['garrison'] += global.portal.brute.on * soldiers;
+            }
+            if (global.race['wish'] && global.race['wishStats']){
+                lCaps['garrison'] += jobScale(global.race.wishStats.troop);
+            }
+            if (p_on['s_gate'] && global.galaxy['starbase']){
+                let soldiers = actions.galaxy.gxy_gateway.starbase.soldiers();
+                lCaps['garrison'] += p_on['starbase'] * soldiers;
+            }
+            if (global.eden['bunker']){
+                let soldiers = actions.eden.eden_asphodel.bunker.soldiers();
+                lCaps['garrison'] += support_on['bunker'] * soldiers;
+            }
+            if (global.eden['fire_support_base'] && global.eden.fire_support_base.count === 100){
+                lCaps['garrison'] += actions.eden.eden_elysium.fire_support_base.soldiers();
+            }
+            if (!global.tech['world_control']){
+                let occ_amount = jobScale(global.civic.govern.type === 'federation' ? 15 : 20);
+                for (let i=2; i>=0; i--){
+                    if (global.civic.foreign[`gov${i}`].occ){
+                        lCaps['garrison'] -= occ_amount;
+                        if (lCaps['garrison'] < 0){
+                            global.civic.foreign[`gov${i}`].occ = false;
+                            lCaps['garrison'] += occ_amount;
+                            global.civic.garrison.workers += occ_amount;
+                            messageQueue(loc('civics_garrison_autodeoccupy_desc',[govTitle(i)]),'danger',false,['spy']);
+                        }
                     }
                 }
             }
-
-            let miners = support_on['womling_mine'] * 6;
-            if (miners > unemployed){ miners = unemployed; }
-            unemployed -= miners;
-
-            let heal_chance = global.tech['tech_womling_firstaid'] ? 3 : 4;
-            if (Math.rand(0,10) === 0){
-                let raw = Math.rand(0,miners + scientist);
-                if (raw > injured){
-                    injured = raw;
-                }
+            if (p_on['operating_base']){
+                lCaps['garrison'] += Math.min(support_on['operating_base'],p_on['operating_base']) * actions.space.spc_enceladus.operating_base.soldiers();
             }
-            else if (injured > 0 && Math.rand(0,heal_chance) === 0){
-                injured--;
+            if (p_on['fob']){
+                lCaps['garrison'] += actions.space.spc_triton.fob.soldiers();
             }
-
-            if (global.tauceti.hasOwnProperty('womling_farm')){
-                global.tauceti.womling_farm.farmers = farmers;
+        }
+        //Colonist
+        //Titan_colonist
+        //Priest
+        {
+            if (global.city['temple'] && global.genes['ancients'] && global.genes['ancients'] >= 2){
+                lCaps['priest'] += jobScale(templeCount());
             }
-            if (global.tauceti.hasOwnProperty('womling_mine')){
-                global.tauceti.womling_mine.miners = miners;
+            if (global.space['ziggurat'] && global.genes['ancients'] && global.genes['ancients'] >= 4){
+                lCaps['priest'] += jobScale(templeCount(true));
             }
-            if (global.tauceti.hasOwnProperty('womling_lab')){
-                global.tauceti.womling_lab.scientist = scientist;
+            if (global.eden['rectory'] && global.genes['ancients'] && global.genes['ancients'] >= 2 && p_on['rectory']){
+                lCaps['priest'] += jobScale(p_on['rectory']);
+            }
+            if (global.race['wish'] && global.race['wishStats'] && global.race.wishStats.priest){
+                lCaps['priest'] += jobScale(global.race.wishStats.priest);
             }
-
-            loyal -= miners;
-            morale -= miners;
-            morale -= farmers;
-            morale -= injured;
-            if (loyal > 100){ loyal = 100; }
-            else if (loyal < 0){ loyal = 0; }
-            if (morale > 100){ morale = 100; }
-            else if (morale < 0){ morale = 0; }
-
-            prod = Math.round((loyal + morale) / 2);
-            global.tauceti.overseer.loyal = loyal;
-            global.tauceti.overseer.morale = morale;
-            global.tauceti.overseer.pop = pop;
-            global.tauceti.overseer.working = farmers + miners + scientist;
-            global.tauceti.overseer.injured = injured;
-            global.tauceti.overseer.prod = prod;
         }
+        //Pit_miner
+        //Torturer
+            if (global.civic.torturer.display && global.tech['unfathomable'] && global.tech.unfathomable >= 2){
+                lCaps['torturer'] = global.city.captive_housing.count;
+            }
+        //Crew
+        {
+            if (global.galaxy['bolognium_ship']){
+                lCaps['crew'] += global.galaxy.bolognium_ship.on * actions.galaxy.gxy_gateway.bolognium_ship.ship.civ();
+            }
+            if (global.galaxy['scout_ship']){
+                lCaps['crew'] += global.galaxy.scout_ship.on * actions.galaxy.gxy_gateway.scout_ship.ship.civ();
+            }
+            if (global.galaxy['corvette_ship']){
+                lCaps['crew'] += global.galaxy.corvette_ship.on * actions.galaxy.gxy_gateway.corvette_ship.ship.civ();
+            }
+            if (global.galaxy['frigate_ship']){
+                lCaps['crew'] += global.galaxy.frigate_ship.on * actions.galaxy.gxy_gateway.frigate_ship.ship.civ();
+            }
+            if (global.galaxy['cruiser_ship']){
+                lCaps['crew'] += global.galaxy.cruiser_ship.on * actions.galaxy.gxy_gateway.cruiser_ship.ship.civ();
+            }
+            if (global.galaxy['dreadnought']){
+                lCaps['crew'] += global.galaxy.dreadnought.on * actions.galaxy.gxy_gateway.dreadnought.ship.civ();
+            }
+            if (global.galaxy['armed_miner']){
+                lCaps['crew'] += global.galaxy.armed_miner.on * actions.galaxy.gxy_alien2.armed_miner.ship.civ();
+            }
+            if (global.galaxy['scavenger']){
+                lCaps['crew'] += global.galaxy.scavenger.on * actions.galaxy.gxy_alien2.scavenger.ship.civ();
+            }
+            if (global.portal['transport']){
+                lCaps['crew'] += global.portal.transport.on * actions.portal.prtl_lake.transport.ship.civ();
+            }
+        }
+
 
         ['inspired','distracted','stimulated','motivated'].forEach(function(t){
             if (global.race[t]){
@@ -10218,31 +10506,6 @@ function midLoop(){
             }
         }
 
-        if (p_on['world_controller']){
-            let boost = 0.25;
-            if (global.interstellar['far_reach'] && p_on['far_reach'] > 0){
-                boost += p_on['far_reach'] * 0.01;
-            }
-            if (global.tech.science >= 19){
-                boost += 0.15;
-            }
-            let gain = Math.round(caps['Knowledge'] * boost);
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('space_dwarf_collider_title')] = gain+'v';
-        }
-
-        if (p_on['alien_outpost']){
-            let iso = 0;
-            if (global.tech['isolation']){
-                iso = global.race['lone_survivor'] ? 3500000 : 6500000;
-                caps['Knowledge'] += iso;
-            }
-            let boost = 0.2;
-            let gain = Math.round(caps['Knowledge'] * boost);
-            caps['Knowledge'] += gain;
-            breakdown.c.Knowledge[loc('tech_alien_outpost')] = gain+iso+'v';
-        }
-
         if (global.eden['fortress'] && global.tech.hasOwnProperty('celestial_warfare')){
             let warefare_bonus = global.tech.celestial_warfare * 10;
             if (warefare_bonus > 30){ warefare_bonus = 30; }
@@ -10253,6 +10516,19 @@ function midLoop(){
             }
         }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
         let tempCrates = caps['Crates'], tempContainers = caps['Containers'];
         Object.keys(caps).forEach(function (res){
             caps['Crates'] -= global.resource[res].crates;
diff --git a/src/space.js b/src/space.js
index 8a516b399e..3dd3cef318 100644
--- a/src/space.js
+++ b/src/space.js
@@ -67,16 +67,20 @@ const spaceProjects = {
                 Alloy(offset){ return spaceCostMultiplier('satellite', offset, 8000, 1.22); }
             },
             effect(){
-                let knowledge = global.race['cataclysm'] || global.race['orbit_decayed'] ? 2000 : 750;
-                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['supercollider']){
-                    let ratio = global.tech['particles'] && global.tech['particles'] >= 3 ? 5 : 10;
-                    knowledge *= (global.tech['supercollider'] / ratio) + 1;
-                }
+                let knowledge = actions.space.spc_home.satellite.knowVal()
                 let label = global.race['cataclysm'] ? loc('space_moon_observatory_title') : (global.race['orbit_decayed'] ? loc('city_university') : wardenLabel());
                 let amount = global.race['cataclysm'] ? 25 : (global.race['orbit_decayed'] ? 12 : 4);
                 let synergy = `<div>${loc('space_home_satellite_effect2',[label, amount])}</div>`;
                 return `<div>${loc('plus_max_resource',[knowledge,global.resource.Knowledge.name])}</div>${synergy}<div>${loc('space_home_satellite_effect3',[global.civic.scientist ? global.civic.scientist.name : loc('job_scientist')])}</div>`
             },
+            knowVal(){
+                let gain = global.race['cataclysm'] || global.race['orbit_decayed'] ? 2000 : 750;
+                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['supercollider']){
+                    let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 5: 10;
+                    gain *= (global.tech['supercollider'] / ratio) + 1;
+                }
+                return gain
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('satellite');
@@ -420,12 +424,16 @@ const spaceProjects = {
                 if (global.race['cataclysm']){
                     prof = `<div>${loc('city_university_effect',[jobScale(1)])}</div>`;
                 }
+                let gain = actions.space.spc_moon.observatory.knowVal()
+                let synergy = global.race['cataclysm'] ? `<div>${loc('space_moon_observatory_cata_effect',[25])}</div>` : `<div>${loc('space_moon_observatory_effect',[5])}</div>`;
+                return `<div class="has-text-caution">${loc('space_used_support',[loc('space_moon_info_name')])}</div>${prof}<div>${loc('plus_max_resource',[gain,global.resource.Knowledge.name])}</div>${synergy}`;
+            },
+            knowVal(){
                 let gain = 5000;
                 if (global.race['cataclysm'] && global.space['satellite'] && global.space.satellite.count > 0){
                     gain *= 1 + (global.space.satellite.count * 0.25);
                 }
-                let synergy = global.race['cataclysm'] ? `<div>${loc('space_moon_observatory_cata_effect',[25])}</div>` : `<div>${loc('space_moon_observatory_effect',[5])}</div>`;
-                return `<div class="has-text-caution">${loc('space_used_support',[loc('space_moon_info_name')])}</div>${prof}<div>${loc('plus_max_resource',[gain,global.resource.Knowledge.name])}</div>${synergy}`;
+                return gain
             },
             s_type: 'moon',
             support(){ return -1; },
@@ -1247,7 +1255,21 @@ const spaceProjects = {
                 Elerium(offset){ return spaceCostMultiplier('exotic_lab', offset, 20, 1.28) - 4; }
             },
             effect(wiki){
-                let sci = 500;
+                let sci = actions.space.spc_red.exotic_lab.knowVal(wiki)
+                let elerium = spatialReasoning(10);
+
+                let scientist = '';
+                let lab = '';
+                if (global.race['cataclysm'] || global.race['orbit_decayed']){
+                    scientist = `<div>${loc('city_wardenclyffe_effect1',[jobScale(1), global.civic.scientist.name])}</div>`;
+                    if (global.tech.science >= 15){
+                        lab = `<div>${loc('city_wardenclyffe_effect4',[2])}</div>`;
+                    }
+                }
+                return `<div class="has-text-caution">${loc('space_used_support',[planetName().red])}</div>${scientist}${lab}<div>${loc('space_red_exotic_lab_effect1',[+(sci).toFixed(0)])}</div><div>${loc('plus_max_resource',[elerium,global.resource.Elerium.name])}</div>`;
+            },
+            knowVal(wiki){
+                let sci=500;
                 if (global.tech['science'] >= 13 && global.interstellar['laboratory']){
                     let num_lab_on = wiki ? global.interstellar.laboratory.on : int_on['laboratory'];
                     sci += num_lab_on * 25;
@@ -1255,28 +1277,27 @@ const spaceProjects = {
                 if (global.tech['ancient_study'] && global.tech['ancient_study'] >= 2){
                     sci += templeCount(true) * 15;
                 }
-                let num_mass_driver_on = wiki ? (global.city?.mass_driver?.on ?? 0) : p_on['mass_driver'];
-                if (global.tech.mass >= 2 && num_mass_driver_on > 0){
-                    sci += highPopAdjust(num_mass_driver_on * global.civic.scientist.workers);
+                if (global.tech.mass >= 2){
+                    let brain = workerScale(global.civic.scientist.workers,'scientist');
+                    if (global.race['high_pop']){
+                        brain = highPopAdjust(brain);
+                    }
+                    let num_mass_on=wiki ? global.city.mass_driver.on : p_on['mass_driver']
+                    sci += num_mass_on * brain;
                 }
                 if (global.tech['science'] >= 21){
                     sci *= 1.45;
                 }
+                if (global.race['cataclysm'] && support_on['observatory']){
+                    sci *= 1 + (wiki ? global.space.observatory.on : support_on['observatory']) * 0.25;
+                }
+                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.portal['sensor_drone'] && global.tech['science'] >= 14){
+                    sci *= 1 + (wiki ? global.portal.sensor_drone.on : p_on['sensor_drone']) * 0.02;
+                }
                 if (global.race['high_pop']){
                     sci = highPopAdjust(sci);
                 }
-                let elerium = spatialReasoning(10);
-
-                let scientist = '';
-                let lab = '';
-                if (global.race['cataclysm'] || global.race['orbit_decayed']){
-                    scientist = `<div>${loc('city_wardenclyffe_effect1',[jobScale(1), global.civic.scientist.name])}</div>`;
-                    sci *= 1 + (wiki ? global.space.observatory.on : support_on['observatory']) * 0.25;
-                    if (global.tech.science >= 15){
-                        lab = `<div>${loc('city_wardenclyffe_effect4',[2])}</div>`;
-                    }
-                }
-                return `<div class="has-text-caution">${loc('space_used_support',[planetName().red])}</div>${scientist}${lab}<div>${loc('space_red_exotic_lab_effect1',[+(sci).toFixed(0)])}</div><div>${loc('plus_max_resource',[elerium,global.resource.Elerium.name])}</div>`;
+                return sci
             },
             s_type: 'red',
             support(){ return -1; },

From fe7e127f1085beeeebb7c745cfe185498cccdffd Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Tue, 28 Apr 2026 18:27:03 -0600
Subject: [PATCH 03/18] simplified variables in the money section

---
 src/compare.js | 14 ++++++++++++++
 src/main.js    | 33 +++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 10 deletions(-)
 create mode 100644 src/compare.js

diff --git a/src/compare.js b/src/compare.js
new file mode 100644
index 0000000000..30a246d528
--- /dev/null
+++ b/src/compare.js
@@ -0,0 +1,14 @@
+
+let global={
+    fire:{
+        ee:{
+            throw:{
+                potato:102,
+            },
+            comm:{
+                '123':456,
+            },
+        }
+    }
+}
+console.log(ifExist(global.fire,'ee','comm','123'))
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 09946931e1..5ac9a8b07b 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8130,6 +8130,19 @@ function fastLoop(){
     firstRun = false;
 }
 
+function ifExist(main,...args){
+    for(let i in args){
+        let cur_a=args[i]
+        if(main.hasOwnProperty(cur_a)){
+            main=main[cur_a]
+        }
+        else{
+            return null
+        }
+    }
+    return main
+}
+
 function midLoop(){
     const astroSign = astrologySign();
     if (global.race.species === 'protoplasm'){
@@ -9038,15 +9051,16 @@ function midLoop(){
             }
         }
         // Money -HERE
+        let cata_orbit=global.race['cataclysm'] || global.race['orbit_decayed'];
         {
             if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
-                let vault = global.race['cataclysm'] || global.race['orbit_decayed'] ? bank_vault() * 4 : bank_vault();
-                let banks = global.race['cataclysm'] || global.race['orbit_decayed'] ? p_on['spaceport'] : global.city['bank'].count;
+                let vault = cata_orbit ? bank_vault() * 4 : bank_vault();
+                let banks = cata_orbit ? p_on['spaceport'] : global.city['bank'].count;
 
                 let gain = (banks * spatialReasoning(vault));
                 caps['Money'] += gain;
 
-                if (global.race['cataclysm'] || global.race['orbit_decayed']){
+                if (cata_orbit){
                     breakdown.c.Money[loc('space_red_spaceport_title')] = gain+'v';
                 }
                 else {
@@ -9077,15 +9091,12 @@ function midLoop(){
                 if (global.race['warlord'] && global.eden['corruptor'] && global.tech.asphodel >= 12){
                     vault *= 1 + (p_on['corruptor'] || 0) * 0.08;
                 }
-                let banks = global.eden.eternal_bank.count;
-                let gain = (banks * spatialReasoning(vault));
+                let gain = (global.eden.eternal_bank.count * spatialReasoning(vault));
                 caps['Money'] += gain;
                 breakdown.c.Money[loc('eden_eternal_bank_title')] = gain+'v';
             }
             if (global.space['titan_bank']){
-                let vault = bank_vault() * 2;
-                let banks = global.space.titan_bank.count;
-                let gain = (banks * spatialReasoning(vault));
+                let gain = (global.space.titan_bank.count * spatialReasoning(vault));
                 caps['Money'] += gain;
                 breakdown.c.Money[`${planetName().titan} ${loc('city_bank')}`] = gain+'v';
             }
@@ -9121,8 +9132,10 @@ function midLoop(){
             }
             if (global.tech['banking'] >= 4){
                 let cm = 250;
+                let title='tech_bonds'
                 if (global.tech.banking >= 14){
                     cm = 1000000;
+                    title='tech_crypto_currency'
                 }
                 else if (global.tech.banking >= 11){
                     cm = 1000;
@@ -9130,12 +9143,12 @@ function midLoop(){
                 else if (global.tech.banking >= 6){
                     cm = 600;
                 }
-                let gain = cm * (global.resource[global.race.species].amount + global.civic.garrison.workers);
+                let gain = cm * (global.resource[s_name].amount + global.civic.garrison.workers);
                 if (global.race['high_pop']){
                     gain = highPopAdjust(gain);
                 }
                 caps['Money'] += gain;
-                breakdown.c.Money[global.tech.banking >= 14 ? loc('tech_crypto_currency') : loc('tech_bonds')] = gain+'v';
+                breakdown.c.Money[loc(title)] = gain+'v';
             }
         }
         // Population

From 14836a9c1111c31a2e684ba11e8cf69c27d74046 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Tue, 28 Apr 2026 18:42:20 -0600
Subject: [PATCH 04/18] simplified vars in population section mostly changing
 global.race.species to s_name (them same)

---
 src/main.js | 134 ++++++++++++++++++++++++++++------------------------
 1 file changed, 71 insertions(+), 63 deletions(-)

diff --git a/src/main.js b/src/main.js
index 5ac9a8b07b..97202ad0cb 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8741,6 +8741,7 @@ function midLoop(){
         let space_home=actions.space.spc_home, space_titan=actions.space.spc_titan, space_red=actions.space.spc_red;
         let portal=actions.portal;
         let inter=actions.interstellar;
+        let gxy=actions.galaxy;
         let eden=actions.eden;
         let tau_home=actions.tauceti.tau_home;
         let s_name=global.race.species;
@@ -9154,112 +9155,119 @@ function midLoop(){
         // Population
         {
             if (global.tauceti['tauceti_casino']){
+                let j_count=jobScale(global.tauceti.tauceti_casino.count)
                 if (global.tech['theatre'] && !global.race['joyless']){
-                    lCaps['entertainer'] += jobScale(global.tauceti.tauceti_casino.count);
+                    lCaps['entertainer'] += j_count;
                 }
                 if (global.tech['isolation']){
-                    lCaps['banker'] += jobScale(global.tauceti.tauceti_casino.count);
+                    lCaps['banker'] += j_count;
 
-                    let pop = p_on['tauceti_casino'] * actions.tauceti.tau_home.tauceti_casino.citizens();
-                    caps[global.race.species] += pop;
-                    breakdown.c[global.race.species][structName('casino')] = pop + 'v';
+                    let pop = p_on['tauceti_casino'] * tau_home.tauceti_casino.citizens();
+                    caps[s_name] += pop;
+                    breakdown.c[s_name][structName('casino')] = pop + 'v';
                 }
             }
             if (global.city['basic_housing']){
-                let pop = global.city.basic_housing.count * actions.city.basic_housing.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][housingLabel('small')] = pop + 'v';
+                let pop = global.city.basic_housing.count * city.basic_housing.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][housingLabel('small')] = pop + 'v';
             }
             if (global.tauceti['tau_housing'] && global.tech['isolation']){
-                let pop = global.tauceti.tau_housing.count * actions.tauceti.tau_home.tau_housing.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][housingLabel('small')] = pop + 'v';
+                let pop = global.tauceti.tau_housing.count * tau_home.tau_housing.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][housingLabel('small')] = pop + 'v';
             }
             if (global.city['cottage']){
-                let pop = global.city.cottage.count * actions.city.cottage.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][housingLabel('medium')] = pop + 'v';
+                let c_count=global.city.cottage.count;
+                let pop = c_count * actions.city.cottage.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][housingLabel('medium')] = pop + 'v';
                 if (global.tech['home_safe']){
-                    let gain = (global.city['cottage'].count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
+                    let gain = (c_count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
                     caps['Money'] += gain;
                     breakdown.c.Money[housingLabel('medium')] = gain+'v';
                 }
             }
             if (global.city['apartment']){
-                let pop = p_on['apartment'] * actions.city.apartment.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][housingLabel('large')] = pop + 'v';
+                let a_count=p_on['apartment'];
+                let pop = a_count * city.apartment.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][housingLabel('large')] = pop + 'v';
                 if (global.tech['home_safe']){
-                    let gain = (p_on['apartment']  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
+                    let gain = (a_count  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
                     caps['Money'] += gain;
                     breakdown.c.Money[housingLabel('large')] = gain+'v';
                 }
             }
             if (global.eden['rectory']){
-                let pop = p_on['rectory'] * actions.eden.eden_asphodel.rectory.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc(`eden_rectory_title`)] = pop + 'v';
+                let pop = p_on['rectory'] * eden.eden_asphodel.rectory.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][loc(`eden_rectory_title`)] = pop + 'v';
             }
-            if (p_on['s_gate'] && global.galaxy['consulate'] && global.galaxy.consulate.count >= 1){
-                let pop = actions.galaxy.gxy_alien1.consulate.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('galaxy_consulate')] = pop + 'v';
+            let s_gate_on=p_on['s_gate'];
+            if (s_gate_on && global.galaxy['consulate'] && global.galaxy.consulate.count >= 1){
+                let pop = gxy.gxy_alien1.consulate.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][loc('galaxy_consulate')] = pop + 'v';
             }
-            if (p_on['s_gate'] && p_on['embassy'] && global.tech.xeno >= 11){
-                let pop = actions.galaxy.gxy_gorddon.embassy.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('galaxy_embassy')] = pop + 'v';
+            if (s_gate_on && p_on['embassy'] && global.tech.xeno >= 11){
+                let pop = gxy.gxy_gorddon.embassy.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][loc('galaxy_embassy')] = pop + 'v';
             }
-            if (p_on['s_gate'] && p_on['embassy'] && global.galaxy['dormitory']){
-                let pop = p_on['dormitory'] * actions.galaxy.gxy_gorddon.dormitory.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('galaxy_dormitory')] = pop + 'v';
+            if (s_gate_on && p_on['embassy'] && global.galaxy['dormitory']){
+                let pop = p_on['dormitory'] * gxy.gxy_gorddon.dormitory.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][loc('galaxy_dormitory')] = pop + 'v';
             }
             if (global.space['living_quarters']){
-                let gain = Math.round(support_on['living_quarters'] * actions.space.spc_red.living_quarters.citizens());
-                caps[global.race.species] += gain;
-                lCaps['colonist'] += jobScale(support_on['living_quarters']);
-                breakdown.c[global.race.species][`${planetName().red}`] = gain + 'v';
-
-                if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['home_safe']){
-                    let gain = (support_on['living_quarters'] * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 100000 : 50000) : 25000));
+                let l_count=support_on['living_quarters'];
+                let gain = Math.round(l_count * space_red.living_quarters.citizens());
+                caps[s_name] += gain;
+                lCaps['colonist'] += jobScale(l_count);
+                breakdown.c[s_name][`${planetName().red}`] = gain + 'v';
+
+                if (cata_orbit && global.tech['home_safe']){
+                    let gain = (l_count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 100000 : 50000) : 25000));
                     caps['Money'] += gain;
                     breakdown.c.Money[loc('space_red_living_quarters_title')] = gain+'v';
                 }
             }
             if (global.space['titan_quarters']){
-                let gain = Math.round(support_on['titan_quarters'] * actions.space.spc_titan.titan_quarters.citizens());
-                caps[global.race.species] += gain;
-                lCaps['titan_colonist'] += jobScale(support_on['titan_quarters']);
-                breakdown.c[global.race.species][`${planetName().titan}`] = gain + 'v';
+                let t_count=support_on['titan_qaurters']
+                let gain = Math.round(l_count * space_titan.titan_quarters.citizens());
+                caps[s_name] += gain;
+                lCaps['titan_colonist'] += jobScale(l_count);
+                breakdown.c[s_name][`${planetName().titan}`] = gain + 'v';
             }
             if (global.interstellar['habitat'] && p_on['habitat']){
-                let pop = p_on['habitat'] * actions.interstellar.int_alpha.habitat.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('interstellar_habitat_title')] = pop + 'v';
+                let pop = p_on['habitat'] * inter.int_alpha.habitat.citizens();
+                caps[s_name] += pop;
+                breakdown.c[s_name][loc('interstellar_habitat_title')] = pop + 'v';
             }
             if (global.interstellar['luxury_condo'] && p_on['luxury_condo']){
-                let cit = p_on['luxury_condo'] * actions.interstellar.int_alpha.luxury_condo.citizens();
-                caps[global.race.species] += cit;
-                breakdown.c[global.race.species][loc('tech_luxury_condo')] = cit + 'v';
-                let gain = (p_on['luxury_condo']  * spatialReasoning(750000));
+                let l_count=p_on['luxury_condo'];
+                let cit = l_count * inter.int_alpha.luxury_condo.citizens();
+                caps[s_name] += cit;
+                breakdown.c[s_name][loc('tech_luxury_condo')] = cit + 'v';
+                let gain = (l_count  * spatialReasoning(750000));
                 caps['Money'] += gain;
                 breakdown.c.Money[loc('tech_luxury_condo')] = gain+'v';
             }
             if (global.city['lodge']){
-                let cit = global.city.lodge.count * actions.city.lodge.citizens();
-                caps[global.race.species] += cit;
-                breakdown.c[global.race.species][loc('city_lodge')] = cit + 'v';
+                let cit = global.city.lodge.count * city.lodge.citizens();
+                caps[s_name] += cit;
+                breakdown.c[s_name][loc('city_lodge')] = cit + 'v';
             }
             if (global.portal['hovel']){
-                let cit = global.portal.hovel.count * actions.portal.prtl_wasteland.hovel.citizens();
-                caps[global.race.species] += cit;
-                breakdown.c[global.race.species][loc('portal_hovel_title')] = cit + 'v';
+                let cit = global.portal.hovel.count * portal.prtl_wasteland.hovel.citizens();
+                caps[s_name] += cit;
+                breakdown.c[s_name][loc('portal_hovel_title')] = cit + 'v';
             }
             if (global.portal['dig_demon'] && global.race['warlord']){
-                let demons = global.portal.dig_demon.on * actions.portal.prtl_wasteland.dig_demon.citizens();
-                caps[global.race.species] += demons;
-                breakdown.c[global.race.species][loc('portal_dig_demon_title')] = demons + 'v';
+                let demons = global.portal.dig_demon.on * portal.prtl_wasteland.dig_demon.citizens();
+                caps[s_name] += demons;
+                breakdown.c[s_name][loc('portal_dig_demon_title')] = demons + 'v';
                 lCaps['miner'] += demons;
                 global.civic.miner.max = demons;
                 global.civic.miner.workers = demons;
@@ -9267,8 +9275,8 @@ function midLoop(){
             }
         }
         if (global.race['lone_survivor']){
-            breakdown.c[global.race.species][loc('base')] = '1v';
-            caps[global.race.species] = 1;
+            breakdown.c[s_name][loc('base')] = '1v';
+            caps[s_name] = 1;
         }
         // Slave
             if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {

From 38ed35bf8f6dfc1b983db3fbc15892041e3b9761 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Tue, 28 Apr 2026 20:07:43 -0600
Subject: [PATCH 05/18] just the slave cap with some simplification

ok so i got distracted *ahem* discord people *ahem* and simplified the city and space initStruct blocks! (in warlord)
---
 src/compare.js | 14 --------
 src/main.js    | 71 ++++++++++++++++++++--------------------
 src/portal.js  | 88 +++++++-------------------------------------------
 3 files changed, 47 insertions(+), 126 deletions(-)

diff --git a/src/compare.js b/src/compare.js
index 30a246d528..e69de29bb2 100644
--- a/src/compare.js
+++ b/src/compare.js
@@ -1,14 +0,0 @@
-
-let global={
-    fire:{
-        ee:{
-            throw:{
-                potato:102,
-            },
-            comm:{
-                '123':456,
-            },
-        }
-    }
-}
-console.log(ifExist(global.fire,'ee','comm','123'))
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 97202ad0cb..3ad0d6eb21 100644
--- a/src/main.js
+++ b/src/main.js
@@ -889,34 +889,34 @@ function fastLoop(){
     }
 
     const date = new Date();
-    const astroSign = astrologySign();
+    const astroSign = astrologySign();// not needed?
     breakdown.p['Global'] = {};
     var global_multiplier = 1;
-    let applyPlasmid = false;
-    let pBonus = plasmidBonus('raw');
+    let applyPlasmid = false;// not needed?
+    let pBonus = plasmidBonus('raw');// not needed?
     if (global.prestige.Plasmid.count > 0 && ((global.race.universe !== 'antimatter') || (global.genes['bleed'] && global.race.universe === 'antimatter'))){
         breakdown.p['Global'][loc('resource_Plasmid_name')] = (pBonus[1] * 100) + '%';
         applyPlasmid = true;
-    }
+    }// not needed?
     if (global.prestige.AntiPlasmid.count > 0 && ((global.race.universe === 'antimatter') || (global.genes['bleed'] && global.genes['bleed'] >= 2 && global.race.universe !== 'antimatter'))){
         breakdown.p['Global'][loc('resource_AntiPlasmid_name')] = (pBonus[2] * 100) + '%';
         applyPlasmid = true;
-    }
+    }// not needed?
     if (applyPlasmid){
         global_multiplier += pBonus[0];
-    }
+    }// not needed?
     if (global.prestige.Supercoiled.count > 0){
         let bonus = (global.prestige.Supercoiled.count / (global.prestige.Supercoiled.count + 5000));
         breakdown.p['Global'][loc('resource_Supercoiled_short')] = +(bonus * 100).toFixed(2) + '%';
         global_multiplier *= (1 + bonus);
-    }
+    }// not needed?
     if (global.race['no_plasmid'] || global.race.universe === 'antimatter'){
         if (faithTempleCount()){
             let faith = faithBonus();
             breakdown.p['Global'][loc('faith')] = (faith * 100) + '%';
             global_multiplier *= (1 + faith);
         }
-    }
+    }// not needed?
     if (global.race.universe === 'evil' && global.resource.Authority.display){
         if (global.resource.Authority.amount < 100){
             let malus = (100 - global.resource.Authority.amount) * 0.0035;
@@ -929,12 +929,10 @@ function fastLoop(){
             global_multiplier *= (1 + bonus);
         }
     }
-    if (global.race['untapped']){
-        if (global.race['untapped'] > 0){
-            let untapped = +(global.race.untapped / (global.race.untapped + 20) / 10 + 0.00024).toFixed(4);
-            breakdown.p['Global'][loc('trait_untapped_bd')] = `${untapped * 100}%`;
-            global_multiplier *= 1 + (untapped);
-        }
+    if (global.race['untapped'] && global.race['untapped'] > 0){
+        let untapped = +(global.race.untapped / (global.race.untapped + 20) / 10 + 0.00024).toFixed(4);
+        breakdown.p['Global'][loc('trait_untapped_bd')] = `${untapped * 100}%`;
+        global_multiplier *= 1 + (untapped);
     }
     if (global.race['rainbow_active'] && global.race['rainbow_active'] > 1){
         breakdown.p['Global'][loc('trait_rainbow_bd')] = `${traits.rainbow.vars()[0]}%`;
@@ -961,7 +959,7 @@ function fastLoop(){
         }
         breakdown.p['Global'][loc('tech_unification')] = `${bonus}%`;
         global_multiplier *= 1 + (bonus / 100);
-    }
+    }// not needed?
     else {
         let occupy = 0;
         for (let i=0; i<3; i++){
@@ -973,26 +971,26 @@ function fastLoop(){
             breakdown.p['Global'][loc('civics_garrison_occupy')] = `${occupy}%`;
             global_multiplier *= 1 + (occupy / 100);
         }
-    }
+    }// not needed?
     if (global.genes['challenge'] && global.genes.challenge >= 2){
         let mastery = calc_mastery();
         breakdown.p['Global'][loc('mastery')] = mastery + '%';
         global_multiplier *= 1 + (mastery / 100);
-    }
+    }// not needed?
     if (global['pillars']){
         let harmonic = calcPillar();
         breakdown.p['Global'][loc('harmonic')] = `${(harmonic[0] - 1) * 100}%`;
         global_multiplier *= harmonic[0];
-    }
+    }// not needed?
     if (global.race['ascended']){
         breakdown.p['Global'][loc('achieve_ascended_name')] = `5%`;
         global_multiplier *= 1.05;
-    }
+    }// not needed?
     if (global.race['corruption']){
         let corruption = global.race['corruption'] * 2;
         breakdown.p['Global'][loc('achieve_corrupted_name')] = `${corruption}%`;
         global_multiplier *= 1 + (corruption / 100);
-    }
+    }// not needed?
     if (global.race['rejuvenated']){
         let decay = global.stats.days < 996 ? (1000 - global.stats.days) / 2000 : 0.02;
         breakdown.p['Global'][loc('rejuvenated')] = `${decay * 100}%`;
@@ -1009,7 +1007,7 @@ function fastLoop(){
         }
         breakdown.p['Global'][loc('trait_suction_grip_bd')] = bonus+'%';
         global_multiplier *= 1 + (bonus / 100);
-    }
+    }// not needed?
 
     let cyclopsFathom = fathomCheck('cyclops');
     if (global.race['intelligent'] || cyclopsFathom > 0){
@@ -1025,7 +1023,7 @@ function fastLoop(){
         }
         breakdown.p['Global'][loc('trait_intelligent_bd')] = bonus+'%';
         global_multiplier *= 1 + (bonus / 100);
-    }
+    }// not needed?
     if (global.race['slaver'] && global.city['slave_pen'] && global.city['slave_pen']){
         let bonus = (global.resource.Slave.amount * traits.slaver.vars()[0]);
         breakdown.p['Global'][loc('trait_slaver_bd')] = bonus+'%';
@@ -1048,7 +1046,7 @@ function fastLoop(){
             breakdown.p['Global'][jobName('scavenger')] = bonus+'%';
             global_multiplier *= 1 + (bonus / 100);
         }
-    }
+    }// not needed (maybe)?
     if (global.race['unfathomable'] && global.city['surfaceDwellers'] && global.city['captive_housing']){
         let thralls = 0;
         let rank = global.stats.achieve['nightmare'] && global.stats.achieve.nightmare['mg'] ? global.stats.achieve.nightmare.mg : 0;
@@ -1073,12 +1071,12 @@ function fastLoop(){
     if (global.city.ptrait.includes('mellow')){
         breakdown.p['Global'][loc('planet_mellow_bd')] = '-' + (100 - (planetTraits.mellow.vars()[2] * 100)) + '%';
         global_multiplier *= planetTraits.mellow.vars()[2];
-    }
+    }// not needed?
     if (global.city.ptrait.includes('ozone') && global.city['sun']){
         let uv = global.city['sun'] * planetTraits.ozone.vars()[0];
         breakdown.p['Global'][loc('planet_ozone_bd')] = `-${uv}%`;
         global_multiplier *= 1 - (uv / 100);
-    }
+    }// not needed?
     let phoenixFathom = fathomCheck('phoenix');
     if ((global.race['smoldering'] || phoenixFathom > 0) && global.city['hot']){
         let heat = 0;
@@ -1181,7 +1179,7 @@ function fastLoop(){
             breakdown.p['Global'][loc('unsuited')] = `-${Math.round((1 - unsuited) * 100)}%`;
             global_multiplier *= unsuited;
         }
-    }
+    }// not needed (maybe)?
 
     if (global.race['hibernator'] && global.city.calendar.season === 3){
         global_multiplier *= 1 - (traits.hibernator.vars()[1] / 100);
@@ -1201,7 +1199,7 @@ function fastLoop(){
         'Bolognium','Vitreloy','Orichalcum','Asphodel_Powder','Elysanite','Unobtainium','Quantium',
         'Plywood','Brick','Wrought_Iron','Sheet_Metal','Mythril','Aerogel','Nanoweave','Scarletite',
         'Cipher','Nanite','Mana','Authority'
-    ];
+    ];// not needed?
 
     breakdown.p['consume'] = {};
     resList.forEach(function(res){
@@ -8100,7 +8098,7 @@ function fastLoop(){
         }
         updateDebugData();
     }
-
+    
     let easter = eventActive('easter');
     if (easter.active){
         for (i=1; i<=18; i++){
@@ -8109,7 +8107,7 @@ function fastLoop(){
                 $(`#egg${i}`).addClass('binded');
             }
         }
-    }
+    }// not needed?
 
     let halloween = eventActive('halloween');
     if (halloween.active){
@@ -8125,7 +8123,7 @@ function fastLoop(){
                 $(`#trick${i}`).addClass('binded');
             }
         }
-    }
+    }// not needed?
 
     firstRun = false;
 }
@@ -9051,7 +9049,7 @@ function midLoop(){
                 }
             }
         }
-        // Money -HERE
+        // Money
         let cata_orbit=global.race['cataclysm'] || global.race['orbit_decayed'];
         {
             if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
@@ -9280,11 +9278,12 @@ function midLoop(){
         }
         // Slave
             if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {
-                caps['Slave'] = global.city.slave_pen.count * 4;
-                breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = global.city.slave_pen.count * 4 + 'v';
+                let s_count=global.city.slave_pen.count*4;
+                caps['Slave'] = s_count;
+                breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = s_count + 'v';
 
-                if (caps['Slave'] < global.resource.Slave.amount){
-                    global.resource.Slave.amount = caps['Slave'];
+                if (s_count < global.resource.Slave.amount){
+                    global.resource.Slave.amount = s_count;
                 }
             }
         // Captive Race / Cattle
@@ -9299,7 +9298,7 @@ function midLoop(){
                 caps['Nanite'] += gain;
                 breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
             }
-        // Knowledge
+        // Knowledge -HERE
         {
             if (shrineBonusActive()){
                 let getShrineResult = getShrineBonus('know');
diff --git a/src/portal.js b/src/portal.js
index cb0efe89d1..981634faf0 100644
--- a/src/portal.js
+++ b/src/portal.js
@@ -8834,82 +8834,18 @@ export function warlordSetup(){
             global.city['transmitter'] = { count: 0, on: 0 };
         }
 
-        initStruct(actions.city.factory);
-        initStruct(actions.city.foundry);
-        initStruct(actions.city.smelter);
-
-        initStruct(actions.city.amphitheatre);
-        initStruct(actions.city.apartment);
-        initStruct(actions.city.bank);
-        initStruct(actions.city.basic_housing);
-        initStruct(actions.city.biolab);
-        initStruct(actions.city.boot_camp);
-        initStruct(actions.city.casino);
-        initStruct(actions.city.cement_plant);
-        initStruct(actions.city.coal_mine);
-        initStruct(actions.city.coal_power);
-        initStruct(actions.city.cottage);
-        initStruct(actions.city.fission_power);
-        initStruct(actions.city.garrison);
-        initStruct(actions.city.hospital);
-        initStruct(actions.city.library);
-        initStruct(actions.city.lumber_yard);
-        initStruct(actions.city.mass_driver);
-        initStruct(actions.city.metal_refinery);
-        initStruct(actions.city.mine);
-        initStruct(actions.city.oil_depot);
-        initStruct(actions.city.oil_power);
-        initStruct(actions.city.oil_well);
-        initStruct(actions.city.rock_quarry);
-        initStruct(actions.city.sawmill);
-        initStruct(actions.city.shed);
-        initStruct(actions.city.storage_yard);
-        initStruct(actions.city.temple);
-        initStruct(actions.city.tourist_center);
-        initStruct(actions.city.trade);
-        initStruct(actions.city.university);
-        initStruct(actions.city.wardenclyffe);
-        initStruct(actions.city.warehouse);
-        initStruct(actions.city.wharf);
-
-        initStruct(actions.space.spc_belt.elerium_ship);
-        initStruct(actions.space.spc_belt.iridium_ship);
-        initStruct(actions.space.spc_belt.iron_ship);
-        initStruct(actions.space.spc_belt.space_station);
-        initStruct(actions.space.spc_dwarf.e_reactor);
-        initStruct(actions.space.spc_dwarf.elerium_contain);
-        initStruct(actions.space.spc_dwarf.shipyard);
-        initStruct(actions.space.spc_gas.gas_mining);
-        initStruct(actions.space.spc_gas.gas_storage);
-        initStruct(actions.space.spc_gas_moon.drone);
-        initStruct(actions.space.spc_gas_moon.oil_extractor);
-        initStruct(actions.space.spc_gas_moon.outpost);
-        initStruct(actions.space.spc_hell.geothermal);
-        initStruct(actions.space.spc_hell.hell_smelter);
-        initStruct(actions.space.spc_hell.spc_casino);
-        initStruct(actions.space.spc_hell.swarm_plant);
-        initStruct(actions.space.spc_home.gps);
-        initStruct(actions.space.spc_home.nav_beacon);
-        initStruct(actions.space.spc_home.propellant_depot);
-        initStruct(actions.space.spc_home.satellite);
-        initStruct(actions.space.spc_moon.helium_mine);
-        initStruct(actions.space.spc_moon.iridium_mine);
-        initStruct(actions.space.spc_moon.moon_base);
-        initStruct(actions.space.spc_moon.observatory);
-        initStruct(actions.space.spc_red.biodome);
-        initStruct(actions.space.spc_red.exotic_lab);
-        initStruct(actions.space.spc_red.fabrication);
-        initStruct(actions.space.spc_red.garage);
-        initStruct(actions.space.spc_red.living_quarters);
-        initStruct(actions.space.spc_red.red_factory);
-        initStruct(actions.space.spc_red.red_mine);
-        initStruct(actions.space.spc_red.red_tower);
-        initStruct(actions.space.spc_red.space_barracks);
-        initStruct(actions.space.spc_red.spaceport);
-        initStruct(actions.space.spc_red.vr_center);
-        initStruct(actions.space.spc_red.ziggurat);
-        initStruct(actions.space.spc_sun.swarm_control);
-        initStruct(actions.space.spc_sun.swarm_satellite);
+        let City_Builds=['factory','foundry','smelter','amphitheatre','apartment','bank','basic_housing','biolab','boot_camp','casino','cement_plant','coal_mine','coal_power','cottage','fission_power','garrison','hospital','library','lumber_yard','mass_driver','metal_refinery','mine','oil_depot','oil_power','oil_well','rock_quarry','sawmill','shed','storage_yard','temple','tourist_center','trade','university','wardenclyffe','warehouse','wharf']
+        City_Builds.forEach(nm_struct=>{
+            initStruct(actions.city[nm_struct])
+        })
+
+        let Space_Builds={"spc_belt":['elerium_ship','iridium_ship','iron_ship','space_station',],"spc_dwarf":['e_reactor','elerium_contain','shipyard',],"spc_gas":['gas_mining','gas_storage','drone','oil_extractor','outpost',],"spc_hell":['geothermal','hell_smelter','spc_casino','swarm_plant',],"spc_home":['gps','nav_beacon','propellant_depot','satellite',],"spc_moon":['helium_mine','iridium_mine','moon_base','observatory',],"spc_red":['biodome','exotic_lab','fabrication','garage','living_quarters','red_factory','red_mine','red_tower','space_barracks','spaceport','vr_center','ziggurat',],"spc_sun":['swarm_control','swarm_satellite',]}
+        for(let i in Space_Builds){
+            Space_Builds[i].forEach(nm_struct=>{
+                initStruct(actions.space[i][nm_struct])
+            })
+        }
+        
 
         global.civic['garrison'] = {
             display: true,

From 917989472e268734b3e5d0f01ffbeffcb66707f2 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Wed, 29 Apr 2026 10:00:13 -0600
Subject: [PATCH 06/18] More buildings done -> wharf, warehouse may have
 started bank

---
 src/actions.js | 32 ++++++++++++++++++++++----------
 src/main.js    | 32 ++++----------------------------
 2 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 33a977b1c2..8c7ca849cd 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -2249,6 +2249,15 @@ export const actions = {
                 Wrought_Iron(offset){ return costMultiplier('storage_yard', offset, 5, bananaPerk(1.35)); }
             },
             effect(){
+                let cap = actions.city.storage_yard.crateVal()
+                if (global.tech['trade'] && global.tech['trade'] >= 3){
+                    return `<div>${loc('plus_max_resource',[cap,global.resource.Crates.name])}</div><div>${loc('city_trade_effect',[1])}</div>`;
+                }
+                else {
+                    return loc('plus_max_resource',[cap,global.resource.Crates.name]);
+                }
+            },
+            crateVal(){
                 let cap = global.tech.container >= 3 ? 20 : 10;
                 if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
                     cap += 10;
@@ -2259,12 +2268,7 @@ export const actions = {
                 if (global.tech['particles'] && global.tech['particles'] >= 2){
                     cap *= 2;
                 }
-                if (global.tech['trade'] && global.tech['trade'] >= 3){
-                    return `<div>${loc('plus_max_resource',[cap,global.resource.Crates.name])}</div><div>${loc('city_trade_effect',[1])}</div>`;
-                }
-                else {
-                    return loc('plus_max_resource',[cap,global.resource.Crates.name]);
-                }
+                return cap
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2309,6 +2313,10 @@ export const actions = {
                 Sheet_Metal(offset){ return costMultiplier('warehouse', offset, 25, bananaPerk(1.25)); }
             },
             effect(){
+                let cap = actions.city.warehouse.contVal()
+                return loc('plus_max_resource',[cap,global.resource.Containers.name]);
+            },
+            contVal(){
                 let cap = global.tech.steel_container >= 2 ? 20 : 10;
                 if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
                     cap += 10;
@@ -2319,7 +2327,7 @@ export const actions = {
                 if (global.tech['particles'] && global.tech['particles'] >= 2){
                     cap *= 2;
                 }
-                return loc('plus_max_resource',[cap,global.resource.Containers.name]);
+                return cap
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -3202,11 +3210,15 @@ export const actions = {
                 Oil(offset){ return costMultiplier('wharf', offset, 750, 1.32); }
             },
             effect(){
-                let containers = global.tech['world_control'] ? 15 : 10;
+                let containers=actions.city.wharf.ContVal()
+                return `<div>${loc('city_trade_effect',[2])}</div><div>${loc('city_wharf_effect')}</div><div>${loc('plus_max_crates',[containers])}</div><div>${loc('plus_max_containers',[containers])}</div>`;
+            },
+            contVal(){
+                let vol = global.tech['world_control'] ? 15 : 10;
                 if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    containers *= 2;
+                    vol *= 2;
                 }
-                return `<div>${loc('city_trade_effect',[2])}</div><div>${loc('city_wharf_effect')}</div><div>${loc('plus_max_crates',[containers])}</div><div>${loc('plus_max_containers',[containers])}</div>`;
+                return vol
             },
             action(args){
                 if (payCosts($(this)[0])){
diff --git a/src/main.js b/src/main.js
index 3ad0d6eb21..f7ac20b313 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8873,12 +8873,8 @@ function midLoop(){
         // Crates & Containters
             // Crates Only
         {
-            if (global.city['wharf']){
-                let vol = global.tech['world_control'] ? 15 : 10;
-                if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    vol *= 2;
-                }
-                let wharf_count=global.city.wharf.count*vol;
+            if (global.city['wharf']){                
+                let wharf_count=global.city.wharf.count * city.wharf.contVal();
 
                 caps['Crates'] += wharf_count;
                 breakdown.c.Crates[loc('city_wharf')] = (wharf_count) + 'v';
@@ -8893,17 +8889,7 @@ function midLoop(){
                 breakdown.c.Containers[loc('tech_munitions_depot')] = vol + 'v';
             }
             if (global.city['storage_yard']){
-                let size = global.tech.container >= 3 ? 20 : 10;
-                if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
-                    size += 10;
-                }
-                if (global.tech['world_control']){
-                    size += 10;
-                }
-                if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    size *= 2;
-                }
-                let stor_count=global.city['storage_yard'].count * size
+                let stor_count=global.city['storage_yard'].count * city.storage_yard.crateVal()
                 caps['Crates'] += stor_count;
                 breakdown.c.Crates[loc('city_storage_yard')] = stor_count + 'v';
             }
@@ -8947,17 +8933,7 @@ function midLoop(){
         }
             // Containers Only
             if (global.city['warehouse']){
-                let volume = global.tech['steel_container'] >= 2 ? 20 : 10;
-                if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
-                    volume += 10;
-                }
-                if (global.tech['world_control']){
-                    volume += 10;
-                }
-                if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    volume *= 2;
-                }
-                let w_count=(global.city['warehouse'].count * volume)
+                let w_count=(global.city['warehouse'].count * city.warehouse.contVal())
                 caps['Containers'] += w_count;
                 breakdown.c.Containers[loc('city_warehouse')] = w_count + 'v';
             }

From e606e164028b597e3b03a5f33e88d6c918172571 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Wed, 29 Apr 2026 10:02:40 -0600
Subject: [PATCH 07/18] accidently redifined gain for pumpjack

---
 src/main.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main.js b/src/main.js
index f7ac20b313..3a8015b4db 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9826,13 +9826,13 @@ function midLoop(){
                 }
             }
             if (global.portal['pumpjack']){
-                let gain = (global.portal.pumpjack.count * spatialReasoning(500));
-                caps['Oil'] += gain;
-                breakdown.c.Oil[loc('portal_pumpjack_title')] = gain+'v';
+                let o_gain = (global.portal.pumpjack.count * spatialReasoning(500));
+                caps['Oil'] += o_gain;
+                breakdown.c.Oil[loc('portal_pumpjack_title')] = o_gain+'v';
 
-                let gain = (global.portal.pumpjack.count * spatialReasoning(250));
-                caps['Helium_3'] += gain;
-                breakdown.c.Helium_3[loc('portal_pumpjack_title')] = gain+'v';
+                let h_gain = (global.portal.pumpjack.count * spatialReasoning(250));
+                caps['Helium_3'] += h_gain;
+                breakdown.c.Helium_3[loc('portal_pumpjack_title')] = h_gain+'v';
             }
         }
         // Uranium

From 3ebdc401963870bb6e3e713abe7616a7cd241308 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Wed, 29 Apr 2026 11:24:19 -0600
Subject: [PATCH 08/18] added a save/load govenor config system

---
 src/governor.js | 112 +++++++++++++++++++++++++++++++++++++++++++-----
 src/vars.js     |   7 +++
 2 files changed, 109 insertions(+), 10 deletions(-)

diff --git a/src/governor.js b/src/governor.js
index 666229c978..db7810d5c5 100644
--- a/src/governor.js
+++ b/src/governor.js
@@ -1,5 +1,5 @@
 import { global, seededRandom, p_on, breakdown } from './vars.js';
-import { vBind, popover, tagEvent, calcQueueMax, calcRQueueMax, clearElement, adjustCosts, decodeStructId, timeCheck, arpaTimeCheck, hoovedRename } from './functions.js';
+import { vBind, popover, tagEvent, calcQueueMax, calcRQueueMax, clearElement, adjustCosts, decodeStructId, timeCheck, arpaTimeCheck, hoovedRename, deepClone } from './functions.js';
 import { races } from './races.js';
 import { actions, checkCityRequirements, housingLabel, wardenLabel, updateQueueNames, checkAffordable, drawTech, drawCity } from './actions.js';
 import { govCivics, govTitle } from './civics.js';
@@ -417,6 +417,38 @@ function dragSpyopList(gov){
     }
 }
 
+function getKeyByValue(obj, value) {
+    return Object.keys(obj).find(key => obj[key] === value);
+}
+function createGovConfigName(task,name){
+    if(!name || name=="name"){
+        let config=global.race.governor.config.saves[task]
+        name=0;
+        Object.keys(config).forEach(elm=>{
+            if(typeof elm=="number"){
+                name=Math.max(name,parseInt(elm))
+            }
+        })
+        name=name+1
+    }
+    return name
+}
+function createGovConfig(task,name){
+    let config;
+    name=createGovConfigName(task,name)
+
+    if(!global.race.governor.config.saves[task]){
+        config={}
+    }
+    else{
+        config=global.race.governor.config.saves[task]
+    }
+    
+    global.race.governor.config.saves.name=name;
+    config[name]=deepClone(global.race.governor.config[task])
+    global.race.governor.config.saves[task]=config
+}
+
 export function drawnGovernOffice(){
     clearSpyopDrag();
     let govern = $(`<div id="govOffice" class="govOffice"></div>`);
@@ -459,7 +491,31 @@ export function drawnGovernOffice(){
         global.race.governor['config'] = {};
     }
 
-    let options = $(`<div class="options"><div>`);
+    let config=$(`<div id="saveLoadTasks" class="govTask"></div>`);
+    govern.append(config);
+
+    let config_opt=``;
+    Object.keys(gov_tasks).forEach(function(task){
+        if(gov_tasks[task].req()){//v-show="activeTask('${task}')" 
+            config_opt+=`<b-dropdown-item v-on:click="setTask('${task}',10);">{{ '${task}' | label }}</b-dropdown-item>`
+        }
+    })
+    config.append(/*html*/`
+        <span>${loc(`gov_task`,["Load / Save"])}</span>
+        <b-dropdown hoverable>
+            <button class="button is-primary" slot="trigger">
+                <span>{{ t.t10 | label }}</span>
+                <i class="fas fa-sort-down"></i>
+            </button>
+            <b-dropdown-item v-on:click="setTask('none',10)">{{ 'none' | label }}</b-dropdown-item>
+            ${config_opt}
+        </b-dropdown>
+        <b-button v-on:click="loadConfig(t.t10,c.saves.name)">Load</b-button>
+        <b-button v-on:click="saveConfig(t.t10,c.saves.name)">Save</b-button>
+        <b-input v-model="c.saves.name" :controls="false"></b-input>`)//:v-html="c.saves.name"
+
+
+    let options = $(`<div class="options"></div>`);
     govern.append(options);
 
     //Configs
@@ -700,21 +756,28 @@ export function drawnGovernOffice(){
                         }
                     });
                 }
-                tagEvent('govtask',{
-                    'task': t
-                });
+                if(n!==10){
+                    tagEvent('govtask',{
+                        'task': t
+                    });
+                }
                 vBind({el: `#race`},'update');
             },
             showTask(t){
-                return Object.values(global.race.governor.tasks).includes(t) 
+                return (Object.values(global.race.governor.tasks).includes(t) 
                 || (Object.values(global.race.governor.tasks).includes('combo_storage') && ['storage','bal_storage'].includes(t))
-                || (Object.values(global.race.governor.tasks).includes('combo_spy') && ['spy','spyop'].includes(t));
+                || (Object.values(global.race.governor.tasks).includes('combo_spy') && ['spy','spyop'].includes(t))) && Object.keys(global.race.governor.tasks).map(key=>{
+                    if(key!="t10"){
+                        return global.race.governor.tasks[key]
+                    }
+                }).includes(t);
             },
             activeTask(t){
                 let activeTasks = [];
                 if (global.race.hasOwnProperty('governor')){
                     Object.keys(global.race.governor.tasks).forEach(function(ts){
-                        if (global.race.governor.tasks[ts] !== 'none'){
+                        // console.log(ts,"t10")
+                        if (global.race.governor.tasks[ts] !== 'none' && ts !== "t10"){
                             activeTasks.push(global.race.governor.tasks[ts]);
                         }
                     });
@@ -760,7 +823,27 @@ export function drawnGovernOffice(){
             },
             trashLabel(r){
                 return loc(global.race.governor.config.trash[r].s ? `gov_task_trash_max` : `gov_task_trash_min`,[global.resource[r].name]);
-            }
+            },
+            saveConfig(t,n){
+                // console.log(global.race.governor.config)
+                // if(!global.race.governor.config.saves){
+                //     global.race.governor.config.saves={name:'0'}
+                // }
+                createGovConfig(t,n)
+            },
+            loadConfig(t,n){
+                let saves=global.race.governor.config.saves
+                if(!saves.hasOwnProperty(t)){
+                    console.log("you have no save for the task ",t)
+                    return
+                }
+                if(!saves[t].hasOwnProperty(n)){
+                    console.log("you have no save for the task ",t," named ",n)
+                    return
+                }
+                global.race.governor.config[t]=global.race.governor.config.saves[t][n]
+                console.log("here is config",global.race.governor.config[t],global.race.governor.config.saves[t][n])
+            },
         },
         filters: {
             label(t){
@@ -779,7 +862,16 @@ export function drawnGovernOffice(){
     {
         elm: `#govOffice .bg`,
     });
-    
+    popover(`saveLoadTasks`,function(){
+        let gov=global.race.governor
+        // console.log(gov.config.saves)
+        let desc=`<div>Current Saves: ${gov.tasks.t10}</div><div>${gov.config.saves[gov.tasks.t10]?Object.keys(gov.config.saves[gov.tasks.t10]).join(', '):'None'}</div>`
+        //'Hey there'+
+        return desc
+    },{
+        elm:`#saveLoadTasks`,
+    })
+
     Object.keys(global.civic.foreign).forEach(function (gov){
         dragSpyopList(gov);
     });
diff --git a/src/vars.js b/src/vars.js
index 4ed92d2c68..c7ed58ccf7 100644
--- a/src/vars.js
+++ b/src/vars.js
@@ -105,6 +105,7 @@ if (!global['version']){
     global['version'] = '0.2.0';
 }
 
+
 if (convertVersion(global['version']) < 2060){
     Object.keys(global.resource).forEach(function (res){
         if (global.resource[res].crates){
@@ -1999,6 +2000,12 @@ if (!global.civic['d_job']){
         global.civic['d_job'] = 'unemployed';
     }
 }
+if(!global.race.governor?.tasks){
+    global.race.governor.tasks.t10='none';
+}
+if(!global.race.governor.config?.saves){
+    global.race.governor.config.saves={name:"0"}
+}
 
 global.settings.animated = true;
 global.settings.disableReset = false;

From 72c610209b3d8ab49ec07b499112cf15eef7a01f Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Wed, 29 Apr 2026 12:15:37 -0600
Subject: [PATCH 09/18] Started working on Zen (meditation), Mana (city pylon),
 Food (silo, compost, soul_well, smokehouse), rock_quarry, lumber_yard,
 graveyard Changed *Val() funcs to be *Cap() to reflect their nature *Val()
 now means resource.*.amount - may be addition or just eq *Cap() now means
 caps['*'] *Disp() now means any value / cap that has any special math to
 determine display value - You may encounter a *DispC  or *DispV, (cap or val)
 which means a buildling displays both the cap and value with special math, so
 it needs to handle both

---
 src/actions.js | 65 +++++++++++++++++++++++++++++++++++++++-----------
 src/main.js    | 51 ++++++++++++++++++++-------------------
 src/space.js   | 12 +++++-----
 3 files changed, 84 insertions(+), 44 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 8c7ca849cd..0800cc28d9 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1597,9 +1597,12 @@ export const actions = {
                 Stone(offset){ return costMultiplier('smokehouse', offset, 50, 1.36); }
             },
             effect(){
-                let food = BHStorageMulti(spatialReasoning(100));
+                let food = actions.city.smokehouse.foodCap();
                 return `<div>${loc('plus_max_resource',[food, global.resource.Food.name])}</div><div>${loc('city_smokehouse_effect',[10])}</div>`;
             },
+            foodCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(100));
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('smokehouse','city');
@@ -1636,10 +1639,14 @@ export const actions = {
                 Stone(offset){ return costMultiplier('soul_well', offset, 10, 1.36); }
             },
             effect(){
-                let souls = BHStorageMulti(spatialReasoning(500));
+                let souls = actions.city.soul_well.foodCap()
                 let production = global.race['ghostly'] ? (2 + traits.ghostly.vars()[1]) : 2;
                 return `<div>${loc('city_soul_well_effect',[production])}</div><div>${loc('plus_max_resource',[souls, loc('resource_Souls_name')])}</div>`;
             },
+            foodCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(500))
+            },
+            foodVal(){},
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('soul_well','city');
@@ -1813,10 +1820,14 @@ export const actions = {
                 generated *= global.city.biome === 'hellscape' ? biomes.hellscape.vars()[0] : 1;
                 generated *= global.city.ptrait.includes('trashed') ? planetTraits.trashed.vars()[0] : 1;
                 generated = +(generated).toFixed(2);
-                let store = BHStorageMulti(spatialReasoning(200));
+                let store = actions.city.compost.foodCap();
                 let wood = global.race['kindling_kindred'] || global.race['smoldering'] ? `` : `<div class="has-text-caution">${loc('city_compost_heap_effect2',[0.5,global.resource.Lumber.name])}</div>`;
                 return `<div>${loc('city_compost_heap_effect',[generated])}</div><div>${loc('city_compost_heap_effect3',[store])}</div>${wood}`;
             },
+            foodCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(200));
+            },
+            foodVal(){},
             switchable(){ return true; },
             action(args){
                 if (payCosts($(this)[0])){
@@ -1939,9 +1950,12 @@ export const actions = {
                 Iron(offset){ return ((global.city.silo ? global.city.silo.count : 0) + (offset || 0)) >= 4 && global.city.ptrait.includes('unstable') ? costMultiplier('silo', offset, 10, 1.36) : 0; }
             },
             effect(){
-                let food = BHStorageMulti(spatialReasoning(500));
+                let food = actions.city.silo.foodCap();
                 return loc('plus_max_resource',[food, global.resource.Food.name]);
             },
+            foodCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(500))
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('silo','city');
@@ -2257,7 +2271,7 @@ export const actions = {
                     return loc('plus_max_resource',[cap,global.resource.Crates.name]);
                 }
             },
-            crateVal(){
+            crateCap(){
                 let cap = global.tech.container >= 3 ? 20 : 10;
                 if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
                     cap += 10;
@@ -2316,7 +2330,7 @@ export const actions = {
                 let cap = actions.city.warehouse.contVal()
                 return loc('plus_max_resource',[cap,global.resource.Containers.name]);
             },
-            contVal(){
+            contCap(){
                 let cap = global.tech.steel_container >= 2 ? 20 : 10;
                 if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
                     cap += 10;
@@ -2422,10 +2436,14 @@ export const actions = {
                 Crystal(offset){ return costMultiplier('pylon', offset, 8, 1.42) - 3; }
             },
             effect(){
-                let max = spatialReasoning(5);
+                let max = actions.city.pylon.manaCap();
                 let mana = +(0.01 * darkEffect('magic')).toFixed(3);
                 return `<div>${loc('gain',[mana,global.resource.Mana.name])}</div><div>${loc('plus_max_resource',[max,global.resource.Mana.name])}</div>`;
             },
+            manaCap(){
+                return spatialReasoning(5);
+            },
+
             special(){ return global.tech['magic'] && global.tech.magic >= 3 ? true : false; },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2493,9 +2511,12 @@ export const actions = {
                 Stone(offset){ return costMultiplier('graveyard', offset, 6, 1.9); }
             },
             effect(){
-                let lum = BHStorageMulti(spatialReasoning(100));
+                let lum = actions.city.graveyard.lumberCap();
                 return `<div>${loc('city_graveyard_effect',[8])}</div><div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div>`;
             },
+            lumberCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(100));
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('graveyard','city');
@@ -2532,9 +2553,12 @@ export const actions = {
                 Stone(offset){ return costMultiplier('lumber_yard', offset, 2, 1.95); }
             },
             effect(){
-                let lum = BHStorageMulti(spatialReasoning(100));
+                let lum = actions.city.lumber_yard.lumberCap();
                 return `<div>${loc('production',[2,global.resource.Lumber.name])}</div><div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div>`;
             },
+            lumberCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(100));
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('lumber_yard','city');
@@ -2618,7 +2642,7 @@ export const actions = {
                 Stone(offset){ return costMultiplier('rock_quarry', offset, 10, 1.36); }
             },
             effect(){
-                let stone = BHStorageMulti(spatialReasoning(100));
+                let stone = actions.city.rock_quarry.stoneCap();
                 let asbestos = global.race['smoldering'] ? `<div>${loc('plus_max_resource',[stone,global.resource.Chrysotile.name])}</div>` : '';
                 if (global.tech['mine_conveyor']){
                     return `<div>${loc('city_rock_quarry_effect1',[2])}</div><div>${loc('plus_max_resource',[stone,global.resource.Stone.name])}</div>${asbestos}<div class="has-text-caution">${loc('city_rock_quarry_effect2',[4,$(this)[0].powered()])}</div>`;
@@ -2627,6 +2651,9 @@ export const actions = {
                     return `<div>${loc('city_rock_quarry_effect1',[2])}</div><div>${loc('plus_max_resource',[stone,global.resource.Stone.name])}</div>${asbestos}`;
                 }
             },
+            stoneCap(count){
+                return BHStorageMulti((count??1) * spatialReasoning(100));
+            },
             special(){ return global.race['smoldering'] ? true : false; },
             powered(){ return powerCostMod(1); },
             powerBalancer(){
@@ -3213,7 +3240,7 @@ export const actions = {
                 let containers=actions.city.wharf.ContVal()
                 return `<div>${loc('city_trade_effect',[2])}</div><div>${loc('city_wharf_effect')}</div><div>${loc('plus_max_crates',[containers])}</div><div>${loc('plus_max_containers',[containers])}</div>`;
             },
-            contVal(){
+            contCap(){
                 let vol = global.tech['world_control'] ? 15 : 10;
                 if (global.tech['particles'] && global.tech['particles'] >= 2){
                     vol *= 2;
@@ -3673,7 +3700,7 @@ export const actions = {
                 let gain = +($(this)[0].knowVal(wiki)).toFixed(0);
                 return `<div>${loc('city_university_effect',[jobScale(1)])}</div><div>${loc('city_max_knowledge',[gain.toLocaleString()])}</div>`;
             },
-            knowVal(wiki){
+            knowCap(wiki){
                 let multiplier = 1;
                 let base = global.tech['science'] && global.tech['science'] >= 8 ? 700 : 500;
                 if (global.city.ptrait.includes('permafrost')){
@@ -3951,7 +3978,7 @@ export const actions = {
                 gain = +(gain).toFixed(0);
                 return `<span>${loc('city_max_knowledge',[gain.toLocaleString()])}</span>, <span class="has-text-caution">${loc('minus_power',[$(this)[0].powered()])}</span>`;
             },
-            knowVal(wiki){
+            knowCap(wiki){
                 let gain=3000;
                 if (global.portal['sensor_drone'] && global.tech['science'] >= 14){
                     gain *= 1 + (wiki ? global.portal.sensor_drone.on : p_on['sensor_drone']) * 0.02;
@@ -5096,9 +5123,19 @@ export function buildTemplate(key, region){
                     Furs(offset){ return costMultiplier('meditation', offset, 8, 1.2); }
                 },
                 effect(){
-                    let zen = global.resource.Zen.amount / (global.resource.Zen.amount + 5000);
+                    let zen = actions.city.meditation.zenDisp();
                     return `<div>${loc(`city_meditation_effect`,[traits.calm.vars()[0]])}</div><div class="has-text-special">${loc(`city_meditation_effect2`,[2])}</div><div class="has-text-special">${loc(`city_meditation_effect3`,[1])}</div><div>${loc(`city_meditation_effect4`,[`${(zen * 100).toFixed(2)}%`])}</div>`;
                 },
+                zenCap(){
+                    return traits.calm.vars()[0]
+                },
+                zenVal(){
+                    return (global.resource[global.race.species].amount * 2) + global.civic.garrison.workers;
+                    
+                },
+                zenDisp(){
+                    return global.resource.Zen.amount / (global.resource.Zen.amount + 5000);
+                },
                 action(args){
                     if (payCosts($(this)[0])){
                         incrementStruct('meditation','city');
diff --git a/src/main.js b/src/main.js
index 3a8015b4db..55368a9166 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8874,7 +8874,7 @@ function midLoop(){
             // Crates Only
         {
             if (global.city['wharf']){                
-                let wharf_count=global.city.wharf.count * city.wharf.contVal();
+                let wharf_count=global.city.wharf.count * city.wharf.contCap();
 
                 caps['Crates'] += wharf_count;
                 breakdown.c.Crates[loc('city_wharf')] = (wharf_count) + 'v';
@@ -8889,7 +8889,7 @@ function midLoop(){
                 breakdown.c.Containers[loc('tech_munitions_depot')] = vol + 'v';
             }
             if (global.city['storage_yard']){
-                let stor_count=global.city['storage_yard'].count * city.storage_yard.crateVal()
+                let stor_count=global.city['storage_yard'].count * city.storage_yard.crateCap()
                 caps['Crates'] += stor_count;
                 breakdown.c.Crates[loc('city_storage_yard')] = stor_count + 'v';
             }
@@ -8933,7 +8933,7 @@ function midLoop(){
         }
             // Containers Only
             if (global.city['warehouse']){
-                let w_count=(global.city['warehouse'].count * city.warehouse.contVal())
+                let w_count=(global.city['warehouse'].count * city.warehouse.contCap())
                 caps['Containers'] += w_count;
                 breakdown.c.Containers[loc('city_warehouse')] = w_count + 'v';
             }
@@ -9274,7 +9274,7 @@ function midLoop(){
                 caps['Nanite'] += gain;
                 breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
             }
-        // Knowledge -HERE
+        // Knowledge
         {
             if (shrineBonusActive()){
                 let getShrineResult = getShrineBonus('know');
@@ -9285,7 +9285,7 @@ function midLoop(){
             if (global.city['university']){
                 let univCount=global.city.university.count;
 
-                let gain = city.university.knowVal() * univCount;
+                let gain = city.university.knowCap() * univCount;
                 lCaps['professor'] += jobScale(univCount);
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('city_university')] = gain+'v';
@@ -9323,18 +9323,18 @@ function midLoop(){
                 }
             }
             if (global.city['biolab']){
-                let gain = p_on['biolab'] * city.biolab.knowVal()
+                let gain = p_on['biolab'] * city.biolab.knowCap()
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('city_biolab')] = gain+'v';
             }
             let space=actions.space;
             if (global.space['satellite']){
-                let gain = global.space.satellite.count * space.spc_home.satellite.knowVal()//;
+                let gain = global.space.satellite.count * space.spc_home.satellite.knowCap()//;
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('space_home_satellite_title')] = gain+'v';
             }
             if (global.space['observatory'] && global.space.observatory.count > 0){
-                let gain = support_on['observatory'] * space.spc_moon.observatory.knowVal();
+                let gain = support_on['observatory'] * space.spc_moon.observatory.knowCap();
 
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('space_moon_observatory_title')] = gain+'v';
@@ -9349,7 +9349,7 @@ function midLoop(){
                 caps['Elerium'] += el_gain;
                 breakdown.c.Elerium[loc('space_red_exotic_lab_bd')] = el_gain+'v';
                 
-                let sci = space.spc_red.exotic_lab.knowVal()
+                let sci = space.spc_red.exotic_lab.knowCap()
                 let gain = exo_support * workerScale(global.civic.colonist.workers,'colonist') * sci;
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('tech_exotic_bd')] = gain+'v';
@@ -9650,13 +9650,16 @@ function midLoop(){
         }
         // Zen
             if (global.race['calm'] && global.city['meditation']) {
-                caps['Zen'] = global.city.meditation.count * traits.calm.vars()[0];
-                breakdown.c.Zen[loc('city_meditation')] = global.city.meditation.count * traits.calm.vars()[0] + 'v';
-                global.resource.Zen.amount = (global.resource[global.race.species].amount * 2) + global.civic.garrison.workers;
-                if (global.resource.Zen.amount > global.resource.Zen.max){
-                    global.resource.Zen.amount = global.resource.Zen.max;
+                let m_zen=city.meditation.zenCap() * global.city.meditation.count;
+                caps['Zen'] = m_zen;
+                breakdown.c.Zen[loc('city_meditation')] = zen + 'v';
+
+                let zen=city.meditation.zenVal();
+                if (zen > m_zen){
+                    zen = m_zen;
                 }
-                let zen = global.resource.Zen.amount / (global.resource.Zen.amount + 5000);
+                global.resource.Zen.amount = zen
+                zen = city.meditation.dispVal();
                 breakdown.c.Zen[loc('trait_calm_desc')] = `+${(zen * 100).toFixed(2)}%`;
             }
         // Mana
@@ -9668,11 +9671,11 @@ function midLoop(){
                     name = 'space_red_pylon';
                 }
                 else if (global.tech['isolation'] && global.tauceti['pylon']){
-                    gain = spatialReasoning(2) * global.tauceti.pylon.count;;
+                    gain = spatialReasoning(2) * global.tauceti.pylon.count;
                     name = 'tau_home_pylon';
                 }
                 else if (global.city['pylon']){
-                    gain = spatialReasoning(5) * global.city.pylon.count;;
+                    gain = city.pylon.manaCap() * global.city.pylon.count;
                 }
 
                 caps['Mana'] += gain;
@@ -9701,29 +9704,29 @@ function midLoop(){
                 breakdown.c.Food[loc('tau_home_tau_farm')] = gain+'v';
             }
             if (global.city['silo']){
-                let gain = BHStorageMulti(global.city['silo'].count * spatialReasoning(500));
+                let gain = city.silo(global.city['silo'].count);
                 caps['Food'] += gain;
                 breakdown.c.Food[loc('city_silo')] = gain+'v';
             }
             if (global.city['compost']){
-                let gain = BHStorageMulti(global.city['compost'].count * spatialReasoning(200));
+                let gain = city.compost.foodCap(global.city['compost'].count);
                 caps['Food'] += gain;
                 breakdown.c.Food[loc('city_compost_heap')] = gain+'v';
             }
             if (global.city['soul_well']){
-                let gain = BHStorageMulti(global.city['soul_well'].count * spatialReasoning(500));
+                let gain = city.soul_well.foodCap(global.city['soul_well'].count);
                 caps['Food'] += gain;
                 breakdown.c.Food[loc('city_soul_well')] = gain+'v';
             }
             if (global.city['smokehouse']){
-                let gain = BHStorageMulti(global.city['smokehouse'].count * spatialReasoning(100));
+                let gain = city.smokehouse.foodCap(global.city['smokehouse'].count);
                 caps['Food'] += gain;
                 breakdown.c.Food[loc('city_smokehouse')] = gain+'v';
             }
         }
         // Stone / Chrysotile
             if (global.city['rock_quarry']){
-                let gain = BHStorageMulti(global.city.rock_quarry.count * spatialReasoning(100));
+                let gain = city.rock_quarry.stoneCap(global.city.rock_quarry.count);
                 caps['Stone'] += gain;
                 breakdown.c.Stone[loc('city_rock_quarry')] = gain+'v';
 
@@ -9733,12 +9736,12 @@ function midLoop(){
         // Lumber
         {
             if (global.city['lumber_yard']){
-                let gain = BHStorageMulti(global.city.lumber_yard.count * spatialReasoning(100));
+                let gain = city.lumber_yard.lumberCap(global.city.lumber_yard.count);
                 caps['Lumber'] += gain;
                 breakdown.c.Lumber[loc('city_lumber_yard')] = gain+'v';
             }
             else if (global.city['graveyard']){
-                let gain = BHStorageMulti(global.city.graveyard.count * spatialReasoning(100));
+                let gain = city.graveyard.lumberCap(global.city.graveyard.count);
                 caps['Lumber'] += gain;
                 breakdown.c.Lumber[loc('city_graveyard')] = gain+'v';
             }
diff --git a/src/space.js b/src/space.js
index 3dd3cef318..65a825ab98 100644
--- a/src/space.js
+++ b/src/space.js
@@ -67,13 +67,13 @@ const spaceProjects = {
                 Alloy(offset){ return spaceCostMultiplier('satellite', offset, 8000, 1.22); }
             },
             effect(){
-                let knowledge = actions.space.spc_home.satellite.knowVal()
+                let knowledge = actions.space.spc_home.satellite.knowCap()
                 let label = global.race['cataclysm'] ? loc('space_moon_observatory_title') : (global.race['orbit_decayed'] ? loc('city_university') : wardenLabel());
                 let amount = global.race['cataclysm'] ? 25 : (global.race['orbit_decayed'] ? 12 : 4);
                 let synergy = `<div>${loc('space_home_satellite_effect2',[label, amount])}</div>`;
                 return `<div>${loc('plus_max_resource',[knowledge,global.resource.Knowledge.name])}</div>${synergy}<div>${loc('space_home_satellite_effect3',[global.civic.scientist ? global.civic.scientist.name : loc('job_scientist')])}</div>`
             },
-            knowVal(){
+            knowCap(){
                 let gain = global.race['cataclysm'] || global.race['orbit_decayed'] ? 2000 : 750;
                 if ((global.race['cataclysm'] || global.race['orbit_decayed']) && global.tech['supercollider']){
                     let ratio = global.tech['tp_particles'] || (global.tech['particles'] && global.tech['particles'] >= 3) ? 5: 10;
@@ -424,11 +424,11 @@ const spaceProjects = {
                 if (global.race['cataclysm']){
                     prof = `<div>${loc('city_university_effect',[jobScale(1)])}</div>`;
                 }
-                let gain = actions.space.spc_moon.observatory.knowVal()
+                let gain = actions.space.spc_moon.observatory.knowCap()
                 let synergy = global.race['cataclysm'] ? `<div>${loc('space_moon_observatory_cata_effect',[25])}</div>` : `<div>${loc('space_moon_observatory_effect',[5])}</div>`;
                 return `<div class="has-text-caution">${loc('space_used_support',[loc('space_moon_info_name')])}</div>${prof}<div>${loc('plus_max_resource',[gain,global.resource.Knowledge.name])}</div>${synergy}`;
             },
-            knowVal(){
+            knowCap(){
                 let gain = 5000;
                 if (global.race['cataclysm'] && global.space['satellite'] && global.space.satellite.count > 0){
                     gain *= 1 + (global.space.satellite.count * 0.25);
@@ -1255,7 +1255,7 @@ const spaceProjects = {
                 Elerium(offset){ return spaceCostMultiplier('exotic_lab', offset, 20, 1.28) - 4; }
             },
             effect(wiki){
-                let sci = actions.space.spc_red.exotic_lab.knowVal(wiki)
+                let sci = actions.space.spc_red.exotic_lab.knowCap(wiki)
                 let elerium = spatialReasoning(10);
 
                 let scientist = '';
@@ -1268,7 +1268,7 @@ const spaceProjects = {
                 }
                 return `<div class="has-text-caution">${loc('space_used_support',[planetName().red])}</div>${scientist}${lab}<div>${loc('space_red_exotic_lab_effect1',[+(sci).toFixed(0)])}</div><div>${loc('plus_max_resource',[elerium,global.resource.Elerium.name])}</div>`;
             },
-            knowVal(wiki){
+            knowCap(wiki){
                 let sci=500;
                 if (global.tech['science'] >= 13 && global.interstellar['laboratory']){
                     let num_lab_on = wiki ? global.interstellar.laboratory.on : int_on['laboratory'];

From 24df7a2a9b510169432732e8a161dc0eedd3d25c Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Wed, 29 Apr 2026 13:01:06 -0600
Subject: [PATCH 10/18] trying something new!

adding a simple function that can do all the things for you! (in the middle of adding it)
---
 src/actions.js |  53 +++---
 src/compare.js |  10 ++
 src/main.js    | 454 +++++++++++++++++++++++++------------------------
 3 files changed, 277 insertions(+), 240 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 0800cc28d9..ae8ac09b62 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -2327,21 +2327,23 @@ export const actions = {
                 Sheet_Metal(offset){ return costMultiplier('warehouse', offset, 25, bananaPerk(1.25)); }
             },
             effect(){
-                let cap = actions.city.warehouse.contVal()
+                let cap = $(this)[0].caps.Container()
                 return loc('plus_max_resource',[cap,global.resource.Containers.name]);
             },
-            contCap(){
-                let cap = global.tech.steel_container >= 2 ? 20 : 10;
-                if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
-                    cap += 10;
-                }
-                if (global.tech['world_control']){
-                    cap += 10;
-                }
-                if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    cap *= 2;
+            caps:{
+                Container(count){
+                    let cap = global.tech.steel_container >= 2 ? 20 : 10;
+                    if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
+                        cap += 10;
+                    }
+                    if (global.tech['world_control']){
+                        cap += 10;
+                    }
+                    if (global.tech['particles'] && global.tech['particles'] >= 2){
+                        cap *= 2;
+                    }
+                    return cap*(count??1)
                 }
-                return cap
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2388,8 +2390,7 @@ export const actions = {
                 Iron(offset){ return ((global.city['bank'] ? global.city.bank.count : 0) + (offset || 0)) >= 2 && global.city.ptrait.includes('unstable') ? costMultiplier('bank', offset, traitCostMod('untrustworthy',30), 1.3) : 0; }
             },
             effect(){
-                let vault = bank_vault();
-                vault = spatialReasoning(vault);
+                let vault = $(this)[0].caps.Money()
                 vault = (+(vault).toFixed(0)).toLocaleString();
 
                 if (global.tech['banking'] >= 2){
@@ -2399,6 +2400,11 @@ export const actions = {
                     return loc('plus_max_resource',[`\$${vault}`,loc('resource_Money_name')]);
                 }
             },
+            caps:{
+                Money(count){
+                    return spatialReasoning(bank_vault()) * (count ?? 1)
+                }
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     global['resource']['Money'].max += spatialReasoning(1800);
@@ -3237,15 +3243,20 @@ export const actions = {
                 Oil(offset){ return costMultiplier('wharf', offset, 750, 1.32); }
             },
             effect(){
-                let containers=actions.city.wharf.ContVal()
+                let containers=$(this)[0].caps.Containers()
                 return `<div>${loc('city_trade_effect',[2])}</div><div>${loc('city_wharf_effect')}</div><div>${loc('plus_max_crates',[containers])}</div><div>${loc('plus_max_containers',[containers])}</div>`;
             },
-            contCap(){
-                let vol = global.tech['world_control'] ? 15 : 10;
-                if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    vol *= 2;
-                }
-                return vol
+            caps:{
+                Containers(count){
+                    let vol = global.tech['world_control'] ? 15 : 10;
+                    if (global.tech['particles'] && global.tech['particles'] >= 2){
+                        vol *= 2;
+                    }
+                    return vol*(count??1)
+                },
+                Crate(count){
+                    return $(this)[0].caps.Containers(count)
+                },
             },
             action(args){
                 if (payCosts($(this)[0])){
diff --git a/src/compare.js b/src/compare.js
index e69de29bb2..f1a14f853c 100644
--- a/src/compare.js
+++ b/src/compare.js
@@ -0,0 +1,10 @@
+let name;
+let title;
+let is_true;
+function c(){
+    console.log(name,title,is_true)
+    name=null,title=null,is_true=null;
+}
+c()
+c(name='fish',title='debt',is_true='oops')
+c()
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 55368a9166..260a6f4429 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8743,6 +8743,183 @@ function midLoop(){
         let eden=actions.eden;
         let tau_home=actions.tauceti.tau_home;
         let s_name=global.race.species;
+        // let is_true,title;
+        function increaseCapCity({name = null,resource = null,is_true = null,title = null, count = null} = {}){
+            if(!title)title=loc(`city_${name}`)
+            if(!is_true)is_true=global.city.hasOwnProperty(name)
+            
+            if(!is_true||!resources||!name||!title)return
+            if(typeof resource==="string"){
+                resource=[resource]
+            }
+            let gain=count
+            resource.forEach(res=>{
+                if(!count)gain=city[name].caps[res](global.city[name].count);
+                caps[resource]+=gain;
+                breakdown.c[resource][loc(title)]=gain+'v';
+            })
+            // is_true=null,title=null;
+        }
+        class AMOUNT{
+            constructor(name,resource,is_true,title,count){
+                this.name=name
+                this.resource=resource
+                this.is_true=is_true
+                this.title=title
+                this.count=count
+            }
+        }
+        function Amount(name,resource,is_true,title){
+            return new AMOUNT(name,resource,is_true,title)
+        }
+        let capsIncrease=[
+            Amount('wharf',['Crates','Containers']),
+            Amount('storage_yard','Crates'),
+            Amount('warehouse','Containers'),
+            Amount('bank','Money',global.city.hasOwnProperty('bank') && !(global.race['cataclysm'] && p_on['spaceport'])),
+            Amount('basic_housing',s_name,null,housingLabel('small',city.basic_housing.citizens())),
+            Amount('cottage',s_name,null,housingLabel('medium'),city.cottage.citizens()),
+            // Amount('cottage','Money',null)
+        ]
+        if (global.city['cottage'] && global.tech['home_safe']){
+            let gain = (c_count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
+            caps['Money'] += gain;
+            breakdown.c.Money[housingLabel('medium')] = gain+'v';
+        }
+        if (global.city['apartment']){
+            let a_count=p_on['apartment'];
+            let pop = a_count * city.apartment.citizens();
+            caps[s_name] += pop;
+            breakdown.c[s_name][housingLabel('large')] = pop + 'v';
+            if (global.tech['home_safe']){
+                let gain = (a_count  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
+                caps['Money'] += gain;
+                breakdown.c.Money[housingLabel('large')] = gain+'v';
+            }
+        }
+        if (global.city['lodge']){
+            let cit = global.city.lodge.count * city.lodge.citizens();
+            caps[s_name] += cit;
+            breakdown.c[s_name][loc('city_lodge')] = cit + 'v';
+        }
+        if (global.city['nanite_factory']){
+            let gain = global.city.nanite_factory.count * spatialReasoning(2500);
+            caps['Nanite'] += gain;
+            breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
+        }
+        if (global.city['captive_housing']){
+            let houses = global.city.captive_housing.count;
+            global.city.captive_housing.raceCap = houses * (global.tech['unfathomable'] && global.tech.unfathomable >= 3 ? 3 : 2);
+            global.city.captive_housing.cattleCap = houses * 5;
+        }
+        if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {
+            let s_count=global.city.slave_pen.count*4;
+            caps['Slave'] = s_count;
+            breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = s_count + 'v';
+
+            if (s_count < global.resource.Slave.amount){
+                global.resource.Slave.amount = s_count;
+            }
+        }
+        if (global.city['farm'] && global.tech['farm']){
+                let pop = global.city.farm.count * actions.city.farm.citizens();
+                caps[global.race.species] += pop;
+                breakdown.c[global.race.species][loc('city_farm')] = pop + 'v';
+        }
+        if (global.city['silo']){
+            let gain = city.silo(global.city['silo'].count);
+            caps['Food'] += gain;
+            breakdown.c.Food[loc('city_silo')] = gain+'v';
+        }
+        if (global.city['compost']){
+            let gain = city.compost.foodCap(global.city['compost'].count);
+            caps['Food'] += gain;
+            breakdown.c.Food[loc('city_compost_heap')] = gain+'v';
+        }
+        if (global.city['soul_well']){
+            let gain = city.soul_well.foodCap(global.city['soul_well'].count);
+            caps['Food'] += gain;
+            breakdown.c.Food[loc('city_soul_well')] = gain+'v';
+        }
+        if (global.city['smokehouse']){
+            let gain = city.smokehouse.foodCap(global.city['smokehouse'].count);
+            caps['Food'] += gain;
+            breakdown.c.Food[loc('city_smokehouse')] = gain+'v';
+        }
+        if (global.city['rock_quarry']){
+            let gain = city.rock_quarry.stoneCap(global.city.rock_quarry.count);
+            caps['Stone'] += gain;
+            breakdown.c.Stone[loc('city_rock_quarry')] = gain+'v';
+
+            caps['Chrysotile'] += gain;
+            breakdown.c.Chrysotile[loc('city_rock_quarry')] = gain+'v';
+        }
+        if (global.city['lumber_yard']){
+            let gain = city.lumber_yard.lumberCap(global.city.lumber_yard.count);
+            caps['Lumber'] += gain;
+            breakdown.c.Lumber[loc('city_lumber_yard')] = gain+'v';
+        }
+        else if (global.city['graveyard']){
+            let gain = city.graveyard.lumberCap(global.city.graveyard.count);
+            caps['Lumber'] += gain;
+            breakdown.c.Lumber[loc('city_graveyard')] = gain+'v';
+        }
+        if (global.city['sawmill']){
+            let gain = BHStorageMulti(global.city.sawmill.count * spatialReasoning(200));
+            caps['Lumber'] += gain;
+            breakdown.c.Lumber[loc('city_sawmill')] = gain+'v';
+        }
+        if (global.city['oil_well']){
+            let gain = (global.city['oil_well'].count * spatialReasoning(500));
+            caps['Oil'] += gain;
+            breakdown.c.Oil[loc('city_oil_well')] = gain+'v';
+        }
+        if (global.city['oil_depot']){
+            let gain = (global.city['oil_depot'].count * spatialReasoning(1000));
+            gain *= global.tech['world_control'] ? 1.5 : 1;
+            caps['Oil'] += gain;
+            breakdown.c.Oil[loc('city_oil_depot')] = gain+'v';
+            if (global.tech['uranium'] >= 2){
+                gain = (global.city['oil_depot'].count * spatialReasoning(250));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Uranium'] += gain;
+                breakdown.c.Uranium[loc('city_oil_depot')] = gain+'v';
+            }
+            if (global.resource['Helium_3'].display){
+                gain = (global.city['oil_depot'].count * spatialReasoning(400));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Helium_3'] += gain;
+                breakdown.c.Helium_3[loc('city_oil_depot')] = gain+'v';
+            }
+        }
+
+
+        if (global.city['trade']){
+            let routes = global.race['nomadic'] || global.race['xenophobic'] ? global.tech.trade : global.tech.trade + 1;
+            if (global.tech['trade'] && global.tech['trade'] >= 3){
+                routes--;
+            }
+            if (global.race['flier']){
+                routes += traits.flier.vars()[1];
+            }
+            global.city.market.mtrade += routes * global.city.trade.count;
+            breakdown.t_route[loc('city_trade')] = routes * global.city.trade.count;
+            if (global.tech['fanaticism'] && global.tech['fanaticism'] >= 3){
+                let r_count = faithTempleCount();
+                global.city.market.mtrade += r_count;
+                breakdown.t_route[global.race['cataclysm'] ? loc('space_red_ziggurat_title') : structName('temple')] = r_count;
+            }
+        }
+        if (global.city['wharf']){
+            let r_count = global.city.wharf.count * 2;
+            global.city.market.mtrade += r_count;
+            breakdown.t_route[loc('city_wharf')] = r_count;
+        }
+        if (global.city['storage_yard'] && global.tech['trade'] && global.tech['trade'] >= 3){
+            let r_count = global.city.storage_yard.count;
+            global.city.market.mtrade += r_count;
+            breakdown.t_route[loc('city_storage_yard')] = r_count;
+        }
         //Res Caps ------------------
         // Storage - General
         {
@@ -8871,16 +9048,9 @@ function midLoop(){
             }
         }
         // Crates & Containters
+        
             // Crates Only
-        {
-            if (global.city['wharf']){                
-                let wharf_count=global.city.wharf.count * city.wharf.contCap();
-
-                caps['Crates'] += wharf_count;
-                breakdown.c.Crates[loc('city_wharf')] = (wharf_count) + 'v';
-                caps['Containers'] += wharf_count;
-                breakdown.c.Containers[loc('city_wharf')] = (wharf_count) + 'v';
-            }
+        {   
             if (global.space['munitions_depot']){
                 let vol = 25 * global.space.munition_depot.count;
                 caps['Crates'] += vol;
@@ -8888,11 +9058,6 @@ function midLoop(){
                 caps['Containers'] += vol;
                 breakdown.c.Containers[loc('tech_munitions_depot')] = vol + 'v';
             }
-            if (global.city['storage_yard']){
-                let stor_count=global.city['storage_yard'].count * city.storage_yard.crateCap()
-                caps['Crates'] += stor_count;
-                breakdown.c.Crates[loc('city_storage_yard')] = stor_count + 'v';
-            }
             if (global.space['garage']){
                 let g_vol = global.tech['particles'] >= 4 ? 20 + global.tech['supercollider'] : 20;
                 if (global.tech['world_control'] || global.race['cataclysm']){
@@ -8932,11 +9097,6 @@ function midLoop(){
             }
         }
             // Containers Only
-            if (global.city['warehouse']){
-                let w_count=(global.city['warehouse'].count * city.warehouse.contCap())
-                caps['Containers'] += w_count;
-                breakdown.c.Containers[loc('city_warehouse')] = w_count + 'v';
-            }
             //Both
         {
             if (p_on['arcology']){
@@ -9028,39 +9188,7 @@ function midLoop(){
         // Money
         let cata_orbit=global.race['cataclysm'] || global.race['orbit_decayed'];
         {
-            if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
-                let vault = cata_orbit ? bank_vault() * 4 : bank_vault();
-                let banks = cata_orbit ? p_on['spaceport'] : global.city['bank'].count;
-
-                let gain = (banks * spatialReasoning(vault));
-                caps['Money'] += gain;
-
-                if (cata_orbit){
-                    breakdown.c.Money[loc('space_red_spaceport_title')] = gain+'v';
-                }
-                else {
-                    breakdown.c.Money[loc('city_bank')] = gain+'v';
-                }
-
-                if (global.interstellar['exchange']){
-                    if (global.eden['eternal_bank']){ banks += global.eden.eternal_bank.count * 2; }
-                    let g_vault = spatialReasoning(int_on['exchange'] * (vault * banks / 18));
-                    if (global.race['inflation']){
-                        g_vault *= 2;
-                    }
-                    if (global.tech.banking >= 13){
-                        if (global.galaxy['freighter']){
-                            g_vault *= 1 + (gal_on['freighter'] * 0.03);
-                        }
-                        if (global.galaxy['super_freighter']){
-                            g_vault *= 1 + (gal_on['super_freighter'] * 0.08);
-                        }
-                    }
-                    g_vault = Math.round(g_vault);
-                    caps['Money'] += g_vault;
-                    breakdown.c.Money[loc('interstellar_exchange_bd')] = g_vault+'v';
-                }
-            }
+            
             if (global.eden['eternal_bank']){
                 let vault = bank_vault() * (global.race['warlord'] ? 20 : 10);
                 if (global.race['warlord'] && global.eden['corruptor'] && global.tech.asphodel >= 12){
@@ -9081,25 +9209,6 @@ function midLoop(){
                 caps['Money'] += gain;
                 breakdown.c.Money[loc('tau_home_colony')] = gain+'v';
             }
-            if (global.city['casino'] || global.space['spc_casino'] || global.tauceti['tauceti_casino'] || global.portal['hell_casino']){
-                let casinos = 0;
-                if (global.city['casino'] && global.city.casino.count > 0){
-                    casinos += global.city.casino.count;
-                }
-                if (global.space['spc_casino'] && global.space.spc_casino.count > 0){
-                    casinos += global.space.spc_casino.count;
-                }
-                if (global.tauceti['tauceti_casino'] && global.tauceti.tauceti_casino.count > 0){
-                    casinos += global.tauceti.tauceti_casino.count;
-                }
-                if (global.portal['hell_casino'] && global.portal.hell_casino.count > 0){
-                    casinos += global.portal.hell_casino.count;
-                }
-
-                let vault = casinos * casino_vault();
-                caps['Money'] += vault;
-                breakdown.c.Money[structName('casino')] = vault+'v';
-            }
             if (global.galaxy['resort']){
                 let vault = p_on['resort'] * spatialReasoning(global.tech['world_control'] ? 1875000 : 1500000);
                 caps['Money'] += vault;
@@ -9125,6 +9234,59 @@ function midLoop(){
                 caps['Money'] += gain;
                 breakdown.c.Money[loc(title)] = gain+'v';
             }
+            //when not bank vv
+            if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
+                let vault = cata_orbit ? bank_vault() * 4 : bank_vault();
+                let banks = cata_orbit ? p_on['spaceport'] : global.city['bank'].count;
+
+                let gain = (banks * spatialReasoning(vault));
+                caps['Money'] += gain;
+
+                if (cata_orbit){
+                    breakdown.c.Money[loc('space_red_spaceport_title')] = gain+'v';
+                }
+                else {
+                    breakdown.c.Money[loc('city_bank')] = gain+'v';
+                }
+
+            }
+            if ((global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])) && global.interstellar['exchange']){
+                if (global.eden['eternal_bank']){ banks += global.eden.eternal_bank.count * 2; }
+                let g_vault = spatialReasoning(int_on['exchange'] * (vault * banks / 18));
+                if (global.race['inflation']){
+                    g_vault *= 2;
+                }
+                if (global.tech.banking >= 13){
+                    if (global.galaxy['freighter']){
+                        g_vault *= 1 + (gal_on['freighter'] * 0.03);
+                    }
+                    if (global.galaxy['super_freighter']){
+                        g_vault *= 1 + (gal_on['super_freighter'] * 0.08);
+                    }
+                }
+                g_vault = Math.round(g_vault);
+                caps['Money'] += g_vault;
+                breakdown.c.Money[loc('interstellar_exchange_bd')] = g_vault+'v';
+            }
+            if (global.city['casino'] || global.space['spc_casino'] || global.tauceti['tauceti_casino'] || global.portal['hell_casino']){
+                let casinos = 0;
+                if (global.city['casino'] && global.city.casino.count > 0){
+                    casinos += global.city.casino.count;
+                }
+                if (global.space['spc_casino'] && global.space.spc_casino.count > 0){
+                    casinos += global.space.spc_casino.count;
+                }
+                if (global.tauceti['tauceti_casino'] && global.tauceti.tauceti_casino.count > 0){
+                    casinos += global.tauceti.tauceti_casino.count;
+                }
+                if (global.portal['hell_casino'] && global.portal.hell_casino.count > 0){
+                    casinos += global.portal.hell_casino.count;
+                }
+
+                let vault = casinos * casino_vault();
+                caps['Money'] += vault;
+                breakdown.c.Money[structName('casino')] = vault+'v';
+            }
         }
         // Population
         {
@@ -9141,38 +9303,11 @@ function midLoop(){
                     breakdown.c[s_name][structName('casino')] = pop + 'v';
                 }
             }
-            if (global.city['basic_housing']){
-                let pop = global.city.basic_housing.count * city.basic_housing.citizens();
-                caps[s_name] += pop;
-                breakdown.c[s_name][housingLabel('small')] = pop + 'v';
-            }
             if (global.tauceti['tau_housing'] && global.tech['isolation']){
                 let pop = global.tauceti.tau_housing.count * tau_home.tau_housing.citizens();
                 caps[s_name] += pop;
                 breakdown.c[s_name][housingLabel('small')] = pop + 'v';
             }
-            if (global.city['cottage']){
-                let c_count=global.city.cottage.count;
-                let pop = c_count * actions.city.cottage.citizens();
-                caps[s_name] += pop;
-                breakdown.c[s_name][housingLabel('medium')] = pop + 'v';
-                if (global.tech['home_safe']){
-                    let gain = (c_count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
-                    caps['Money'] += gain;
-                    breakdown.c.Money[housingLabel('medium')] = gain+'v';
-                }
-            }
-            if (global.city['apartment']){
-                let a_count=p_on['apartment'];
-                let pop = a_count * city.apartment.citizens();
-                caps[s_name] += pop;
-                breakdown.c[s_name][housingLabel('large')] = pop + 'v';
-                if (global.tech['home_safe']){
-                    let gain = (a_count  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
-                    caps['Money'] += gain;
-                    breakdown.c.Money[housingLabel('large')] = gain+'v';
-                }
-            }
             if (global.eden['rectory']){
                 let pop = p_on['rectory'] * eden.eden_asphodel.rectory.citizens();
                 caps[s_name] += pop;
@@ -9228,11 +9363,6 @@ function midLoop(){
                 caps['Money'] += gain;
                 breakdown.c.Money[loc('tech_luxury_condo')] = gain+'v';
             }
-            if (global.city['lodge']){
-                let cit = global.city.lodge.count * city.lodge.citizens();
-                caps[s_name] += cit;
-                breakdown.c[s_name][loc('city_lodge')] = cit + 'v';
-            }
             if (global.portal['hovel']){
                 let cit = global.portal.hovel.count * portal.prtl_wasteland.hovel.citizens();
                 caps[s_name] += cit;
@@ -9253,27 +9383,8 @@ function midLoop(){
             caps[s_name] = 1;
         }
         // Slave
-            if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {
-                let s_count=global.city.slave_pen.count*4;
-                caps['Slave'] = s_count;
-                breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = s_count + 'v';
-
-                if (s_count < global.resource.Slave.amount){
-                    global.resource.Slave.amount = s_count;
-                }
-            }
         // Captive Race / Cattle
-            if (global.city['captive_housing']){
-                let houses = global.city.captive_housing.count;
-                global.city.captive_housing.raceCap = houses * (global.tech['unfathomable'] && global.tech.unfathomable >= 3 ? 3 : 2);
-                global.city.captive_housing.cattleCap = houses * 5;
-            }
         // Nanite
-            if (global.city['nanite_factory']){
-                let gain = global.city.nanite_factory.count * spatialReasoning(2500);
-                caps['Nanite'] += gain;
-                breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
-            }
         // Knowledge
         {
             if (shrineBonusActive()){
@@ -9688,11 +9799,6 @@ function midLoop(){
                 caps['Food'] += gain;
                 breakdown.c.Food[loc('city_transmitter')] = gain+'v';
             }
-            if (global.city['farm'] && global.tech['farm']){
-                    let pop = global.city.farm.count * actions.city.farm.citizens();
-                    caps[global.race.species] += pop;
-                    breakdown.c[global.race.species][loc('city_farm')] = pop + 'v';
-            }
             if (support_on['biodome'] && (global.race['artifical'] || global.race['orbit_decayed'])){
                 let gain = support_on['biodome'] * spatialReasoning(global.race['artifical'] ? 500 : 100);
                 caps['Food'] += gain;
@@ -9703,79 +9809,15 @@ function midLoop(){
                 caps['Food'] += gain;
                 breakdown.c.Food[loc('tau_home_tau_farm')] = gain+'v';
             }
-            if (global.city['silo']){
-                let gain = city.silo(global.city['silo'].count);
-                caps['Food'] += gain;
-                breakdown.c.Food[loc('city_silo')] = gain+'v';
-            }
-            if (global.city['compost']){
-                let gain = city.compost.foodCap(global.city['compost'].count);
-                caps['Food'] += gain;
-                breakdown.c.Food[loc('city_compost_heap')] = gain+'v';
-            }
-            if (global.city['soul_well']){
-                let gain = city.soul_well.foodCap(global.city['soul_well'].count);
-                caps['Food'] += gain;
-                breakdown.c.Food[loc('city_soul_well')] = gain+'v';
-            }
-            if (global.city['smokehouse']){
-                let gain = city.smokehouse.foodCap(global.city['smokehouse'].count);
-                caps['Food'] += gain;
-                breakdown.c.Food[loc('city_smokehouse')] = gain+'v';
-            }
         }
         // Stone / Chrysotile
-            if (global.city['rock_quarry']){
-                let gain = city.rock_quarry.stoneCap(global.city.rock_quarry.count);
-                caps['Stone'] += gain;
-                breakdown.c.Stone[loc('city_rock_quarry')] = gain+'v';
-
-                caps['Chrysotile'] += gain;
-                breakdown.c.Chrysotile[loc('city_rock_quarry')] = gain+'v';
-            }
         // Lumber
         {
-            if (global.city['lumber_yard']){
-                let gain = city.lumber_yard.lumberCap(global.city.lumber_yard.count);
-                caps['Lumber'] += gain;
-                breakdown.c.Lumber[loc('city_lumber_yard')] = gain+'v';
-            }
-            else if (global.city['graveyard']){
-                let gain = city.graveyard.lumberCap(global.city.graveyard.count);
-                caps['Lumber'] += gain;
-                breakdown.c.Lumber[loc('city_graveyard')] = gain+'v';
-            }
-            if (global.city['sawmill']){
-                let gain = BHStorageMulti(global.city.sawmill.count * spatialReasoning(200));
-                caps['Lumber'] += gain;
-                breakdown.c.Lumber[loc('city_sawmill')] = gain+'v';
-            }
+            
         }
         // Oil
         {
-            if (global.city['oil_well']){
-                let gain = (global.city['oil_well'].count * spatialReasoning(500));
-                caps['Oil'] += gain;
-                breakdown.c.Oil[loc('city_oil_well')] = gain+'v';
-            }
-            if (global.city['oil_depot']){
-                let gain = (global.city['oil_depot'].count * spatialReasoning(1000));
-                gain *= global.tech['world_control'] ? 1.5 : 1;
-                caps['Oil'] += gain;
-                breakdown.c.Oil[loc('city_oil_depot')] = gain+'v';
-                if (global.tech['uranium'] >= 2){
-                    gain = (global.city['oil_depot'].count * spatialReasoning(250));
-                    gain *= global.tech['world_control'] ? 1.5 : 1;
-                    caps['Uranium'] += gain;
-                    breakdown.c.Uranium[loc('city_oil_depot')] = gain+'v';
-                }
-                if (global.resource['Helium_3'].display){
-                    gain = (global.city['oil_depot'].count * spatialReasoning(400));
-                    gain *= global.tech['world_control'] ? 1.5 : 1;
-                    caps['Helium_3'] += gain;
-                    breakdown.c.Helium_3[loc('city_oil_depot')] = gain+'v';
-                }
-            }
+            
             if (global.space['propellant_depot']){
                 let gain = (global.space['propellant_depot'].count * spatialReasoning(1250));
                 gain *= global.tech['world_control'] ? 1.5 : 1;
@@ -9976,37 +10018,11 @@ function midLoop(){
                 global.city.market.mtrade++;
                 breakdown.t_route[loc('base')] = 1;
             }
-            if (global.city['trade']){
-                let routes = global.race['nomadic'] || global.race['xenophobic'] ? global.tech.trade : global.tech.trade + 1;
-                if (global.tech['trade'] && global.tech['trade'] >= 3){
-                    routes--;
-                }
-                if (global.race['flier']){
-                    routes += traits.flier.vars()[1];
-                }
-                global.city.market.mtrade += routes * global.city.trade.count;
-                breakdown.t_route[loc('city_trade')] = routes * global.city.trade.count;
-                if (global.tech['fanaticism'] && global.tech['fanaticism'] >= 3){
-                    let r_count = faithTempleCount();
-                    global.city.market.mtrade += r_count;
-                    breakdown.t_route[global.race['cataclysm'] ? loc('space_red_ziggurat_title') : structName('temple')] = r_count;
-                }
-            }
-            if (global.city['wharf']){
-                let r_count = global.city.wharf.count * 2;
-                global.city.market.mtrade += r_count;
-                breakdown.t_route[loc('city_wharf')] = r_count;
-            }
             if (global.space['gps'] && global.space.gps.count >= 4){
                 let r_count = global.space.gps.count * 2;
                 global.city.market.mtrade += global.space.gps.count * 2;
                 breakdown.t_route[loc('space_home_gps_title')] = r_count;
             }
-            if (global.city['storage_yard'] && global.tech['trade'] && global.tech['trade'] >= 3){
-                let r_count = global.city.storage_yard.count;
-                global.city.market.mtrade += r_count;
-                breakdown.t_route[loc('city_storage_yard')] = r_count;
-            }
             if (global.portal['bazaar'] && global.portal['spire']){
                 let r_count = global.portal.bazaar.count * global.portal.spire.count;
                 global.city.market.mtrade += r_count;

From edf206e52cd11c0fa7596c5cfd1deba0b86bd346 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Wed, 29 Apr 2026 21:16:17 -0600
Subject: [PATCH 11/18] im like 90% sure this will work so basically i made it
 so that it now uses caps:{resName(count}{return count * maths for res}} and
 can be smart and you only have to list each location but it may only work for
 the city techs

um yea it is very smaller and works better
---
 src/actions.js | 133 ++++++++++++-----
 src/main.js    | 385 ++++++++++++++++++++++++-------------------------
 src/space.js   |   6 +
 3 files changed, 290 insertions(+), 234 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index ae8ac09b62..c9b728ca8c 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1402,6 +1402,11 @@ export const actions = {
                 let pop = $(this)[0].citizens();
                 return global.race['sappy'] ? `<div>${loc('plus_max_resource',[pop,loc('citizen')])}</div><div>${loc('city_grove_effect',[2.5])}</div>` : loc('plus_max_resource',[pop,loc('citizen')]);
             },
+            caps:{
+                Pop(count){
+                    return actions.city.basic_housing.citizens()*(count ?? 1)
+                },
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     global['resource'][global.race.species].display = true;
@@ -1455,6 +1460,11 @@ export const actions = {
                     return loc('plus_max_citizens',[pop]);
                 }
             },
+            caps:{
+                Pop(count){
+                    return actions.city.cottage.citizens() * (count ?? 1)
+                },
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     global['resource'][global.race.species].max += $(this)[0].citizens();
@@ -1511,6 +1521,11 @@ export const actions = {
                     return `${loc('plus_max_citizens',[pop])}. <span class="has-text-caution">${loc('minus_power',[$(this)[0].powered()])}</span>`;
                 }
             },
+            caps:{
+                Pop(count){
+                    return actions.city.apartment.citizens() * (count ?? 1)
+                }
+            },
             powered(){
                 let extraVal = govActive('extravagant',1);
                 return powerCostMod(extraVal ? extraVal : 1);
@@ -1560,6 +1575,11 @@ export const actions = {
                 let pop = $(this)[0].citizens();
                 return global.race['carnivore'] && !global.race['artifical'] ? `<div>${loc('plus_max_resource',[pop,loc('citizen')])}</div><div>${loc('city_lodge_effect',[5])}</div>` : loc('plus_max_resource',[pop,loc('citizen')]);
             },
+            caps:{
+                Pop(count){
+                    return actions.city.lodge.citizens() * (count ?? 1)
+                }
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('lodge','city');
@@ -1600,8 +1620,10 @@ export const actions = {
                 let food = actions.city.smokehouse.foodCap();
                 return `<div>${loc('plus_max_resource',[food, global.resource.Food.name])}</div><div>${loc('city_smokehouse_effect',[10])}</div>`;
             },
-            foodCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(100));
+            caps:{
+                Food(count){
+                    return BHStorageMulti((count??1) * spatialReasoning(100));
+                }
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -1643,8 +1665,10 @@ export const actions = {
                 let production = global.race['ghostly'] ? (2 + traits.ghostly.vars()[1]) : 2;
                 return `<div>${loc('city_soul_well_effect',[production])}</div><div>${loc('plus_max_resource',[souls, loc('resource_Souls_name')])}</div>`;
             },
-            foodCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(500))
+            caps:{
+                Food(count){
+                    return BHStorageMulti((count??1) * spatialReasoning(500))
+                }
             },
             foodVal(){},
             action(args){
@@ -1677,7 +1701,12 @@ export const actions = {
                 Nanite(offset){ return global.race['deconstructor'] ? costMultiplier('slave_pen', offset, 4, 1.36) : 0; },
             },
             effect(){
-                return `<div>${loc('plus_max_resource',[4,global.resource.Slave.name])}</div>`;
+                return `<div>${loc('plus_max_resource',[$(this)[0].caps.Slave(),global.resource.Slave.name])}</div>`;
+            },
+            caps:{
+                Slave(count){
+                    return 4 * (count ?? 1)
+                }
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -1757,6 +1786,11 @@ export const actions = {
                 let pop = $(this)[0].citizens();
                 return global.tech['farm'] ? `<div>${loc('city_farm_effect')}</div><div>${loc('plus_max_resource',[pop,loc('citizen')])}</div>` : loc('city_farm_effect');
             },
+            caps:{
+                Pop(count){
+                    return actions.city.farm.citizens() * (count ?? 1)
+                }
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('farm','city');
@@ -1824,8 +1858,10 @@ export const actions = {
                 let wood = global.race['kindling_kindred'] || global.race['smoldering'] ? `` : `<div class="has-text-caution">${loc('city_compost_heap_effect2',[0.5,global.resource.Lumber.name])}</div>`;
                 return `<div>${loc('city_compost_heap_effect',[generated])}</div><div>${loc('city_compost_heap_effect3',[store])}</div>${wood}`;
             },
-            foodCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(200));
+            caps:{
+                Food(count){
+                    return BHStorageMulti((count??1) * spatialReasoning(200));
+                }
             },
             foodVal(){},
             switchable(){ return true; },
@@ -1953,8 +1989,10 @@ export const actions = {
                 let food = actions.city.silo.foodCap();
                 return loc('plus_max_resource',[food, global.resource.Food.name]);
             },
-            foodCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(500))
+            caps:{
+                Food(count){
+                    return BHStorageMulti((count ?? 1) * spatialReasoning(500))
+                },
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2263,7 +2301,7 @@ export const actions = {
                 Wrought_Iron(offset){ return costMultiplier('storage_yard', offset, 5, bananaPerk(1.35)); }
             },
             effect(){
-                let cap = actions.city.storage_yard.crateVal()
+                let cap = actions.city.storage_yard.caps.Crates()
                 if (global.tech['trade'] && global.tech['trade'] >= 3){
                     return `<div>${loc('plus_max_resource',[cap,global.resource.Crates.name])}</div><div>${loc('city_trade_effect',[1])}</div>`;
                 }
@@ -2271,18 +2309,20 @@ export const actions = {
                     return loc('plus_max_resource',[cap,global.resource.Crates.name]);
                 }
             },
-            crateCap(){
-                let cap = global.tech.container >= 3 ? 20 : 10;
-                if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
-                    cap += 10;
-                }
-                if (global.tech['world_control']){
-                    cap += 10;
-                }
-                if (global.tech['particles'] && global.tech['particles'] >= 2){
-                    cap *= 2;
+            caps:{
+                Crates(count){
+                    let cap = global.tech.container >= 3 ? 20 : 10;
+                    if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
+                        cap += 10;
+                    }
+                    if (global.tech['world_control']){
+                        cap += 10;
+                    }
+                    if (global.tech['particles'] && global.tech['particles'] >= 2){
+                        cap *= 2;
+                    }
+                    return cap * (count ?? 1)
                 }
-                return cap
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2327,11 +2367,11 @@ export const actions = {
                 Sheet_Metal(offset){ return costMultiplier('warehouse', offset, 25, bananaPerk(1.25)); }
             },
             effect(){
-                let cap = $(this)[0].caps.Container()
+                let cap = $(this)[0].caps.Containers()
                 return loc('plus_max_resource',[cap,global.resource.Containers.name]);
             },
             caps:{
-                Container(count){
+                Containers(count){
                     let cap = global.tech.steel_container >= 2 ? 20 : 10;
                     if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
                         cap += 10;
@@ -2402,6 +2442,9 @@ export const actions = {
             },
             caps:{
                 Money(count){
+                    if(global.race['cataclysm'] && global.space.spaceport.on){
+                        return 0
+                    }
                     return spatialReasoning(bank_vault()) * (count ?? 1)
                 }
             },
@@ -2517,11 +2560,13 @@ export const actions = {
                 Stone(offset){ return costMultiplier('graveyard', offset, 6, 1.9); }
             },
             effect(){
-                let lum = actions.city.graveyard.lumberCap();
+                let lum = actions.city.graveyard.caps.Lumber();
                 return `<div>${loc('city_graveyard_effect',[8])}</div><div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div>`;
             },
-            lumberCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(100));
+            caps:{
+                Lumber(count){
+                    return BHStorageMulti((count??1) * spatialReasoning(100));
+                }
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2562,8 +2607,10 @@ export const actions = {
                 let lum = actions.city.lumber_yard.lumberCap();
                 return `<div>${loc('production',[2,global.resource.Lumber.name])}</div><div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div>`;
             },
-            lumberCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(100));
+            caps:{
+                Lumber(count){
+                    return BHStorageMulti((count??1) * spatialReasoning(100));
+                }
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -2595,7 +2642,7 @@ export const actions = {
             },
             effect(){
                 let impact = global.tech['saw'] >= 2 ? 8 : 5;
-                let lum = BHStorageMulti(spatialReasoning(200));
+                let lum = actions.city.sawmill.caps.Lumber();
                 let desc = `<div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div><div>${loc('production',[impact,global.resource.Lumber.name])}</div>`;
                 if (global.tech['foundry'] && global.tech['foundry'] >= 4){
                     desc = desc + `<div>${loc('crafting',[2,global.resource.Plywood.name])}</div>`;
@@ -2605,6 +2652,11 @@ export const actions = {
                 }
                 return desc;
             },
+            caps:{
+                Lumber(count){
+                    return BHStorageMulti(spatialReasoning(200) * (count ?? 1));
+                }
+            },
             powered(){ return powerCostMod(1); },
             powerBalancer(){
                 return global.city.sawmill.hasOwnProperty('psaw')
@@ -2657,8 +2709,13 @@ export const actions = {
                     return `<div>${loc('city_rock_quarry_effect1',[2])}</div><div>${loc('plus_max_resource',[stone,global.resource.Stone.name])}</div>${asbestos}`;
                 }
             },
-            stoneCap(count){
-                return BHStorageMulti((count??1) * spatialReasoning(100));
+            caps:{
+                Stone(count){
+                    return BHStorageMulti((count??1) * spatialReasoning(100));
+                },
+                Chrysotile(count){
+                    return actions.city.rock_quarry.caps.Stone(count)
+                },
             },
             special(){ return global.race['smoldering'] ? true : false; },
             powered(){ return powerCostMod(1); },
@@ -3115,6 +3172,9 @@ export const actions = {
                 }
                 return desc;
             },
+            caps:{
+                Oil(count){},
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('oil_well','city');
@@ -3254,8 +3314,8 @@ export const actions = {
                     }
                     return vol*(count??1)
                 },
-                Crate(count){
-                    return $(this)[0].caps.Containers(count)
+                Crates(count){
+                    return actions.city.wharf.caps.Containers(count)
                 },
             },
             action(args){
@@ -4778,9 +4838,14 @@ export function buildTemplate(key, region){
                     Steel(offset){ return costMultiplier('nanite_factory', offset, 1000, dirt_adjust(1.25)); }
                 },
                 effect(){
-                    let val = spatialReasoning(2500);
+                    let val = $(this)[0].caps.Nanite()
                     return `<div>${loc('city_nanite_factory_effect',[global.resource.Nanite.name])}</div><div>${loc('plus_max_resource',[val,global.resource.Nanite.name])}.</div>`;
                 },
+                caps:{
+                    Nanite(count){
+                        return spatialReasoning(2500) * (count ?? 1);
+                    }
+                },
                 special: true,
                 action(args){
                     if (payCosts($(this)[0])){
diff --git a/src/main.js b/src/main.js
index 260a6f4429..4ebb907e6c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8140,7 +8140,106 @@ function ifExist(main,...args){
     }
     return main
 }
-
+class AMOUNT{
+    constructor(loci,name,is_true,resource,title,count){
+        this.loci=loci
+        this.name=name
+        this.resource=null
+        this.tempRes=true
+        if(typeof this.resource === 'string'){
+            this.resource=[resource]
+            this.tempRes=false
+        }
+        else if(resource === undefined){
+            this.resource=Object.keys(actions['city'][name].caps)
+            this.rempRes=true
+        }
+        else{
+            this.resource=resource
+            this.tempRes=false
+        }
+        this.is_true=is_true
+        this.title=title
+        this.count=count
+        this.works=true
+    }
+    calc(){
+        let act=this.findAct()
+        if(this.tempRes){
+            this.resource=Object.keys(act[this.name].caps)
+            this.rempRes=true
+        }
+        this.is_true=this.findGlob().hasOwnProperty(this.name)
+        // console.log(title)
+        this.title=typeof act[this.name].title ==="string"?act[this.name].title : act[this.name].title()
+    }
+    findAct(){
+        if(typeof this.loci == "string"){
+            return actions[this.loci]
+        }
+        else{
+            let main=actions[this.loci[0]]
+            for(let i=1; i<this.loci.length; i++){
+                main=main[this.loci[i]]
+            }
+            return main
+        }
+    }
+    findGlob(){
+        if(typeof this.loci == "string"){
+            return global[this.loci]
+        }
+        else{
+            return global[this.loci[0]]
+        }
+    }
+}
+function Amount(loci,name,resource,is_true,title){
+    return new AMOUNT(loci,name,resource,is_true,title)
+}
+function c_Amount(name,resource,is_true,title){
+    return Amount('city',name,resource,is_true,title)
+}
+function sh_Amount(name,resource,is_true,title){
+    return Amount(['space',"spc_home"],name,resource,is_true,title)
+}
+function st_Amount(name,resource,is_true,title){
+    return Amount(['space',"spc_titan"],name,resource,is_true,title)
+}
+function sr_Amount(name,resource,is_true,title){
+    return Amount(['space',"spc_red"],name,resource,is_true,title)
+}
+let capsIncrease=[
+    c_Amount('wharf'),
+    c_Amount('storage_yard'),
+    c_Amount('warehouse'),
+    c_Amount('bank'),
+    c_Amount('farm'),
+    c_Amount('basic_housing'),
+    c_Amount('cottage'),
+    c_Amount('apartment'),
+    c_Amount('lodge'),
+    c_Amount('nanite_factory'),
+    c_Amount('slave_pen'),
+    c_Amount('silo'),
+    c_Amount('compost'),
+    c_Amount('soul_well'),
+    c_Amount('smokehouse'),
+    c_Amount('rock_quarry'),
+    c_Amount('lumber_yard'),
+    c_Amount('graveyard'),
+    c_Amount('sawmill'),
+    c_Amount('oil_well'),
+    // sr_Amount('garage'),
+    // sh_Amount(''),
+    // sh_Amount(''),
+    // sh_Amount(''),
+    // sh_Amount(''),
+    // sh_Amount(''),
+    // sh_Amount(''),
+    // // Amount('cottage','Money',null)
+]
+// MAKE SURE THE SLAVES HAVE CAP STILL!!!!!!!!!!!!
 function midLoop(){
     const astroSign = astrologySign();
     if (global.race.species === 'protoplasm'){
@@ -8744,182 +8843,25 @@ function midLoop(){
         let tau_home=actions.tauceti.tau_home;
         let s_name=global.race.species;
         // let is_true,title;
-        function increaseCapCity({name = null,resource = null,is_true = null,title = null, count = null} = {}){
-            if(!title)title=loc(`city_${name}`)
-            if(!is_true)is_true=global.city.hasOwnProperty(name)
-            
-            if(!is_true||!resources||!name||!title)return
-            if(typeof resource==="string"){
-                resource=[resource]
-            }
-            let gain=count
+        let loci='city'
+        for(let i in capsIncrease){
+            let inc=capsIncrease[i]
+            inc.calc();
+            let is_true=inc.is_true, resource=inc.resource, name=inc.name, title=inc.title;
+            if(!is_true||!name)break
+            let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : global[loci][name].count)
             resource.forEach(res=>{
-                if(!count)gain=city[name].caps[res](global.city[name].count);
-                caps[resource]+=gain;
-                breakdown.c[resource][loc(title)]=gain+'v';
+                let gain=inc.findAct()[name].caps[res](struct_count);
+                if(res=='Pop'){
+                    res=global.race.species
+                }
+                if(gain){
+                    caps[res]+=gain;
+                    breakdown.c[res][title]=gain+'v';
+                }
             })
-            // is_true=null,title=null;
-        }
-        class AMOUNT{
-            constructor(name,resource,is_true,title,count){
-                this.name=name
-                this.resource=resource
-                this.is_true=is_true
-                this.title=title
-                this.count=count
-            }
-        }
-        function Amount(name,resource,is_true,title){
-            return new AMOUNT(name,resource,is_true,title)
-        }
-        let capsIncrease=[
-            Amount('wharf',['Crates','Containers']),
-            Amount('storage_yard','Crates'),
-            Amount('warehouse','Containers'),
-            Amount('bank','Money',global.city.hasOwnProperty('bank') && !(global.race['cataclysm'] && p_on['spaceport'])),
-            Amount('basic_housing',s_name,null,housingLabel('small',city.basic_housing.citizens())),
-            Amount('cottage',s_name,null,housingLabel('medium'),city.cottage.citizens()),
-            // Amount('cottage','Money',null)
-        ]
-        if (global.city['cottage'] && global.tech['home_safe']){
-            let gain = (c_count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
-            caps['Money'] += gain;
-            breakdown.c.Money[housingLabel('medium')] = gain+'v';
-        }
-        if (global.city['apartment']){
-            let a_count=p_on['apartment'];
-            let pop = a_count * city.apartment.citizens();
-            caps[s_name] += pop;
-            breakdown.c[s_name][housingLabel('large')] = pop + 'v';
-            if (global.tech['home_safe']){
-                let gain = (a_count  * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000));
-                caps['Money'] += gain;
-                breakdown.c.Money[housingLabel('large')] = gain+'v';
-            }
-        }
-        if (global.city['lodge']){
-            let cit = global.city.lodge.count * city.lodge.citizens();
-            caps[s_name] += cit;
-            breakdown.c[s_name][loc('city_lodge')] = cit + 'v';
-        }
-        if (global.city['nanite_factory']){
-            let gain = global.city.nanite_factory.count * spatialReasoning(2500);
-            caps['Nanite'] += gain;
-            breakdown.c.Nanite[loc('city_nanite_factory')] = gain+'v';
-        }
-        if (global.city['captive_housing']){
-            let houses = global.city.captive_housing.count;
-            global.city.captive_housing.raceCap = houses * (global.tech['unfathomable'] && global.tech.unfathomable >= 3 ? 3 : 2);
-            global.city.captive_housing.cattleCap = houses * 5;
         }
-        if (global.race['slaver'] && global.tech['slaves'] && global.city['slave_pen']) {
-            let s_count=global.city.slave_pen.count*4;
-            caps['Slave'] = s_count;
-            breakdown.c.Slave[loc('city_slave_housing',[global.resource.Slave.name])] = s_count + 'v';
 
-            if (s_count < global.resource.Slave.amount){
-                global.resource.Slave.amount = s_count;
-            }
-        }
-        if (global.city['farm'] && global.tech['farm']){
-                let pop = global.city.farm.count * actions.city.farm.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('city_farm')] = pop + 'v';
-        }
-        if (global.city['silo']){
-            let gain = city.silo(global.city['silo'].count);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_silo')] = gain+'v';
-        }
-        if (global.city['compost']){
-            let gain = city.compost.foodCap(global.city['compost'].count);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_compost_heap')] = gain+'v';
-        }
-        if (global.city['soul_well']){
-            let gain = city.soul_well.foodCap(global.city['soul_well'].count);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_soul_well')] = gain+'v';
-        }
-        if (global.city['smokehouse']){
-            let gain = city.smokehouse.foodCap(global.city['smokehouse'].count);
-            caps['Food'] += gain;
-            breakdown.c.Food[loc('city_smokehouse')] = gain+'v';
-        }
-        if (global.city['rock_quarry']){
-            let gain = city.rock_quarry.stoneCap(global.city.rock_quarry.count);
-            caps['Stone'] += gain;
-            breakdown.c.Stone[loc('city_rock_quarry')] = gain+'v';
-
-            caps['Chrysotile'] += gain;
-            breakdown.c.Chrysotile[loc('city_rock_quarry')] = gain+'v';
-        }
-        if (global.city['lumber_yard']){
-            let gain = city.lumber_yard.lumberCap(global.city.lumber_yard.count);
-            caps['Lumber'] += gain;
-            breakdown.c.Lumber[loc('city_lumber_yard')] = gain+'v';
-        }
-        else if (global.city['graveyard']){
-            let gain = city.graveyard.lumberCap(global.city.graveyard.count);
-            caps['Lumber'] += gain;
-            breakdown.c.Lumber[loc('city_graveyard')] = gain+'v';
-        }
-        if (global.city['sawmill']){
-            let gain = BHStorageMulti(global.city.sawmill.count * spatialReasoning(200));
-            caps['Lumber'] += gain;
-            breakdown.c.Lumber[loc('city_sawmill')] = gain+'v';
-        }
-        if (global.city['oil_well']){
-            let gain = (global.city['oil_well'].count * spatialReasoning(500));
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('city_oil_well')] = gain+'v';
-        }
-        if (global.city['oil_depot']){
-            let gain = (global.city['oil_depot'].count * spatialReasoning(1000));
-            gain *= global.tech['world_control'] ? 1.5 : 1;
-            caps['Oil'] += gain;
-            breakdown.c.Oil[loc('city_oil_depot')] = gain+'v';
-            if (global.tech['uranium'] >= 2){
-                gain = (global.city['oil_depot'].count * spatialReasoning(250));
-                gain *= global.tech['world_control'] ? 1.5 : 1;
-                caps['Uranium'] += gain;
-                breakdown.c.Uranium[loc('city_oil_depot')] = gain+'v';
-            }
-            if (global.resource['Helium_3'].display){
-                gain = (global.city['oil_depot'].count * spatialReasoning(400));
-                gain *= global.tech['world_control'] ? 1.5 : 1;
-                caps['Helium_3'] += gain;
-                breakdown.c.Helium_3[loc('city_oil_depot')] = gain+'v';
-            }
-        }
-
-
-        if (global.city['trade']){
-            let routes = global.race['nomadic'] || global.race['xenophobic'] ? global.tech.trade : global.tech.trade + 1;
-            if (global.tech['trade'] && global.tech['trade'] >= 3){
-                routes--;
-            }
-            if (global.race['flier']){
-                routes += traits.flier.vars()[1];
-            }
-            global.city.market.mtrade += routes * global.city.trade.count;
-            breakdown.t_route[loc('city_trade')] = routes * global.city.trade.count;
-            if (global.tech['fanaticism'] && global.tech['fanaticism'] >= 3){
-                let r_count = faithTempleCount();
-                global.city.market.mtrade += r_count;
-                breakdown.t_route[global.race['cataclysm'] ? loc('space_red_ziggurat_title') : structName('temple')] = r_count;
-            }
-        }
-        if (global.city['wharf']){
-            let r_count = global.city.wharf.count * 2;
-            global.city.market.mtrade += r_count;
-            breakdown.t_route[loc('city_wharf')] = r_count;
-        }
-        if (global.city['storage_yard'] && global.tech['trade'] && global.tech['trade'] >= 3){
-            let r_count = global.city.storage_yard.count;
-            global.city.market.mtrade += r_count;
-            breakdown.t_route[loc('city_storage_yard')] = r_count;
-        }
         //Res Caps ------------------
         // Storage - General
         {
@@ -9249,24 +9191,24 @@ function midLoop(){
                     breakdown.c.Money[loc('city_bank')] = gain+'v';
                 }
 
-            }
-            if ((global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])) && global.interstellar['exchange']){
-                if (global.eden['eternal_bank']){ banks += global.eden.eternal_bank.count * 2; }
-                let g_vault = spatialReasoning(int_on['exchange'] * (vault * banks / 18));
-                if (global.race['inflation']){
-                    g_vault *= 2;
-                }
-                if (global.tech.banking >= 13){
-                    if (global.galaxy['freighter']){
-                        g_vault *= 1 + (gal_on['freighter'] * 0.03);
+                if ((global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])) && global.interstellar['exchange']){
+                    if (global.eden['eternal_bank']){ banks += global.eden.eternal_bank.count * 2; }
+                    let g_vault = spatialReasoning(int_on['exchange'] * (vault * banks / 18));
+                    if (global.race['inflation']){
+                        g_vault *= 2;
                     }
-                    if (global.galaxy['super_freighter']){
-                        g_vault *= 1 + (gal_on['super_freighter'] * 0.08);
+                    if (global.tech.banking >= 13){
+                        if (global.galaxy['freighter']){
+                            g_vault *= 1 + (gal_on['freighter'] * 0.03);
+                        }
+                        if (global.galaxy['super_freighter']){
+                            g_vault *= 1 + (gal_on['super_freighter'] * 0.08);
+                        }
                     }
+                    g_vault = Math.round(g_vault);
+                    caps['Money'] += g_vault;
+                    breakdown.c.Money[loc('interstellar_exchange_bd')] = g_vault+'v';
                 }
-                g_vault = Math.round(g_vault);
-                caps['Money'] += g_vault;
-                breakdown.c.Money[loc('interstellar_exchange_bd')] = g_vault+'v';
             }
             if (global.city['casino'] || global.space['spc_casino'] || global.tauceti['tauceti_casino'] || global.portal['hell_casino']){
                 let casinos = 0;
@@ -9287,6 +9229,11 @@ function midLoop(){
                 caps['Money'] += vault;
                 breakdown.c.Money[structName('casino')] = vault+'v';
             }
+            if (global.city['cottage'] && global.tech['home_safe']){
+                let gain = (global.city['cottage'].count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
+                caps['Money'] += gain;
+                breakdown.c.Money[housingLabel('medium')] = gain+'v';
+            }
         }
         // Population
         {
@@ -9384,6 +9331,11 @@ function midLoop(){
         }
         // Slave
         // Captive Race / Cattle
+        if (global.city['captive_housing']){
+            let houses = global.city.captive_housing.count;
+            global.city.captive_housing.raceCap = houses * (global.tech['unfathomable'] && global.tech.unfathomable >= 3 ? 3 : 2);
+            global.city.captive_housing.cattleCap = houses * 5;
+        }
         // Nanite
         // Knowledge
         {
@@ -9879,6 +9831,24 @@ function midLoop(){
                 caps['Helium_3'] += h_gain;
                 breakdown.c.Helium_3[loc('portal_pumpjack_title')] = h_gain+'v';
             }
+            if (global.city['oil_depot']){
+                let gain = (global.city['oil_depot'].count * spatialReasoning(1000));
+                gain *= global.tech['world_control'] ? 1.5 : 1;
+                caps['Oil'] += gain;
+                breakdown.c.Oil[loc('city_oil_depot')] = gain+'v';
+                if (global.tech['uranium'] >= 2){
+                    gain = (global.city['oil_depot'].count * spatialReasoning(250));
+                    gain *= global.tech['world_control'] ? 1.5 : 1;
+                    caps['Uranium'] += gain;
+                    breakdown.c.Uranium[loc('city_oil_depot')] = gain+'v';
+                }
+                if (global.resource['Helium_3'].display){
+                    gain = (global.city['oil_depot'].count * spatialReasoning(400));
+                    gain *= global.tech['world_control'] ? 1.5 : 1;
+                    caps['Helium_3'] += gain;
+                    breakdown.c.Helium_3[loc('city_oil_depot')] = gain+'v';
+                }
+            }
         }
         // Uranium
         // Iridium
@@ -10054,6 +10024,33 @@ function midLoop(){
                 breakdown.gt_route[loc('galaxy_super_freighter')] = gal_on['super_freighter'] * 5;
                 lCaps['crew'] += global.galaxy.super_freighter.on * actions.galaxy.gxy_alien1.super_freighter.ship.civ();
             }
+            if (global.city['trade']){
+                let routes = global.race['nomadic'] || global.race['xenophobic'] ? global.tech.trade : global.tech.trade + 1;
+                if (global.tech['trade'] && global.tech['trade'] >= 3){
+                    routes--;
+                }
+                if (global.race['flier']){
+                    routes += traits.flier.vars()[1];
+                }
+                global.city.market.mtrade += routes * global.city.trade.count;
+                // console.log(breakdown.t_route,loc('city_trade'),routes * global.city.trade.count)
+                breakdown.t_route[loc('city_trade')] = routes * global.city.trade.count;
+                if (global.tech['fanaticism'] && global.tech['fanaticism'] >= 3){
+                    let r_count = faithTempleCount();
+                    global.city.market.mtrade += r_count;
+                    breakdown.t_route[global.race['cataclysm'] ? loc('space_red_ziggurat_title') : structName('temple')] = r_count;
+                }
+            }
+            if (global.city['wharf']){
+                let r_count = global.city.wharf.count * 2;
+                global.city.market.mtrade += r_count;
+                breakdown.t_route[loc('city_wharf')] = r_count;
+            }
+            if (global.city['storage_yard'] && global.tech['trade'] && global.tech['trade'] >= 3){
+                let r_count = global.city.storage_yard.count;
+                global.city.market.mtrade += r_count;
+                breakdown.t_route[loc('city_storage_yard')] = r_count;
+            }
         }
         // Sus
             if (global.race['universe'] === 'magic' && global.race['witch_hunter']){
@@ -10532,18 +10529,6 @@ function midLoop(){
         }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
         let tempCrates = caps['Crates'], tempContainers = caps['Containers'];
         Object.keys(caps).forEach(function (res){
             caps['Crates'] -= global.resource[res].crates;
diff --git a/src/space.js b/src/space.js
index 65a825ab98..91893fa4d1 100644
--- a/src/space.js
+++ b/src/space.js
@@ -950,6 +950,12 @@ const spaceProjects = {
                 desc = desc + '</div>';
                 return desc;
             },
+            caps:{
+                Containers(count){
+                    let g_count=0
+                    return g_count * (count ?? 1)
+                },
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('garage');

From cba1d1c4a2548b639f3349b2592f9fbf6cee4513 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Fri, 1 May 2026 11:31:25 -0600
Subject: [PATCH 12/18] asking question so showing people whats up

---
 src/actions.js |  12 +++--
 src/compare.js | 135 +++++++++++++++++++++++++++++++++++++++++++++----
 src/main.js    |   3 +-
 3 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index c9b728ca8c..358741a933 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -2443,7 +2443,7 @@ export const actions = {
             caps:{
                 Money(count){
                     if(global.race['cataclysm'] && global.space.spaceport.on){
-                        return 0
+                        return
                     }
                     return spatialReasoning(bank_vault()) * (count ?? 1)
                 }
@@ -3173,7 +3173,9 @@ export const actions = {
                 return desc;
             },
             caps:{
-                Oil(count){},
+                Oil(count){
+                    return (count ?? 1) * spatialReasoning(500)
+                },
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -5202,8 +5204,10 @@ export function buildTemplate(key, region){
                     let zen = actions.city.meditation.zenDisp();
                     return `<div>${loc(`city_meditation_effect`,[traits.calm.vars()[0]])}</div><div class="has-text-special">${loc(`city_meditation_effect2`,[2])}</div><div class="has-text-special">${loc(`city_meditation_effect3`,[1])}</div><div>${loc(`city_meditation_effect4`,[`${(zen * 100).toFixed(2)}%`])}</div>`;
                 },
-                zenCap(){
-                    return traits.calm.vars()[0]
+                caps:{
+                    Zen(count){
+                        return traits.calm.vars()[0] * (count ?? 1);
+                    },
                 },
                 zenVal(){
                     return (global.resource[global.race.species].amount * 2) + global.civic.garrison.workers;
diff --git a/src/compare.js b/src/compare.js
index f1a14f853c..feda449770 100644
--- a/src/compare.js
+++ b/src/compare.js
@@ -1,10 +1,125 @@
-let name;
-let title;
-let is_true;
-function c(){
-    console.log(name,title,is_true)
-    name=null,title=null,is_true=null;
-}
-c()
-c(name='fish',title='debt',is_true='oops')
-c()
\ No newline at end of file
+
+//I removed everything that wasn't changed from an example struct
+const actions={
+    rock_quarry: {
+        effect(){
+            let stone = actions.city.rock_quarry.caps.Stone();
+            let asbestos = global.race['smoldering'] ? `<div>${loc('plus_max_resource',[stone,global.resource.Chrysotile.name])}</div>` : '';
+            if (global.tech['mine_conveyor']){
+                return `<div>${loc('city_rock_quarry_effect1',[2])}</div><div>${loc('plus_max_resource',[stone,global.resource.Stone.name])}</div>${asbestos}<div class="has-text-caution">${loc('city_rock_quarry_effect2',[4,$(this)[0].powered()])}</div>`;
+            }
+            else {
+                return `<div>${loc('city_rock_quarry_effect1',[2])}</div><div>${loc('plus_max_resource',[stone,global.resource.Stone.name])}</div>${asbestos}`;
+            }
+        },
+        caps:{
+            Stone(count){
+                return BHStorageMulti((count??1) * spatialReasoning(100));
+            },
+            Chrysotile(count){
+                return actions.city.rock_quarry.caps.Stone(count)
+            },
+        },
+    },
+}
+// Here is the class (will explain)
+class AMOUNT{
+    constructor(loci,name,is_true,resource,title,count){
+        this.loci=loci//location
+        this.name=name//name of struct
+        this.resource=null
+        this.tempRes=true
+        /* 
+            If the cap name is a string -> make it a list because then we can remove other checks later
+            if its undefined -> we can just get it from the actions struct (this will be updated later for reasons that i cant remember, imma think on that lol)
+            if its anything else (so a list) -> its good
+        
+        */
+        if(typeof this.resource === 'string'){
+            this.resource=[resource]
+            this.tempRes=false
+        }
+        else if(resource === undefined){
+            this.resource=[]
+            this.tempRes=true
+        }
+        else{
+            this.resource=resource
+            this.tempRes=false
+        }
+        this.is_true=is_true//can we actually add the caps?
+        this.title=title//whats its name
+    }
+    calc(){
+        let act=this.findAct()
+        if(this.tempRes){
+            this.resource=Object.keys(act[this.name].caps)// get all the resources to cap
+        }
+        this.is_true=this.findGlob().hasOwnProperty(this.name)//make sure it works still
+        this.title=typeof act[this.name].title ==="string"?act[this.name].title : act[this.name].title()//get title, with in case of function
+    }
+    findAct(){
+        //if its a string then one location
+        if(typeof this.loci == "string"){
+            return actions[this.loci]
+        }
+        else{
+            //otherwise get the levels (probably a more efficint way to do this)
+            let main=actions[this.loci[0]]
+            for(let i=1; i<this.loci.length; i++){
+                main=main[this.loci[i]]
+            }
+            return main
+        }
+    }
+    findGlob(){
+        //the global (so far) has only used th first thing 
+        //so like space.spc_home is just space
+        if(typeof this.loci == "string"){
+            return global[this.loci]
+        }
+        else{
+            return global[this.loci[0]]
+        }
+    }
+}
+
+function Amount(loci,name,resource,is_true,title){
+    return new AMOUNT(loci,name,resource,is_true,title)
+}
+function c_Amount(name,resource,is_true,title){
+    return new AMOUNT('city',name,resource,is_true,title)
+}
+function sh_Amount(name,resource,is_true,title){
+    return new AMOUNT(['space',"spc_home"],name,resource,is_true,title)
+}
+//the list
+let capsIncrease=[
+    c_Amount('rock_quarry'),
+]
+
+
+//everythin above is outside of midLoop
+//everything below is inside
+
+for(let i in capsIncrease){
+    let inc=capsIncrease[i]
+    inc.calc();//make sure everything is correct
+    let is_true=inc.is_true, resource=inc.resource, name=inc.name, title=inc.title;//relic of creation of this, will remove when its finished
+
+    if(!is_true||!name)break//if its false or doesnt have a name dont add anything
+    //checks first if it has anything on, then any support on, then finally just uses the struct count
+    let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : global[loci][name].count)
+    resource.forEach(res=>{
+        let gain=inc.findAct()[name].caps[res](struct_count);// get the gain per resource
+        if(res=='Pop'){
+            res=global.race.species
+        }
+        //if it isn't undefined or null, add stuff in
+        //this is because somethings have other conditions, banks only give money if you dont have cataclysm and a spaceport on
+        if(gain!=undefined && gain !=null){
+            caps[res]+=gain;
+            breakdown.c[res][title]=gain+'v';
+        }
+    })
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4ebb907e6c..0c3a7f59ed 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8848,6 +8848,7 @@ function midLoop(){
             let inc=capsIncrease[i]
             inc.calc();
             let is_true=inc.is_true, resource=inc.resource, name=inc.name, title=inc.title;
+
             if(!is_true||!name)break
             let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : global[loci][name].count)
             resource.forEach(res=>{
@@ -9713,7 +9714,7 @@ function midLoop(){
         }
         // Zen
             if (global.race['calm'] && global.city['meditation']) {
-                let m_zen=city.meditation.zenCap() * global.city.meditation.count;
+                let m_zen=city.meditation.caps.Zen(global.city.meditation.count);
                 caps['Zen'] = m_zen;
                 breakdown.c.Zen[loc('city_meditation')] = zen + 'v';
 

From 91acec56e50bee01614e0a14f57a4e069f89d59e Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Fri, 1 May 2026 12:00:42 -0600
Subject: [PATCH 13/18] thx IntoxicatedPlatypus for some suggestions to remove
 findAct and findGlob to just have vars for it also pointing out we dont need
 to recalc if its from action.caps

---
 src/compare.js | 57 +++++++++++++-------------------------------------
 src/main.js    |  4 ++--
 2 files changed, 16 insertions(+), 45 deletions(-)

diff --git a/src/compare.js b/src/compare.js
index feda449770..cabdabd244 100644
--- a/src/compare.js
+++ b/src/compare.js
@@ -24,74 +24,45 @@ const actions={
 }
 // Here is the class (will explain)
 class AMOUNT{
-    constructor(loci,name,is_true,resource,title,count){
-        this.loci=loci//location
+    constructor(action,globl,name,is_true,resource,title,count){
         this.name=name//name of struct
         this.resource=null
-        this.tempRes=true
+        this.action=action
+        this.global=globl
         /* 
             If the cap name is a string -> make it a list because then we can remove other checks later
             if its undefined -> we can just get it from the actions struct (this will be updated later for reasons that i cant remember, imma think on that lol)
             if its anything else (so a list) -> its good
         
         */
+        
         if(typeof this.resource === 'string'){
             this.resource=[resource]
-            this.tempRes=false
         }
         else if(resource === undefined){
-            this.resource=[]
-            this.tempRes=true
+            this.resource=Object.keys(this.action.caps)
         }
         else{
             this.resource=resource
-            this.tempRes=false
         }
         this.is_true=is_true//can we actually add the caps?
         this.title=title//whats its name
+
     }
     calc(){
-        let act=this.findAct()
-        if(this.tempRes){
-            this.resource=Object.keys(act[this.name].caps)// get all the resources to cap
-        }
-        this.is_true=this.findGlob().hasOwnProperty(this.name)//make sure it works still
-        this.title=typeof act[this.name].title ==="string"?act[this.name].title : act[this.name].title()//get title, with in case of function
-    }
-    findAct(){
-        //if its a string then one location
-        if(typeof this.loci == "string"){
-            return actions[this.loci]
-        }
-        else{
-            //otherwise get the levels (probably a more efficint way to do this)
-            let main=actions[this.loci[0]]
-            for(let i=1; i<this.loci.length; i++){
-                main=main[this.loci[i]]
-            }
-            return main
-        }
-    }
-    findGlob(){
-        //the global (so far) has only used th first thing 
-        //so like space.spc_home is just space
-        if(typeof this.loci == "string"){
-            return global[this.loci]
-        }
-        else{
-            return global[this.loci[0]]
-        }
+        this.is_true=this.global.hasOwnProperty(this.name)//make sure it works still
+        this.title=typeof this.action.title ==="string"?this.action.title : this.action.title()//get title, with in case of function
     }
 }
 
-function Amount(loci,name,resource,is_true,title){
-    return new AMOUNT(loci,name,resource,is_true,title)
+function Amount(action,globl,name,resource,is_true,title){
+    return new AMOUNT(action,globl,name,resource,is_true,title)
 }
 function c_Amount(name,resource,is_true,title){
-    return new AMOUNT('city',name,resource,is_true,title)
+    return new AMOUNT(actions.city[name],global.city,name,resource,is_true,title)
 }
 function sh_Amount(name,resource,is_true,title){
-    return new AMOUNT(['space',"spc_home"],name,resource,is_true,title)
+    return new AMOUNT(actions.space.spc_home[name],global.space,name,resource,is_true,title)
 }
 //the list
 let capsIncrease=[
@@ -109,9 +80,9 @@ for(let i in capsIncrease){
 
     if(!is_true||!name)break//if its false or doesnt have a name dont add anything
     //checks first if it has anything on, then any support on, then finally just uses the struct count
-    let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : global[loci][name].count)
+    let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : inc.global[name].count)
     resource.forEach(res=>{
-        let gain=inc.findAct()[name].caps[res](struct_count);// get the gain per resource
+        let gain=inc.action.caps[res](struct_count);// get the gain per resource
         if(res=='Pop'){
             res=global.race.species
         }
diff --git a/src/main.js b/src/main.js
index 0c3a7f59ed..bd604d89aa 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8850,9 +8850,9 @@ function midLoop(){
             let is_true=inc.is_true, resource=inc.resource, name=inc.name, title=inc.title;
 
             if(!is_true||!name)break
-            let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : global[loci][name].count)
+            let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : inc.global[name].count)
             resource.forEach(res=>{
-                let gain=inc.findAct()[name].caps[res](struct_count);
+                let gain=inc.action.caps[res](struct_count);
                 if(res=='Pop'){
                     res=global.race.species
                 }

From 709f620b035f282a154f80634b46cffde4872dc9 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Fri, 1 May 2026 12:37:32 -0600
Subject: [PATCH 14/18] All of the actions.city should be up and working! time
 to go check lol

BUG -> tooltip of apartment had a 2x Money Cap if extravagant governor. This was removed.
---
 src/actions.js | 63 +++++++++++++++++++++++++++-----------------------
 src/compare.js |  1 -
 2 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 358741a933..5d518ee765 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1399,7 +1399,7 @@ export const actions = {
                 Horseshoe(){ return global.race['hooved'] ? 1 : 0; }
             },
             effect(){
-                let pop = $(this)[0].citizens();
+                let pop = this.citizens();
                 return global.race['sappy'] ? `<div>${loc('plus_max_resource',[pop,loc('citizen')])}</div><div>${loc('city_grove_effect',[2.5])}</div>` : loc('plus_max_resource',[pop,loc('citizen')]);
             },
             caps:{
@@ -1451,9 +1451,9 @@ export const actions = {
                 Horseshoe(){ return global.race['hooved'] ? 2 : 0; }
             },
             effect(){
-                let pop = $(this)[0].citizens();
+                let pop = this.citizens();
                 if (global.tech['home_safe']){
-                    let safe = spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000);
+                    let safe = actions.city.cottage.caps.Money();
                     return `<div>${loc('plus_max_citizens',[pop])}</div><div>${loc('plus_max_resource',[`\$${safe.toLocaleString()}`,loc('resource_Money_name')])}</div>`;
                 }
                 else {
@@ -1464,6 +1464,12 @@ export const actions = {
                 Pop(count){
                     return actions.city.cottage.citizens() * (count ?? 1)
                 },
+                Money(count){
+                    if(!global.tech['home_safe']){
+                        return
+                    }
+                    return spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000) * (count ?? 1)
+                },
             },
             action(args){
                 if (payCosts($(this)[0])){
@@ -1508,13 +1514,9 @@ export const actions = {
                 Horseshoe(){ return global.race['hooved'] ? 5 : 0; }
             },
             effect(){
-                let extraVal = govActive('extravagant',2);
-                let pop = $(this)[0].citizens();
+                let pop = this.citizens();
                 if (global.tech['home_safe']){
-                    let safe = spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000);
-                    if (extraVal){
-                        safe *= 2;
-                    }
+                    let safe = this.caps.Money();
                     return `<div>${loc('plus_max_citizens',[pop])}. <span class="has-text-caution">${loc('minus_power',[$(this)[0].powered()])}</span></div><div>${loc('plus_max_resource',[`\$${safe.toLocaleString()}`,loc('resource_Money_name')])}</div>`;
                 }
                 else {
@@ -1524,7 +1526,10 @@ export const actions = {
             caps:{
                 Pop(count){
                     return actions.city.apartment.citizens() * (count ?? 1)
-                }
+                },
+                Money(count){
+                    return spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 10000 : 5000) : 2000) * (count ?? 1);
+                },
             },
             powered(){
                 let extraVal = govActive('extravagant',1);
@@ -1572,7 +1577,7 @@ export const actions = {
                 Horseshoe(){ return global.race['hooved'] ? 1 : 0; }
             },
             effect(){
-                let pop = $(this)[0].citizens();
+                let pop = this.citizens();
                 return global.race['carnivore'] && !global.race['artifical'] ? `<div>${loc('plus_max_resource',[pop,loc('citizen')])}</div><div>${loc('city_lodge_effect',[5])}</div>` : loc('plus_max_resource',[pop,loc('citizen')]);
             },
             caps:{
@@ -1617,7 +1622,7 @@ export const actions = {
                 Stone(offset){ return costMultiplier('smokehouse', offset, 50, 1.36); }
             },
             effect(){
-                let food = actions.city.smokehouse.foodCap();
+                let food = this.caps.Food();
                 return `<div>${loc('plus_max_resource',[food, global.resource.Food.name])}</div><div>${loc('city_smokehouse_effect',[10])}</div>`;
             },
             caps:{
@@ -1661,7 +1666,7 @@ export const actions = {
                 Stone(offset){ return costMultiplier('soul_well', offset, 10, 1.36); }
             },
             effect(){
-                let souls = actions.city.soul_well.foodCap()
+                let souls = this.caps.Food()
                 let production = global.race['ghostly'] ? (2 + traits.ghostly.vars()[1]) : 2;
                 return `<div>${loc('city_soul_well_effect',[production])}</div><div>${loc('plus_max_resource',[souls, loc('resource_Souls_name')])}</div>`;
             },
@@ -1701,7 +1706,7 @@ export const actions = {
                 Nanite(offset){ return global.race['deconstructor'] ? costMultiplier('slave_pen', offset, 4, 1.36) : 0; },
             },
             effect(){
-                return `<div>${loc('plus_max_resource',[$(this)[0].caps.Slave(),global.resource.Slave.name])}</div>`;
+                return `<div>${loc('plus_max_resource',[this.caps.Slave(),global.resource.Slave.name])}</div>`;
             },
             caps:{
                 Slave(count){
@@ -1783,7 +1788,7 @@ export const actions = {
                 Horseshoe(offset){ return global.race['hooved'] && ((global.city['farm'] ? global.city['farm'].count : 0) + (offset || 0)) >= 2 ? 1 : 0; }
             },
             effect(){
-                let pop = $(this)[0].citizens();
+                let pop = this.citizens();
                 return global.tech['farm'] ? `<div>${loc('city_farm_effect')}</div><div>${loc('plus_max_resource',[pop,loc('citizen')])}</div>` : loc('city_farm_effect');
             },
             caps:{
@@ -1854,7 +1859,7 @@ export const actions = {
                 generated *= global.city.biome === 'hellscape' ? biomes.hellscape.vars()[0] : 1;
                 generated *= global.city.ptrait.includes('trashed') ? planetTraits.trashed.vars()[0] : 1;
                 generated = +(generated).toFixed(2);
-                let store = actions.city.compost.foodCap();
+                let store = this.caps.Food();
                 let wood = global.race['kindling_kindred'] || global.race['smoldering'] ? `` : `<div class="has-text-caution">${loc('city_compost_heap_effect2',[0.5,global.resource.Lumber.name])}</div>`;
                 return `<div>${loc('city_compost_heap_effect',[generated])}</div><div>${loc('city_compost_heap_effect3',[store])}</div>${wood}`;
             },
@@ -1986,7 +1991,7 @@ export const actions = {
                 Iron(offset){ return ((global.city.silo ? global.city.silo.count : 0) + (offset || 0)) >= 4 && global.city.ptrait.includes('unstable') ? costMultiplier('silo', offset, 10, 1.36) : 0; }
             },
             effect(){
-                let food = actions.city.silo.foodCap();
+                let food = this.caps.Food();
                 return loc('plus_max_resource',[food, global.resource.Food.name]);
             },
             caps:{
@@ -2301,7 +2306,7 @@ export const actions = {
                 Wrought_Iron(offset){ return costMultiplier('storage_yard', offset, 5, bananaPerk(1.35)); }
             },
             effect(){
-                let cap = actions.city.storage_yard.caps.Crates()
+                let cap = this.caps.Crates()
                 if (global.tech['trade'] && global.tech['trade'] >= 3){
                     return `<div>${loc('plus_max_resource',[cap,global.resource.Crates.name])}</div><div>${loc('city_trade_effect',[1])}</div>`;
                 }
@@ -2367,7 +2372,7 @@ export const actions = {
                 Sheet_Metal(offset){ return costMultiplier('warehouse', offset, 25, bananaPerk(1.25)); }
             },
             effect(){
-                let cap = $(this)[0].caps.Containers()
+                let cap = this.caps.Containers()
                 return loc('plus_max_resource',[cap,global.resource.Containers.name]);
             },
             caps:{
@@ -2430,7 +2435,7 @@ export const actions = {
                 Iron(offset){ return ((global.city['bank'] ? global.city.bank.count : 0) + (offset || 0)) >= 2 && global.city.ptrait.includes('unstable') ? costMultiplier('bank', offset, traitCostMod('untrustworthy',30), 1.3) : 0; }
             },
             effect(){
-                let vault = $(this)[0].caps.Money()
+                let vault = this.caps.Money()
                 vault = (+(vault).toFixed(0)).toLocaleString();
 
                 if (global.tech['banking'] >= 2){
@@ -2560,7 +2565,7 @@ export const actions = {
                 Stone(offset){ return costMultiplier('graveyard', offset, 6, 1.9); }
             },
             effect(){
-                let lum = actions.city.graveyard.caps.Lumber();
+                let lum = this.caps.Lumber();
                 return `<div>${loc('city_graveyard_effect',[8])}</div><div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div>`;
             },
             caps:{
@@ -2604,7 +2609,7 @@ export const actions = {
                 Stone(offset){ return costMultiplier('lumber_yard', offset, 2, 1.95); }
             },
             effect(){
-                let lum = actions.city.lumber_yard.lumberCap();
+                let lum = this.caps.Lumber();
                 return `<div>${loc('production',[2,global.resource.Lumber.name])}</div><div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div>`;
             },
             caps:{
@@ -2642,7 +2647,7 @@ export const actions = {
             },
             effect(){
                 let impact = global.tech['saw'] >= 2 ? 8 : 5;
-                let lum = actions.city.sawmill.caps.Lumber();
+                let lum = this.caps.Lumber();
                 let desc = `<div>${loc('plus_max_resource',[lum,global.resource.Lumber.name])}</div><div>${loc('production',[impact,global.resource.Lumber.name])}</div>`;
                 if (global.tech['foundry'] && global.tech['foundry'] >= 4){
                     desc = desc + `<div>${loc('crafting',[2,global.resource.Plywood.name])}</div>`;
@@ -2700,7 +2705,7 @@ export const actions = {
                 Stone(offset){ return costMultiplier('rock_quarry', offset, 10, 1.36); }
             },
             effect(){
-                let stone = actions.city.rock_quarry.stoneCap();
+                let stone = this.caps.Stone();
                 let asbestos = global.race['smoldering'] ? `<div>${loc('plus_max_resource',[stone,global.resource.Chrysotile.name])}</div>` : '';
                 if (global.tech['mine_conveyor']){
                     return `<div>${loc('city_rock_quarry_effect1',[2])}</div><div>${loc('plus_max_resource',[stone,global.resource.Stone.name])}</div>${asbestos}<div class="has-text-caution">${loc('city_rock_quarry_effect2',[4,$(this)[0].powered()])}</div>`;
@@ -2714,7 +2719,7 @@ export const actions = {
                     return BHStorageMulti((count??1) * spatialReasoning(100));
                 },
                 Chrysotile(count){
-                    return actions.city.rock_quarry.caps.Stone(count)
+                    return this.Stone(count)
                 },
             },
             special(){ return global.race['smoldering'] ? true : false; },
@@ -3163,7 +3168,7 @@ export const actions = {
             },
             effect(){
                 let oil = +(production('oil_well')).toFixed(2);
-                let oc = spatialReasoning(500);
+                let oc = this.caps.Oil();
                 let desc = `<div>${loc('city_oil_well_effect',[oil,oc])}</div>`;
                 if (global.race['blubber'] && global.city.hasOwnProperty('oil_well')){
                     let maxDead = global.city.oil_well.count + (global.space['oil_extractor'] ? global.space.oil_extractor.count : 0);
@@ -3305,7 +3310,7 @@ export const actions = {
                 Oil(offset){ return costMultiplier('wharf', offset, 750, 1.32); }
             },
             effect(){
-                let containers=$(this)[0].caps.Containers()
+                let containers=this.caps.Containers()
                 return `<div>${loc('city_trade_effect',[2])}</div><div>${loc('city_wharf_effect')}</div><div>${loc('plus_max_crates',[containers])}</div><div>${loc('plus_max_containers',[containers])}</div>`;
             },
             caps:{
@@ -3317,7 +3322,7 @@ export const actions = {
                     return vol*(count??1)
                 },
                 Crates(count){
-                    return actions.city.wharf.caps.Containers(count)
+                    return this.Containers(count)
                 },
             },
             action(args){
@@ -4840,7 +4845,7 @@ export function buildTemplate(key, region){
                     Steel(offset){ return costMultiplier('nanite_factory', offset, 1000, dirt_adjust(1.25)); }
                 },
                 effect(){
-                    let val = $(this)[0].caps.Nanite()
+                    let val = this.caps.Nanite()
                     return `<div>${loc('city_nanite_factory_effect',[global.resource.Nanite.name])}</div><div>${loc('plus_max_resource',[val,global.resource.Nanite.name])}.</div>`;
                 },
                 caps:{
diff --git a/src/compare.js b/src/compare.js
index cabdabd244..c2094a1ee0 100644
--- a/src/compare.js
+++ b/src/compare.js
@@ -35,7 +35,6 @@ class AMOUNT{
             if its anything else (so a list) -> its good
         
         */
-        
         if(typeof this.resource === 'string'){
             this.resource=[resource]
         }

From f958ce689b9fab0306060af2dae06ec4e832fb03 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Fri, 1 May 2026 13:29:03 -0600
Subject: [PATCH 15/18] removing all the independent Blackhole storage
 calculations and routing them throught the BHStorage function removing
 unnecesary planet action code that is run in midLoop (got to foundry)

---
 src/actions.js   | 74 ++++++--------------------------------
 src/main.js      | 92 ++++++++++++++++--------------------------------
 src/resources.js |  8 ++---
 src/space.js     |  9 ++---
 src/truepath.js  |  7 ++--
 5 files changed, 49 insertions(+), 141 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 5d518ee765..52443961a1 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1410,7 +1410,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     global['resource'][global.race.species].display = true;
-                    global['resource'][global.race.species].max += $(this)[0].citizens();
                     incrementStruct($(this)[0]);
                     global.settings.showCivic = true;
                     return true;
@@ -1473,7 +1472,6 @@ export const actions = {
             },
             action(args){
                 if (payCosts($(this)[0])){
-                    global['resource'][global.race.species].max += $(this)[0].citizens();
                     incrementStruct('cottage','city');
                     return true;
                 }
@@ -1538,9 +1536,7 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('apartment','city');
-                    if (powerOnNewStruct($(this)[0])){
-                        global['resource'][global.race.species].max += $(this)[0].citizens();
-                    }
+                    powerOnNewStruct($(this)[0])
                     return true;
                 }
                 return false;
@@ -1589,7 +1585,6 @@ export const actions = {
                 if (payCosts($(this)[0])){
                     incrementStruct('lodge','city');
                     global['resource'][global.race.species].display = true;
-                    global['resource'][global.race.species].max += 1;
                     global.settings.showCivic = true;
                     return true;
                 }
@@ -1633,7 +1628,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('smokehouse','city');
-                    global['resource']['Food'].max += BHStorageMulti(spatialReasoning(100));
                     return true;
                 }
                 return false;
@@ -1675,11 +1669,9 @@ export const actions = {
                     return BHStorageMulti((count??1) * spatialReasoning(500))
                 }
             },
-            foodVal(){},
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('soul_well','city');
-                    global['resource']['Food'].max += BHStorageMulti(spatialReasoning(500));
                     return true;
                 }
                 return false;
@@ -1808,7 +1800,6 @@ export const actions = {
                     }
                     if (global.tech['farm']){
                         global['resource'][global.race.species].display = true;
-                        global['resource'][global.race.species].max += $(this)[0].citizens();
                         global.settings.showCivic = true;
                     }
                     return true;
@@ -1868,13 +1859,11 @@ export const actions = {
                     return BHStorageMulti((count??1) * spatialReasoning(200));
                 }
             },
-            foodVal(){},
             switchable(){ return true; },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('compost','city');
                     global.city.compost.on++;
-                    global['resource']['Food'].max += BHStorageMulti(spatialReasoning(200));
                     return true;
                 }
                 return false;
@@ -2002,7 +1991,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('silo','city');
-                    global['resource']['Food'].max += BHStorageMulti(spatialReasoning(500));
                     return true;
                 }
                 return false;
@@ -2276,12 +2264,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('shed','city');
-                    let multiplier = storageMultipler();
-                    for (const res of $(this)[0].res()){
-                        if (global.resource[res].display){
-                            global.resource[res].max += (spatialReasoning($(this)[0].val(res) * multiplier));
-                        }
-                    };
                     return true;
                 }
                 return false;
@@ -2332,17 +2314,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('storage_yard','city');
-                    let cap = global.tech.container >= 3 ? 20 : 10;
-                    if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 1){
-                        cap += 10;
-                    }
-                    if (global.tech['world_control']){
-                        cap += 10;
-                    }
-                    if (global.tech['particles'] && global.tech['particles'] >= 2){
-                        cap *= 2;
-                    }
-                    global.resource.Crates.max += cap;
                     // A freight yard is always required, so this is the only struct that can unlock crates
                     // Any scenario where a freight yard is unnecessary will begin with crates unlocked
                     if (!global.resource.Crates.display){
@@ -2393,17 +2364,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('warehouse','city');
-                    let cap = global.tech['steel_container'] >= 2 ? 20 : 10;
-                    if (global.stats.achieve['pathfinder'] && global.stats.achieve.pathfinder.l >= 2){
-                        cap += 10;
-                    }
-                    if (global.tech['world_control']){
-                        cap += 10;
-                    }
-                    if (global.tech['particles'] && global.tech['particles'] >= 2){
-                        cap *= 2;
-                    }
-                    global.resource.Containers.max += cap;
                     if (!global.resource.Containers.display){
                         unlockContainers();
                     }
@@ -2455,7 +2415,6 @@ export const actions = {
             },
             action(args){
                 if (payCosts($(this)[0])){
-                    global['resource']['Money'].max += spatialReasoning(1800);
                     incrementStruct('bank','city');
                     global.civic.banker.max = jobScale(global.city.bank.count);
                     return true;
@@ -2494,15 +2453,15 @@ export const actions = {
                 let mana = +(0.01 * darkEffect('magic')).toFixed(3);
                 return `<div>${loc('gain',[mana,global.resource.Mana.name])}</div><div>${loc('plus_max_resource',[max,global.resource.Mana.name])}</div>`;
             },
-            manaCap(){
-                return spatialReasoning(5);
+            caps:{
+                Mana(count){
+                    return (count ?? 1) * spatialReasoning(5);
+                },
             },
-
             special(){ return global.tech['magic'] && global.tech.magic >= 3 ? true : false; },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('pylon','city');
-                    global.resource.Mana.max += spatialReasoning(5);
                     return true;
                 }
                 return false;
@@ -2576,7 +2535,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('graveyard','city');
-                    global['resource']['Lumber'].max += BHStorageMulti(spatialReasoning(100));
                     return true;
                 }
                 return false;
@@ -2621,7 +2579,6 @@ export const actions = {
                 if (payCosts($(this)[0])){
                     incrementStruct('lumber_yard','city');
                     global.civic.lumberjack.display = true;
-                    global['resource']['Lumber'].max += BHStorageMulti(spatialReasoning(100));
                     return true;
                 }
                 return false;
@@ -2671,7 +2628,6 @@ export const actions = {
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('sawmill','city');
-                    global['resource']['Lumber'].max += BHStorageMulti(spatialReasoning(200));
                     powerOnNewStruct($(this)[0]);
                     return true;
                 }
@@ -2741,15 +2697,10 @@ export const actions = {
                 if (payCosts($(this)[0])){
                     incrementStruct('rock_quarry','city');
                     global.civic.quarry_worker.display = true;
-                    let stone = BHStorageMulti(spatialReasoning(100));
-                    global['resource']['Stone'].max += stone;
-                    if (global.race['smoldering'] && global.resource.Chrysotile.display){
-                        global['resource']['Chrysotile'].max += stone;
-                        if (global.city.rock_quarry.count === 1){
-                            global.settings.showCivic = true;
-                            global.settings.showIndustry = true;
-                            defineIndustry();
-                        }
+                    if (global.race['smoldering'] && global.resource.Chrysotile.display && global.city.rock_quarry.count === 1){
+                        global.settings.showCivic = true;
+                        global.settings.showIndustry = true;
+                        defineIndustry();
                     }
                     powerOnNewStruct($(this)[0]);
                     return true;
@@ -5913,7 +5864,7 @@ export function BHStorageMulti(val){
     if (global.stats.achieve['blackhole']){
         val *= 1 + global.stats.achieve.blackhole.l * 0.05;
     }
-    return Math.round(val);
+    return val;
 }
 
 export function storageMultipler(scale = 1, wiki = false){
@@ -5937,9 +5888,6 @@ export function storageMultipler(scale = 1, wiki = false){
     if (global.tech['shelving'] && global.tech.shelving >= 3){
         multiplier *= 1.5;
     }
-    if (global.stats.achieve['blackhole']){
-        multiplier *= 1 + global.stats.achieve.blackhole.l * 0.05;
-    }
     multiplier *= global.tech['world_control'] ? 3 : 1;
     if (global.race['ascended']){
         multiplier *= 1.1;
@@ -5950,7 +5898,7 @@ export function storageMultipler(scale = 1, wiki = false){
     if (global.tech['storage'] >= 7 && global.interstellar['cargo_yard']){
         multiplier *= 1 + ((global.interstellar['cargo_yard'].count * get_qlevel(wiki)) / 100);
     }
-    return multiplier * scale;
+    return BHStorageMulti(multiplier) * scale;
 }
 
 export function checkCityRequirements(action){
diff --git a/src/main.js b/src/main.js
index bd604d89aa..a2af4f4304 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8141,73 +8141,44 @@ function ifExist(main,...args){
     return main
 }
 class AMOUNT{
-    constructor(loci,name,is_true,resource,title,count){
-        this.loci=loci
-        this.name=name
+    constructor(action,globl,name,is_true,resource,title,count){
+        this.name=name//name of struct
         this.resource=null
-        this.tempRes=true
+        this.action=action
+        this.global=globl
+        /* 
+            If the cap name is a string -> make it a list because then we can remove other checks later
+            if its undefined -> we can just get it from the actions struct (this will be updated later for reasons that i cant remember, imma think on that lol)
+            if its anything else (so a list) -> its good
+        
+        */
         if(typeof this.resource === 'string'){
             this.resource=[resource]
-            this.tempRes=false
         }
         else if(resource === undefined){
-            this.resource=Object.keys(actions['city'][name].caps)
-            this.rempRes=true
+            this.resource=Object.keys(this.action.caps)
         }
         else{
             this.resource=resource
-            this.tempRes=false
         }
-        this.is_true=is_true
-        this.title=title
-        this.count=count
-        this.works=true
+        this.is_true=is_true//can we actually add the caps?
+        this.title=title//whats its name
+
     }
     calc(){
-        let act=this.findAct()
-        if(this.tempRes){
-            this.resource=Object.keys(act[this.name].caps)
-            this.rempRes=true
-        }
-        this.is_true=this.findGlob().hasOwnProperty(this.name)
-        // console.log(title)
-        this.title=typeof act[this.name].title ==="string"?act[this.name].title : act[this.name].title()
-    }
-    findAct(){
-        if(typeof this.loci == "string"){
-            return actions[this.loci]
-        }
-        else{
-            let main=actions[this.loci[0]]
-            for(let i=1; i<this.loci.length; i++){
-                main=main[this.loci[i]]
-            }
-            return main
-        }
-    }
-    findGlob(){
-        if(typeof this.loci == "string"){
-            return global[this.loci]
-        }
-        else{
-            return global[this.loci[0]]
-        }
+        this.is_true=this.global.hasOwnProperty(this.name)//make sure it works still
+        this.title=typeof this.action.title ==="string"?this.action.title : this.action.title()//get title, with in case of function
     }
 }
-function Amount(loci,name,resource,is_true,title){
-    return new AMOUNT(loci,name,resource,is_true,title)
+
+function Amount(action,globl,name,resource,is_true,title){
+    return new AMOUNT(action,globl,name,resource,is_true,title)
 }
 function c_Amount(name,resource,is_true,title){
-    return Amount('city',name,resource,is_true,title)
+    return new AMOUNT(actions.city[name],global.city,name,resource,is_true,title)
 }
 function sh_Amount(name,resource,is_true,title){
-    return Amount(['space',"spc_home"],name,resource,is_true,title)
-}
-function st_Amount(name,resource,is_true,title){
-    return Amount(['space',"spc_titan"],name,resource,is_true,title)
-}
-function sr_Amount(name,resource,is_true,title){
-    return Amount(['space',"spc_red"],name,resource,is_true,title)
+    return new AMOUNT(actions.space.spc_home[name],global.space,name,resource,is_true,title)
 }
 let capsIncrease=[
     c_Amount('wharf'),
@@ -8846,17 +8817,19 @@ function midLoop(){
         let loci='city'
         for(let i in capsIncrease){
             let inc=capsIncrease[i]
-            inc.calc();
-            let is_true=inc.is_true, resource=inc.resource, name=inc.name, title=inc.title;
-
-            if(!is_true||!name)break
+            inc.calc();//make sure everything is correct
+            let is_true=inc.is_true, resource=inc.resource, name=inc.name, title=inc.title;//relic of creation of this, will remove when its finished
+            if(!is_true||!name)continue//if its false or doesnt have a name dont add anything
+            //checks first if it has anything on, then any support on, then finally just uses the struct count
             let struct_count=p_on[name] != undefined? p_on[name] : (support_on[name] != undefined ? support_on[name] != undefined : inc.global[name].count)
             resource.forEach(res=>{
-                let gain=inc.action.caps[res](struct_count);
+                let gain=inc.action.caps[res](struct_count);// get the gain per resource
                 if(res=='Pop'){
                     res=global.race.species
                 }
-                if(gain){
+                //if it isn't undefined or null, add stuff in
+                //this is because somethings have other conditions, banks only give money if you dont have cataclysm and a spaceport on
+                if(gain!=undefined && gain !=null){
                     caps[res]+=gain;
                     breakdown.c[res][title]=gain+'v';
                 }
@@ -9178,7 +9151,7 @@ function midLoop(){
                 breakdown.c.Money[loc(title)] = gain+'v';
             }
             //when not bank vv
-            if (global.city['bank'] || (global.race['cataclysm'] && p_on['spaceport'])){
+            if ((global.race['cataclysm'] && p_on['spaceport'])){
                 let vault = cata_orbit ? bank_vault() * 4 : bank_vault();
                 let banks = cata_orbit ? p_on['spaceport'] : global.city['bank'].count;
 
@@ -9230,11 +9203,6 @@ function midLoop(){
                 caps['Money'] += vault;
                 breakdown.c.Money[structName('casino')] = vault+'v';
             }
-            if (global.city['cottage'] && global.tech['home_safe']){
-                let gain = (global.city['cottage'].count * spatialReasoning(global.tech.home_safe >= 2 ? (global.tech.home_safe >= 3 ? 5000 : 2000) : 1000));
-                caps['Money'] += gain;
-                breakdown.c.Money[housingLabel('medium')] = gain+'v';
-            }
         }
         // Population
         {
diff --git a/src/resources.js b/src/resources.js
index 59259ada13..c3ec5783b7 100644
--- a/src/resources.js
+++ b/src/resources.js
@@ -1,7 +1,7 @@
 import { global, tmp_vars, keyMultiplier, breakdown, sizeApproximation, p_on, support_on, active_rituals } from './vars.js';
 import { vBind, clearElement, modRes, flib, calc_mastery, calcPillar, eventActive, easterEgg, trickOrTreat, popover, harmonyEffect, darkEffect, hoovedRename, messageQueue } from './functions.js';
 import { traits, fathomCheck } from './races.js';
-import { templeCount, actions } from './actions.js';
+import { templeCount, actions, BHStorageMulti } from './actions.js';
 import { workerScale } from './jobs.js';
 import { hellSupression } from './portal.js';
 import { syndicate } from './truepath.js';
@@ -2661,8 +2661,7 @@ export function crateValue(){
     if (global.stats.achieve['banana'] && global.stats.achieve.banana.l >= 3){
         create_value *= 1.1;
     }
-    create_value *= global.stats.achieve['blackhole'] ? 1 + (global.stats.achieve.blackhole.l * 0.05) : 1;
-    return Math.round(spatialReasoning(create_value));
+    return Math.round(spatialReasoning(BHStorageMulti(create_value)));
 }
 
 export function containerValue(){
@@ -2683,8 +2682,7 @@ export function containerValue(){
     if (fathom > 0){
         container_value *= 1 + (traits.pack_rat.vars(1)[0] / 100 * fathom);
     }
-    container_value *= global.stats.achieve['blackhole'] ? 1 + (global.stats.achieve.blackhole.l * 0.05) : 1;
-    return Math.round(spatialReasoning(container_value));
+    return Math.round(spatialReasoning(BHStorageMulti(container_value)));
 }
 
 function initMarket(){
diff --git a/src/space.js b/src/space.js
index 91893fa4d1..ae575e9d11 100644
--- a/src/space.js
+++ b/src/space.js
@@ -6,7 +6,7 @@ import { spatialReasoning, unlockContainers, drawResourceTab, atomic_mass } from
 import { loadFoundry, jobScale } from './jobs.js';
 import { defineIndustry, addSmelter } from './industry.js';
 import { garrisonSize, describeSoldier, checkControlling, govTitle } from './civics.js';
-import { actions, payCosts, powerOnNewStruct, initStruct, setAction, setPlanet, storageMultipler, drawTech, bank_vault, updateDesc, actionDesc, templeEffect, templeCount, casinoEffect, wardenLabel, buildTemplate, structName } from './actions.js';
+import { actions, payCosts, powerOnNewStruct, initStruct, setAction, setPlanet, storageMultipler, drawTech, bank_vault, updateDesc, actionDesc, templeEffect, templeCount, casinoEffect, wardenLabel, buildTemplate, structName, BHStorageMulti } from './actions.js';
 import { outerTruthTech, syndicate, drawShipYard } from './truepath.js';
 import { production, highPopAdjust } from './prod.js';
 import { defineGovernor, govActive } from './governor.js';
@@ -923,7 +923,7 @@ const spaceProjects = {
                 if (global.tech['shelving'] && global.tech.shelving >= 3){
                     multiplier *= 1.5;
                 }
-                multiplier *= global.stats.achieve['blackhole'] ? 1 + (global.stats.achieve.blackhole.l * 0.05) : 1;
+                multiplier = BHStorageMulti(multiplier);
                 if (h){
                     return global.tech['shelving'] && global.tech.shelving >= 2 ? multiplier * 3 : multiplier;
                 }
@@ -6622,11 +6622,8 @@ export function gatewayStorage(){
     if (global.race['pack_rat']){
         multiplier *= 1.05;
     }
-    if (global.stats.achieve['blackhole']){
-        multiplier *= 1 + global.stats.achieve.blackhole.l * 0.05;
-    }
     multiplier *= global.tech['world_control'] ? 2 : 1;
-    return multiplier;
+    return BHStorageMulti(multiplier);
 }
 
 const structDefinitions = {
diff --git a/src/truepath.js b/src/truepath.js
index 036ec529ff..9aaada189d 100644
--- a/src/truepath.js
+++ b/src/truepath.js
@@ -5,7 +5,7 @@ import { spatialReasoning, unlockContainers } from './resources.js';
 import { armyRating, garrisonSize, soldierDeath } from './civics.js';
 import { jobScale, job_desc, loadFoundry, limitCraftsmen } from './jobs.js';
 import { production, highPopAdjust } from './prod.js';
-import { actions, payCosts, powerOnNewStruct, setAction, drawTech, bank_vault, buildTemplate, casinoEffect, housingLabel, structName, initStruct } from './actions.js';
+import { actions, payCosts, powerOnNewStruct, setAction, drawTech, bank_vault, buildTemplate, casinoEffect, housingLabel, structName, initStruct, BHStorageMulti } from './actions.js';
 import { fuel_adjust, int_fuel_adjust, spaceTech, renderSpace, checkRequirements, incrementStruct, planetName } from './space.js';
 import { defineGovernor, removeTask, govActive } from './governor.js';
 import { defineIndustry, nf_resources, addSmelter, setupRituals, cancelRituals } from './industry.js';
@@ -5498,9 +5498,6 @@ export function tpStorageMultiplier(type,heavy,wiki){
     if (global.race['pack_rat']){
         multiplier *= 1 + (traits.pack_rat.vars()[1] / 100);
     }
-    if (global.stats.achieve['blackhole']){
-        multiplier *= 1 + global.stats.achieve.blackhole.l * 0.05;
-    }
     if (global.tech['world_control']){
         multiplier *= 3;
     }
@@ -5529,7 +5526,7 @@ export function tpStorageMultiplier(type,heavy,wiki){
         }
         break;
     }
-    return multiplier;
+    return BHStorageMulti(multiplier);
 }
 
 export function jumpGateShutdown(){

From 1a295aeca045c43fa9c4e8d661f4b952b65171c4 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Fri, 1 May 2026 13:54:17 -0600
Subject: [PATCH 16/18] fixing science and knowVal stuff

---
 src/actions.js | 4 ++--
 src/main.js    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/actions.js b/src/actions.js
index 52443961a1..4a77721f51 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -3729,7 +3729,7 @@ export const actions = {
                 let gain = +($(this)[0].knowVal(wiki)).toFixed(0);
                 return `<div>${loc('city_university_effect',[jobScale(1)])}</div><div>${loc('city_max_knowledge',[gain.toLocaleString()])}</div>`;
             },
-            knowCap(wiki){
+            knowVal(wiki){
                 let multiplier = 1;
                 let base = global.tech['science'] && global.tech['science'] >= 8 ? 700 : 500;
                 if (global.city.ptrait.includes('permafrost')){
@@ -4007,7 +4007,7 @@ export const actions = {
                 gain = +(gain).toFixed(0);
                 return `<span>${loc('city_max_knowledge',[gain.toLocaleString()])}</span>, <span class="has-text-caution">${loc('minus_power',[$(this)[0].powered()])}</span>`;
             },
-            knowCap(wiki){
+            knowVal(wiki){
                 let gain=3000;
                 if (global.portal['sensor_drone'] && global.tech['science'] >= 14){
                     gain *= 1 + (wiki ? global.portal.sensor_drone.on : p_on['sensor_drone']) * 0.02;
diff --git a/src/main.js b/src/main.js
index a2af4f4304..b28aa459b8 100644
--- a/src/main.js
+++ b/src/main.js
@@ -9317,7 +9317,7 @@ function midLoop(){
             if (global.city['university']){
                 let univCount=global.city.university.count;
 
-                let gain = city.university.knowCap() * univCount;
+                let gain = city.university.knowVal(univCount);
                 lCaps['professor'] += jobScale(univCount);
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('city_university')] = gain+'v';
@@ -9355,7 +9355,7 @@ function midLoop(){
                 }
             }
             if (global.city['biolab']){
-                let gain = p_on['biolab'] * city.biolab.knowCap()
+                let gain = p_on['biolab'] * city.biolab.knowVal()
                 caps['Knowledge'] += gain;
                 breakdown.c.Knowledge[loc('city_biolab')] = gain+'v';
             }

From aabd80597af8b8ac6301a15985666fd9d803d3ca Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Mon, 4 May 2026 14:42:29 -0600
Subject: [PATCH 17/18] added space_red garage, int_proxima cargo_yard,
 tau_home colony

---
 src/main.js     | 131 +++++++++++++++++++-----------------------------
 src/space.js    |  38 ++++++++++----
 src/truepath.js |  15 +++++-
 3 files changed, 93 insertions(+), 91 deletions(-)

diff --git a/src/main.js b/src/main.js
index b28aa459b8..48ebe7b00a 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8171,45 +8171,29 @@ class AMOUNT{
     }
 }
 
-function Amount(action,globl,name,resource,is_true,title){
+function Amounts(action,globl,name,resource,is_true,title){
     return new AMOUNT(action,globl,name,resource,is_true,title)
 }
-function c_Amount(name,resource,is_true,title){
-    return new AMOUNT(actions.city[name],global.city,name,resource,is_true,title)
-}
-function sh_Amount(name,resource,is_true,title){
-    return new AMOUNT(actions.space.spc_home[name],global.space,name,resource,is_true,title)
+function Amount(name,loci,resource,is_true,title){
+    switch(loci){
+        case 'city':
+            return new AMOUNT(actions.city[name],global.city,name,resource,is_true,title)
+        break
+        case 'space_red':
+            return new AMOUNT(actions.space.spc_red[name],global.space,name,resource,is_true,title)
+        break
+        case 'int_proxima':
+            return new AMOUNT(actions.interstellar.int_proxima[name],global.interstellar,name,resource,is_true,title)
+        break
+        case 'tau_home':
+            return new AMOUNT(actions.tauceti.tau_home[name],global.tauceti,name,resource,is_true,title)
+        break
+        default:
+            return new AMOUNT(actions.city[name],global.city,name,resource,is_true,title)
+        break
+    }
 }
-let capsIncrease=[
-    c_Amount('wharf'),
-    c_Amount('storage_yard'),
-    c_Amount('warehouse'),
-    c_Amount('bank'),
-    c_Amount('farm'),
-    c_Amount('basic_housing'),
-    c_Amount('cottage'),
-    c_Amount('apartment'),
-    c_Amount('lodge'),
-    c_Amount('nanite_factory'),
-    c_Amount('slave_pen'),
-    c_Amount('silo'),
-    c_Amount('compost'),
-    c_Amount('soul_well'),
-    c_Amount('smokehouse'),
-    c_Amount('rock_quarry'),
-    c_Amount('lumber_yard'),
-    c_Amount('graveyard'),
-    c_Amount('sawmill'),
-    c_Amount('oil_well'),
-    // sr_Amount('garage'),
-    // sh_Amount(''),
-    // sh_Amount(''),
-    // sh_Amount(''),
-    // sh_Amount(''),
-    // sh_Amount(''),
-    // sh_Amount(''),
-    // // Amount('cottage','Money',null)
-]
+
 // MAKE SURE THE SLAVES HAVE CAP STILL!!!!!!!!!!!!
 function midLoop(){
     const astroSign = astrologySign();
@@ -8835,7 +8819,37 @@ function midLoop(){
                 }
             })
         }
-
+let capsIncrease=[
+    Amount('wharf'),
+    Amount('storage_yard'),
+    Amount('warehouse'),
+    Amount('bank'),
+    Amount('farm'),
+    Amount('basic_housing'),
+    Amount('cottage'),
+    Amount('apartment'),
+    Amount('lodge'),
+    Amount('nanite_factory'),
+    Amount('slave_pen'),
+    Amount('silo'),
+    Amount('compost'),
+    Amount('soul_well'),
+    Amount('smokehouse'),
+    Amount('rock_quarry'),
+    Amount('lumber_yard'),
+    Amount('graveyard'),
+    Amount('sawmill'),
+    Amount('oil_well'),
+
+    Amount('garage','space_red'),
+
+    Amount('cargo_yard','int_proxima'),
+
+    Amount('colony','tau_home'),
+    Amount('',''),
+    Amount('',''),
+    // Amount('',''),
+]
         //Res Caps ------------------
         // Storage - General
         {
@@ -8964,7 +8978,6 @@ function midLoop(){
             }
         }
         // Crates & Containters
-        
             // Crates Only
         {   
             if (global.space['munitions_depot']){
@@ -8974,19 +8987,6 @@ function midLoop(){
                 caps['Containers'] += vol;
                 breakdown.c.Containers[loc('tech_munitions_depot')] = vol + 'v';
             }
-            if (global.space['garage']){
-                let g_vol = global.tech['particles'] >= 4 ? 20 + global.tech['supercollider'] : 20;
-                if (global.tech['world_control'] || global.race['cataclysm']){
-                    g_vol += 10;
-                }
-                let g_count=(global.space.garage.count * g_vol)
-                caps['Containers'] += g_count;
-                breakdown.c.Containers[loc('space_red_garage_title')] = g_count + 'v';
-                if (global.race['cataclysm'] || global.race['orbit_decayed']){
-                    caps['Crates'] += g_count;
-                    breakdown.c.Crates[loc('space_red_garage_title')] = g_count + 'v';
-                }
-            }
             if (global.tech['tp_depot']){
                 let tp_count=(global.tech.tp_depot * 50)
                 caps['Containers'] += tp_count;
@@ -8994,25 +8994,7 @@ function midLoop(){
                 caps['Crates'] += tp_count;
                 breakdown.c.Crates[loc('galaxy_gateway_depot')] = tp_count + 'v';
             }
-            if (global.interstellar['cargo_yard']){
-                let cargo_count=global.interstellar.cargo_yard.count;
-                let c_count=cargo_count*50
-
-                caps['Crates'] += c_count;
-                breakdown.c.Crates[loc('interstellar_cargo_yard_title')] = c_count + 'v';
-                caps['Containers'] += c_count;
-                breakdown.c.Containers[loc('interstellar_cargo_yard_title')] = c_count + 'v';
-
-                let gain = (cargo_count * spatialReasoning(200));
-                caps['Neutronium'] += gain;
-                breakdown.c.Neutronium[loc('interstellar_cargo_yard_title')] = gain+'v';
-
-                gain = (cargo_count * spatialReasoning(150));
-                caps['Infernite'] += gain;
-                breakdown.c.Infernite[loc('interstellar_cargo_yard_title')] = gain+'v';
-            }
         }
-            // Containers Only
             //Both
         {
             if (p_on['arcology']){
@@ -9048,17 +9030,6 @@ function midLoop(){
                 caps['Money'] += money;
                 breakdown.c.Money[loc('portal_bazaar_title')] = money+'v';
             }
-            if (support_on['colony']){
-                let containers = support_on['colony'] * (global.tech['isolation'] ? 900 : 250);
-                caps['Containers'] += containers;
-                breakdown.c.Containers[loc('tau_home_colony')] = containers + 'v';
-                caps['Crates'] += containers;
-                breakdown.c.Crates[loc('tau_home_colony')] = containers + 'v';
-
-                let pop = support_on['colony'] * actions.tauceti.tau_home.colony.citizens();
-                caps[global.race.species] += pop;
-                breakdown.c[global.race.species][loc('tau_home_colony')] = pop + 'v';
-            }
             if (global.galaxy['gateway_depot']){
                 let g_count=global.galaxy.gateway_depot.count
                 let containers = g_count * (global.tech['world_control'] ? 150 : 100);
diff --git a/src/space.js b/src/space.js
index ae575e9d11..09d5da447f 100644
--- a/src/space.js
+++ b/src/space.js
@@ -932,10 +932,7 @@ const spaceProjects = {
             effect(){
                 let multiplier = $(this)[0].multiplier(false);
                 let h_multiplier = $(this)[0].multiplier(true);
-                let containers = global.tech['particles'] >= 4 ? 20 + global.tech['supercollider'] : 20;
-                if (global.tech['world_control'] || global.race['cataclysm'] || global.race['orbit_decayed']){
-                    containers += 10;
-                }
+                let containers = this.caps.Containers()
                 let crate = global.race['cataclysm'] || global.race['orbit_decayed'] ? `<span>${loc('plus_max_resource',[containers,global.resource.Crates.name])}</span>` : ``;
 
                 let desc = '<div class="aTable">';
@@ -952,8 +949,17 @@ const spaceProjects = {
             },
             caps:{
                 Containers(count){
-                    let g_count=0
-                    return g_count * (count ?? 1)
+                    let containers = global.tech['particles'] >= 4 ? 20 + global.tech['supercollider'] : 20;
+                    if (global.tech['world_control'] || global.race['cataclysm'] || global.race['orbit_decayed']){
+                        containers += 10;
+                    }
+                    return containers * (count ?? 1)
+                },
+                Crate(count){
+                    if(!(global.race['cataclysm'] || global.race['obit_decayed'])){
+                        return
+                    }
+                    return this.Containers(count)
                 },
             },
             action(args){
@@ -3448,9 +3454,9 @@ const interstellarProjects = {
                 Mythril(offset){ return spaceCostMultiplier('cargo_yard', offset, 6000, 1.28, 'interstellar'); },
             },
             effect(wiki){
-                let containers = 50;
-                let neutronium = spatialReasoning(200);
-                let infernite = spatialReasoning(150);
+                let containers = this.caps.Containers();
+                let neutronium = this.caps.Neutronium();
+                let infernite = this.caps.Infernite();
                 let desc = `<div>${loc('plus_max_resource',[containers,global.resource.Crates.name])}</div><div>${loc('plus_max_resource',[containers,global.resource.Containers.name])}</div>`;
                 desc = desc + `<div>${loc('plus_max_resource',[neutronium,global.resource.Neutronium.name])}</div><div>${loc('plus_max_resource',[infernite,global.resource.Infernite.name])}</div>`;
                 if (global.tech['storage'] >= 7){
@@ -3459,6 +3465,20 @@ const interstellarProjects = {
                 }
                 return desc;
             },
+            caps:{
+                Containers(count){
+                    return 50 * (count ?? 1);
+                },
+                Crates(count){
+                    return this.Containers(count);
+                },
+                Neutronium(count){
+                    return spatialReasoning(200) * (count ?? 1);
+                },
+                Infernite(count){
+                    return spatialReasoning(150) * (count ?? 1);
+                },
+            },
             action(args){
                 if (payCosts($(this)[0])){
                     incrementStruct('cargo_yard','interstellar');
diff --git a/src/truepath.js b/src/truepath.js
index 9aaada189d..595ae58e69 100644
--- a/src/truepath.js
+++ b/src/truepath.js
@@ -1865,8 +1865,8 @@ const tauCetiModules = {
                 Brick(offset){ return tauEnabled() ? spaceCostMultiplier('colony', offset, wom_recycle(880000), 1.225, 'tauceti') : 0; },
             },
             effect(){
-                let pop = $(this)[0].citizens();
-                let containers = global.tech['isolation'] ? 900 : 250;
+                let pop = this.citizens();
+                let containers = this.caps.Containers();
                 let fuel = +($(this)[0].support_fuel().a).toFixed(1);
                 let desc = `<div class="has-text-caution">${loc('tau_new_support',[$(this)[0].support(), races[global.race.species].home])}</div>`;
                 
@@ -1903,6 +1903,17 @@ const tauCetiModules = {
                 }
                 return desc;
             },
+            caps:{
+                Containers(count){
+                    return (global.tech['isolation'] ? 900 : 250) * (count ?? 1);
+                },
+                Crates(count){
+                    return this.Containers(count);
+                },
+                Pop(count){
+                    return actions.tauceti.tau_home.colony.citizens()* (count ?? 1);
+                },
+            },
             s_type: 'tau_home',
             support(){ return -2; },
             support_fuel(){ return { r: 'Food', a: global.tech['isolation'] ? (global.race['lone_survivor'] ? -2 : 75) : 1000 }; },

From 093467085ed509010d5bfa664e22f29c2e2a3b36 Mon Sep 17 00:00:00 2001
From: The1stBurb <eli.cooper@ucas-edu.net>
Date: Sat, 9 May 2026 15:10:51 -0600
Subject: [PATCH 18/18] erm making it run lol

---
 src/index.js       |  2 ++
 src/main.js        | 64 ++++++++++++++++++++++++----------------------
 src/star.svg       |  1 +
 src/star_anti.svg  |  1 +
 src/star_evil.svg  |  1 +
 src/star_heavy.svg |  1 +
 src/star_magic.svg |  1 +
 src/star_micro.svg |  1 +
 8 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 src/star.svg
 create mode 100644 src/star_anti.svg
 create mode 100644 src/star_evil.svg
 create mode 100644 src/star_heavy.svg
 create mode 100644 src/star_magic.svg
 create mode 100644 src/star_micro.svg

diff --git a/src/index.js b/src/index.js
index 8845ee9e0b..d382d6b72d 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1317,6 +1317,7 @@ export function index(){
                 <b-dropdown-item v-on:click="setTheme('gruvboxDarkRG')">{{ 'theme_gruvboxDarkRG' | label }}</b-dropdown-item>
                 <b-dropdown-item v-on:click="setTheme('orangeSoda')">{{ 'theme_orangeSoda' | label }}</b-dropdown-item>
                 <b-dropdown-item v-on:click="setTheme('dracula')">{{ 'theme_dracula' | label }}</b-dropdown-item>
+                <b-dropdown-item v-on:click="setTheme('custom')">{{ 'theme_dracula' | label }}</b-dropdown-item>
                 ${hideEgg}
             </b-dropdown>
 
@@ -1502,4 +1503,5 @@ export function index(){
             </span>
         </div>
     `);
+    // document.documentElement.style.setProperty('--customTheme-html-background','#0f0');
 }
diff --git a/src/main.js b/src/main.js
index 48ebe7b00a..870356702d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -8156,6 +8156,7 @@ class AMOUNT{
             this.resource=[resource]
         }
         else if(resource === undefined){
+            // console.log(name,typeof this.action.title == "string" ? this.action.title : this.action.title())
             this.resource=Object.keys(this.action.caps)
         }
         else{
@@ -8193,7 +8194,37 @@ function Amount(name,loci,resource,is_true,title){
         break
     }
 }
+let capsIncrease=[
+    Amount('wharf'),
+    Amount('storage_yard'),
+    Amount('warehouse'),
+    Amount('bank'),
+    Amount('farm'),
+    Amount('basic_housing'),
+    Amount('cottage'),
+    Amount('apartment'),
+    Amount('lodge'),
+    Amount('nanite_factory'),
+    Amount('slave_pen'),
+    Amount('silo'),
+    Amount('compost'),
+    Amount('soul_well'),
+    Amount('smokehouse'),
+    Amount('rock_quarry'),
+    Amount('lumber_yard'),
+    Amount('graveyard'),
+    Amount('sawmill'),
+    Amount('oil_well'),
 
+    // Amount('garage','space_red'),
+
+    // Amount('cargo_yard','int_proxima'),
+
+    // Amount('colony','tau_home'),
+    // Amount('',''),
+    // Amount('',''),
+    // Amount('',''),
+]
 // MAKE SURE THE SLAVES HAVE CAP STILL!!!!!!!!!!!!
 function midLoop(){
     const astroSign = astrologySign();
@@ -8819,37 +8850,7 @@ function midLoop(){
                 }
             })
         }
-let capsIncrease=[
-    Amount('wharf'),
-    Amount('storage_yard'),
-    Amount('warehouse'),
-    Amount('bank'),
-    Amount('farm'),
-    Amount('basic_housing'),
-    Amount('cottage'),
-    Amount('apartment'),
-    Amount('lodge'),
-    Amount('nanite_factory'),
-    Amount('slave_pen'),
-    Amount('silo'),
-    Amount('compost'),
-    Amount('soul_well'),
-    Amount('smokehouse'),
-    Amount('rock_quarry'),
-    Amount('lumber_yard'),
-    Amount('graveyard'),
-    Amount('sawmill'),
-    Amount('oil_well'),
-
-    Amount('garage','space_red'),
-
-    Amount('cargo_yard','int_proxima'),
 
-    Amount('colony','tau_home'),
-    Amount('',''),
-    Amount('',''),
-    // Amount('',''),
-]
         //Res Caps ------------------
         // Storage - General
         {
@@ -10336,6 +10337,7 @@ let capsIncrease=[
             }
             if (global.city['garrison']){
                 lCaps['garrison'] += global.city.garrison.on * actions.city.garrison.soldiers();
+                // console.log(global.city.garrison.count,global.city.garrison.on)
             }
             if (global.space['space_barracks'] && !global.race['fasting']){
                 let soldiers = actions.space.spc_red.space_barracks.soldiers();
@@ -10549,7 +10551,7 @@ let capsIncrease=[
         ['Scarletite','Quantium'].forEach(function (res){
             limitCraftsmen(res);
         });
-
+        console.log(lCaps['garrison'])
         Object.keys(lCaps).forEach(function (job){
             global.civic[job].max = lCaps[job];
             if (global.civic[job].workers > global.civic[job].max && global.civic[job].max !== -1){
diff --git a/src/star.svg b/src/star.svg
new file mode 100644
index 0000000000..be8a7a7264
--- /dev/null
+++ b/src/star.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="60px" height="60px" viewBox="0 0 640 640" xml:space="preserve"><path class="bolden" d="M320.012 15.662l88.076 215.246L640 248.153 462.525 398.438l55.265 225.9-197.778-122.363-197.778 122.363 55.264-225.9L0 248.153l231.936-17.245z"></path></svg>
\ No newline at end of file
diff --git a/src/star_anti.svg b/src/star_anti.svg
new file mode 100644
index 0000000000..b2ad3f7d63
--- /dev/null
+++ b/src/star_anti.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="60px" height="60px" viewBox="0 0 100 100" xml:space="preserve"><path class="bolden" d="m100 44.189c0-6.796-10.63-11.822-24.783-14.529 1.155-3.322 2.105-6.538 2.764-9.541 2.193-10.025 1.133-16.856-2.981-19.231-1.019-0.588-2.193-0.888-3.49-0.888-5.62 0-13.46 5.665-21.509 15-8.046-9.335-15.886-15-21.511-15-1.294 0-2.47 0.3-3.491 0.888-5.891 3.4-4.918 15.141-0.175 28.767-14.173 2.701-24.824 7.731-24.824 14.534 0 6.799 10.634 11.822 24.79 14.531-1.161 3.323-2.11 6.536-2.767 9.539-2.194 10.027-1.136 16.857 2.976 19.231 1.021 0.589 2.197 0.886 3.491 0.886 5.625 0 13.464-5.667 21.511-14.998 8.047 9.331 15.886 15 21.509 15 1.297 0 2.472-0.299 3.49-0.888 4.114-2.374 5.174-9.204 2.98-19.231-0.658-3.003-1.608-6.216-2.766-9.539 14.156-2.708 24.786-7.732 24.786-14.531zm-28.49-41.605c0.838 0 1.579 0.187 2.199 0.543 3.016 1.741 3.651 7.733 1.747 16.44-0.661 3.022-1.628 6.264-2.814 9.63-4.166-0.695-8.585-1.194-13.096-1.49-2.572-3.887-5.206-7.464-7.834-10.67 7.581-8.861 14.934-14.453 19.798-14.453zm-9.198 48.71c-1.375 2.379-2.794 4.684-4.242 6.9-2.597 0.132-5.287 0.206-8.069 0.206s-5.474-0.074-8.067-0.206c-1.452-2.217-2.87-4.521-4.242-6.9-1.388-2.406-2.669-4.771-3.849-7.081 1.204-2.369 2.477-4.753 3.851-7.13 1.37-2.377 2.79-4.68 4.24-6.901 2.593-0.131 5.285-0.205 8.067-0.205s5.473 0.074 8.069 0.205c1.448 2.222 2.866 4.524 4.239 6.901 1.37 2.37 2.64 4.747 3.842 7.106-1.202 2.362-2.471 4.739-3.839 7.105zm5.259-4.225c1.587 3.303 3 6.558 4.2 9.72-3.25 0.521-6.758 0.926-10.488 1.203 1.104-1.75 2.194-3.554 3.265-5.404 1.062-1.837 2.059-3.681 3.023-5.519zm-11.277 13.78c-2.068 3.019-4.182 5.854-6.293 8.444-2.109-2.591-4.22-5.426-6.294-8.444 2.095 0.088 4.196 0.138 6.294 0.138 2.099-0.001 4.201-0.05 6.293-0.138zm-17.573-2.857c-3.733-0.277-7.241-0.683-10.49-1.203 1.202-3.157 2.611-6.414 4.197-9.72 0.97 1.858 1.979 3.701 3.026 5.519 1.071 1.85 2.161 3.654 3.267 5.404zm-6.304-16.654c-1.636-3.389-3.046-6.653-4.226-9.741 3.26-0.52 6.781-0.931 10.53-1.212-1.107 1.751-2.197 3.553-3.268 5.407-1.067 1.847-2.065 3.701-3.036 5.546zm11.294-13.805c2.07-3.019 4.181-5.855 6.29-8.449 2.111 2.594 4.225 5.43 6.293 8.449-2.093-0.091-4.194-0.14-6.293-0.14-2.098 0.001-4.199 0.049-6.29 0.14zm20.837 8.259c-1.07-1.859-2.16-3.656-3.265-5.407 3.73 0.281 7.238 0.687 10.488 1.205-1.2 3.157-2.613 6.419-4.2 9.722-0.964-1.838-1.961-3.683-3.023-5.52zm-38.254-32.665c0.619-0.359 1.36-0.543 2.196-0.543 4.864 0 12.217 5.592 19.8 14.453-2.626 3.206-5.262 6.783-7.834 10.67-4.526 0.296-8.962 0.802-13.144 1.5-4.886-13.794-5.036-23.762-1.018-26.08zm-23.709 41.062c0-4.637 8.707-9.493 23.096-12.159 1.487 3.974 3.268 8.069 5.277 12.14-2.061 4.14-3.843 8.229-5.323 12.167-14.364-2.664-23.05-7.516-23.05-12.148zm25.905 41.605c-0.848 0-1.564-0.178-2.196-0.538-3.015-1.742-3.652-7.734-1.746-16.442 0.662-3.023 1.626-6.269 2.814-9.633 4.166 0.696 8.586 1.195 13.092 1.491 2.574 3.885 5.207 7.462 7.834 10.671-7.58 8.86-14.934 14.451-19.798 14.451zm46.962-16.981c1.907 8.708 1.272 14.7-1.743 16.442-0.623 0.355-1.361 0.539-2.199 0.539-4.864 0-12.217-5.592-19.798-14.452 2.628-3.209 5.262-6.786 7.837-10.671 4.508-0.296 8.927-0.795 13.093-1.491 1.186 3.365 2.153 6.61 2.81 9.633zm-1.086-12.475c-1.476-3.933-3.254-8.014-5.31-12.148 2.056-4.135 3.834-8.217 5.312-12.148 14.361 2.665 23.049 7.519 23.049 12.148 0 4.631-8.688 9.483-23.051 12.148z"/><circle cy="44.189" cx="50.001" r="5.492"/></svg>
\ No newline at end of file
diff --git a/src/star_evil.svg b/src/star_evil.svg
new file mode 100644
index 0000000000..5e973ac8cb
--- /dev/null
+++ b/src/star_evil.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="60px" height="60px" viewBox="0 0 240 240" xml:space="preserve"><path d="m105.63 236.87c-17.275-2.22-34.678-8.73-49.291-18.44-54.583-36.26-69.355-108.23-33.382-162.64 11.964-18.101 31.389-34.423 51.05-42.899 36.303-15.652 78.013-12.004 110.65 9.678 54.58 36.259 69.36 108.23 33.38 162.65-24.44 36.97-68.62 57.27-112.41 51.65zm9.37-7.17c0-1.12-15.871-50.86-20.804-65.2l-1.719-5-36.926-0.26c-20.309-0.15-37.284 0.09-37.721 0.53-1.104 1.1 4.147 11.87 10.535 21.59 16.439 25.04 41.149 41.59 71.135 47.65 11.07 2.24 15.5 2.44 15.5 0.69zm25.71-0.61c30.52-5.95 55.28-22.38 71.92-47.73 6.39-9.72 11.64-20.49 10.54-21.59-0.44-0.44-17.41-0.68-37.72-0.53l-36.93 0.26-1.72 5c-4.93 14.34-20.8 64.08-20.8 65.2 0 1.77 3.2 1.64 14.71-0.61zm-9.32-38.99c5.25-16.18 9.3-29.79 9.01-30.25-0.28-0.47-9.24-0.85-19.9-0.85s-19.62 0.38-19.9 0.85c-0.46 0.74 17.66 58.14 19.08 60.43 0.3 0.49 0.91 0.52 1.36 0.06s5.11-14.07 10.35-30.24zm-42.19-38.63c0.629-0.63-10.723-36.39-11.936-37.61-0.817-0.81-51.452 35.32-52.097 37.18-0.349 1 63.032 1.43 64.033 0.43zm61.27-20.06c3.65-11.32 6.51-21.41 6.34-22.42-0.32-1.86-34.12-26.99-36.31-26.99s-35.993 25.13-36.308 26.99c-0.169 1.01 2.683 11.1 6.339 22.42l6.647 20.59h46.642l6.65-20.59zm65.36 19.63c-0.64-1.86-51.28-37.99-52.09-37.18-1.22 1.22-12.57 36.98-11.94 37.61 1 1 64.38 0.57 64.03-0.43zm-169.97-24.02c16.09-11.7 29.071-21.78 28.847-22.4-0.397-1.09-12.185-37.499-18.958-58.555-1.846-5.739-3.951-10.632-4.678-10.875-0.727-0.242-4.903 3.259-9.28 7.78-22 22.72-32.81 50.641-31.513 81.39 0.678 16.09 2.371 24.97 4.646 24.37 0.925-0.24 14.846-10.01 30.936-21.71zm183.14 15.73c0.66-3.44 1.44-11.71 1.72-18.39 1.3-30.749-9.51-58.67-31.51-81.39-4.38-4.521-8.55-8.022-9.28-7.78-0.73 0.243-2.83 5.136-4.68 10.875-1.84 5.739-6.93 21.448-11.29 34.908-6.26 19.297-7.68 24.717-6.7 25.627 3.41 3.18 58.29 42.4 59.32 42.4 0.68 0 1.73-2.72 2.42-6.25zm-129.27-54.808c7.573-5.522 13.773-10.467 13.773-10.987 0-1.007-50.318-37.955-51.689-37.955-0.446 0-0.811 0.317-0.811 0.704 0 0.388 3.825 12.484 8.5 26.882s8.5 26.401 8.5 26.674 0.697 2.163 1.548 4.201c1.832 4.389-0.216 5.349 20.179-9.519zm66.613-5.442c3.03-9.35 7.35-22.629 9.59-29.508 4.36-13.403 4.5-13.992 3.26-13.992-1.39 0-51.69 36.953-51.69 37.971 0 1.477 31.75 24.189 32.58 23.309 0.4-0.431 3.22-8.43 6.26-17.78zm-14.4-32.538l29.32-21.329-2.37-1.927c-10.93-8.844-38.4-16.706-58.39-16.706s-47.464 7.862-58.388 16.708l-2.382 1.929 29.885 21.728c16.845 12.25 30.565 21.552 31.435 21.326 0.86-0.22 14.75-9.999 30.89-21.729z"/></svg>
\ No newline at end of file
diff --git a/src/star_heavy.svg b/src/star_heavy.svg
new file mode 100644
index 0000000000..31c827b8c0
--- /dev/null
+++ b/src/star_heavy.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="64px" height="64px" viewBox="0 0 30 30" xml:space="preserve"><path d="M20.57 14.86L22 13.43 20.57 12 17 15.57 8.43 7 12 3.43 10.57 2 9.14 3.43 7.71 2 5.57 4.14 4.14 2.71 2.71 4.14l1.43 1.43L2 7.71l1.43 1.43L2 10.57 3.43 12 7 8.43 15.57 17 12 20.57 13.43 22l1.43-1.43L16.29 22l2.14-2.14 1.43 1.43 1.43-1.43-1.43-1.43L22 16.29z"/></svg>
\ No newline at end of file
diff --git a/src/star_magic.svg b/src/star_magic.svg
new file mode 100644
index 0000000000..b1eaa7137a
--- /dev/null
+++ b/src/star_magic.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="60px" height="60px" viewBox="0 0 4000 3000" xml:space="preserve"><path class="bolden" d="m2077.0957,2355.0556 c -24.8548,-6.6306 -43.8442,-12.4931 -65.1438,-20.1115 -171.2303,-61.2458 -332.546,-186.5828 -484.656,-376.562 -106.9479,-133.5736 -211.9033,-304.0752 -307.5304,-499.5874 -70.9505,-145.0603 -137.2376,-301.6744 -201.0755,-475.07329 -4.0445,-10.9859 -7.4891,-20.1129 -7.6546,-20.2824 -0.1656,-0.1694 -2.0374,1.7618 -4.1597,4.2917 -41.97221,50.03289 -102.85691,112.12769 -165.25321,168.53769 -153.4012,138.6841 -322.8342,254.6704 -451.2868,308.9308 -4.8375,2.0435 -9.6944,4.102 -10.793,4.5744 l -1.9977,0.8591 14.4133,7.0194 c 72.3515,35.2357 143.3639,78.5554 206.1228,125.7414 218.7562,164.4739 368.1707,393.9487 437.81411,672.4065 3.7109,14.8375 9.1943,38.7303 9.0117,39.2665 -0.069,0.2024 -1.3235,-3.0502 -2.788,-7.228 -74.09121,-211.3582 -207.71511,-385.1177 -394.71211,-513.2685 -102.107,-69.9749 -219.4845,-126.1019 -348.488,-166.6383 -76.1077,-23.9151 -155.9429,-42.2005 -232.883496,-53.3396 -6.991,-1.0121 -12.8528,-1.8883 -13.0261,-1.947 -0.1733,-0.059 2.0738,-1.6288 4.9936,-3.4891 2.9198,-1.8603 15.625,-10.0516 28.2339,-18.2031 204.092496,-131.9427 358.291896,-247.07 478.472596,-357.2338 37.0992,-34.0071 77.0506,-73.8638 107.6314,-107.3762 86.2451,-94.51319 148.9362,-188.57859 189.3356,-284.08999 30.7863,-72.7845 49.1302,-147.8337 55.0585,-225.2576 0.8677,-11.3324 1.6179,-24.3907 1.6179,-28.1635 l 0,-2.8677 -2.3833,-0.2589 c -5.6397,-0.6126 -53.3922,-2.328 -84.3238,-3.0291 -26.1322,-0.5923 -105.9829,-0.2965 -125.748,0.4658 -35.3648,1.3639 -61.1426,2.7941 -86.7072,4.8105 -195.6367,15.431 -343.0035,61.1297 -446.9275,138.593 -2.4968,1.8611 -4.029,2.8664 -3.4048,2.2341 0.9758,-0.9885 397.2225,-336.9788 399.0477,-338.3654 0.4983,-0.3785 8.2687,0.05 30.6293,1.691 273.5285,20.0676 411.83311,27.9616 556.33281,31.7538 29.6737,0.7788 110.952,1.0595 138.2321,0.4775 83.5286,-1.7821 143.7695,-6.6707 194.0695,-15.7487 47.0041,-8.4831 83.1621,-21.2812 103.3974,-36.5973 1.6154,-1.2226 2.9812,-2.1619 3.0353,-2.0872 0.054,0.075 -0.079,2.1785 -0.2952,4.6753 -0.578,6.6693 -0.5481,29.498 0.048,36.3171 3.3368,38.2002 14.0507,70.8483 33.8884,103.2667 18.8519,30.8073 47.6861,61.0826 82.1419,86.2473 37.3245,27.2597 81.564,49.9843 131.8765,67.7412 4.8688,1.7184 8.2555,3.0024 7.5259,2.8535 -0.7295,-0.1489 -6.3473,-1.3924 -12.484,-2.7634 -39.6642,-8.861 -104.6887,-20.5993 -168.0021,-30.328 -137.3768,-21.1093 -273.1583,-35.4146 -362.8049,-38.2235 l -9.8479,-0.3086 -0.224,1.0898 c -0.1233,0.5995 -0.335,2.5199 -0.4706,4.2677 -1.3397,17.2691 -1.7023,22.4205 -2.2846,32.4584 -2.3935,41.2643 -2.3955,89.1364 -0.01,134.8273 11.3803,217.5701 77.3475,473.27869 189.8401,735.87559 89.2575,208.3584 210.5193,422.3508 332.3606,586.5215 22.7139,30.605 33.0709,42.8702 44.5166,52.7187 25.6187,22.0437 46.811,23.8716 65.2335,5.6265 19.5207,-19.3327 34.7161,-60.9422 45.5423,-124.7077 19.3386,-113.9042 23.2932,-297.6572 10.9059,-506.7671 -4.6678,-78.7985 -10.1013,-140.5522 -20.8699,-237.1961 -5.9357,-53.2693 -7.4546,-65.7004 -8.6502,-70.7914 -4.7369,-20.171 -27.3114,-47.5028 -65.7926,-79.6576 -11.906,-9.9486 -20.1748,-16.4224 -39.1544,-30.6551 -8.4267,-6.3191 -15.3189,-11.6171 -15.3159,-11.7734 0,-0.1563 1.2797,-0.9816 2.8373,-1.8339 14.6036,-7.9917 42.9197,-26.1494 64.2088,-41.17369 35.0761,-24.7546 77.4208,-59.2093 108.4143,-88.2139 58.9609,-55.1774 106.4613,-109.4316 139.8321,-159.7139 2.693,-4.0578 4.9524,-7.3218 5.0209,-7.2532 0.069,0.068 -0.9793,4.6953 -2.3284,10.2819 -52.0714,215.624 -73.4586,458.30359 -63.0753,715.71049 8.1008,200.8217 36.667,415.9599 82.2909,619.7502 l 2.6625,11.8924 -4.124,2.8336 c -25.7438,17.6888 -44.4201,32.0283 -57.3292,44.017 -19.4405,18.0544 -30.6873,35.3946 -36.0405,55.5665 -3.2336,12.1849 -4.2393,21.7435 -4.2035,39.9489 0.043,21.9591 1.571,38.7035 9.4024,103.0498 1.3371,10.9859 2.4091,19.9949 2.3823,20.0199 -0.027,0.025 -1.8874,-0.445 -4.1345,-1.0444 z m 326.7144,-985.6489 c -17.4427,-32.7693 -52.6734,-76.4714 -96.8446,-120.1314 -30.3662,-30.0148 -57.7931,-52.8046 -81.5396,-67.7535 -6.8082,-4.2859 -19.6404,-11.0063 -22.8544,-11.9693 -0.9739,-0.2918 -1.7706,-0.6524 -1.7706,-0.8014 0,-0.149 1.2767,-0.754 2.8373,-1.3444 8.1023,-3.0654 22.7254,-11.5869 35.2957,-20.5684 21.4993,-15.3612 43.2465,-34.1516 68.6986,-59.358 42.609,-42.1976 76.3979,-83.8447 94.6619,-116.67699 2.2626,-4.0672 4.2245,-7.6252 4.36,-7.9065 0.1826,-0.3795 0.3097,-0.3795 0.4923,0 0.1354,0.2813 2.0845,3.8162 4.3314,7.8552 18.2956,32.88899 52.1844,74.66389 94.6871,116.72119 25.6446,25.3759 47.2008,44.0026 68.702,59.3651 12.5703,8.9815 27.1934,17.503 35.2957,20.5684 1.5605,0.5904 2.8373,1.1777 2.8373,1.3051 0,0.1274 -1.2768,0.7145 -2.8373,1.305 -1.5605,0.5904 -5.6973,2.5407 -9.1928,4.334 -24.7032,12.6736 -57.8306,39.0407 -94.1346,74.9245 -44.1711,43.66 -79.4018,87.3621 -96.8445,120.1314 -1.5749,2.9588 -2.9656,5.3796 -3.0904,5.3796 -0.1249,0 -1.5156,-2.4208 -3.0905,-5.3796 z M 166.36129,670.71331 c 0.452,-0.4994 0.9239,-0.9079 1.0487,-0.9079 0.1248,0 -0.1428,0.4085 -0.5947,0.9079 -0.4519,0.4993 -0.9238,0.9079 -1.0487,0.9079 -0.1248,0 0.1428,-0.4086 0.5947,-0.9079 z"/></svg>
\ No newline at end of file
diff --git a/src/star_micro.svg b/src/star_micro.svg
new file mode 100644
index 0000000000..c94608c2e5
--- /dev/null
+++ b/src/star_micro.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" x="0px" y="0px" width="60px" height="60px" viewBox="0 0 300 300" xml:space="preserve"><path d="m150.18 114.71c-11.276-6.0279-15.771-19.766-9.9989-30.563 6.0279-11.276 19.766-15.771 30.563-9.9989 11.276 6.0279 15.771 19.766 9.9989 30.563-6.0279 11.276-19.766 15.771-30.563 9.9989z"/><path d="m47.263 265.24c-0.41891-0.4189-0.76165-5.194-0.76165-10.611 0-11.606 2.7184-18.417 9.0231-22.606 3.8412-2.5527 4.2946-2.5798 43.128-2.5798h39.246v-13.71-13.71h10.905c10.055 0 11.124-0.2186 13.71-2.8043 2.5824-2.5824 2.8043-3.66 2.8043-13.619v-10.815l3.3639-0.73883c1.8501-0.40636 5.1713-2.7395 7.3804-5.1847 8.0637-8.9255 9.8103-25.642 3.9223-37.54l-2.9588-5.9787 5.9675-5.9676c9.887-9.887 12.537-24.129 6.6886-35.949-1.3037-2.635-2.1165-4.7908-1.8062-4.7908 0.31024 0 3.5239 1.798 7.1414 3.9955 14.491 8.8026 26.675 25.759 31.636 44.025 2.7168 10.004 2.7314 30.947 0.0286 41.093-4.445 16.685-15.856 33.364-29.027 42.425l-4.9176 3.3834v7.9424 7.9424h10.966c12.713 0 17.226 1.5998 21.944 7.7794 2.828 3.7038 3.1086 5.033 3.464 16.405l0.4 12.38h-90.737c-49.906 0-91.08-0.34274-91.499-0.76165zm17.518-81.497v-9.1398h45.699 45.699v9.1398 9.1398h-45.699-45.699v-9.1398zm32.227-32.318-4.8078-4.8988v-13.72-13.72l-4.5699-4.4624-4.5699-4.4624v-27.527-27.527l4.5699-4.4624c4.5593-4.452 4.5699-4.4831 4.5699-13.37 0-8.6703-0.07402-8.9079-2.7746-8.9079-4.4514 0-6.3652-2.8757-6.3652-9.5641 0-3.2854 0.61694-6.5904 1.371-7.3445 1.9422-1.9422 50.155-1.9422 52.097 0 0.75403 0.75403 1.371 4.3347 1.371 7.9571 0 6.9911-1.4848 8.9515-6.7797 8.9515-2.1833 0-2.3601 0.66715-2.3601 8.9079 0 8.8872 0.0103 8.9183 4.5699 13.37l4.5699 4.4624v9.5554c0 8.412-0.33908 10-2.8338 13.271-6.443 8.4472-7.9966 20.22-4.0419 30.628 2.2572 5.9405 2.2572 5.9661 0 8.3688-1.997 2.1258-2.2642 4.0244-2.2642 16.094v13.684l-4.8988 4.8078c-4.877 4.7864-4.9369 4.8078-13.472 4.8078h-8.5731l-4.8078-4.8988z"/></svg>
\ No newline at end of file
