Merge branch 'dev-economics-2' into economics-v2

Azgaar · Jan 15, 2025 · 80bbf5b · 80bbf5b
2 parents 9ce260a + 5bb3331
commit 80bbf5b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/index.html b/index.html
@@ -8386,21 +8386,19 @@
     <script src="modules/river-generator.js?v=1.106.7"></script>
     <script src="modules/lakes.js?v=1.99.00"></script>
     <script src="modules/biomes.js?v=1.99.00"></script>
-    <script src="modules/names-generator.js?v=1.105"></script>
-    <script src="modules/resources-generator.js"></script>
-    <script src="modules/production-generator.js"></script>
-    <script src="modules/trade-generator.js"></script>
-    <script src="modules/cultures-generator.js?v=1.99.05"></script>
     <script src="modules/burgs-and-states.js?v=1.99.05"></script>
-    <script src="modules/routes-generator.js?v=1.99.04"></script>
-    <script src="modules/religions-generator.js?v=1.99.05"></script>
     <script src="modules/resources-generator.js?v=1.100.00"></script>
-    <script src="modules/provinces-generator.js?v=1.100.00"></script>
     <script src="modules/production-generator.js?v=1.100.00"></script>
     <script src="modules/trade-generator.js?v=1.100.00"></script>
-    <script src="modules/military-generator.js?v=1.99.00"></script>
-    <script src="modules/markers-generator.js?v=1.103.02"></script>
-    <script src="modules/zones-generator.js?v=1.100.00"></script>
+    <script src="modules/names-generator.js?v=1.105.11"></script>
+    <script src="modules/cultures-generator.js?v=1.106.0"></script>
+    <script src="modules/burgs-and-states.js?v=1.106.0"></script>
+    <script src="modules/provinces-generator.js?v=1.106.0"></script>
+    <script src="modules/routes-generator.js?v=1.106.0"></script>
+    <script src="modules/religions-generator.js?v=1.106.0"></script>
+    <script src="modules/military-generator.js?v=1.104.0"></script>
+    <script src="modules/markers-generator.js?v=1.104.0"></script>
+    <script src="modules/zones-generator.js?v=1.106.0"></script>
     <script src="modules/coa-generator.js?v=1.99.00"></script>
     <script src="modules/resample.js?v=1.106.4"></script>
     <script src="libs/alea.min.js?v1.105.0"></script>

diff --git a/modules/burgs-and-states.js b/modules/burgs-and-states.js
@@ -887,6 +887,7 @@ window.BurgsAndStates = (() => {
       state.salesTax = maxTax ? rn(Math.random() * maxTax, 2) : 0;
     }
   };
+
   return {
     generate,
     expandStates,
@@ -902,7 +903,6 @@ window.BurgsAndStates = (() => {
     generateDiplomacy,
     defineStateForms,
     getFullName,
-    defineTaxes,
     updateCultures,
     getCloseToEdgePoint,
     defineTaxes