From ee71de9b8ad145a189660340fd87052396538f86 Mon Sep 17 00:00:00 2001
From: Jeremy Saklad <saklad5@me.com>
Date: Tue, 3 Aug 2021 12:12:11 -0500
Subject: [PATCH] Move Action to different file

In order to move remaining enumerations into other files, dependencies
in this file need to be moved as well.

The folder is named "objects" because "types" is taken as a name.
---
 Bone Market Solver.py | 68 +------------------------------------------
 objects/action.py     | 65 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 67 deletions(-)
 create mode 100644 objects/action.py

diff --git a/Bone Market Solver.py b/Bone Market Solver.py
index 8ea206b..c82eeac 100644
--- a/Bone Market Solver.py	
+++ b/Bone Market Solver.py	
@@ -12,6 +12,7 @@ from os import cpu_count
 from ortools.sat.python import cp_model
 
 from data.costs import Cost
+from objects.action import Action
 
 # This multiplier is applied to the profit margin to avoid losing precision due to rounding.
 PROFIT_MARGIN_MULTIPLIER = 10000000
@@ -66,73 +67,6 @@ cp_model.CpModel.AddGeneralMultiplicationEquality = AddGeneralMultiplicationEqua
 del AddGeneralMultiplicationEquality
 
 
-class Action:
-    """An action that affects a skeleton's qualities."""
-
-    def __init__(self, name, cost, torso_style = None, value = 0, skulls_needed = 0, limbs_needed = 0, tails_needed = 0, skulls = 0, arms = 0, legs = 0, tails = 0, wings = 0, fins = 0, tentacles = 0, amalgamy = 0, antiquity = 0, menace = 0, implausibility = 0, counter_church = 0, exhaustion = 0):
-        self.name = name
-
-        # Cost in pennies of using this action, including the value of the actions spent
-        self.cost = cost
-
-        # Skeleton: Torso Style
-        self.torso_style = torso_style
-
-        # Approximate Value of Your Skeleton in Pennies
-        self.value = value
-
-        # Skeleton: Skulls Needed
-        self.skulls_needed = skulls_needed
-
-        # Skeleton: Limbs Needed
-        self.limbs_needed = limbs_needed
-
-        # Skeleton: Tails Needed
-        self.tails_needed = tails_needed
-
-        # Skeleton: Skulls
-        self.skulls = skulls
-
-        # Skeleton: Arms
-        self.arms = arms
-
-        # Skeleton: Legs
-        self.legs = legs
-
-        # Skeleton: Tails
-        self.tails = tails
-
-        # Skeleton: Wings
-        self.wings = wings
-
-        # Skeleton: Fins
-        self.fins = fins
-
-        # Skeleton: Tentacles
-        self.tentacles = tentacles
-
-        # Skeleton: Amalgamy
-        self.amalgamy = amalgamy
-
-        # Skeleton: Antiquity
-        self.antiquity = antiquity
-
-        # Skeleton: Menace
-        self.menace = menace
-
-        # Skeleton: Self-Evident Implausibility
-        self.implausibility = implausibility
-
-        # Skeleton: Support for a Counter-church Theology
-        self.counter_church = counter_church
-
-        # Bone Market Exhaustion
-        self.exhaustion = exhaustion
-
-    def __str__(self):
-        return str(self.name)
-
-
 class Torso(Enum):
     """An action that initiates a skeleton."""
 
diff --git a/objects/action.py b/objects/action.py
new file mode 100644
index 0000000..a7b6e41
--- /dev/null
+++ b/objects/action.py
@@ -0,0 +1,65 @@
+class Action:
+    """An action that affects a skeleton's qualities."""
+
+    def __init__(self, name, cost, torso_style = None, value = 0, skulls_needed = 0, limbs_needed = 0, tails_needed = 0, skulls = 0, arms = 0, legs = 0, tails = 0, wings = 0, fins = 0, tentacles = 0, amalgamy = 0, antiquity = 0, menace = 0, implausibility = 0, counter_church = 0, exhaustion = 0):
+        self.name = name
+
+        # Cost in pennies of using this action, including the value of the actions spent
+        self.cost = cost
+
+        # Skeleton: Torso Style
+        self.torso_style = torso_style
+
+        # Approximate Value of Your Skeleton in Pennies
+        self.value = value
+
+        # Skeleton: Skulls Needed
+        self.skulls_needed = skulls_needed
+
+        # Skeleton: Limbs Needed
+        self.limbs_needed = limbs_needed
+
+        # Skeleton: Tails Needed
+        self.tails_needed = tails_needed
+
+        # Skeleton: Skulls
+        self.skulls = skulls
+
+        # Skeleton: Arms
+        self.arms = arms
+
+        # Skeleton: Legs
+        self.legs = legs
+
+        # Skeleton: Tails
+        self.tails = tails
+
+        # Skeleton: Wings
+        self.wings = wings
+
+        # Skeleton: Fins
+        self.fins = fins
+
+        # Skeleton: Tentacles
+        self.tentacles = tentacles
+
+        # Skeleton: Amalgamy
+        self.amalgamy = amalgamy
+
+        # Skeleton: Antiquity
+        self.antiquity = antiquity
+
+        # Skeleton: Menace
+        self.menace = menace
+
+        # Skeleton: Self-Evident Implausibility
+        self.implausibility = implausibility
+
+        # Skeleton: Support for a Counter-church Theology
+        self.counter_church = counter_church
+
+        # Bone Market Exhaustion
+        self.exhaustion = exhaustion
+
+    def __str__(self):
+        return str(self.name)