| summaryrefslogtreecommitdiff |
diff options
| -rw-r--r-- | tile/error.m4d | 8 | ||||
| -rw-r--r-- | tile/global.m4.conf | 21 | ||||
| -rw-r--r-- | tile/grassland.m4d | 24 | ||||
| -rw-r--r-- | tile/mud.m4d | 8 | ||||
| -rw-r--r-- | tile/water.m4d | 8 | ||||
| -rw-r--r-- | weapon/basic.m4d | 80 | ||||
| -rw-r--r-- | weapon/global.m4.conf | 31 |
7 files changed, 146 insertions, 34 deletions
diff --git a/tile/error.m4d b/tile/error.m4d index 11b9a8e..1e15875 100644 --- a/tile/error.m4d +++ b/tile/error.m4d @@ -1,2 +1,8 @@ __TILE_CATEGORY(`Error', 0, 0)m4_dnl -__TILE_CLASS(0, `Error', __TILE_COST_WHEN_OCCUPIED) +__TILE_CLASS(0, + `Error', + __TILE_COST_WHEN_OCCUPIED, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl diff --git a/tile/global.m4.conf b/tile/global.m4.conf index 178f516..57b12d9 100644 --- a/tile/global.m4.conf +++ b/tile/global.m4.conf @@ -1,3 +1,4 @@ +m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl 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 @@ -7,6 +8,10 @@ m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') -> id = $1, name = <<"[__TILE_CATEGORY_NAME] $2">>, cost = $3, + attr_mod = $4, + stat_mod = $5, + atk_mod = $6, + def_mod = $7 family = __TILE_CATEGORY_FAMILY, depth = __TILE_CATEGORY_DEPTH };')m4_dnl @@ -15,17 +20,25 @@ m4_define(`__TILE_CLASS_PARTIAL_ERLANG_STYLE',`from_class_id (`$1') -> { id = $1, name = <<"[__TILE_CATEGORY_NAME] $2">>, - cost = $3 + cost = $3, + attr_mod = $4, + stat_mod = $5, + atk_mod = $6, + def_mod = $7 };')m4_dnl m4_define(`__TILE_CLASS_JSON_STYLE',` { "msg": "add_tile", "id": $1, "nam": "[__TILE_CATEGORY_NAME] $2", "ct": $3, + "attm": $4, + "stam": $5, + "atkm": $6, + "defm": $7 "fa": __TILE_CATEGORY_FAMILY, "de": __TILE_CATEGORY_DEPTH },')m4_dnl m4_define(`__TILE_CATEGORY',`m4_define(`__TILE_CATEGORY_NAME', `$1')m4_define(`__TILE_CATEGORY_FAMILY', `$2')m4_define(`__TILE_CATEGORY_DEPTH', `$3')')m4_dnl -m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')')m4_dnl -m4_define(`__TILE_CLASS_USE_PARTIAL_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_PARTIAL_ERLANG_STYLE')')m4_dnl -m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')')m4_dnl +m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl +m4_define(`__TILE_CLASS_USE_PARTIAL_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_PARTIAL_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl +m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl diff --git a/tile/grassland.m4d b/tile/grassland.m4d index 9240730..177f1ff 100644 --- a/tile/grassland.m4d +++ b/tile/grassland.m4d @@ -1,4 +1,22 @@ __TILE_CATEGORY(`Grassland', 1, 2)m4_dnl -__TILE_CLASS(1, `Grass', 6) -__TILE_CLASS(3, `Mushroom Infestation', 12) -__TILE_CLASS(5, `Tree Remains', 24) +__TILE_CLASS(1, + `Grass', + 6, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl +__TILE_CLASS(3, + `Mushroom Infestation', + 12, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl +__TILE_CLASS(5, + `Tree Remains', + 24, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl diff --git a/tile/mud.m4d b/tile/mud.m4d index 0236b3c..6f798e3 100644 --- a/tile/mud.m4d +++ b/tile/mud.m4d @@ -1,2 +1,8 @@ __TILE_CATEGORY(`Mud', 2, 2)m4_dnl -__TILE_CLASS(2, `Mud', 30)m4_dnl +__TILE_CLASS(2, + `Mud', + 30, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl diff --git a/tile/water.m4d b/tile/water.m4d index 7f3ef7d..671b782 100644 --- a/tile/water.m4d +++ b/tile/water.m4d @@ -1,2 +1,8 @@ __TILE_CATEGORY(`Water', 3, 1)m4_dnl -__TILE_CLASS(4, `Clear Water', __TILE_COST_WHEN_OCCUPIED) +__TILE_CLASS(4, + `Clear Water', + __TILE_COST_WHEN_OCCUPIED, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl diff --git a/weapon/basic.m4d b/weapon/basic.m4d index 7824217..8dfbd61 100644 --- a/weapon/basic.m4d +++ b/weapon/basic.m4d @@ -1,11 +1,75 @@ -__WEAPON(0,None,melee,short,blunt,light,0.3)m4_dnl -__WEAPON(1,Dagger,melee,short,slash,light,1.0)m4_dnl -__WEAPON(2,Sword,melee,short,slash,heavy,1.0)m4_dnl -__WEAPON(3,Claymore,melee,long,slash,light,1.0)m4_dnl -__WEAPON(4,Bardiche,melee,long,slash,heavy,1.0)m4_dnl -__WEAPON(5,Stiletto,melee,short,pierce,light,1.0)m4_dnl -__WEAPON(6,Pickaxe,melee,short,pierce,heavy,1.0)m4_dnl -__WEAPON(7,Rapier,melee,long,pierce,light,1.0)m4_dnl +__WEAPON(0, + Unarmed, + 0, + 1, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_BLUNT(5)), + __MOD_LIST()))m4_dnl +__WEAPON(1, + Old Dagger, + 0, + 1, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(10)__MOD_PIERCE(10)), + __MOD_LIST(__MOD_SPEED(-5)))m4_dnl +__WEAPON(2, + Old Sword, + 0, + 1, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(20)__MOD_PIERCE(10)), + __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)))m4_dnl +__WEAPON(3, + Old Claymore, + 0, + 2, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(20)__MOD_PIERCE(10)), + __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)))m4_dnl +__WEAPON(4, + Old Bardiche, + 0, + 3, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(20)__MOD_PIERCE(10)), + __MOD_LIST(__MOD_SPEED(-17)__MOD_DEXTERITY(-30)))m4_dnl +__WEAPON(5, + Old Stiletto, + 0, + 1, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_PIERCE(20)__MOD_SLASH(10)), + __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)))m4_dnl +__WEAPON(6, + Old Pickaxe, + 0, + 2, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_PIERCE(30)), + __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl +__WEAPON(7, + Old Rapier, + 0, + 1, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_PIERCE(30)__MOD_SLASH(10)), + __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)))m4_dnl +__WEAPON(8, + Old Pike, + 0, + 3, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_PIERCE(30)__MOD_SLASH(10)), + __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-30)))m4_dnl __WEAPON(8,Pike,melee,long,pierce,heavy,1.0)m4_dnl __WEAPON(9,Club,melee,short,blunt,light,1.0)m4_dnl __WEAPON(10,Mace,melee,short,blunt,heavy,1.0)m4_dnl diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf index d733be0..498ea01 100644 --- a/weapon/global.m4.conf +++ b/weapon/global.m4.conf @@ -1,30 +1,29 @@ +m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl m4_define(`__WEAPON_CHOOSE_STYLE', `m4_define(`__WEAPON',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl m4_define(`__WEAPON_ERLANG_STYLE',`from_id (`$1') -> #weapon { id = $1, name = <<"$2">>, - range_type = $3, - range_mod = $4, - damage_type = $5, - damage_mod = $6, - coef = $7 + max_range = $3, + min_range = $4, + attr_mod = $5, + stat_mod = $6, + atk_mod = $7, + def_mod = $8 }; ')m4_dnl -m4_define(`__WEAPON_RANGE_TYPE_TO_CHAR',`m4_ifelse($1,melee,m,$1,ranged,r)')m4_dnl -m4_define(`__WEAPON_RANGE_MOD_TO_CHAR',`m4_ifelse($1,long,l,$1,short,s)')m4_dnl -m4_define(`__WEAPON_DAMAGE_TYPE_TO_CHAR',`m4_ifelse($1,slash,s,$1,pierce,p,$1,blunt,b)')m4_dnl -m4_define(`__WEAPON_DAMAGE_MOD_TO_CHAR',`m4_ifelse($1,heavy,h,$1,light,l)')m4_dnl m4_define(`__WEAPON_JSON_STYLE',` { "msg": "add_weapon", "id": $1, "nam": "$2", - "rt": "__WEAPON_RANGE_TYPE_TO_CHAR($3)", - "rm": "__WEAPON_RANGE_MOD_TO_CHAR($4)", - "dt": "__WEAPON_DAMAGE_TYPE_TO_CHAR($5)", - "dm": "__WEAPON_DAMAGE_MOD_TO_CHAR($6)", - "cf": $7 + "rma": $3, + "rmi": $4, + "attm": $5, + "stam": $6, + "atkm": $7, + "defm": $8 }, ')m4_dnl -m4_define(`__WEAPON_USE_ERLANG_STYLE',`__WEAPON_CHOOSE_STYLE(`__WEAPON_ERLANG_STYLE')')m4_dnl -m4_define(`__WEAPON_USE_JSON_STYLE',`__WEAPON_CHOOSE_STYLE(`__WEAPON_JSON_STYLE')')m4_dnl +m4_define(`__WEAPON_USE_ERLANG_STYLE',`__WEAPON_CHOOSE_STYLE(`__WEAPON_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl +m4_define(`__WEAPON_USE_JSON_STYLE',`__WEAPON_CHOOSE_STYLE(`__WEAPON_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl |