Set attributes for all cargos

ahyangyi · Nov 12, 2023 · 39d3e52 · 39d3e52
1 parent 2362096
commit 39d3e52
Show file tree

Hide file tree

Showing 43 changed files with 131 additions and 1 deletion.
diff --git a/industry/cargos/alcohol.py b/industry/cargos/alcohol.py
@@ -7,6 +7,7 @@
     grf.CargoClass.EXPRESS | grf.CargoClass.PIECE_GOODS | grf.CargoClass.LIQUID,
     weight=17,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
     penalty1=9,
     penalty2=36,
     base_price=166,

diff --git a/industry/cargos/ammonia.py b/industry/cargos/ammonia.py
@@ -7,6 +7,7 @@
     grf.CargoClass.LIQUID | grf.CargoClass.HAZARDOUS,
     weight=10,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
     penalty1=32,
     penalty2=64,
     base_price=109,

diff --git a/industry/cargos/building_materials.py b/industry/cargos/building_materials.py
@@ -6,6 +6,7 @@
     b"BDMT",
     grf.CargoClass.BULK | grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.CRATE,
+    is_freight=1,
     penalty1=12,
     penalty2=255,
     base_price=133,

diff --git a/industry/cargos/chemicals.py b/industry/cargos/chemicals.py
@@ -7,6 +7,7 @@
     grf.CargoClass.LIQUID | grf.CargoClass.PIECE_GOODS | grf.CargoClass.HAZARDOUS,
     weight=19,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
     penalty1=20,
     penalty2=255,
     base_price=115,

diff --git a/industry/cargos/china_clay.py b/industry/cargos/china_clay.py
@@ -6,6 +6,7 @@
     b"KAOL",
     grf.CargoClass.BULK | grf.CargoClass.LIQUID | grf.CargoClass.COVERED,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
     penalty1=30,
     penalty2=255,
     base_price=100,

diff --git a/industry/cargos/coal.py b/industry/cargos/coal.py
@@ -6,6 +6,7 @@
     b"COAL",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
     penalty1=40,
     penalty2=255,
     base_price=86,

diff --git a/industry/cargos/copper_ore.py b/industry/cargos/copper_ore.py
@@ -6,6 +6,7 @@
     b"CORE",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
     penalty1=30,
     penalty2=255,
     base_price=89,

diff --git a/industry/cargos/diamonds.py b/industry/cargos/diamonds.py
@@ -7,6 +7,7 @@
     grf.CargoClass.ARMOURED,
     weight=2,
     units_text=CargoUnit.BAG,
+    is_freight=1,
     penalty1=30,
     penalty2=255,
     base_price=162,

diff --git a/industry/cargos/engineering_supplies.py b/industry/cargos/engineering_supplies.py
@@ -6,6 +6,7 @@
     b"ENSP",
     grf.CargoClass.EXPRESS | grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.CRATE,
+    is_freight=1,
     penalty1=2,
     penalty2=32,
     base_price=172,

diff --git a/industry/cargos/explosives.py b/industry/cargos/explosives.py
@@ -7,6 +7,7 @@
     grf.CargoClass.EXPRESS | grf.CargoClass.PIECE_GOODS,
     weight=4,
     units_text=CargoUnit.CRATE,
+    is_freight=1,
     penalty1=6,
     penalty2=42,
     base_price=158,

diff --git a/industry/cargos/farm_supplies.py b/industry/cargos/farm_supplies.py
@@ -7,6 +7,7 @@
     grf.CargoClass.EXPRESS | grf.CargoClass.PIECE_GOODS,
     weight=10,
     units_text=CargoUnit.CRATE,
+    is_freight=1,
     penalty1=2,
     penalty2=32,
     base_price=170,

diff --git a/industry/cargos/fertiliser.py b/industry/cargos/fertiliser.py
@@ -6,6 +6,7 @@
     b"FERT",
     grf.CargoClass.EXPRESS | grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
     penalty1=22,
     penalty2=44,
     base_price=123,

diff --git a/industry/cargos/fish.py b/industry/cargos/fish.py
@@ -6,6 +6,7 @@
     b"FISH",
     grf.CargoClass.EXPRESS | grf.CargoClass.REFRIGERATED,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
     penalty1=0,
     penalty2=18,
     base_price=134,

diff --git a/industry/cargos/food.py b/industry/cargos/food.py
@@ -6,4 +6,8 @@
     b"FOOD",
     grf.CargoClass.EXPRESS | grf.CargoClass.REFRIGERATED,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=0,
+    penalty2=20,
+    base_price=168,
 )
diff --git a/industry/cargos/fruit.py b/industry/cargos/fruit.py
@@ -6,4 +6,8 @@
     b"FRUT",
     grf.CargoClass.BULK | grf.CargoClass.REFRIGERATED,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=0,
+    penalty2=26,
+    base_price=124,
 )
diff --git a/industry/cargos/gold.py b/industry/cargos/gold.py
@@ -7,4 +7,8 @@
     grf.CargoClass.ARMOURED,
     weight=8,
     units_text=CargoUnit.BAG,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=152,
 )
diff --git a/industry/cargos/goods.py b/industry/cargos/goods.py
@@ -8,4 +8,8 @@
     capacity_multiplier=0x200,
     weight=8,
     units_text=CargoUnit.CRATE,
+    is_freight=1,
+    penalty1=10,
+    penalty2=56,
+    base_price=163,
 )
diff --git a/industry/cargos/grain.py b/industry/cargos/grain.py
@@ -6,4 +6,8 @@
     b"GRAI",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=4,
+    penalty2=40,
+    base_price=114,
 )
diff --git a/industry/cargos/iron_ore.py b/industry/cargos/iron_ore.py
@@ -6,4 +6,8 @@
     b"IORE",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=40,
+    penalty2=255,
+    base_price=90,
 )
diff --git a/industry/cargos/livestock.py b/industry/cargos/livestock.py
@@ -7,4 +7,8 @@
     grf.CargoClass.PIECE_GOODS,
     weight=3,
     units_text=CargoUnit.ITEM,
+    is_freight=1,
+    penalty1=0,
+    penalty2=15,
+    base_price=122,
 )
diff --git a/industry/cargos/mail.py b/industry/cargos/mail.py
@@ -8,4 +8,8 @@
     capacity_multiplier=0x200,
     weight=4,
     units_text=CargoUnit.BAG,
+    is_freight=0,
+    penalty1=6,
+    penalty2=24,
+    base_price=167,
 )
diff --git a/industry/cargos/maize.py b/industry/cargos/maize.py
@@ -6,4 +6,8 @@
     b"MAIZ",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=4,
+    penalty2=40,
+    base_price=111,
 )
diff --git a/industry/cargos/milk.py b/industry/cargos/milk.py
@@ -7,4 +7,8 @@
     grf.CargoClass.EXPRESS | grf.CargoClass.LIQUID | grf.CargoClass.REFRIGERATED,
     weight=18,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
+    penalty1=0,
+    penalty2=16,
+    base_price=131,
 )
diff --git a/industry/cargos/oil.py b/industry/cargos/oil.py
@@ -7,4 +7,8 @@
     grf.CargoClass.LIQUID,
     weight=14,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=101,
 )
diff --git a/industry/cargos/paper.py b/industry/cargos/paper.py
@@ -6,4 +6,8 @@
     b"PAPR",
     grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=12,
+    penalty2=60,
+    base_price=143,
 )
diff --git a/industry/cargos/passengers.py b/industry/cargos/passengers.py
@@ -8,7 +8,8 @@
     capacity_multiplier=0x400,
     weight=1,
     units_text=CargoUnit.PASSENGER,
+    is_freight=0,
     penalty1=0,
     penalty2=22,
-    base_price=46,
+    base_price=137,
 )
diff --git a/industry/cargos/peat.py b/industry/cargos/peat.py
@@ -6,4 +6,8 @@
     b"PEAT",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=89,
 )
diff --git a/industry/cargos/phosphate.py b/industry/cargos/phosphate.py
@@ -6,4 +6,8 @@
     b"PHOS",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=99,
 )
diff --git a/industry/cargos/potash.py b/industry/cargos/potash.py
@@ -6,4 +6,8 @@
     b"POTA",
     grf.CargoClass.BULK | grf.CargoClass.COVERED,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=102,
 )
diff --git a/industry/cargos/pyrite_ore.py b/industry/cargos/pyrite_ore.py
@@ -6,4 +6,8 @@
     b"PORE",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=87,
 )
diff --git a/industry/cargos/rubber.py b/industry/cargos/rubber.py
@@ -6,4 +6,8 @@
     b"RUBR",
     grf.CargoClass.LIQUID,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
+    penalty1=10,
+    penalty2=36,
+    base_price=110,
 )
diff --git a/industry/cargos/sand.py b/industry/cargos/sand.py
@@ -6,4 +6,8 @@
     b"SAND",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=64,
+    penalty2=255,
+    base_price=93,
 )
diff --git a/industry/cargos/scrap_metal.py b/industry/cargos/scrap_metal.py
@@ -6,4 +6,8 @@
     b"SCMT",
     grf.CargoClass.BULK | grf.CargoClass.NON_POURABLE,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=36,
+    penalty2=255,
+    base_price=107,
 )
diff --git a/industry/cargos/steel.py b/industry/cargos/steel.py
@@ -6,4 +6,8 @@
     b"STEL",
     grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=14,
+    penalty2=255,
+    base_price=127,
 )
diff --git a/industry/cargos/sulphur.py b/industry/cargos/sulphur.py
@@ -6,4 +6,8 @@
     b"SULP",
     grf.CargoClass.BULK | grf.CargoClass.LIQUID | grf.CargoClass.COVERED,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=30,
+    penalty2=255,
+    base_price=105,
 )
diff --git a/industry/cargos/timber.py b/industry/cargos/timber.py
@@ -6,4 +6,8 @@
     b"WDPR",
     grf.CargoClass.BULK | grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=18,
+    penalty2=255,
+    base_price=117,
 )
diff --git a/industry/cargos/tired_workers.py b/industry/cargos/tired_workers.py
@@ -8,4 +8,8 @@
     capacity_multiplier=0x400,
     weight=1,
     units_text=CargoUnit.PASSENGER,
+    is_freight=0,
+    penalty1=0,
+    penalty2=18,
+    base_price=96,
 )
diff --git a/industry/cargos/valuables.py b/industry/cargos/valuables.py
@@ -7,4 +7,8 @@
     grf.CargoClass.ARMOURED,
     weight=2,
     units_text=CargoUnit.BAG,
+    is_freight=1,
+    penalty1=1,
+    penalty2=48,
+    base_price=178,
 )
diff --git a/industry/cargos/water.py b/industry/cargos/water.py
@@ -6,4 +6,8 @@
     b"WATR",
     grf.CargoClass.LIQUID,
     units_text=CargoUnit.LITRE,
+    is_freight=1,
+    penalty1=20,
+    penalty2=80,
+    base_price=93,
 )
diff --git a/industry/cargos/wheat.py b/industry/cargos/wheat.py
@@ -6,4 +6,8 @@
     b"WHEA",
     grf.CargoClass.BULK,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=4,
+    penalty2=40,
+    base_price=112,
 )
diff --git a/industry/cargos/wood.py b/industry/cargos/wood.py
@@ -6,4 +6,8 @@
     b"WOOD",
     grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=24,
+    penalty2=255,
+    base_price=104,
 )
diff --git a/industry/cargos/workers.py b/industry/cargos/workers.py
@@ -8,4 +8,8 @@
     capacity_multiplier=0x400,
     weight=1,
     units_text=CargoUnit.PASSENGER,
+    is_freight=0,
+    penalty1=0,
+    penalty2=16,
+    base_price=104,
 )
diff --git a/industry/cargos/zinc.py b/industry/cargos/zinc.py
@@ -6,4 +6,8 @@
     b"ZINC",
     grf.CargoClass.PIECE_GOODS,
     units_text=CargoUnit.TONNE,
+    is_freight=1,
+    penalty1=12,
+    penalty2=255,
+    base_price=126,
 )