| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'armor')
| -rw-r--r-- | armor/basic.m4d | 35 | ||||
| -rw-r--r-- | armor/global.m4.conf | 18 |
2 files changed, 41 insertions, 12 deletions
diff --git a/armor/basic.m4d b/armor/basic.m4d index 2d4e3a8..f99c0b1 100644 --- a/armor/basic.m4d +++ b/armor/basic.m4d @@ -1,5 +1,30 @@ -__ARMOR(0,None,leather,0.0)m4_dnl -__ARMOR(1,Last Meal's Pelts,leather,0.5)m4_dnl -__ARMOR(2,Bits of Wall,plate,0.5)m4_dnl -__ARMOR(3,Garden Fence,chain,0.5)m4_dnl -__ARMOR(4,Morrigan's Pity,kinetic,0.5)m4_dnl +__ARMOR(0, + None, + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST())m4_dnl +__ARMOR(1, + Meal Pelts, + __MOD_LIST(__MOD_CONSTITUTION(-5)__MOD_DEXTERITY(-5)), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(10)__MOD_BLUNT(10)__MOD_PIERCE(10)))m4_dnl +__ARMOR(2, + Wall Bits, + __MOD_LIST(__MOD_CONSTITUTION(-5)__MOD_DEXTERITY(-5)__MOD_SPEED(-10)__MOD_STRENGTH(-10)), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(15)__MOD_BLUNT(10)__MOD_PIERCE(15)))m4_dnl +__ARMOR(3, + Garden Fence, + __MOD_LIST(__MOD_CONSTITUTION(-5)__MOD_DEXTERITY(-5)__MOD_SPEED(-10)), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_SLASH(15)__MOD_BLUNT(10)__MOD_PIERCE(10)))m4_dnl +__ARMOR(4, + Morrigan's Pity, + __MOD_LIST(__MOD_MIND(-10)), + __MOD_LIST(), + __MOD_LIST(), + __MOD_LIST(__MOD_BLUNT(15)__MOD_PIERCE(10)))m4_dnl diff --git a/armor/global.m4.conf b/armor/global.m4.conf index 871fcb3..4813060 100644 --- a/armor/global.m4.conf +++ b/armor/global.m4.conf @@ -1,21 +1,25 @@ +m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl m4_define(`__ARMOR_CHOOSE_STYLE', `m4_define(`__ARMOR',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl m4_define(`__ARMOR_ERLANG_STYLE',`from_id (`$1') -> #armor { id = $1, name = <<"$2">>, - category = $3, - coef = $4 + attr_mod = $3, + stat_mod = $4, + atk_mod = $5, + def_mod = $6 }; ')m4_dnl -m4_define(`__ARMOR_CATEGORY_TO_CHAR',`m4_ifelse($1,kinetic,j,$1,leather,l,$1,chain,c,$1,plate,p)')m4_dnl m4_define(`__ARMOR_JSON_STYLE',` { "msg": "add_armor", "id": $1, "nam": "$2", - "ct": "__ARMOR_CATEGORY_TO_CHAR($3)", - "cf": $4 + "attm": $3, + "stam": $4, + "atkm": $5, + "defm": $6 }, ')m4_dnl -m4_define(`__ARMOR_USE_ERLANG_STYLE',`__ARMOR_CHOOSE_STYLE(`__ARMOR_ERLANG_STYLE')')m4_dnl -m4_define(`__ARMOR_USE_JSON_STYLE',`__ARMOR_CHOOSE_STYLE(`__ARMOR_JSON_STYLE')')m4_dnl +m4_define(`__ARMOR_USE_ERLANG_STYLE',`__ARMOR_CHOOSE_STYLE(`__ARMOR_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl +m4_define(`__ARMOR_USE_JSON_STYLE',`__ARMOR_CHOOSE_STYLE(`__ARMOR_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl |