| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | include/damage_types.hrl.m4 | 16 | ||||
| -rw-r--r-- | src/balancer/struct/blc_armor.erl | 2 | ||||
| -rw-r--r-- | src/battle/query/btl_character_turn.erl | 2 | ||||
| -rw-r--r-- | src/login/query/lgn_get_player_id.erl | 2 | ||||
| -rw-r--r-- | src/player/query/plr_get_battles.erl | 2 | ||||
| -rw-r--r-- | src/shared/struct/shr_damage_type.erl | 27 | ||||
| -rw-r--r-- | src/shared/struct/shr_query.erl | 2 |
8 files changed, 49 insertions, 6 deletions
@@ -18,7 +18,7 @@ ERL_NAME_VS_SNAME ?= -sname ## Binaries ERLC ?= erlc -ERLC_OPTS ?= +ERLC_OPTS ?= -I $(INCLUDE_DIR) ERL ?= erl ERL_OPTS ?= -connect_all false -pa `find $(BIN_DIR) -type d` diff --git a/include/damage_types.hrl.m4 b/include/damage_types.hrl.m4 new file mode 100644 index 0000000..df82e59 --- /dev/null +++ b/include/damage_types.hrl.m4 @@ -0,0 +1,16 @@ +m4_include(__MAKEFILE_DATA_DIR/names.m4.conf) + +-define(DAMAGE_TYPE_SLASH, __SN_SLASH). +-define(DAMAGE_TYPE_PIERCE, __SN_PIERCE). +-define(DAMAGE_TYPE_BLUNT, __SN_BLUNT). + +% Synonyms for blunt damage. +-define(DAMAGE_TYPE_BLUDGEONING, ?DAMAGE_TYPE_BLUNT). +-define(DAMAGE_TYPE_IMPACT, ?DAMAGE_TYPE_BLUNT). + +% Synonyms for pierce damage. +-define(DAMAGE_TYPE_PIERCING, ?DAMAGE_TYPE_PIERCE). +-define(DAMAGE_TYPE_PUNCTURE, ?DAMAGE_TYPE_PIERCE). + +% Synonyms for slash damage. +-define(DAMAGE_TYPE_SLASHING, ?DAMAGE_TYPE_SLASH). diff --git a/src/balancer/struct/blc_armor.erl b/src/balancer/struct/blc_armor.erl index d8fafd8..d3c3daf 100644 --- a/src/balancer/struct/blc_armor.erl +++ b/src/balancer/struct/blc_armor.erl @@ -1,6 +1,6 @@ -module(blc_armor). --include("../../../include/base_attributes.hrl"). +-include("base_attributes.hrl"). -define ( diff --git a/src/battle/query/btl_character_turn.erl b/src/battle/query/btl_character_turn.erl index 1176355..4f96552 100644 --- a/src/battle/query/btl_character_turn.erl +++ b/src/battle/query/btl_character_turn.erl @@ -3,7 +3,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). +-include("yaws_api.hrl"). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/login/query/lgn_get_player_id.erl b/src/login/query/lgn_get_player_id.erl index 2056cec..f7c0439 100644 --- a/src/login/query/lgn_get_player_id.erl +++ b/src/login/query/lgn_get_player_id.erl @@ -3,7 +3,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). +-include("yaws_api.hrl"). %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/player/query/plr_get_battles.erl b/src/player/query/plr_get_battles.erl index 4b00ed8..02ed354 100644 --- a/src/player/query/plr_get_battles.erl +++ b/src/player/query/plr_get_battles.erl @@ -6,7 +6,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). +-include("yaws_api.hrl"). -record ( diff --git a/src/shared/struct/shr_damage_type.erl b/src/shared/struct/shr_damage_type.erl new file mode 100644 index 0000000..9bcd79f --- /dev/null +++ b/src/shared/struct/shr_damage_type.erl @@ -0,0 +1,27 @@ +-module(shr_damage_type). + +-include("damage_types.hrl"). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +-opaque type() :: + ( + ?DAMAGE_TYPE_SLASH + | ?DAMAGE_TYPE_PIERCE + | ?DAMAGE_TYPE_BLUNT + ). + +-export_type([type/0]). + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% LOCAL FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%% EXPORTED FUNCTIONS %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/shared/struct/shr_query.erl b/src/shared/struct/shr_query.erl index e85f204..42bc263 100644 --- a/src/shared/struct/shr_query.erl +++ b/src/shared/struct/shr_query.erl @@ -3,7 +3,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% TYPES %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% --include("../../../include/yaws_api.hrl"). +-include("yaws_api.hrl"). -record ( |