...

2 files changed, 31 insertions, 17 deletions

diff --git a/src/battle/query/btl_character_turn.erl b/src/battle/query/btl_character_turn.erl
index fe41c67..9d00834 100644
--- a/src/battle/query/btl_character_turn.erl
+++ b/src/battle/query/btl_character_turn.erl
@@ -230,7 +230,7 @@ send_to_database (Update, Request) ->
       (
          battle_db,
          ataxia_security:user_from_id(PlayerID),
-         ataxic:value(ataxic:sequence(Ops)),
+         ataxic:update_value(ataxic:sequence(Ops)),
          BattleID
       ),
 
diff --git a/src/battle/query/btl_join.erl b/src/battle/query/btl_join.erl
index aa7249a..3ab7be8 100644
--- a/src/battle/query/btl_join.erl
+++ b/src/battle/query/btl_join.erl
@@ -90,29 +90,43 @@ authenticate_user (Input) ->
 -spec handle_new_attack (input()) -> query_state().
 handle_new_attack (Input) ->
    PlayerID = <<"">>,
-   PlayerDBUser = shr_db_user:player(PlayerID),
+   PlayerDBUser = ataxia_security:user_from_id(PlayerID),
    PartySize = 8,
-   DBCond =
-      recl:ge
+
+   AvailableBattle =
+      ataxia_client:update_and_fetch_any
       (
-         recl:update_field
+         btl_pending,
+         PlayerDBUser,
+         ataxic:update_lock
          (
-            btl_builder:get_free_slots_field(),
-            [recl:current_value()]
+            ataxic:apply_function
+            (
+               ataxia_lock,
+               locked,
+               [
+                  ataxic:constant(PlayerDBUser),
+                  ataxic:constant(60)
+               ]
+            )
          ),
-         recl:constant(PartySize)
+         ataxic:ge
+         (
+            ataxic:field
+            (
+               ataxia_entry:get_value_field(),
+               ataxic:field
+               (
+                  btl_pending_battle:get_free_slots_field(),
+                  ataxic:current_value()
+               )
+            ),
+            ataxic:constant(PartySize)
+         )
       ),
 
-   TempLockQuery =
-      shr_db_query:first_match
-      (
-         db_name,
-         PlayerDBUser,
-         DBCond,
-         shr_db_query:temporary_lock(PlayerDBUser)
-      ),
+   ...
 
-   %% Need: find[lone]; update; fetch
 
 -spec fetch_data (input()) -> query_state().
 fetch_data (Input) ->