summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-04-04 18:32:58 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-04-04 18:32:58 +0200
commit11b234915be1eaa8098e651f1870a9322f1e30cf (patch)
tree8e04e1e64d49404fcfa09809d57680108cb70098 /src/battle
parent567ad4994492f4d53325260c63638cf12fe928e4 (diff)
[Broken] ...
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/reply/btl_add_char.erl13
1 files changed, 3 insertions, 10 deletions
diff --git a/src/battle/reply/btl_add_char.erl b/src/battle/reply/btl_add_char.erl
index 9518677..d2fe255 100644
--- a/src/battle/reply/btl_add_char.erl
+++ b/src/battle/reply/btl_add_char.erl
@@ -31,22 +31,18 @@ rank_to_string (Rank) ->
)
-> {list(any())}.
generate (IX, Character, PlayerIX) ->
- {ActiveWeapon, SecondaryWeapon} = btl_character:get_weapon_ids(Character),
CharacterPlayerIX = btl_character:get_player_index(Character),
- Location = btl_character:get_location(Character),
{
[
{<<"msg">>, <<"add_char">>},
{<<"ix">>, IX},
- {<<"nam">>, btl_character:get_name(Character)},
{<<"rnk">>, rank_to_string(btl_character:get_rank(Character))},
- {<<"prt">>, btl_character:get_portrait_id(Character)},
{
<<"hea">>,
btl_character:get_current_health(Character)
},
- {<<"lc">>, shr_location:encode(Location)},
+ {<<"lc">>, shr_location:encode(btl_character:get_location(Character))},
{<<"pla">>, CharacterPlayerIX},
{
<<"ena">>,
@@ -56,12 +52,9 @@ generate (IX, Character, PlayerIX) ->
)
},
{<<"dea">>, btl_character:get_is_defeated(Character)},
- {<<"awp">>, ActiveWeapon},
- {<<"swp">>, SecondaryWeapon},
- {<<"ar">>, btl_character:get_armor_id(Character)},
{
- <<"pomni">>,
- shr_omnimods:encode(btl_character:get_permanent_omnimods(Character))
+ <<"bas">>,
+ shr_character:encode(btl_character:get_base_character(Character))
}
]
}.