made loaded signals not dependent on configuration

redruin1 · Dec 17, 2024 · 8708b12 · 8708b12
1 parent 04f9f68
commit 8708b12
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 5 deletions.
diff --git a/draftsman/_factorio_version.py b/draftsman/_factorio_version.py
@@ -1,4 +1,4 @@
 # _factorio_version.py
 
-__factorio_version__ = "2.0.24.0"
-__factorio_version_info__ = (2, 0, 24, 0)
+__factorio_version__ = "2.0.27.0"
+__factorio_version_info__ = (2, 0, 27, 0)
diff --git a/draftsman/data/entities.pkl b/draftsman/data/entities.pkl
diff --git a/draftsman/data/fluids.pkl b/draftsman/data/fluids.pkl
diff --git a/draftsman/data/instruments.pkl b/draftsman/data/instruments.pkl
diff --git a/draftsman/data/items.pkl b/draftsman/data/items.pkl
diff --git a/draftsman/data/mods.pkl b/draftsman/data/mods.pkl
diff --git a/draftsman/data/modules.pkl b/draftsman/data/modules.pkl
diff --git a/draftsman/data/recipes.pkl b/draftsman/data/recipes.pkl
diff --git a/draftsman/data/signals.pkl b/draftsman/data/signals.pkl
diff --git a/draftsman/data/tiles.pkl b/draftsman/data/tiles.pkl
diff --git a/draftsman/environment/update.py b/draftsman/environment/update.py
@@ -1309,6 +1309,10 @@ def extract_signals(lua: lupa.LuaRuntime, draftsman_path: str, sort_tuple, verbo
     # hidden_signals = []
 
     def add_signals(signal_category_name, target_location, signal_type):
+        # Depending on configuration, some items/signals might not exist
+        if signal_category_name not in data.raw:
+            return
+
         signal_category = convert_table_to_dict(data.raw[signal_category_name])
         for signal_name in signal_category:
             signal_obj = signal_category[signal_name]
@@ -1448,7 +1452,7 @@ def add_signals(signal_category_name, target_location, signal_type):
     add_signals("pipe", entity_signals, "entity")
     add_signals("pipe-to-ground", entity_signals, "entity")
     add_signals("plant", entity_signals, "entity")
-    # add_signals("player-port", entity_signals, "entity") # Deprecated in 2.0
+    add_signals("player-port", entity_signals, "entity") # Deprecated in 2.0
     add_signals("power-switch", entity_signals, "entity")
     add_signals("programmable-speaker", entity_signals, "entity")
     add_signals("projectile", entity_signals, "entity")
@@ -1500,7 +1504,7 @@ def add_signals(signal_category_name, target_location, signal_type):
     add_signals("space-location", space_location_signals, "space-location")
 
     # Asteroid Chunks Signals
-    #add_signals("asteroid-chunk", asteroid_chunk_signals, "asteroid-chunk")
+    add_signals("asteroid-chunk", asteroid_chunk_signals, "asteroid-chunk")
 
     # Quality Signals
     add_signals("quality", quality_signals, "quality")

diff --git a/draftsman/factorio-data b/draftsman/factorio-data
+1 −1		base/info.json
+1 −0		base/prototypes/achievements.lua
+4 −4		base/prototypes/entity/circuit-network.lua
+6 −1		base/prototypes/entity/entities.lua
+7 −4		base/prototypes/entity/sounds.lua
+1 −1		base/prototypes/entity/trains.lua
+8 −4		base/prototypes/item.lua
+189 −1		changelog.txt
+1 −0		core/lualib/circuit-connector-sprites.lua
+3 −2		core/lualib/space-finish-script.lua
+2 −1		core/prototypes/editor-controller.lua
+2 −0		core/prototypes/utility-constants.lua
+1 −1		elevated-rails/info.json
+1 −1		quality/info.json
+15 −2		quality/prototypes/recycling.lua
+2 −0		space-age/base-data-updates.lua
+2 −0		space-age/data.lua
+1 −1		space-age/info.json
+0 −2		space-age/prototypes/entity/asteroid.lua
+38 −30		space-age/prototypes/entity/entities.lua
+1 −0		space-age/prototypes/entity/mech-armor-animations.lua
+9 −0		space-age/prototypes/entity/plants.lua
+1 −0		space-age/prototypes/entity/turrets.lua
+1 −1		space-age/prototypes/item-groups.lua
+10 −10		space-age/prototypes/item.lua
+8 −21		space-age/prototypes/recipe.lua
+13 −0		space-age/prototypes/tile/tiles-aquilo.lua