| summaryrefslogtreecommitdiff | 
diff options
Diffstat (limited to 'src/battle/reply')
| -rw-r--r-- | src/battle/reply/btl_add_armor.erl | 12 | ||||
| -rw-r--r-- | src/battle/reply/btl_add_char.erl | 14 | ||||
| -rw-r--r-- | src/battle/reply/btl_add_weapon.erl | 24 | 
3 files changed, 25 insertions, 25 deletions
| diff --git a/src/battle/reply/btl_add_armor.erl b/src/battle/reply/btl_add_armor.erl index 2c6a875..01c99ad 100644 --- a/src/battle/reply/btl_add_armor.erl +++ b/src/battle/reply/btl_add_armor.erl @@ -12,7 +12,7 @@  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec encode_category (sh_armor:category()) -> binary(). +-spec encode_category (shr_armor:category()) -> binary().  encode_category (kinetic) -> <<"k">>;  encode_category (leather) -> <<"l">>;  encode_category (chain) -> <<"c">>; @@ -21,14 +21,14 @@ encode_category (plate) -> <<"p">>.  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec generate (sh_armor:type()) -> {list(any())}. +-spec generate (shr_armor:type()) -> {list(any())}.  generate (Armor) ->     {        [           {<<"msg">>, <<"add_armor">>}, -         {<<"id">>, sh_armor:get_id(Armor)}, -         {<<"nam">>, sh_armor:get_name(Armor)}, -         {<<"ct">>, encode_category(sh_armor:get_category(Armor))}, -         {<<"cf">>, sh_armor:get_coefficient(Armor)} +         {<<"id">>, shr_armor:get_id(Armor)}, +         {<<"nam">>, shr_armor:get_name(Armor)}, +         {<<"ct">>, encode_category(shr_armor:get_category(Armor))}, +         {<<"cf">>, shr_armor:get_coefficient(Armor)}        ]     }. diff --git a/src/battle/reply/btl_add_char.erl b/src/battle/reply/btl_add_char.erl index 75b6fcd..f0b70e9 100644 --- a/src/battle/reply/btl_add_char.erl +++ b/src/battle/reply/btl_add_char.erl @@ -22,18 +22,18 @@ rank_to_string (Rank) ->  -spec attributes_as_json     ( -      sh_attributes:type() +      shr_attributes:type()     ) ->     {list({binary(), non_neg_integer()})}.  attributes_as_json (Attributes) ->     {        [ -         {<<"con">>, sh_attributes:get_constitution(Attributes)}, -         {<<"dex">>, sh_attributes:get_dexterity(Attributes)}, -         {<<"int">>, sh_attributes:get_intelligence(Attributes)}, -         {<<"min">>, sh_attributes:get_mind(Attributes)}, -         {<<"spe">>, sh_attributes:get_speed(Attributes)}, -         {<<"str">>, sh_attributes:get_strength(Attributes)} +         {<<"con">>, shr_attributes:get_constitution(Attributes)}, +         {<<"dex">>, shr_attributes:get_dexterity(Attributes)}, +         {<<"int">>, shr_attributes:get_intelligence(Attributes)}, +         {<<"min">>, shr_attributes:get_mind(Attributes)}, +         {<<"spe">>, shr_attributes:get_speed(Attributes)}, +         {<<"str">>, shr_attributes:get_strength(Attributes)}        ]     }. diff --git a/src/battle/reply/btl_add_weapon.erl b/src/battle/reply/btl_add_weapon.erl index d4edbef..5484a76 100644 --- a/src/battle/reply/btl_add_weapon.erl +++ b/src/battle/reply/btl_add_weapon.erl @@ -12,43 +12,43 @@  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec encode_range_type (sh_weapon:range_type()) -> binary(). +-spec encode_range_type (shr_weapon:range_type()) -> binary().  encode_range_type (melee) -> <<"m">>;  encode_range_type (ranged) -> <<"r">>. --spec encode_range_modifier (sh_weapon:range_modifier()) -> binary(). +-spec encode_range_modifier (shr_weapon:range_modifier()) -> binary().  encode_range_modifier (long) -> <<"l">>;  encode_range_modifier (short) -> <<"s">>. --spec encode_damage_type (sh_weapon:damage_type()) -> binary(). +-spec encode_damage_type (shr_weapon:damage_type()) -> binary().  encode_damage_type (slash) -> <<"s">>;  encode_damage_type (pierce) -> <<"p">>;  encode_damage_type (blunt) -> <<"b">>. --spec encode_damage_modifier (sh_weapon:damage_modifier()) -> binary(). +-spec encode_damage_modifier (shr_weapon:damage_modifier()) -> binary().  encode_damage_modifier (heavy) -> <<"h">>;  encode_damage_modifier (light) -> <<"l">>.  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%  %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --spec generate (sh_weapon:type()) -> {list(any())}. +-spec generate (shr_weapon:type()) -> {list(any())}.  generate (Weapon) ->     {        [           {<<"msg">>, <<"add_weapon">>}, -         {<<"id">>, sh_weapon:get_id(Weapon)}, -         {<<"nam">>, sh_weapon:get_name(Weapon)}, -         {<<"rt">>, encode_range_type(sh_weapon:get_range_type(Weapon))}, +         {<<"id">>, shr_weapon:get_id(Weapon)}, +         {<<"nam">>, shr_weapon:get_name(Weapon)}, +         {<<"rt">>, encode_range_type(shr_weapon:get_range_type(Weapon))},           {              <<"rm">>, -            encode_range_modifier(sh_weapon:get_range_modifier(Weapon)) +            encode_range_modifier(shr_weapon:get_range_modifier(Weapon))           }, -         {<<"dt">>, encode_damage_type(sh_weapon:get_damage_type(Weapon))}, +         {<<"dt">>, encode_damage_type(shr_weapon:get_damage_type(Weapon))},           {              <<"dm">>, -            encode_damage_modifier(sh_weapon:get_damage_modifier(Weapon)) +            encode_damage_modifier(shr_weapon:get_damage_modifier(Weapon))           }, -         {<<"cf">>, sh_weapon:get_coefficient(Weapon)} +         {<<"cf">>, shr_weapon:get_coefficient(Weapon)}        ]     }. | 


