...

14 files changed, 101 insertions, 77 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 =
diff --git a/src/battle/query/btl_character_turn.erl b/src/battle/query/btl_character_turn.erl
index 6ec66fe..fe41c67 100644
--- a/src/battle/query/btl_character_turn.erl
+++ b/src/battle/query/btl_character_turn.erl
@@ -121,13 +121,13 @@ finalize_character (Update) ->
    FinalizedData = btl_character_turn_data:clean_battle(UpdatedData),
 
    DBQuery =
-      ataxic:on_field
+      ataxic:update_field
       (
          btl_battle:get_characters_field(),
          ataxic_sugar:update_array_cell
          (
             btl_character_turn_data:get_character_ix(Data),
-            ataxic:on_field
+            ataxic:update_field
             (
                btl_character:get_is_active_field(),
                ataxic:constant(false)
@@ -173,18 +173,26 @@ update_timeline (Update) ->
    UpdatedData = btl_character_turn_data:set_battle(UpdatedBattle, Data),
 
    DBQuery =
-      shr_db_query:update_indexed
+      ataxic:update_field
       (
          btl_battle:get_players_field(),
-         PlayerIX,
-         [
-            shr_db_query:add_to_field
+         ataxic_sugar:update_array_cell
+         (
+            PlayerIX,
+            ataxic:update_field
             (
                btl_player:get_timeline_field(),
-               NewTimelineElements,
-               true % We add those to the start of the list
+               ataxic:apply_function
+               (
+                  lists,
+                  append,
+                  [
+                     ataxic:constant(NewTimelineElements),
+                     ataxic:current_value()
+                  ]
+               )
             )
-         ]
+         )
       ),
 
    S0Update = btl_character_turn_update:set_data(UpdatedData, Update),
@@ -216,9 +224,15 @@ send_to_database (Update, Request) ->
    PlayerID = btl_character_turn_request:get_player_id(Request),
    BattleID = btl_character_turn_request:get_battle_id(Request),
    Ops = btl_character_turn_update:get_db(Update),
-   Query = shr_db_query:new(battle_db, BattleID, {user, PlayerID}, Ops),
 
-   shr_database:commit(Query),
+   ok =
+      ataxia_client:update
+      (
+         battle_db,
+         ataxia_security:user_from_id(PlayerID),
+         ataxic:value(ataxic:sequence(Ops)),
+         BattleID
+      ),
 
    ok.
 
diff --git a/src/battle/query/btl_join.erl b/src/battle/query/btl_join.erl
index 7b8a124..aa7249a 100644
--- a/src/battle/query/btl_join.erl
+++ b/src/battle/query/btl_join.erl
@@ -95,7 +95,7 @@ handle_new_attack (Input) ->
    DBCond =
       recl:ge
       (
-         recl:on_field
+         recl:update_field
          (
             btl_builder:get_free_slots_field(),
             [recl:current_value()]
diff --git a/src/battle/struct/btl_character.erl b/src/battle/struct/btl_character.erl
index 84eecfb..8c04cd8 100644
--- a/src/battle/struct/btl_character.erl
+++ b/src/battle/struct/btl_character.erl
@@ -56,7 +56,7 @@
 
       get_rank_field/0,
       get_weapons_field/0,
-      get_location_field/0,
+      get_locatiupdate_field/0,
       get_current_health_field/0,
       get_is_active_field/0,
       get_is_defeated_field/0
@@ -255,8 +255,8 @@ new
 get_rank_field () -> #character.rank.
 -spec get_weapons_field() -> non_neg_integer().
 get_weapons_field () -> #character.weapon_ids.
--spec get_location_field() -> non_neg_integer().
-get_location_field () -> #character.location.
+-spec get_locatiupdate_field() -> non_neg_integer().
+get_locatiupdate_field () -> #character.location.
 -spec get_current_health_field() -> non_neg_integer().
 get_current_health_field () -> #character.current_health.
 -spec get_is_active_field() -> non_neg_integer().
diff --git a/src/login/query/lgn_sign_in.erl b/src/login/query/lgn_sign_in.erl
index 357ed65..5883acf 100644
--- a/src/login/query/lgn_sign_in.erl
+++ b/src/login/query/lgn_sign_in.erl
@@ -93,12 +93,12 @@ commit_update (QueryState) ->
             ataxic:sequence
             (
                [
-                  ataxic:on_field
+                  ataxic:update_field
                   (
                      shr_player:get_token_field(),
                      ataxic:constant(NewToken)
                   ),
-                  ataxic:on_field
+                  ataxic:update_field
                   (
                      shr_player:get_last_active_field(),
                      ataxic:constant(NewActiveTime)
diff --git a/src/map/query/map_update.erl b/src/map/query/map_update.erl
index ac4499b..d9e3e73 100644
--- a/src/map/query/map_update.erl
+++ b/src/map/query/map_update.erl
@@ -125,17 +125,17 @@ commit_update (QueryState, Input) ->
             ataxic:sequence
             (
                [
-                  ataxic:on_field
+                  ataxic:update_field
                   (
                      map_map:get_height_field(),
                      ataxic:constant(Input#input.h)
                   ),
-                  ataxic:on_field
+                  ataxic:update_field
                   (
                      map_map:get_width_field(),
                      ataxic:constant(Input#input.w)
                   ),
-                  ataxic:on_field
+                  ataxic:update_field
                   (
                      map_map:get_tile_instances_field(),
                      ataxic:constant(map_map:get_tile_instances(Map))
diff --git a/src/roster/query/rst_update.erl b/src/roster/query/rst_update.erl
index af421ea..8afa249 100644
--- a/src/roster/query/rst_update.erl
+++ b/src/roster/query/rst_update.erl
@@ -124,11 +124,10 @@ commit_update (QueryState, Input) ->
              {
                rst_roster:set_character(IX, Character, CurrentRoster),
                [
-                  shr_db_query:update_indexed
+                  ataxic_sugar:update_array_cell
                   (
-                     rst_roster:get_characters_field(),
                      IX,
-                     [shr_db_query:set_value(Character)]
+                     ataxic:constant(Character)
                   )
                   | UpdateList
                ]
@@ -138,16 +137,21 @@ commit_update (QueryState, Input) ->
          Characters
       ),
 
-   Query =
-      shr_db_query:new
+   ok =
+      ataxia_client:update
       (
          roster_db,
-         RosterID,
-         {user, PlayerID},
-         QueryList
+         ataxia_security:user_from_id(PlayerID),
+         ataxic:value
+         (
+            ataxic:update_field
+            (
+               rst_roster:get_characters_field(),
+               ataxic:sequence(QueryList)
+            )
+         )
       ),
 
-   shr_database:commit(Query),
    shr_timed_cache:update(roster_db, PlayerID, RosterID, UpdatedRoster),
 
    'ok'.
diff --git a/src/special/spe_map.erl b/src/special/spe_map.erl
index 00b0fde..1de946b 100644
--- a/src/special/spe_map.erl
+++ b/src/special/spe_map.erl
@@ -34,7 +34,7 @@ grant_additional (OwnerID) ->
    PlayerUpdateQueryOp =
       ataxic:value
       (
-         ataxic:on_field
+         ataxic:update_field
          (
             shr_player:get_map_summaries_field(),
             ataxic:apply_function
diff --git a/src/special/spe_player.erl b/src/special/spe_player.erl
index 4c6f601..4b9a80a 100644
--- a/src/special/spe_player.erl
+++ b/src/special/spe_player.erl
@@ -121,17 +121,17 @@ generate (Username, Password, Email) ->
                ataxic:sequence
                (
                   [
-                     ataxic:on_field
+                     ataxic:update_field
                      (
                         shr_player:get_id_field(),
                         ataxic:constant(PlayerID)
                      ),
-                     ataxic:on_field
+                     ataxic:update_field
                      (
                         shr_player:get_inventory_id_field(),
                         ataxic:constant(InvID)
                      ),
-                     ataxic:on_field
+                     ataxic:update_field
                      (
                         shr_player:get_roster_id_field(),
                         ataxic:constant(RosterID)
@@ -150,7 +150,7 @@ generate (Username, Password, Email) ->
    ok = finalize_login(UsernameLC, EmailLC, PlayerID),
 
    ok =
-      ataxia:update
+      ataxia_client:update
       (
          player_db,
          ataxia_security:janitor(),