Fix Dirty Fighting (2)

* Needed to use the correct code to detect the enemy of the skill test
* Also some random cleanup

backend/arkham-api/library/Arkham/Ability/Builder.hs

@@ -47,12 +47,12 @@ newtype ActionAbilityBuilder a = ActionAbilityBuilder {runAbilityBuilder :: Abil
 instance Functor ActionAbilityBuilder where
   fmap :: (a -> b) -> ActionAbilityBuilder a -> ActionAbilityBuilder b
   fmap f (ActionAbilityBuilder g) = ActionAbilityBuilder $ \ability ->
-    let (a, ability') = g (ability)
+    let (a, ability') = g ability
      in (f a, ability')
 
 instance Applicative ActionAbilityBuilder where
   pure :: a -> ActionAbilityBuilder a
-  pure x = ActionAbilityBuilder $ \ability -> (x, ability)
+  pure x = ActionAbilityBuilder (x,)
 
   (<*>) :: ActionAbilityBuilder (a -> b) -> ActionAbilityBuilder a -> ActionAbilityBuilder b
   (ActionAbilityBuilder f) <*> (ActionAbilityBuilder g) = ActionAbilityBuilder $ \ability ->
@@ -104,7 +104,7 @@ extendRevealedAbilities
   -> [Ability]
 extendRevealedAbilities e action =
   withBaseAbilities (toAttrs e)
-    $ guard ((toAttrs e).revealed)
+    $ guard (toAttrs e).revealed
     *> runReader (execWriterT $ runAbilitiesBuilder action) e
 
 revealedSide
@@ -113,4 +113,4 @@ revealedSide
   -> AbilitiesBuilder e ()
 revealedSide action = do
   e <- ask
-  when ((toAttrs e).revealed) action
+  when (toAttrs e).revealed action

backend/arkham-api/library/Arkham/Ability/Scripted/Builder.hs

@@ -61,7 +61,7 @@ instance Functor (ActionAbilityBuilder e) where
 
 instance Applicative (ActionAbilityBuilder e) where
   pure :: a -> ActionAbilityBuilder e a
-  pure x = ActionAbilityBuilder $ \ab -> (x, ab)
+  pure x = ActionAbilityBuilder (x,)
 
   (<*>) :: ActionAbilityBuilder e (a -> b) -> ActionAbilityBuilder e a -> ActionAbilityBuilder e b
   (ActionAbilityBuilder f) <*> (ActionAbilityBuilder g) = ActionAbilityBuilder $ \ab ->
@@ -156,7 +156,7 @@ extendRevealedAbilities
   -> AbilitiesBuilder e ()
   -> [ScriptedAbility e]
 extendRevealedAbilities e action =
-  guard ((toAttrs e).revealed)
+  guard (toAttrs e).revealed
     *> runReader (execStateT (runAbilitiesBuilder action) []) e
 
 revealedSide
@@ -165,7 +165,7 @@ revealedSide
   -> AbilitiesBuilder e ()
 revealedSide action = do
   e <- ask
-  when ((toAttrs e).revealed) action
+  when (toAttrs e).revealed action
 
 tell :: [ScriptedAbility e] -> StateT [ScriptedAbility e] (Reader e) ()
 tell xs = modify (<> xs)

backend/arkham-api/library/Arkham/Asset/Assets/DirtyFighting2.hs

@@ -1,10 +1,10 @@
-module Arkham.Asset.Assets.DirtyFighting2 (dirtyFighting2, DirtyFighting2 (..)) where
+module Arkham.Asset.Assets.DirtyFighting2 (dirtyFighting2) where
 
 import Arkham.Ability
 import Arkham.Asset.Cards qualified as Cards
 import Arkham.Asset.Import.Lifted hiding (EnemyEvaded)
 import Arkham.Helpers.Modifiers (ModifierType (..), maybeModified_)
-import Arkham.Helpers.SkillTest (getSkillTestAction, getSkillTestTarget, isParley)
+import Arkham.Helpers.SkillTest (getSkillTestAction, getSkillTestTargetedEnemy, isParley)
 import Arkham.Helpers.Window (evadedEnemy)
 import Arkham.Matcher
 
@@ -16,19 +16,18 @@ dirtyFighting2 :: AssetCard DirtyFighting2
 dirtyFighting2 = asset DirtyFighting2 Cards.dirtyFighting2
 
 instance HasModifiersFor DirtyFighting2 where
-  getModifiersFor (DirtyFighting2 a) = case a.controller of
-    Nothing -> pure mempty
-    Just iid -> maybeModified_ a iid do
-      EnemyTarget eid <- MaybeT getSkillTestTarget
-      liftGuardM $ eid <=~> ExhaustedEnemy
+  getModifiersFor (DirtyFighting2 a) = for_ a.controller \iid -> do
+    maybeModified_ a iid do
+      eid <- MaybeT getSkillTestTargetedEnemy
+      guardM $ eid <=~> ExhaustedEnemy
       action <- MaybeT getSkillTestAction
-      liftGuardM $ orM [pure $ action `elem` [#fight, #evade, #parley], isParley]
+      guardM $ (action `elem` [#fight, #evade, #parley] ||) <$> isParley
       pure [AnySkillValue 2]
 
 instance HasAbilities DirtyFighting2 where
   getAbilities (DirtyFighting2 a) =
-    [ restrictedAbility a 1 ControlsThis
-        $ ReactionAbility (EnemyEvaded #after You $ ignoreAloofFightOverride AnyEnemy) (exhaust a)
+    [ restricted a 1 ControlsThis
+        $ triggered (EnemyEvaded #after You $ ignoreAloofFightOverride AnyEnemy) (exhaust a)
     ]
 
 instance RunMessage DirtyFighting2 where