From 0e3471cf7283c1faac11f3d3bc64abbcb17a2d9c Mon Sep 17 00:00:00 2001 From: nsensfel Date: Thu, 14 Feb 2019 13:37:44 +0100 Subject: Sends player data when loading battle. --- src/battle/query/btl_load.erl | 10 ++++++++++ src/battle/reply/btl_add_player.erl | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 src/battle/reply/btl_add_player.erl diff --git a/src/battle/query/btl_load.erl b/src/battle/query/btl_load.erl index e2d1fe4..f41e46c 100644 --- a/src/battle/query/btl_load.erl +++ b/src/battle/query/btl_load.erl @@ -111,6 +111,15 @@ generate_reply (QueryState, Input) -> orddict:to_list(btl_battle:get_characters(Battle)) ), + AddPlayerList = + lists:map + ( + fun ({IX, Player}) -> + btl_add_player:generate(IX, Player) + end, + orddict:to_list(btl_battle:get_players(Battle)) + ), + AddPortraitList = lists:map ( @@ -153,6 +162,7 @@ generate_reply (QueryState, Input) -> ++ [SetTimeline, SetMap | AddWeaponList] ++ AddPortraitList ++ AddArmorList + ++ AddPlayerList ++ AddCharList ), diff --git a/src/battle/reply/btl_add_player.erl b/src/battle/reply/btl_add_player.erl new file mode 100644 index 0000000..d2aed1d --- /dev/null +++ b/src/battle/reply/btl_add_player.erl @@ -0,0 +1,34 @@ +-module(btl_add_player). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +-export([generate/2]). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +-spec generate + ( + non_neg_integer(), + btl_player:type() + ) + -> {list(any())}. +generate (IX, Player) -> + { + [ + {<<"msg">>, <<"add_player">>}, + {<<"id">>, btl_player:get_id(Player)}, + {<<"ix">>, IX}, + {<<"iix">>, btl_player:get_character_index(Player)}, + {<<"luk">>, btl_player:get_luck(Player)} + ] + }. -- cgit v1.2.3-70-g09d2