aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-12-09 18:02:19 +0100
committernsensfel <SpamShield0@noot-noot.org>2019-12-09 18:02:19 +0100
commitec10e2816562873c17f7631bd19c2e4aa931aabf (patch)
tree6dcbb96500d5c2a25f0267c625ede6444499651e
parent8c7d813afb79cbe838be314141224865abd9e4fd (diff)
downloadtacticians-server-skills_and_conditions.zip
tacticians-server-skills_and_conditions.tar.bz2
Map marker -> (StatusIndictator, Condition)...skills_and_conditions
-rw-r--r--src/battle/struct/btl_battle.erl4
-rw-r--r--src/battle/struct/btl_conditions.erl1
-rw-r--r--src/battle/struct/btl_status_indicators.erl3
-rw-r--r--src/shared/struct/map/shr_tile_instance.erl9
4 files changed, 12 insertions, 5 deletions
diff --git a/src/battle/struct/btl_battle.erl b/src/battle/struct/btl_battle.erl
index e914626..164488b 100644
--- a/src/battle/struct/btl_battle.erl
+++ b/src/battle/struct/btl_battle.erl
@@ -16,7 +16,9 @@
players :: orddict:orddict(non_neg_integer(), btl_player:type()),
current_player_turn :: btl_player_turn:type(),
conditions :: btl_conditions:type(),
- status_indicators :: btl_status_indicators:type()
+ map_conditions :: btl_conditions:type(),
+ status_indicators :: btl_status_indicators:type(),
+ map_status_indicators :: btl_status_indicators:type()
}
).
diff --git a/src/battle/struct/btl_conditions.erl b/src/battle/struct/btl_conditions.erl
index d60055d..bd5161b 100644
--- a/src/battle/struct/btl_conditions.erl
+++ b/src/battle/struct/btl_conditions.erl
@@ -9,6 +9,7 @@
(
{char, non_neg_integer(), non_neg_integer()}
| {battle, non_neg_integer()}
+ | {map, non_neg_integer()}
).
-record
diff --git a/src/battle/struct/btl_status_indicators.erl b/src/battle/struct/btl_status_indicators.erl
index 9ffa5ea..4227cdf 100644
--- a/src/battle/struct/btl_status_indicators.erl
+++ b/src/battle/struct/btl_status_indicators.erl
@@ -14,6 +14,7 @@
(
{char, non_neg_integer(), non_neg_integer()}
| {battle, non_neg_integer()}
+ | {map, non_neg_integer()}
).
-record
@@ -64,6 +65,8 @@
-export
(
[
+ add_at/5,
+ ataxia_add/5,
add/4,
ataxia_add/4,
remove/2,
diff --git a/src/shared/struct/map/shr_tile_instance.erl b/src/shared/struct/map/shr_tile_instance.erl
index 1739207..7f53b5f 100644
--- a/src/shared/struct/map/shr_tile_instance.erl
+++ b/src/shared/struct/map/shr_tile_instance.erl
@@ -3,14 +3,15 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
--type display_data() :: list(binary()).
-
-opaque type() ::
{
shr_tile:id(),
shr_tile:variant_id(),
- display_data(),
- ordsets:ordset(shr_map_marker:name())
+ orddict:orddict
+ (
+ shr_condition:trigger(),
+ ordsets:ordset(non_neg_integer())
+ )
}.
-export_type([type/0]).