fixed ovrconsumption!

Australis-0 · Feb 14, 2024 · d56f42b · d56f42b
1 parent 990fd4c
commit d56f42b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/core/framework/data/budget_framework.js b/core/framework/data/budget_framework.js
@@ -405,11 +405,12 @@ module.exports = {
       var all_exports = Object.keys(local_user.trades);
 
       for (var x = 0; x < all_exports.length; x++) {
-        var local_export = usr.trades[all_exports[x]];
+        var local_export = local_user.trades[all_exports[x]];
 
-        if (local_export.good_type == "money")
-          if (local_export.target == actual_id && local_export.duration <= 1)
-            import_revenue = modifyRange(import_revenue, local_export.amount);
+        if (local_export.good_type)
+          if (local_export.good_type == "money")
+            if (local_export.target == actual_id && local_export.duration <= 1)
+              import_revenue = modifyRange(import_revenue, local_export.amount);
       }
     }
 

diff --git a/core/framework/data/pops/pop_econ_framework.js b/core/framework/data/pops/pop_econ_framework.js
@@ -678,7 +678,7 @@ module.exports = {
             var split_key = all_wealth_keys[i].split("-");
             var pop_type = split_key[3];
 
-            var consumption_scalar = returnSafeNumber(local_wealth_pool.size)/1000;
+            var consumption_scalar = returnSafeNumber(local_wealth_pool.size)/100000;
             var pop_obj = config.pops[pop_type];
 
             //Make sure .income, .wealth are safe numbers