(Aegis) add more firs stuff

ahyangyi · Oct 6, 2023 · dc7c860 · dc7c860
1 parent 13ef0e0
commit dc7c860
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 17 deletions.
diff --git a/industry/cargos/china_clay.py b/industry/cargos/china_clay.py
@@ -0,0 +1,4 @@
+import grf
+from industry.lib.cargo import ACargo
+
+the_cargo = ACargo(b"KAOL", grf.CargoClass.BULK | grf.CargoClass.LIQUID | grf.CargoClass.COVERED)
diff --git a/industry/cargos/phosphate.py b/industry/cargos/phosphate.py
@@ -0,0 +1,4 @@
+import grf
+from industry.lib.cargo import ACargo
+
+the_cargo = ACargo(b"PHOS", grf.CargoClass.BULK)
diff --git a/industry/cargos/sulphur.py b/industry/cargos/sulphur.py
@@ -0,0 +1,4 @@
+import grf
+from industry.lib.cargo import ACargo
+
+the_cargo = ACargo(b"SULP", grf.CargoClass.BULK | grf.CargoClass.LIQUID | grf.CargoClass.COVERED)
diff --git a/industry/cargos/timber.py b/industry/cargos/timber.py
@@ -0,0 +1,4 @@
+import grf
+from industry.lib.cargo import ACargo
+
+the_cargo = ACargo(b"WDPR", grf.CargoClass.BULK | grf.CargoClass.PIECE_GOODS)
diff --git a/industry/cargos/zinc.py b/industry/cargos/zinc.py
@@ -0,0 +1,4 @@
+import grf
+from industry.lib.cargo import ACargo
+
+the_cargo = ACargo(b"ZINC", grf.CargoClass.PIECE_GOODS)
diff --git a/industry/economies/firs_arctic.py b/industry/economies/firs_arctic.py
@@ -3,10 +3,14 @@
     ammonia,
     pyrite_ore,
     peat,
-    coal,
+    china_clay,
+    phosphate,
+    zinc,
+    timber,
     food,
     goods,
-    gold,
+    pyrite_ore,
+    sulphur,
     livestock,
     mail,
     oil,
@@ -21,8 +25,10 @@
 )
 from industry.industries import (
     peatlands,
-    bank,
-    coal_mine,
+    pyrite_mine,
+    phosphate_mine,
+    pyrite_smelter,
+    sawmill,
     food_processing_plant,
     farm,
     forest,
@@ -31,7 +37,7 @@
     printing_works,
     oil_wells,
     power_station,
-    gold_mine,
+    pyrite_mine,
     towns,
     port,
     trading_centre,
@@ -48,12 +54,14 @@ def __init__(self):
     def get_economy(self, parameters):
         ret = Economy(
             {
-                coal_mine: PrimaryIndustry(coal),
                 farm: PrimaryIndustry((livestock, wheat)),
                 forest: PrimaryIndustry(wood),
                 oil_wells: PrimaryIndustry(oil),
-                gold_mine: PrimaryIndustry(gold),
+                pyrite_mine: PrimaryIndustry(pyrite_ore),
+                phosphate_mine: PrimaryIndustry(phosphate),
                 peatlands: PrimaryIndustry(peat),
+                pyrite_smelter: SecondaryIndustry(pyrite_ore, (sulphur, zinc)),
+                sawmill: SecondaryIndustry(wood, timber),
                 food_processing_plant: SecondaryIndustry(
                     (
                         livestock,
@@ -64,8 +72,7 @@ def get_economy(self, parameters):
                 paper_mill: SecondaryIndustry(wood, paper),
                 oil_refinery: SecondaryIndustry(oil, goods),
                 printing_works: SecondaryIndustry(paper, goods),
-                power_station: TertiaryIndustry(coal),
-                bank: TertiaryIndustry(gold),
+                power_station: TertiaryIndustry(peat),
                 towns: Town(passengers, mail, food, goods),
             },
             parameters,
@@ -77,26 +84,26 @@ def get_economy(self, parameters):
             del ret.graph[paper_mill]
 
         if parameters["BOOSTER"] == "UNIVERSAL":
-            ret.graph[coal_mine].booster = engineering_supplies
+            ret.graph[peatlands].booster = engineering_supplies
             ret.graph[oil_wells].booster = engineering_supplies
-            ret.graph[gold_mine].booster = engineering_supplies
+            ret.graph[pyrite_mine].booster = engineering_supplies
             ret.graph[farm].booster = engineering_supplies
             ret.graph[forest].booster = engineering_supplies
 
             ret.graph[printing_works].produces += (engineering_supplies,)
         elif parameters["BOOSTER"] == "GENERIC":
-            ret.graph[coal_mine].booster = engineering_supplies
+            ret.graph[peatlands].booster = engineering_supplies
             ret.graph[oil_wells].booster = engineering_supplies
-            ret.graph[gold_mine].booster = engineering_supplies
+            ret.graph[pyrite_mine].booster = engineering_supplies
             ret.graph[farm].booster = farm_supplies
             ret.graph[forest].booster = farm_supplies
 
             ret.graph[printing_works].produces += (engineering_supplies,)
             ret.graph[oil_refinery].produces += (farm_supplies,)
         elif parameters["BOOSTER"] == "GENERIC_PASSENGERS":
-            ret.graph[coal_mine].booster = engineering_supplies
+            ret.graph[peatlands].booster = engineering_supplies
             ret.graph[oil_wells].booster = passengers
-            ret.graph[gold_mine].booster = engineering_supplies
+            ret.graph[pyrite_mine].booster = engineering_supplies
             ret.graph[farm].booster = farm_supplies
             ret.graph[forest].booster = farm_supplies
 
@@ -107,7 +114,7 @@ def get_economy(self, parameters):
             ret.graph[worker_yard] = PrimaryIndustry(workers)
 
             # FIXME
-            ret.graph[coal_mine].booster = workers
+            ret.graph[peatlands].booster = workers
 
         if port in ret.graph:
             if parameters["LAND_PORTS"] == "LAND_ONLY":

diff --git a/industry/industries/peatlands.py b/industry/industries/peatlands.py
@@ -1,6 +1,6 @@
 from industry.lib.industry import AIndustry
 
 the_industry = AIndustry(
+    id=0x26,
     name="Peatlands",
-    substitute_type=0x26,
 )
diff --git a/industry/industries/phosphate_mine.py b/industry/industries/phosphate_mine.py
@@ -0,0 +1,6 @@
+from industry.lib.industry import AIndustry
+
+the_industry = AIndustry(
+    id=0x27,
+    name="Phosphate Mine",
+)
diff --git a/industry/industries/pyrite_mine.py b/industry/industries/pyrite_mine.py
@@ -0,0 +1,6 @@
+from industry.lib.industry import AIndustry
+
+the_industry = AIndustry(
+    id=0x28,
+    name="Pyrite Mine",
+)
diff --git a/industry/industries/pyrite_smelter.py b/industry/industries/pyrite_smelter.py
@@ -0,0 +1,6 @@
+from industry.lib.industry import AIndustry
+
+the_industry = AIndustry(
+    id=0x27,
+    name="Pyrite Smelter",
+)