Merge branch 'main' of github.com:ahyangyi/openttd-newgrfs

ahyangyi · Oct 30, 2023 · eaacb16 · eaacb16
2 parents 0a0c231 + 049e861
commit eaacb16
Show file tree

Hide file tree

Showing 13 changed files with 6 additions and 14 deletions.
diff --git a/agrf/lib/cargo.py b/agrf/lib/cargo.py
@@ -1,5 +1,4 @@
 import grf
-import struct
 
 
 class Cargo(grf.SpriteGenerator):

diff --git a/industry/aegis_gen.py b/industry/aegis_gen.py
@@ -105,7 +105,7 @@ def main():
                 economy = meta_economy.get_economy(variation)
                 try:
                     validate(economy)
-                except AssertionError as e:
+                except AssertionError:
                     print(f"Economy: {meta_economy.name}")
                     for k, v in variation.items():
                         print(f"{k}: {v}")

diff --git a/industry/docgen/economy.py b/industry/docgen/economy.py
@@ -78,7 +78,7 @@ def gen_economy_doc(all_economies, string_manager):
                         choices_text.append(f"{preset}")
                     else:
                         choices_text.append(f"[{preset}]({meta_economy.name}_{preset_desc}.html)")
-                choices_text = " \| ".join(choices_text)
+                choices_text = " \\| ".join(choices_text)
                 print(
                     f"""{choices_text}
 
@@ -98,6 +98,6 @@ def gen_economy_doc(all_economies, string_manager):
                                 f"[{choice}]({meta_economy.name}_{variation_desc[:i]}{j}{variation_desc[i+1:]}.html)"
                             )
                     print(
-                        f"{param}: " + " \| ".join(choices_text) + "\n",
+                        f"{param}: " + " \\| ".join(choices_text) + "\n",
                         file=f,
                     )
diff --git a/industry/economies/firs_arctic.py b/industry/economies/firs_arctic.py
@@ -8,7 +8,6 @@
     fertiliser,
     fish,
     food,
-    goods,
     mail,
     paper,
     passengers,

diff --git a/industry/economies/firs_temperate.py b/industry/economies/firs_temperate.py
@@ -39,8 +39,6 @@
     metal_workshop,
     orchard_and_piggery,
     port,
-    power_station,
-    sawmill,
     scrap_yard,
     steel_mill,
     stockyard,

diff --git a/industry/industries/forest/__init__.py b/industry/industries/forest/__init__.py
@@ -1,5 +1,5 @@
 import grf
-from industry.lib.industry import AIndustry, SplitDefinition, transcribe, symmetrize
+from industry.lib.industry import AIndustry, SplitDefinition, transcribe
 from .enormous import enormous_set
 from .huge import huge_set
 from .large import large_set

diff --git a/industry/lib/cargo.py b/industry/lib/cargo.py
@@ -1,4 +1,3 @@
-import grf
 import struct
 from agrf.lib.cargo import Cargo
 from cargos import cargos as cargo_table

diff --git a/industry/lib/validator/yeti.py b/industry/lib/validator/yeti.py
@@ -11,3 +11,5 @@ def check_yeti(economy):
 
         if economy.parameters["WORKFORCE"] == "YETI":
             assert len(conf.boosters) == 2
+        else:
+            assert len(conf.boosters) == 3
diff --git a/road/road_types/main_asphalt.py b/road/road_types/main_asphalt.py
@@ -1,7 +1,6 @@
 from road.lib import ARoadType
 from road.lib.graphics.underlay import get_spritesheet
 from datetime import date
-import grf
 
 
 the_road_type = ARoadType(

diff --git a/road/road_types/main_concrete.py b/road/road_types/main_concrete.py
@@ -1,7 +1,6 @@
 from road.lib import ARoadType
 from road.lib.graphics.underlay import get_spritesheet
 from datetime import date
-import grf
 
 
 the_road_type = ARoadType(

diff --git a/road/road_types/motorway.py b/road/road_types/motorway.py
@@ -1,7 +1,6 @@
 from road.lib import ARoadType
 from road.lib.graphics.underlay import get_spritesheet
 from datetime import date
-import grf
 
 
 the_road_type = ARoadType(

diff --git a/road/road_types/slate_block.py b/road/road_types/slate_block.py
@@ -1,7 +1,6 @@
 from road.lib import ARoadType
 from road.lib.graphics.underlay import get_spritesheet
 from datetime import date
-import grf
 
 
 the_road_type = ARoadType(

diff --git a/road/road_types/urban_expressway_asphalt.py b/road/road_types/urban_expressway_asphalt.py
@@ -1,7 +1,6 @@
 from road.lib import ARoadType
 from road.lib.graphics.underlay import get_spritesheet
 from datetime import date
-import grf
 
 
 the_road_type = ARoadType(
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,6 @@ @@
         fertiliser,
         fish,
         food,
-        goods,
         mail,
         paper,
         passengers,
@@ Expand Down @@