From 96eba00d76af7fe662bc7f26d8962ada3bfa15b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= <jeremy@asynk.ch>
Date: Wed, 11 Mar 2026 14:53:51 +0100
Subject: split FlnBotRules

---
 lib/colonial_twilight/fln_bot.rb       |  6 ++++++
 lib/colonial_twilight/fln_bot_rules.rb | 30 ++++++++++++++++--------------
 spec/fln_bot_rules_spec.rb             |  7 +++++++
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/lib/colonial_twilight/fln_bot.rb b/lib/colonial_twilight/fln_bot.rb
index 53cac5c..1db4564 100644
--- a/lib/colonial_twilight/fln_bot.rb
+++ b/lib/colonial_twilight/fln_bot.rb
@@ -8,6 +8,12 @@ module ColonialTwilight
   class FLNBot < Player
     include ColonialTwilight::FLNRules
     include ColonialTwilight::FLNBotRules
+    include ColonialTwilight::FLNRalyRules
+    include ColonialTwilight::FLNExtortRules
+    include ColonialTwilight::FLNSubvertRules
+    include ColonialTwilight::FLNTerrorRules
+    include ColonialTwilight::FLNAttackRules
+    include ColonialTwilight::FLNGuidelines
 
     def play_turn(prev_action, possible_actions)
       init_turn prev_action, possible_actions
diff --git a/lib/colonial_twilight/fln_bot_rules.rb b/lib/colonial_twilight/fln_bot_rules.rb
index d6cd297..a773cdc 100644
--- a/lib/colonial_twilight/fln_bot_rules.rb
+++ b/lib/colonial_twilight/fln_bot_rules.rb
@@ -49,13 +49,13 @@ module ColonialTwilight
       dbg 'RALLY 2', r
       r
     end
+  end
 
-    # Rally
-
+  module FLNRalyRules
     def may_rally_1_in?(space)
       # 3+ FLN and no GOV (unless limited_op_only))
       r = may_rally_in?(space) && may_add_base_in?(space) && space.guerrillas >= 3 &&
-          (limited_op_only? ? true : space.gov_cubes.zero?)
+          (limited_op_only? || space.gov_cubes.zero?)
       dbg "  may_rally_1_in : #{space.name}", r
       r
     end
@@ -154,9 +154,9 @@ module ColonialTwilight
       f = _filter(spaces) { |s| s.support? && has_resources.call(s) }
       _filter(f) { |s| s.neutral? && has_resources.call(s) }
     end
+  end
 
-    # Extort
-
+  module FLNExtortRules
     def may_extort_0_in?(space)
       r = may_extort_in?(space) && space.fln_underground > (space.fln_bases.zero? ? 0 : 1)
       dbg "  may_extort_0_in : #{space.name}", r
@@ -168,12 +168,12 @@ module ColonialTwilight
       f = _filter(spaces) { |s| s.guerrillas > (s.gov_cubes.positive? && s.fln_bases.positive? ? 2 : 1) }
       _filter(f, &:country?)
     end
+  end
 
-    # Subvert
-
+  module FLNSubvertRules
     def may_subvert_1_in?(space, num)
       # to remove last cubes
-      r = may_subvert_in?(space) && (space.french_cubes.zero? && space.algerian_cubes <= num)
+      r = may_subvert_in?(space) && space.french_cubes.zero? && space.algerian_cubes <= num
       dbg "  may_subvert_1_in : #{space.name}", r
       r
     end
@@ -189,9 +189,9 @@ module ColonialTwilight
       dbg "  may_subvert_2_in : #{space.name}", r
       r
     end
+  end
 
-    # Terror
-
+  module FLNTerrorRules
     def may_terror_1_in?(space)
       # to remove support, do not active last underground at bases
       r = may_terror_in?(space) && space.support? && space.fln_underground > (space.fln_bases.positive? ? 1 : 0)
@@ -218,8 +218,9 @@ module ColonialTwilight
       (!space.country? && space.gov_bases.positive?) ||
         (de_gaule && space.sector? && space.troops.positive? && space.police.positive? && space.gov_control?)
     end
+  end
 
-    # Attack
+  module FLNAttackRules
     CASUALTIES_PRIORITY = %i[french_police algerian_police french_troops algerian_troops gov_bases].freeze
 
     def may_attack_1_in?(space)
@@ -231,7 +232,7 @@ module ColonialTwilight
 
     def may_ambush_1_in?(space)
       # do not expose a base
-      r = may_ambush_in?(space) && (space.fln_bases.zero? ? true : space.guerrillas > 1)
+      r = may_ambush_in?(space) && (space.fln_bases.zero? || space.guerrillas > 1)
       dbg "  may_ambush_1_in : #{space.name}", r
       r
     end
@@ -250,9 +251,10 @@ module ColonialTwilight
       f = _filter(f) { |s| s.french_police.positive? }
       _max(f, :gov)
     end
+  end
 
-    # 8.1.2 - Procedure Guidelines
-
+  # 8.1.2 - Procedure Guidelines
+  module FLNGuidelines
     def _filter(spaces, &block)
       return spaces if spaces.empty?
 
diff --git a/spec/fln_bot_rules_spec.rb b/spec/fln_bot_rules_spec.rb
index dc071cb..d0a2f4c 100644
--- a/spec/fln_bot_rules_spec.rb
+++ b/spec/fln_bot_rules_spec.rb
@@ -7,6 +7,13 @@ require './spec/mock_board'
 class FLNRulesImpl
   include ColonialTwilight::FLNRules
   include ColonialTwilight::FLNBotRules
+  include ColonialTwilight::FLNRalyRules
+  include ColonialTwilight::FLNExtortRules
+  include ColonialTwilight::FLNSubvertRules
+  include ColonialTwilight::FLNTerrorRules
+  include ColonialTwilight::FLNAttackRules
+  include ColonialTwilight::FLNGuidelines
+
   attr_reader :board
   attr_writer :debug, :limited_op_only, :first_eligible, :will_be_next_first_eligible
 
-- 
cgit v1.1-2-g2b99