GameAction : reorder constructor parameters

11 files changed, 14 insertions, 14 deletions

diff --git a/lib/colonial_twilight/actions/action.rb b/lib/colonial_twilight/actions/action.rb
index 4b7ea6c..3d41766 100644
--- a/lib/colonial_twilight/actions/action.rb
+++ b/lib/colonial_twilight/actions/action.rb
@@ -3,12 +3,12 @@
 module ColonialTwilight
   module Actions
     class GameAction
-      def initialize(faction:, space:, cost: 0, mode: nil)
+      def initialize(faction, space, mode, cost)
         @data = {
           faction: faction,
           space: space,
-          cost: cost,
-          mode: mode
+          mode: mode,
+          cost: cost
         }
         validate!
       end
diff --git a/lib/colonial_twilight/actions/fln/agitate.rb b/lib/colonial_twilight/actions/fln/agitate.rb
index 8434662..b75767b 100644
--- a/lib/colonial_twilight/actions/fln/agitate.rb
+++ b/lib/colonial_twilight/actions/fln/agitate.rb
@@ -10,7 +10,7 @@ module ColonialTwilight
       class Agitate < FlnAction
         # 1 resources per Terror marker, then 1 resource for the level shift
         def initialize(space, mode)
-          super(space, mode, cost: (mode[:remove_terror] || 0) + (mode[:shift_oppose] || 0))
+          super(space, mode, (mode[:remove_terror] || 0) + (mode[:shift_oppose] || 0))
         end
 
         def validate!
diff --git a/lib/colonial_twilight/actions/fln/ambush.rb b/lib/colonial_twilight/actions/fln/ambush.rb
index 9756c55..e5cfe9c 100644
--- a/lib/colonial_twilight/actions/fln/ambush.rb
+++ b/lib/colonial_twilight/actions/fln/ambush.rb
@@ -8,7 +8,7 @@ module ColonialTwilight
       # Ambush 4.3.3 : max 2
       class Ambush < FlnAction
         def initialize(space)
-          super(space, {}, cost: 0)
+          super(space, {}, 0)
         end
 
         # Activate only 1 Underground Guerrilla
diff --git a/lib/colonial_twilight/actions/fln/attack.rb b/lib/colonial_twilight/actions/fln/attack.rb
index 298f28e..65fd8b2 100644
--- a/lib/colonial_twilight/actions/fln/attack.rb
+++ b/lib/colonial_twilight/actions/fln/attack.rb
@@ -9,7 +9,7 @@ module ColonialTwilight
       # Attack 3.3.3
       class Attack < FlnAction
         def initialize(space)
-          super(space, {}, cost: 1)
+          super(space, {}, 1)
           @ambush = nil
         end
 
diff --git a/lib/colonial_twilight/actions/fln/extort.rb b/lib/colonial_twilight/actions/fln/extort.rb
index 58b4e18..ba24062 100644
--- a/lib/colonial_twilight/actions/fln/extort.rb
+++ b/lib/colonial_twilight/actions/fln/extort.rb
@@ -8,7 +8,7 @@ module ColonialTwilight
       # Extort 4.3.1
       class Extort < FlnAction
         def initialize(space, mode)
-          super(space, mode, cost: 0)
+          super(space, mode, 0)
         end
 
         # flip 1 Underground Guerrilla to Active
diff --git a/lib/colonial_twilight/actions/fln/fln_action.rb b/lib/colonial_twilight/actions/fln/fln_action.rb
index 3a571aa..fc05a5e 100644
--- a/lib/colonial_twilight/actions/fln/fln_action.rb
+++ b/lib/colonial_twilight/actions/fln/fln_action.rb
@@ -5,8 +5,8 @@ require_relative '../action'
 module ColonialTwilight
   module Actions
     class FlnAction < GameAction
-      def initialize(space, mode, cost: 1)
-        super(faction: :FLN, space: space, mode: mode, cost: cost)
+      def initialize(space, mode, cost)
+        super(:FLN, space, mode, cost)
       end
     end
   end
diff --git a/lib/colonial_twilight/actions/fln/march.rb b/lib/colonial_twilight/actions/fln/march.rb
index e738733..8b505b4 100644
--- a/lib/colonial_twilight/actions/fln/march.rb
+++ b/lib/colonial_twilight/actions/fln/march.rb
@@ -8,7 +8,7 @@ module ColonialTwilight
       # March 3.3.2
       class March < FlnAction
         def initialize(space, mode)
-          super(space, mode, cost: 1)
+          super(space, mode, 1)
         end
 
         def cost
diff --git a/lib/colonial_twilight/actions/fln/oas.rb b/lib/colonial_twilight/actions/fln/oas.rb
index 6d38e0f..eb36316 100644
--- a/lib/colonial_twilight/actions/fln/oas.rb
+++ b/lib/colonial_twilight/actions/fln/oas.rb
@@ -8,7 +8,7 @@ module ColonialTwilight
       # OAS 5.3.1
       class Oas < FlnAction
         def initialize(space, mode)
-          super(space, mode, cost: 0)
+          super(space, mode, 0)
         end
 
         # add 1 Terror, set to Neutral
diff --git a/lib/colonial_twilight/actions/fln/rally.rb b/lib/colonial_twilight/actions/fln/rally.rb
index bfa7ab2..d1c8046 100644
--- a/lib/colonial_twilight/actions/fln/rally.rb
+++ b/lib/colonial_twilight/actions/fln/rally.rb
@@ -9,7 +9,7 @@ module ColonialTwilight
       # Rally 3.3.1
       class Rally < FlnAction
         def initialize(space, mode)
-          super(space, mode, cost: 1)
+          super(space, mode, 1)
           @agitate = nil
         end
 
diff --git a/lib/colonial_twilight/actions/fln/subvert.rb b/lib/colonial_twilight/actions/fln/subvert.rb
index a6ec252..ed3048c 100644
--- a/lib/colonial_twilight/actions/fln/subvert.rb
+++ b/lib/colonial_twilight/actions/fln/subvert.rb
@@ -8,7 +8,7 @@ module ColonialTwilight
       # Subvert 4.3.2
       class Subvert < FlnAction
         def initialize(space, mode)
-          super(space, mode, cost: 0)
+          super(space, mode, 0)
           @second = nil
         end
 
diff --git a/lib/colonial_twilight/actions/fln/terror.rb b/lib/colonial_twilight/actions/fln/terror.rb
index b812bb4..314cff3 100644
--- a/lib/colonial_twilight/actions/fln/terror.rb
+++ b/lib/colonial_twilight/actions/fln/terror.rb
@@ -8,7 +8,7 @@ module ColonialTwilight
       # Terror 3.3.4
       class Terror < FlnAction
         def initialize(space, mode)
-          super(space, mode, cost: 1)
+          super(space, mode, 1)
         end
 
         # flip 1 Underground Guerrilla to Active.