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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: factorio-draftsman
-Version: 3.2.0
+Version: 3.3.0
 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/draftsman/_version.py

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

{factorio_draftsman-3.2.0 → factorio_draftsman-3.3.0}/draftsman/classes/mixins/target_priorities.py

@@ -148,7 +148,7 @@ class TargetPrioritiesMixin(Exportable):
 draftsman_converters.get_version((2, 0)).add_hook_fns(
     TargetPrioritiesMixin,
     lambda fields: {
-        "priority_list": fields.priority_list.name,
+        "priority-list": fields.priority_list.name,
         "ignore_unprioritized": fields.ignore_unprioritized.name,
         "set_priority_list": fields.set_priority_list.name,
         "set_ignore_unprioritized": fields.set_ignore_unprioritized.name,

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

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

{factorio_draftsman-3.2.0 → factorio_draftsman-3.3.0}/draftsman/factorio-data/base/prototypes/entity/circuit-network.lua

@@ -24,7 +24,7 @@ data:extend
     energy_source =
     {
       type = "electric",
-      usage_priority = "secondary-input"
+      usage_priority = "primary-input"
     },
     active_energy_usage = "1kW",
 
@@ -93,7 +93,7 @@ data:extend
     energy_source =
     {
       type = "electric",
-      usage_priority = "secondary-input"
+      usage_priority = "primary-input"
     },
     active_energy_usage = "1kW",
 
@@ -961,9 +961,9 @@ data:extend
     energy_source =
     {
       type = "electric",
-      usage_priority = "secondary-input"
+      usage_priority = "primary-input"
     },
-    active_energy_usage = "5kW",
+    active_energy_usage = "1kW",
 
     working_sound =
     {

{factorio_draftsman-3.2.0 → factorio_draftsman-3.3.0}/draftsman/factorio-data/core/prototypes/utility-sounds.lua

@@ -181,6 +181,7 @@ add_utility_sound("build_blueprint_huge", "__core__/sound/build-blueprint-large.
 add_utility_sound("build_ghost_upgrade", "__core__/sound/build-ghost-upgrade.ogg", 0.7, 64)
 add_utility_sound("build_ghost_upgrade_cancel", "__core__/sound/build-ghost-upgrade-cancel.ogg", 0.7, 64)
 add_utility_sound("gui_click", "__core__/sound/gui-click.ogg")
+add_utility_sound("gui_switch", "__core__/sound/gui-switch.ogg", 0.7)
 add_utility_sound("list_box_click", "__core__/sound/list-box-click.ogg")
 add_utility_sound("cannot_build", "__core__/sound/cannot-build.ogg")
 add_utility_sound_with_vibration("deconstruct_small", "__core__/sound/deconstruct-small.ogg", 1.0, 64, nil, "__core__/sound/deconstruct-small.bnvib", 0.25)

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

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

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

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

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

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

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

@@ -9,7 +9,7 @@ from draftsman.classes.mixins import (
     DirectionalMixin,
 )
 from draftsman.serialization import draftsman_converters
-from draftsman.signatures import ManualSection, SignalFilter, uint32
+from draftsman.signatures import ManualSection, QualityID, SignalFilter, uint32
 from draftsman.validators import instance_of
 from draftsman.data import mods
 
@@ -131,6 +131,7 @@ class ConstantCombinator(
 
         :returns: A reference to the :py:class:`.ManualSection` just added.
         """
+        print("add_section")
         self.sections += [
             ManualSection(
                 group=group,
@@ -142,6 +143,81 @@ class ConstantCombinator(
 
     # =========================================================================
 
+    def set_signal(
+        self,
+        index: int,  # TODO: should be int64
+        name: Optional[str],  # TODO: should be SignalIDName
+        count: int = 0,  # TODO: should be int32
+        quality: QualityID = "normal",
+        type: Optional[str] = None,
+    ) -> None:
+        """
+        Sets a particular signal in this constant combinator.
+
+        This function does all of the signal section management for you, acting
+        as if the constant combinator has one big, unnamed signal group rather
+        than multiple individual groups. This is useful if you just want to
+        treat the CC as a black box that outputs the given signals with the
+        given values for simple cases.
+
+        What signal section defined signals will reside in is determined by
+        their ``index // 1000``; so a signal set at index 999 will be in the
+        0th signal section, while a signal set at index 1000 will be in the
+        1st signal section, and so on.
+
+        In order to prevent collisions between identical signal types in the
+        same group, this method prohibits setting the same signal in at two
+        different indexes at the same time (following the concept of "one big
+        signal section"). If this is troublesome, users should instead use
+        :py:meth:`.add_section` and perform the grouping themselves manually.
+
+        :param index: The index of the signal in the GUI.
+        :param name: The name of the signal.
+        :param count: The amount of the item/the value to output.
+        :param quality: The quality of the signal.
+        :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...
+            (section for section in self.sections if section.index == section_index),
+            None,
+        )
+        # ... or create a new one if it doesn't exist
+        if section is None:
+            section = self.add_section(index=section_index)
+
+        section.set_signal(
+            index=index % 1000, name=name, count=count, quality=quality, type=type
+        )
+
+    # =========================================================================
+
+    def get_signal(self, index: int) -> Optional[SignalFilter]:
+        """
+        Gets a particular signal inside of this constant combinator.
+
+        :returns: A :py:class:`.SignalFilter` instance, or ``None`` if nothing
+            was found at that index.
+        """
+        section_index = index // 1000
+        # TODO: this might be slow
+        section = next(
+            # Try and an existing section with that particular index
+            (section for section in self.sections if section.index == section_index),
+            None,
+        )
+        # If it doesn't exist, clearly there's no signal there
+        if section is None:
+            return None
+
+        return section.get_signal(index=index % 1000)
+
+    # =========================================================================
+
     __hash__ = Entity.__hash__
 
 

{factorio_draftsman-3.2.0 → factorio_draftsman-3.3.0}/draftsman/prototypes/selector_combinator.py

@@ -418,7 +418,7 @@ draftsman_converters.add_hook_fns(
         ("control_behavior", "select_max"): fields.select_max.name,
         ("control_behavior", "index_constant"): fields.index_constant.name,
         ("control_behavior", "index_signal"): fields.index_signal.name,
-        ("control_behavior", "count_inputs_signal"): fields.count_signal.name,
+        ("control_behavior", "count_signal"): fields.count_signal.name,
         (
             "control_behavior",
             "random_update_interval",

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: factorio-draftsman
-Version: 3.2.0
+Version: 3.3.0
 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/test/test_version.py

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

factorio_draftsman-3.2.0/draftsman/_version.py

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

factorio_draftsman-3.2.0/test/test_version.py

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