From b60978b4dacb355fbd12779fb4f8089a7321883d Mon Sep 17 00:00:00 2001 From: nsensfel Date: Fri, 13 Jul 2018 16:02:58 +0200 Subject: Split data into tacticians-data. --- Makefile | 2 +- data/tile/global.m4.conf | 23 ----------- data/tile/grassland.m4d | 5 --- src/battle/struct/btl_tile.erl | 10 +++-- src/battle/struct/btl_tile.erl.m4 | 8 ++-- src/shared/struct/shr_armor.erl | 20 +++++++--- src/shared/struct/shr_weapon.erl | 81 ++++++++++++++++++++++++++------------- 7 files changed, 80 insertions(+), 69 deletions(-) delete mode 100644 data/tile/global.m4.conf delete mode 100644 data/tile/grassland.m4d diff --git a/Makefile b/Makefile index 9837720..91dc448 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ BIN_DIR ?= ${CURDIR}/ebin INCLUDE_DIR ?= ${CURDIR}/include WWW_DIR ?= ${CURDIR}/www LOG_DIR ?= ${CURDIR}/log -DATA_DIR ?= ${CURDIR}/data +DATA_DIR ?= /my/src/tacticians-data/ ## Local only? #ERL_NAME_VS_SNAME ?= -name diff --git a/data/tile/global.m4.conf b/data/tile/global.m4.conf deleted file mode 100644 index c470c7c..0000000 --- a/data/tile/global.m4.conf +++ /dev/null @@ -1,23 +0,0 @@ -m4_define(`__TILE_CHOOSE_STYLE', `m4_define(`__TILE_CLASS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl -m4_define(`__TILE_COST_WHEN_OCCUPIED', 201)m4_dnl -m4_define(`__TILE_COST_WHEN_OOB', 255)m4_dnl -m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_id (`$1') -> - #tile - { - id = $1, - name = <<"[__TILE_CATEGORY_NAME] $2">>, - cost = $3, - class_range_min = $4, - class_range_max = $5 - };')m4_dnl -m4_define(`__TILE_CLASS_JSON_STYLE',` { - "msg": "add_tile", - "id": $1, - "nam": "[__TILE_CATEGORY_NAME] $2", - "ct": $3, - "rmi": $4, - "rma": $5 - },')m4_dnl -m4_define(`__TILE_CATEGORY',`m4_define(`__TILE_CATEGORY_NAME', `$1')')m4_dnl -m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')')m4_dnl -m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')')m4_dnl diff --git a/data/tile/grassland.m4d b/data/tile/grassland.m4d deleted file mode 100644 index 7d4c943..0000000 --- a/data/tile/grassland.m4d +++ /dev/null @@ -1,5 +0,0 @@ -__TILE_CATEGORY(`Grassland')m4_dnl -__TILE_CLASS(0, `Grass', 6, 0, 0) -__TILE_CLASS(1, `Mushroom Infestation', 12, 1, 1) -__TILE_CLASS(2, `Tree Remains', 24, 2, 2) -__TILE_CLASS(3, `Clear Water', __TILE_COST_WHEN_OCCUPIED, 3, 17) diff --git a/src/battle/struct/btl_tile.erl b/src/battle/struct/btl_tile.erl index 479e37e..3abfb9c 100644 --- a/src/battle/struct/btl_tile.erl +++ b/src/battle/struct/btl_tile.erl @@ -55,10 +55,12 @@ -spec class_id_to_type_id (class_id()) -> id(). class_id_to_type_id (ClassID) -> case ClassID of - 0 -> 0; - 1 -> 1; - 2 -> 2; - N when ((N >= 3) and (N =< 17)) -> 3 + + N when ((N >= 0) and (N =< 0)) -> 0; + N when ((N >= 1) and (N =< 1)) -> 1; + N when ((N >= 2) and (N =< 2)) -> 2; + N when ((N >= 3) and (N =< 17)) -> 3; + _ -> 0 end. -spec from_id (id()) -> type(). diff --git a/src/battle/struct/btl_tile.erl.m4 b/src/battle/struct/btl_tile.erl.m4 index 8c884ca..7a8ea21 100644 --- a/src/battle/struct/btl_tile.erl.m4 +++ b/src/battle/struct/btl_tile.erl.m4 @@ -55,10 +55,10 @@ -spec class_id_to_type_id (class_id()) -> id(). class_id_to_type_id (ClassID) -> case ClassID of - 0 -> 0; - 1 -> 1; - 2 -> 2; - N when ((N >= 3) and (N =< 17)) -> 3 +m4_include(__MAKEFILE_DATA_DIR/tile/global.m4.conf)m4_dnl +__TILE_CLASS_USE_ERLANG_SELECT_STYLE +m4_include(__MAKEFILE_DATA_DIR/tile/grassland.m4d)m4_dnl + _ -> 0 end. -spec from_id (id()) -> type(). diff --git a/src/shared/struct/shr_armor.erl b/src/shared/struct/shr_armor.erl index 65445ca..fa516f3 100644 --- a/src/shared/struct/shr_armor.erl +++ b/src/shared/struct/shr_armor.erl @@ -69,41 +69,49 @@ get_coefficient (Ar) -> Ar#armor.coef. get_category (Ar) -> Ar#armor.category. -spec from_id (id()) -> type(). + from_id (0) -> - #armor{ + #armor + { id = 0, name = <<"None">>, category = leather, coef = 0.0 }; from_id (1) -> - #armor{ + #armor + { id = 1, name = <<"Last Meal's Pelts">>, category = leather, coef = 0.5 }; from_id (2) -> - #armor{ + #armor + { id = 2, name = <<"Bits of Wall">>, category = plate, coef = 0.5 }; from_id (3) -> - #armor{ + #armor + { id = 3, name = <<"Garden Fence">>, category = chain, coef = 0.5 }; from_id (4) -> - #armor{ + #armor + { id = 4, name = <<"Morrigan's Pity">>, category = kinetic, coef = 0.5 - }. + }; +from_id(_) -> + from_id(0). -spec random_id () -> id(). random_id () -> shr_roll:between(0, 4). diff --git a/src/shared/struct/shr_weapon.erl b/src/shared/struct/shr_weapon.erl index 3ecb749..ade46f8 100644 --- a/src/shared/struct/shr_weapon.erl +++ b/src/shared/struct/shr_weapon.erl @@ -130,8 +130,10 @@ get_damages (Wp) -> can_parry (Wp) -> (Wp#weapon.range_type == melee). -spec from_id (id()) -> type(). + from_id (0) -> - #weapon{ + #weapon + { id = 0, name = <<"None">>, range_type = melee, @@ -141,7 +143,8 @@ from_id (0) -> coef = 0.3 }; from_id (1) -> - #weapon{ + #weapon + { id = 1, name = <<"Dagger">>, range_type = melee, @@ -151,7 +154,8 @@ from_id (1) -> coef = 1.0 }; from_id (2) -> - #weapon{ + #weapon + { id = 2, name = <<"Sword">>, range_type = melee, @@ -161,7 +165,8 @@ from_id (2) -> coef = 1.0 }; from_id (3) -> - #weapon{ + #weapon + { id = 3, name = <<"Claymore">>, range_type = melee, @@ -171,7 +176,8 @@ from_id (3) -> coef = 1.0 }; from_id (4) -> - #weapon{ + #weapon + { id = 4, name = <<"Bardiche">>, range_type = melee, @@ -181,7 +187,8 @@ from_id (4) -> coef = 1.0 }; from_id (5) -> - #weapon{ + #weapon + { id = 5, name = <<"Stiletto">>, range_type = melee, @@ -191,7 +198,8 @@ from_id (5) -> coef = 1.0 }; from_id (6) -> - #weapon{ + #weapon + { id = 6, name = <<"Pickaxe">>, range_type = melee, @@ -201,7 +209,8 @@ from_id (6) -> coef = 1.0 }; from_id (7) -> - #weapon{ + #weapon + { id = 7, name = <<"Rapier">>, range_type = melee, @@ -211,7 +220,8 @@ from_id (7) -> coef = 1.0 }; from_id (8) -> - #weapon{ + #weapon + { id = 8, name = <<"Pike">>, range_type = melee, @@ -221,7 +231,8 @@ from_id (8) -> coef = 1.0 }; from_id (9) -> - #weapon{ + #weapon + { id = 9, name = <<"Club">>, range_type = melee, @@ -231,7 +242,8 @@ from_id (9) -> coef = 1.0 }; from_id (10) -> - #weapon{ + #weapon + { id = 10, name = <<"Mace">>, range_type = melee, @@ -241,7 +253,8 @@ from_id (10) -> coef = 1.0 }; from_id (11) -> - #weapon{ + #weapon + { id = 11, name = <<"Staff">>, range_type = melee, @@ -251,7 +264,8 @@ from_id (11) -> coef = 1.0 }; from_id (12) -> - #weapon{ + #weapon + { id = 12, name = <<"War Hammer">>, range_type = melee, @@ -261,7 +275,8 @@ from_id (12) -> coef = 1.0 }; from_id (13) -> - #weapon{ + #weapon + { id = 13, name = <<"Short Bow (Broadhead)">>, range_type = ranged, @@ -271,7 +286,8 @@ from_id (13) -> coef = 1.0 }; from_id (14) -> - #weapon{ + #weapon + { id = 14, name = <<"Short Bow (Blunt)">>, range_type = ranged, @@ -281,7 +297,8 @@ from_id (14) -> coef = 1.0 }; from_id (15) -> - #weapon{ + #weapon + { id = 15, name = <<"Short Bow (Bodkin Point)">>, range_type = ranged, @@ -291,7 +308,8 @@ from_id (15) -> coef = 1.0 }; from_id (16) -> - #weapon{ + #weapon + { id = 16, name = <<"Long Bow (Broadhead)">>, range_type = ranged, @@ -301,7 +319,8 @@ from_id (16) -> coef = 1.0 }; from_id (17) -> - #weapon{ + #weapon + { id = 17, name = <<"Long Bow (Blunt)">>, range_type = ranged, @@ -311,7 +330,8 @@ from_id (17) -> coef = 1.0 }; from_id (18) -> - #weapon{ + #weapon + { id = 18, name = <<"Long Bow (Bodkin Point)">>, range_type = ranged, @@ -321,7 +341,8 @@ from_id (18) -> coef = 1.0 }; from_id (19) -> - #weapon{ + #weapon + { id = 19, name = <<"Crossbow (Broadhead)">>, range_type = ranged, @@ -331,7 +352,8 @@ from_id (19) -> coef = 1.0 }; from_id (20) -> - #weapon{ + #weapon + { id = 20, name = <<"Crossbow (Blunt)">>, range_type = ranged, @@ -341,7 +363,8 @@ from_id (20) -> coef = 1.0 }; from_id (21) -> - #weapon{ + #weapon + { id = 21, name = <<"Crossbow (Bodkin Point)">>, range_type = ranged, @@ -351,7 +374,8 @@ from_id (21) -> coef = 1.0 }; from_id (22) -> - #weapon{ + #weapon + { id = 22, name = <<"Arbalest (Broadhead)">>, range_type = ranged, @@ -361,7 +385,8 @@ from_id (22) -> coef = 1.0 }; from_id (23) -> - #weapon{ + #weapon + { id = 23, name = <<"Arbalest (Blunt)">>, range_type = ranged, @@ -371,7 +396,8 @@ from_id (23) -> coef = 1.0 }; from_id (24) -> - #weapon{ + #weapon + { id = 24, name = <<"Arbalest (Bodkin Point)">>, range_type = ranged, @@ -379,7 +405,10 @@ from_id (24) -> damage_type = pierce, damage_mod = heavy, coef = 1.0 - }. + }; +from_id (_) -> + from_id(0). + -spec random_id () -> id(). random_id () -> shr_roll:between(0, 24). -- cgit v1.2.3-70-g09d2