| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | src/battle/reply/btl_add_tile.erl | 2 | ||||
| -rw-r--r-- | src/battle/struct/btl_battle.erl | 4 | ||||
| -rw-r--r-- | src/bounty/bnt_join_battle.erl | 4 | ||||
| -rw-r--r-- | src/shared/reply/shr_add_armor.erl | 2 | ||||
| -rw-r--r-- | src/shared/reply/shr_add_glyph.erl | 2 | ||||
| -rw-r--r-- | src/shared/reply/shr_add_glyph_board.erl | 2 | ||||
| -rw-r--r-- | src/shared/reply/shr_add_portrait.erl | 2 | ||||
| -rw-r--r-- | src/shared/reply/shr_add_weapon.erl | 2 | ||||
| -rw-r--r-- | src/shared/struct/map/shr_tile_instance.erl | 3 |
9 files changed, 13 insertions, 10 deletions
diff --git a/src/battle/reply/btl_add_tile.erl b/src/battle/reply/btl_add_tile.erl index 90bcbc9..d706a2b 100644 --- a/src/battle/reply/btl_add_tile.erl +++ b/src/battle/reply/btl_add_tile.erl @@ -20,7 +20,7 @@ generate (Tile) -> { [ - {<<"msg">>, <<"add_tile">>}, + {<<"msg">>, <<"amds_tile">>}, {<<"id">>, shr_tile:get_id(Tile)}, {<<"nam">>, shr_tile:get_name(Tile)}, {<<"ct">>, shr_tile:get_cost(Tile)}, diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl index 164488b..64bcdb6 100644 --- a/src/battle/struct/btl_battle.erl +++ b/src/battle/struct/btl_battle.erl @@ -691,5 +691,7 @@ new (Map) -> players = EmptyDict, current_player_turn = btl_player_turn:new(0, 0), conditions = btl_conditions:new(), - status_indicators = btl_status_indicators:new() + map_conditions = btl_conditions:new(), + status_indicators = btl_status_indicators:new(), + map_status_indicators = btl_status_indicators:new() }. diff --git a/src/bounty/bnt_join_battle.erl b/src/bounty/bnt_join_battle.erl index 3fccccc..f1a8c10 100644 --- a/src/bounty/bnt_join_battle.erl +++ b/src/bounty/bnt_join_battle.erl @@ -87,10 +87,10 @@ create_character (PlayerIX, RosterChar, Map, ForbiddenLocations) -> btl_character:new ( PlayerIX, - optional, Location, ResolvedBaseChar, - btl_conditions:new() + btl_conditions:new(), + btl_status_indicators:new() ), btl_character:to_unresolved(Result). diff --git a/src/shared/reply/shr_add_armor.erl b/src/shared/reply/shr_add_armor.erl index e4a97b0..5bd7467 100644 --- a/src/shared/reply/shr_add_armor.erl +++ b/src/shared/reply/shr_add_armor.erl @@ -20,7 +20,7 @@ generate (Armor) -> { [ - {<<"msg">>, <<"add_armor">>}, + {<<"msg">>, <<"acds_armor">>}, {<<"id">>, shr_armor:get_id(Armor)}, {<<"nam">>, shr_armor:get_name(Armor)}, {<<"omni">>, shr_omnimods:encode(shr_armor:get_omnimods(Armor))} diff --git a/src/shared/reply/shr_add_glyph.erl b/src/shared/reply/shr_add_glyph.erl index cea10d2..b3ab86e 100644 --- a/src/shared/reply/shr_add_glyph.erl +++ b/src/shared/reply/shr_add_glyph.erl @@ -20,7 +20,7 @@ generate (Glyph) -> { [ - {<<"msg">>, <<"add_glyph">>}, + {<<"msg">>, <<"acds_glyph">>}, {<<"id">>, shr_glyph:get_id(Glyph)}, {<<"nam">>, shr_glyph:get_name(Glyph)}, {<<"fam">>, shr_glyph:get_family_id(Glyph)}, diff --git a/src/shared/reply/shr_add_glyph_board.erl b/src/shared/reply/shr_add_glyph_board.erl index 5776568..3c688ac 100644 --- a/src/shared/reply/shr_add_glyph_board.erl +++ b/src/shared/reply/shr_add_glyph_board.erl @@ -20,7 +20,7 @@ generate (GlyphBoard) -> { [ - {<<"msg">>, <<"add_glyph_board">>}, + {<<"msg">>, <<"acds_glyph_board">>}, {<<"id">>, shr_glyph_board:get_id(GlyphBoard)}, {<<"nam">>, shr_glyph_board:get_name(GlyphBoard)}, {<<"slot">>, shr_glyph_board:get_slots(GlyphBoard)} diff --git a/src/shared/reply/shr_add_portrait.erl b/src/shared/reply/shr_add_portrait.erl index 7c031b4..0654f3b 100644 --- a/src/shared/reply/shr_add_portrait.erl +++ b/src/shared/reply/shr_add_portrait.erl @@ -20,7 +20,7 @@ generate (Portrait) -> { [ - {<<"msg">>, <<"add_portrait">>}, + {<<"msg">>, <<"acds_portrait">>}, {<<"id">>, shr_portrait:get_id(Portrait)}, {<<"nam">>, shr_portrait:get_name(Portrait)}, {<<"bid">>, shr_portrait:get_body_id(Portrait)}, diff --git a/src/shared/reply/shr_add_weapon.erl b/src/shared/reply/shr_add_weapon.erl index bd8dfb5..9c562cc 100644 --- a/src/shared/reply/shr_add_weapon.erl +++ b/src/shared/reply/shr_add_weapon.erl @@ -20,7 +20,7 @@ generate (Weapon) -> { [ - {<<"msg">>, <<"add_weapon">>}, + {<<"msg">>, <<"acds_weapon">>}, {<<"id">>, shr_weapon:get_id(Weapon)}, {<<"nam">>, shr_weapon:get_name(Weapon)}, {<<"rmi">>, shr_weapon:get_minimum_range(Weapon)}, diff --git a/src/shared/struct/map/shr_tile_instance.erl b/src/shared/struct/map/shr_tile_instance.erl index 7f53b5f..8968b8a 100644 --- a/src/shared/struct/map/shr_tile_instance.erl +++ b/src/shared/struct/map/shr_tile_instance.erl @@ -3,10 +3,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --opaque type() :: +-type type() :: { shr_tile:id(), shr_tile:variant_id(), + list(binary()), orddict:orddict ( shr_condition:trigger(), |