summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--armor/global.m4.conf36
-rw-r--r--glyph/global.m4.conf32
-rw-r--r--glyph_board/global.m4.conf34
-rw-r--r--omnimods.m4.conf (renamed from modifiers.m4.conf)52
-rw-r--r--tile/global.m4.conf49
-rw-r--r--weapon/global.m4.conf36
6 files changed, 157 insertions, 82 deletions
diff --git a/armor/global.m4.conf b/armor/global.m4.conf
index 4813060..bf53ea9 100644
--- a/armor/global.m4.conf
+++ b/armor/global.m4.conf
@@ -1,25 +1,37 @@
-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_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__ARMOR_CHOOSE_STYLE',
+ `m4_define(`__ARMOR',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__ARMOR_ERLANG_STYLE',`from_id (`$1') ->
#armor
{
id = $1,
name = <<"$2">>,
- attr_mod = $3,
- stat_mod = $4,
- atk_mod = $5,
- def_mod = $6
+ omnimods = __OMNIMODS($3, $4, $5, $6)
};
')m4_dnl
+m4_define(`__ARMOR_USE_ERLANG_STYLE',
+ `__ARMOR_CHOOSE_STYLE(`__ARMOR_ERLANG_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__ARMOR_JSON_STYLE',` {
"msg": "add_armor",
"id": $1,
"nam": "$2",
- "attm": $3,
- "stam": $4,
- "atkm": $5,
- "defm": $6
+ "omni": __OMNIMODS($3, $4, $5, $6)
},
')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
+m4_define(`__ARMOR_USE_JSON_STYLE',
+ `__ARMOR_CHOOSE_STYLE(`__ARMOR_JSON_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_ifelse(__CODE_STYLE(),
+ erlang, __ARMOR_USE_ERLANG_STYLE(),
+ __CODE_STYLE, json, __ARMOR_USE_JSON_STYLE())m4_dnl
diff --git a/glyph/global.m4.conf b/glyph/global.m4.conf
index fafef02..69d9bdf 100644
--- a/glyph/global.m4.conf
+++ b/glyph/global.m4.conf
@@ -1,25 +1,35 @@
-m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl
-m4_define(`__GLYPH_CHOOSE_STYLE', `m4_define(`__GLYPH',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__GLYPH_CHOOSE_STYLE',
+ `m4_define(`__GLYPH',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__GLYPH_ERLANG_STYLE',`from_id (`$1') ->
#glyph
{
id = $1,
name = <<"$2">>,
- attr_mod = $3,
- stat_mod = $4,
- atk_mod = $5,
- def_mod = $6
+ omnimods = __OMNIMODS($3, $4, $5, $6)
};
')m4_dnl
+m4_define(`__GLYPH_USE_ERLANG_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__GLYPH_JSON_STYLE',` {
"msg": "add_glyph",
"id": $1,
"nam": "$2",
- "attm": $3,
- "stam": $4,
- "atkm": $5,
- "defm": $6
+ "omni": __OMNIMODS($3, $4, $5, $6)
},
')m4_dnl
-m4_define(`__GLYPH_USE_ERLANG_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl
m4_define(`__GLYPH_USE_JSON_STYLE',`__GLYPH_CHOOSE_STYLE(`__GLYPH_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_ifelse(__CODE_STYLE(),
+ erlang, __GLYPH_USE_ERLANG_STYLE(),
+ __CODE_STYLE, json, __GLYPH_USE_JSON_STYLE())m4_dnl
diff --git a/glyph_board/global.m4.conf b/glyph_board/global.m4.conf
index 5965616..c30d311 100644
--- a/glyph_board/global.m4.conf
+++ b/glyph_board/global.m4.conf
@@ -1,25 +1,25 @@
-m4_include(__MAKEFILE_DATA_DIR`/modifiers.m4.conf')m4_dnl
-m4_define(`__GLYPH_BOARD_CHOOSE_STYLE', `m4_define(`__GLYPH_BOARD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__GLYPH_BOARD_CHOOSE_STYLE',
+ `m4_define(`__GLYPH_BOARD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
m4_define(`__GLYPH_SLOT_LIST',``[''$1`` 0 ]'')m4_dnl
-m4_define(`__GLYPH_SLOT', $1``, '')m4_dnl
+m4_define(`__GLYPH_SLOT', `$1``, ''')m4_dnl
m4_dnl
m4_dnl
m4_dnl
-m4_define(`__GLYPH_SLOT_LIST_ERLANG_STYLE',``[''$1`` 0 ]'')m4_dnl
-m4_define(`__GLYPH_SLOT_ERLANG_STYLE', $1``, '')m4_dnl
m4_define(`__GLYPH_BOARD_ERLANG_STYLE',`from_id (`$1') ->
#glyph_board
{
id = $1,
name = <<"$2">>,
slots = $3,
- attr_mod = $4,
- stat_mod = $5,
- atk_mod = $6,
- def_mod = $7
+ omnimods = __OMNIMODS($4, $5, $6, $7)
};
')m4_dnl
-m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE',`__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl
+m4_define(`__GLYPH_BOARD_USE_ERLANG_STYLE',
+ `__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_ERLANG_STYLE')')m4_dnl
m4_dnl
m4_dnl
m4_dnl
@@ -28,10 +28,14 @@ m4_define(`__GLYPH_BOARD_JSON_STYLE',` {
"id": $1,
"nam": "$2",
"slot": $3,
- "attm": $4,
- "stam": $5,
- "atkm": $6,
- "defm": $7
+ "omni": __OMNIMODS($4, $5, $6, $7)
},
')m4_dnl
-m4_define(`__GLYPH_BOARD_USE_JSON_STYLE',`__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl
+m4_define(`__GLYPH_BOARD_USE_JSON_STYLE',
+ `__GLYPH_BOARD_CHOOSE_STYLE(`__GLYPH_BOARD_JSON_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_ifelse(__CODE_STYLE(),
+ erlang, __GLYPH_BOARD_USE_ERLANG_STYLE(),
+ __CODE_STYLE, json, __GLYPH_BOARD_USE_JSON_STYLE())m4_dnl
diff --git a/modifiers.m4.conf b/omnimods.m4.conf
index 13b8e86..6111e2c 100644
--- a/modifiers.m4.conf
+++ b/omnimods.m4.conf
@@ -1,12 +1,43 @@
m4_include(__MAKEFILE_DATA_DIR`/names.m4.conf')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__OMNIMODS_CHOOSE_STYLE', `m4_define(`__OMNIMODS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
m4_define(`__MOD_LIST_CHOOSE_STYLE', `m4_define(`__MOD_LIST',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
m4_define(`__MOD_CHOOSE_STYLE', `m4_define(`__MOD',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
m4_dnl
-m4_define(`__MOD_LIST_ERLANG_STYLE',``[''$1`` {none, 0} ]'')m4_dnl
-m4_define(`__MOD_ERLANG_STYLE',``{''$1``, ''$2``}, '')m4_dnl
m4_dnl
-m4_define(`__MOD_LIST_JSON_STYLE',``[''$1`` {"t": "none", "v": 0} ]'')m4_dnl
-m4_define(`__MOD_JSON_STYLE',``{"t": "''$1``", "v":'' $2``}, '')m4_dnl
+m4_dnl
+m4_define(`__MOD_LIST_ERLANG_STYLE',```[''$1`` {none, 0} ]''')m4_dnl
+m4_define(`__MOD_ERLANG_STYLE',```{''$1``, ''$2``}, ''')m4_dnl
+m4_define(`__OMNIMODS_ERLANG_STYLE',`
+ #omnimods
+ {
+ attmods = $1'``,''`
+ stamods = $2'``,''`
+ atkmods = $3'``,''`
+ defmods = $4
+ }
+')m4_dnl
+m4_define(`__MOD_USE_ERLANG_STYLE',
+ `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_ERLANG_STYLE')__MOD_CHOOSE_STYLE(`__MOD_ERLANG_STYLE')__OMNIMODS_CHOOSE_STYLE(`__OMNIMODS_ERLANG_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__MOD_LIST_JSON_STYLE',```[''$1`` {"t": "none", "v": 0} ]''')m4_dnl
+m4_define(`__MOD_JSON_STYLE',```{"t": "''$1``", "v":'' $2``}, ''')m4_dnl
+m4_define(`__OMNIMODS_JSON_STYLE',`
+ {
+ "attm": $1'``,''`
+ "stam": $2'``,''`
+ "atkm": $3'``,''`
+ "defm": $4
+ }
+')m4_dnl
+m4_define(`__MOD_USE_JSON_STYLE',
+ `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_JSON_STYLE')__MOD_CHOOSE_STYLE(`__MOD_JSON_STYLE')__OMNIMODS_CHOOSE_STYLE(`__OMNIMODS_JSON_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
m4_dnl
m4_define(`__MOD_CONSTITUTION', ``__MOD(__SN_CONSTITUTION(), $1)'')m4_dnl
m4_define(`__MOD_DEXTERITY', ``__MOD(__SN_DEXTERITY(), $1)'')m4_dnl
@@ -15,10 +46,14 @@ m4_define(`__MOD_MIND', ``__MOD(__SN_MIND(), $1)'')m4_dnl
m4_define(`__MOD_SPEED', ``__MOD(__SN_SPEED(), $1)'')m4_dnl
m4_define(`__MOD_STRENGTH', ``__MOD(__SN_STRENGTH(), $1)'')m4_dnl
m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__MOD_SLASH', ``__MOD(__SN_SLASH(), $1)'')m4_dnl
m4_define(`__MOD_PIERCE', ``__MOD(__SN_PIERCE(), $1)'')m4_dnl
m4_define(`__MOD_BLUNT', ``__MOD(__SN_BLUNT(), $1)'')m4_dnl
m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__MOD_MAX_HEALTH', ``__MOD(__SN_MAX_HEALTH(), $1)'')m4_dnl
m4_define(`__MOD_MOVEMENT_POINTS', ``__MOD(__SN_MOVEMENT_POINTS(), $1)'')m4_dnl
m4_define(`__MOD_DODGE', ``__MOD(__SN_DODGE(), $1)'')m4_dnl
@@ -27,7 +62,8 @@ m4_define(`__MOD_ACCURACY', ``__MOD(__SN_ACCURACY(), $1)'')m4_dnl
m4_define(`__MOD_DOUBLE_HITS', ``__MOD(__SN_DOUBLE_HITS(), $1)'')m4_dnl
m4_define(`__MOD_CRITICAL', ``__MOD(__SN_CRITICAL_HIT(), $1)'')m4_dnl
m4_dnl
-m4_define(`__MOD_USE_ERLANG_STYLE',
- `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_ERLANG_STYLE')__MOD_CHOOSE_STYLE(`__MOD_ERLANG_STYLE')')m4_dnl
-m4_define(`__MOD_USE_JSON_STYLE',
- `__MOD_LIST_CHOOSE_STYLE(`__MOD_LIST_JSON_STYLE')__MOD_CHOOSE_STYLE(`__MOD_JSON_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_ifelse(__CODE_STYLE(),
+ erlang, __MOD_USE_ERLANG_STYLE(),
+ __CODE_STYLE, json, __MOD_USE_JSON_STYLE())m4_dnl
diff --git a/tile/global.m4.conf b/tile/global.m4.conf
index 57b12d9..e05dd64 100644
--- a/tile/global.m4.conf
+++ b/tile/global.m4.conf
@@ -1,44 +1,45 @@
-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_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__TILE_CHOOSE_STYLE',
+ `m4_define(`__TILE_CLASS',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__TILE_COST_WHEN_OCCUPIED', 201)m4_dnl
m4_define(`__TILE_COST_WHEN_OOB', 255)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_dnl
+m4_dnl
+m4_dnl
m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') ->
#tile
{
id = $1,
name = <<"[__TILE_CATEGORY_NAME] $2">>,
cost = $3,
- attr_mod = $4,
- stat_mod = $5,
- atk_mod = $6,
- def_mod = $7
+ omnimods = __OMNIMODS($4, $5, $6, $7),
family = __TILE_CATEGORY_FAMILY,
depth = __TILE_CATEGORY_DEPTH
};')m4_dnl
-m4_define(`__TILE_CLASS_PARTIAL_ERLANG_STYLE',`from_class_id (`$1') ->
- #tile
- {
- id = $1,
- name = <<"[__TILE_CATEGORY_NAME] $2">>,
- cost = $3,
- attr_mod = $4,
- stat_mod = $5,
- atk_mod = $6,
- def_mod = $7
- };')m4_dnl
+m4_define(`__TILE_CLASS_USE_ERLANG_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')__MOD_USE_ERLANG_STYLE()')m4_dnl
+m4_dnl
+m4_dnl
+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
+ "omni": __OMNIMODS($4, $5, $6, $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')__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
+m4_dnl
+m4_dnl
+m4_dnl
+m4_ifelse(__CODE_STYLE(),
+ erlang, __TILE_CLASS_USE_ERLANG_STYLE(),
+ __CODE_STYLE, json, __TILE_CLASS_USE_JSON_STYLE())m4_dnl
diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf
index 217788b..3ae3d17 100644
--- a/weapon/global.m4.conf
+++ b/weapon/global.m4.conf
@@ -1,5 +1,12 @@
-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_include(__MAKEFILE_DATA_DIR`/omnimods.m4.conf')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_define(`__WEAPON_CHOOSE_STYLE',
+ `m4_define(`__WEAPON',m4_defn(`$1'))m4_undefine(`$1')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__WEAPON_ERLANG_STYLE',`from_id (`$1') ->
#weapon
{
@@ -7,23 +14,28 @@ m4_define(`__WEAPON_ERLANG_STYLE',`from_id (`$1') ->
name = <<"$2">>,
min_range = $3,
max_range = $4,
- attr_mod = $5,
- stat_mod = $6,
- atk_mod = $7,
- def_mod = $8
+ omnimods = __OMNIMODS($5, $6, $7, $8)
};
')m4_dnl
+m4_define(`__WEAPON_USE_ERLANG_STYLE',
+ `__WEAPON_CHOOSE_STYLE(`__WEAPON_ERLANG_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
m4_define(`__WEAPON_JSON_STYLE',` {
"msg": "add_weapon",
"id": $1,
"nam": "$2",
"rmi": $3,
"rma": $4,
- "attm": $5,
- "stam": $6,
- "atkm": $7,
- "defm": $8
+ "omni": __OMNIMODS($5, $6, $7, $8)
},
')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
+m4_define(`__WEAPON_USE_JSON_STYLE',
+ `__WEAPON_CHOOSE_STYLE(`__WEAPON_JSON_STYLE')')m4_dnl
+m4_dnl
+m4_dnl
+m4_dnl
+m4_ifelse(__CODE_STYLE(),
+ erlang, __WEAPON_USE_ERLANG_STYLE(),
+ __CODE_STYLE, json, __WEAPON_USE_JSON_STYLE())m4_dnl