| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src/bounty')
| -rw-r--r-- | src/bounty/bnt_generate_player.erl | 24 | ||||
| -rw-r--r-- | src/bounty/bnt_grant_land.erl | 2 | ||||
| -rw-r--r-- | src/bounty/bnt_join_battle.erl | 7 |
3 files changed, 15 insertions, 18 deletions
diff --git a/src/bounty/bnt_generate_player.erl b/src/bounty/bnt_generate_player.erl index e02a94b..8612042 100644 --- a/src/bounty/bnt_generate_player.erl +++ b/src/bounty/bnt_generate_player.erl @@ -69,7 +69,7 @@ finalize_login (UsernameLC, EmailLC, PlayerID) -> 'ok'. --spec generate_inventory (ataxia_id:type()) -> ataxia_id:type(). +-spec generate_inventory (shr_player:id()) -> shr_inventory:id(). generate_inventory (PlayerID) -> Inventory = shr_inventory:new(PlayerID), @@ -84,7 +84,7 @@ generate_inventory (PlayerID) -> InventoryID. --spec generate_roster (ataxia_id:type()) -> ataxia_id:type(). +-spec generate_roster (shr_player:id()) -> rst_roster:id(). generate_roster (PlayerID) -> Roster = rst_roster:new(PlayerID), {ok, RosterID} = @@ -101,14 +101,20 @@ generate_roster (PlayerID) -> %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec attempt (binary(), binary(), binary()) -> shr_player:type(). +-spec attempt + ( + binary(), + binary(), + binary() + ) + -> {shr_player:id(), shr_player:type()}. attempt (Username, Password, Email) -> UsernameLC = string:lowercase(Username), EmailLC = string:lowercase(Email), ok = reserve_login(UsernameLC, EmailLC), - Player = shr_player:new(<<"">>, Username, Password, Email), + Player = shr_player:new(Username, Password, Email), JanitorOnlyPermission = ataxia_security:allow_only(ataxia_security:janitor()), @@ -138,11 +144,6 @@ attempt (Username, Password, Email) -> [ ataxic:update_field ( - shr_player:get_id_field(), - ataxic:constant(PlayerID) - ), - ataxic:update_field - ( shr_player:get_inventory_id_field(), ataxic:constant(InvID) ), @@ -185,7 +186,4 @@ attempt (Username, Password, Email) -> PlayerID ), - - Result = shr_player:set_id(PlayerID, Player), - - Result. + {PlayerID, Player}. diff --git a/src/bounty/bnt_grant_land.erl b/src/bounty/bnt_grant_land.erl index 1a8a62e..d12d30c 100644 --- a/src/bounty/bnt_grant_land.erl +++ b/src/bounty/bnt_grant_land.erl @@ -16,7 +16,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec attempt (ataxia_id:type()) -> map_map:type(). +-spec attempt (shr_player:id()) -> map_map:type(). attempt (OwnerID) -> Map = map_map:default(OwnerID), diff --git a/src/bounty/bnt_join_battle.erl b/src/bounty/bnt_join_battle.erl index f97b20b..5daa548 100644 --- a/src/bounty/bnt_join_battle.erl +++ b/src/bounty/bnt_join_battle.erl @@ -413,13 +413,12 @@ generate_battle (PlayerID, MapID) -> map_map:id(), list(non_neg_integer()) ) - -> btl_pending_battle:type(). + -> {btl_pending_battle:id(), btl_pending_battle:type()}. generate (PlayerID, MapID, SelectedRosterCharacterIXs) -> Battle = generate_battle(PlayerID, MapID), PendingBattle = btl_pending_battle:new ( - <<"">>, % TODO: More options than 1 vs N. (length(SelectedRosterCharacterIXs) * 2), Battle @@ -433,7 +432,7 @@ generate (PlayerID, MapID, SelectedRosterCharacterIXs) -> list(non_neg_integer()), btl_pending_battle:type() ) - -> btl_pending_battle:type(). + -> {btl_pending_battle:id(), btl_pending_battle:type()}. attempt (PlayerID, SelectedRosterCharacterIXs, PendingBattle) -> Battle = btl_pending_battle:get_battle(PendingBattle), RemainingSlots = @@ -476,7 +475,7 @@ attempt (PlayerID, SelectedRosterCharacterIXs, PendingBattle) -> {S1PendingBattle, Update}, - S1PendingBattle. + {ataxia_id:null(), S1PendingBattle}. % TODO: % if RemainingSlots = 0 -> del this, new Battle. |