factorio-draftsman 3.3.0__tar.gz → 3.3.1__tar.gz

{factorio_draftsman-3.3.0/factorio_draftsman.egg-info → factorio_draftsman-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: factorio-draftsman
-Version: 3.3.0
+Version: 3.3.1
 Summary: A complete, well-tested, and up-to-date module to manipulate Factorio blueprint strings. Compatible with mods.
 Author: redruin01
 License-Expression: MIT

factorio_draftsman-3.3.1/draftsman/_version.py

@@ -0,0 +1,4 @@
+# _version.py
+
+__version__ = "3.3.1"
+__version_info__ = (3, 3, 1)

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/classes/blueprint.py

@@ -120,7 +120,7 @@ class Blueprint(Transformable, Collection, Blueprintable):
     # =========================================================================
 
     absolute_snapping: bool = attrs.field(
-        default=True,
+        default=False,
         validator=instance_of(bool),
     )
     """

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/data/planets.py

@@ -28,9 +28,10 @@ def get_surface_properties(surface_name: str) -> dict:
         return {}
     else:
         surface = raw[surface_name]
+        surface_props = surface.get("surface_properties", {})
         return {
-            "solar-power": surface.get("solar-power", 100),
-            "magnetic-field": surface.get("magnetic-field", 90),
-            "pressure": surface.get("pressure", 1000),
-            "gravity": surface.get("gravity", 10),
+            "solar-power": surface_props.get("solar-power", 100),
+            "magnetic-field": surface_props.get("magnetic-field", 90),
+            "pressure": surface_props.get("pressure", 1000),
+            "gravity": surface_props.get("gravity", 10),
         }

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/environment/update.py

@@ -788,7 +788,7 @@ def convert_table_to_dict(table) -> Union[dict, list]:
     return out
 
 
-def get_items(lua):
+def get_items(lua, game_version: tuple[int, int, int, int]):
     """
     Gets the loaded items, item subgroups, and item groups. Sorts them and
     returns them. Saves us the trouble of recalcualting this every time we sort
@@ -873,6 +873,8 @@ def get_items(lua):
     add_items(data.raw["repair-tool"])  # not an item somehow
     add_items(data.raw["rail-planner"])
     add_items(data.raw["copy-paste-tool"])
+    if game_version >= (2, 0):
+        add_items(data.raw["space-platform-starter-pack"])
 
     # Sort everything
     for i, _ in enumerate(group_list):
@@ -1893,7 +1895,7 @@ def extract_data(
     # Lots of items are sorted by item order, subgroup and group
     # Here we get these things once and pass them into each extraction function
     # as necessary
-    items = get_items(lua)
+    items = get_items(lua, game_version)
 
     extract_entities(lua, draftsman_path, game_version, items, verbose)
     extract_equipment(lua, draftsman_path, items, verbose)

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/factorio-data/base/info.json

@@ -1,6 +1,6 @@
 {
   "name": "base",
-  "version": "2.0.76",
+  "version": "2.0.77",
   "title": "Base Mod",
   "author": "Wube Software",
   "contact": "dev@factorio.com",

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/factorio-data/elevated-rails/info.json

@@ -1,6 +1,6 @@
 {
   "name": "elevated-rails",
-  "version": "2.0.76",
+  "version": "2.0.77",
   "title": "Elevated Rails",
   "author": "Wube Software",
   "contact": "dev@factorio.com",

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/factorio-data/quality/info.json

@@ -1,6 +1,6 @@
 {
   "name": "quality",
-  "version": "2.0.76",
+  "version": "2.0.77",
   "title": "Quality",
   "author": "Wube Software",
   "contact": "dev@factorio.com",

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/factorio-data/space-age/info.json

@@ -1,6 +1,6 @@
 {
   "name": "space-age",
-  "version": "2.0.76",
+  "version": "2.0.77",
   "title": "Space Age",
   "author": "Wube Software",
   "contact": "dev@factorio.com",

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/draftsman/prototypes/constant_combinator.py

@@ -178,8 +178,6 @@ class ConstantCombinator(
         :param type: The internal type of the signal.
         """
         section_index = index // 1000
-        print(section_index)
-        print([section for section in self.sections if section.index == section_index])
         # TODO: this might be slow
         section = next(
             # Try and an existing section with that particular index...

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1/factorio_draftsman.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: factorio-draftsman
-Version: 3.3.0
+Version: 3.3.1
 Summary: A complete, well-tested, and up-to-date module to manipulate Factorio blueprint strings. Compatible with mods.
 Author: redruin01
 License-Expression: MIT

{factorio_draftsman-3.3.0 → factorio_draftsman-3.3.1}/test/test_blueprint.py

@@ -368,17 +368,17 @@ class TestBlueprint:
 
     def test_set_absolute_snapping(self):
         blueprint = Blueprint()
-        assert blueprint.absolute_snapping == True
+        assert blueprint.absolute_snapping == False
         assert blueprint.to_dict()["blueprint"] == {
             "item": "blueprint",
             "version": encode_version(*mods.versions["base"]),
         }
 
-        blueprint.absolute_snapping = False
-        assert blueprint.absolute_snapping == False
+        blueprint.absolute_snapping = True
+        assert blueprint.absolute_snapping == True
         assert blueprint.to_dict()["blueprint"] == {
             "item": "blueprint",
-            "absolute-snapping": False,
+            "absolute-snapping": True,
             "version": encode_version(*mods.versions["base"]),
         }
 

factorio_draftsman-3.3.1/test/test_version.py

@@ -0,0 +1,9 @@
+# version.py
+
+import draftsman
+
+
+class TestVersion:
+    def test_versions(self):
+        assert draftsman.__version__ == "3.3.1"
+        assert draftsman.__version_info__ == (3, 3, 1)

factorio_draftsman-3.3.0/draftsman/_version.py

@@ -1,4 +0,0 @@
-# _version.py
-
-__version__ = "3.3.0"
-__version_info__ = (3, 3, 0)

factorio_draftsman-3.3.0/test/test_version.py

@@ -1,9 +0,0 @@
-# version.py
-
-import draftsman
-
-
-class TestVersion:
-    def test_versions(self):
-        assert draftsman.__version__ == "3.3.0"
-        assert draftsman.__version_info__ == (3, 3, 0)