summaryrefslogtreecommitdiff |
diff options
author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-01-05 20:14:14 +0100 |
---|---|---|
committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-01-05 20:14:14 +0100 |
commit | 4b7351e6df122418a3e58e5e3b7b55e46b4a6c89 (patch) | |
tree | c24eec31b6fb0849945e581fc80cae3050edfcc2 | |
parent | 16e66ae73cae78eb8179143336e14c6585ec1455 (diff) |
...
-rw-r--r-- | src/battle/query/btl_join.erl | 2 | ||||
-rw-r--r-- | src/bounty/bnt_join_battle.erl | 17 | ||||
-rw-r--r-- | src/db/db_node.erl | 1 |
3 files changed, 12 insertions, 8 deletions
diff --git a/src/battle/query/btl_join.erl b/src/battle/query/btl_join.erl index 85c190e..71c4d9a 100644 --- a/src/battle/query/btl_join.erl +++ b/src/battle/query/btl_join.erl @@ -92,7 +92,7 @@ handle_attack (Input) -> {ok, AvailablePendingBattle, AvailablePendingBattleID} = ataxia_client:update_and_fetch_any ( - btl_pending, + pending_battle_db, PlayerDBUser, ataxic:update_lock ( diff --git a/src/bounty/bnt_join_battle.erl b/src/bounty/bnt_join_battle.erl index 3142a16..a3e9ea2 100644 --- a/src/bounty/bnt_join_battle.erl +++ b/src/bounty/bnt_join_battle.erl @@ -576,11 +576,12 @@ generate (PlayerID, MapID, SelectedRosterCharacterIXs) -> ), BountyData = + #bounty_data { - PlayerID, - MapID, - SelectedRosterCharacterIXs, - NewPendingBattleID + player_id = PlayerID, + map_id = MapID, + roster_ixs = SelectedRosterCharacterIXs, + pending_battle_id = NewPendingBattleID }, % TODO: generate bounty. @@ -603,10 +604,12 @@ attempt PendingBattle ) -> BountyData = + #bounty_data { - PlayerID, - PendingBattleID, - SelectedRosterCharacterIXs + player_id = PlayerID, + map_id = ataxia_id:null(), + roster_ixs = SelectedRosterCharacterIXs, + pending_battle_id = PendingBattleID }, % TODO: generate bounty. diff --git a/src/db/db_node.erl b/src/db/db_node.erl index 763653a..e1ffb94 100644 --- a/src/db/db_node.erl +++ b/src/db/db_node.erl @@ -28,6 +28,7 @@ start () -> Mnesia = ataxia_admin:new("/tmp/to_db_node.mnesia", []), ataxia_admin:start(Mnesia), ataxia_admin:add_db(battle_db, Mnesia), + ataxia_admin:add_db(pending_battle_db, Mnesia), ataxia_admin:add_db(login_db, Mnesia), ataxia_admin:add_db(map_db, Mnesia), ataxia_admin:add_db(player_db, Mnesia), |