From 088a8d11432940125b256422ce4267cee359cd89 Mon Sep 17 00:00:00 2001
From: Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org>
Date: Sat, 20 Jun 2020 19:20:16 +0200
Subject: ...

---
 src/battle/query/btl_join.erl | 52 ++++++++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 23 deletions(-)

(limited to 'src')

diff --git a/src/battle/query/btl_join.erl b/src/battle/query/btl_join.erl
index aabea27..788609d 100644
--- a/src/battle/query/btl_join.erl
+++ b/src/battle/query/btl_join.erl
@@ -118,37 +118,43 @@ handle_attack (Input) ->
                ]
             )
          ),
-         ataxic:land
+         ataxic:sequence
          (
             [
-               ataxic:ge
+               ataxic:field
                (
-                  ataxic:field
-                  (
-                     ataxia_entry:get_value_field(),
-                     ataxic:field
-                     (
-                        btl_pending_battle:get_free_slots_field(),
-                        ataxic:current_value()
-                     )
-                  ),
-                  ataxic:constant(PartySize)
+                  ataxia_entry:get_value_field(),
+                  ataxic:current_value()
                ),
-               ataxic:neg
+               ataxic:land
                (
-                  ataxic:field
-                  (
-                     btl_pending_battle:get_player_ids_field(),
-                     ataxic:apply_function
+                  [
+                     ataxic:ge
                      (
-                        lists,
-                        member,
-                        [
-                           ataxic:constant(PlayerID),
+                        ataxic:field
+                        (
+                           btl_pending_battle:get_free_slots_field(),
                            ataxic:current_value()
-                        ]
+                        ),
+                        ataxic:constant(PartySize)
+                     ),
+                     ataxic:neg
+                     (
+                        ataxic:field
+                        (
+                           btl_pending_battle:get_player_ids_field(),
+                           ataxic:apply_function
+                           (
+                              lists,
+                              member,
+                              [
+                                 ataxic:constant(PlayerID),
+                                 ataxic:current_value()
+                              ]
+                           )
+                        )
                      )
-                  )
+                  ]
                )
             ]
          )
-- 
cgit v1.2.3-70-g09d2