...

5 files changed, 59 insertions, 10 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