...

6 files changed, 49 insertions, 43 deletions

diff --git a/src/battle/game-logic/btl_next_turn.erl b/src/battle/game-logic/btl_next_turn.erl
index 4906c94..a0ea499 100644
--- a/src/battle/game-logic/btl_next_turn.erl
+++ b/src/battle/game-logic/btl_next_turn.erl
@@ -27,7 +27,7 @@ set_player_turn_to_next (Battle) ->
    UpdatedBattle = btl_battle:set_current_player_turn(NextPlayerTurn, Battle),
 
    DBQuery =
-      ataxic:on_field
+      ataxic:update_field
       (
          btl_battle:get_current_player_turn_field(),
          ataxic:constant(NextPlayerTurn)
@@ -47,13 +47,13 @@ reset_next_player_timeline (Battle) ->
       btl_battle:set_player(NextPlayerIX, UpdatedNextPlayer, Battle),
 
    DBQuery =
-      ataxic:on_field
+      ataxic:update_field
       (
          btl_battle:get_players_field(),
          ataxic_sugar:update_array_cell
          (
             NextPlayerIX,
-            ataxic:on_field
+            ataxic:update_field
             (
                btl_player:get_timeline_field(),
                ataxic:constant([])
@@ -83,7 +83,7 @@ activate_next_players_characters (Battle, NextPlayer) ->
       ),
 
    DBQuery =
-      ataxic:on_field
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
          ataxic:sequence
@@ -94,7 +94,7 @@ activate_next_players_characters (Battle, NextPlayer) ->
                   ataxic_sugar:update_array_cell
                   (
                      IX,
-                     ataxic:on_field
+                     ataxic:update_field
                      (
                         btl_character:get_is_active_field(),
                         ataxic:constant(true)
diff --git a/src/battle/game-logic/btl_turn_actions.erl b/src/battle/game-logic/btl_turn_actions.erl
index 3eded89..ee39ba1 100644
--- a/src/battle/game-logic/btl_turn_actions.erl
+++ b/src/battle/game-logic/btl_turn_actions.erl
@@ -43,13 +43,13 @@ mod_current_health (CurrentMaxHealth, PreviousMaxHealth, Update) ->
    S0Update = btl_character_turn_update:set_data(UpdatedData, Update),
 
    DBQuery =
-      ataxic:on_field
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
          ataxic_sugar:update_array_cell
          (
             CharacterIX,
-            ataxic:on_field
+            ataxic:update_field
             (
                btl_character:get_current_health_field(),
                ataxic:constant(NewHealth)
diff --git a/src/battle/game-logic/btl_turn_actions_attack.erl b/src/battle/game-logic/btl_turn_actions_attack.erl
index 355c791..9d1cd87 100644
--- a/src/battle/game-logic/btl_turn_actions_attack.erl
+++ b/src/battle/game-logic/btl_turn_actions_attack.erl
@@ -166,31 +166,33 @@ handle (BattleAction, Update) ->
       ),
 
    DBQuery0 =
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         TargetIX,
-         [
-            shr_db_query:set_field
+         ataxic_sugar:update_array_cell
+         (
+            TargetIX,
+            ataxic:update_field
             (
                btl_character:get_current_health_field(),
-               RemainingDefenderHealth
+               ataxic:constant(RemainingDefenderHealth)
             )
-         ]
+         )
       ),
 
    DBQuery1 =
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         CharacterIX,
-         [
-            shr_db_query:set_field
+         ataxic_sugar:update_array_cell
+         (
+            CharacterIX,
+            ataxic:update_field
             (
                btl_character:get_current_health_field(),
-               RemainingAttackerHealth
+               ataxic:constant(RemainingAttackerHealth)
             )
-         ]
+         )
       ),
 
    S0Update =
diff --git a/src/battle/game-logic/btl_turn_actions_move.erl b/src/battle/game-logic/btl_turn_actions_move.erl
index 1485094..f94f8aa 100644
--- a/src/battle/game-logic/btl_turn_actions_move.erl
+++ b/src/battle/game-logic/btl_turn_actions_move.erl
@@ -94,17 +94,18 @@ commit_move (PreviousCurrentData, Update, Path, NewLocation) ->
       btl_turn_result:new_character_moved(CharacterIX, Path, NewLocation),
 
    DBQuery =
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         CharacterIX,
-         [
-            shr_db_query:set_field
+         ataxic_sugar:update_array_cell
+         (
+            CharacterIX,
+            ataxic:update_field
             (
-               btl_character:get_location_field(),
-               NewLocation
+               btl_character:get_locatiupdate_field(),
+               ataxic:constant(NewLocation)
             )
-         ]
+         )
       ),
 
    S2Update =
diff --git a/src/battle/game-logic/btl_turn_actions_switch_weapon.erl b/src/battle/game-logic/btl_turn_actions_switch_weapon.erl
index 6872ff4..264bcb5 100644
--- a/src/battle/game-logic/btl_turn_actions_switch_weapon.erl
+++ b/src/battle/game-logic/btl_turn_actions_switch_weapon.erl
@@ -51,17 +51,18 @@ handle (Update) ->
    TimelineItem = btl_turn_result:new_character_switched_weapons(CharacterIX),
 
    DBQuery =
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         CharacterIX,
-         [
-            shr_db_query:set_field
+         ataxic_sugar:update_array_cell
+         (
+            CharacterIX,
+            ataxic:update_field
             (
                btl_character:get_weapons_field(),
                UpdatedWeaponIDs
             )
-         ]
+         )
       ),
 
    btl_character_turn_update:add_to_timeline(TimelineItem, DBQuery, S1Update).
diff --git a/src/battle/game-logic/btl_victory.erl b/src/battle/game-logic/btl_victory.erl
index 116fdc3..42a5594 100644
--- a/src/battle/game-logic/btl_victory.erl
+++ b/src/battle/game-logic/btl_victory.erl
@@ -43,17 +43,18 @@ mark_players_characters_as_defeated (PlayerIX, Characters) ->
 add_db_query_to_mark_character_as_defeated (IX, Update) ->
    btl_character_turn_update:add_to_db
    (
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
-         IX,
-         [
-            shr_db_query:set_field
+         ataxic_sugar:update_array_cell
+         (
+            IX,
+            ataxic:update_field
             (
                btl_character:get_is_defeated_field(),
-               true
+               ataxic:constant(true)
             )
-         ]
+         )
       ),
       Update
    ).
@@ -90,17 +91,18 @@ handle_player_defeat (PlayerIX, Update) ->
    S2Update = btl_character_turn_update:set_data(UpdatedData, S1Update),
 
    DBQuery =
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_players_field(),
-         PlayerIX,
-         [
-            shr_db_query:set_field
+         ataxic_sugar:update_array_cell
+         (
+            PlayerIX,
+            ataxic:update_field
             (
                btl_player:get_is_active_field(),
-               false
+               ataxic:constant(false)
             )
-         ]
+         )
       ),
 
    S3Update =