summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-08-03 10:55:28 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-08-03 10:55:28 +0200
commit61b6971817cba720ae6df74ef9cde8ab8797d3c6 (patch)
tree6c8336ef0735638a3c4c45d71137c4b808975cca
parent26957226f4601ff3adb777efc5d19553bdda0711 (diff)
Introduces families & depth.
-rw-r--r--tile/error.m4d2
-rw-r--r--tile/global.m4.conf10
-rw-r--r--tile/grassland.m4d9
-rw-r--r--tile/mud.m4d2
-rw-r--r--tile/water.m4d2
5 files changed, 17 insertions, 8 deletions
diff --git a/tile/error.m4d b/tile/error.m4d
new file mode 100644
index 0000000..11b9a8e
--- /dev/null
+++ b/tile/error.m4d
@@ -0,0 +1,2 @@
+__TILE_CATEGORY(`Error', 0, 0)m4_dnl
+__TILE_CLASS(0, `Error', __TILE_COST_WHEN_OCCUPIED)
diff --git a/tile/global.m4.conf b/tile/global.m4.conf
index 9224b6e..f6ce06b 100644
--- a/tile/global.m4.conf
+++ b/tile/global.m4.conf
@@ -6,15 +6,19 @@ m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') ->
{
id = $1,
name = <<"[__TILE_CATEGORY_NAME] $2">>,
- cost = $3
+ cost = $3,
+ family = __TILE_CATEGORY_FAMILY,
+ depth = __TILE_CATEGORY_DEPTH
};')m4_dnl
m4_define(`__TILE_CLASS_JSON_STYLE',` {
"msg": "add_tile",
"id": $1,
"nam": "[__TILE_CATEGORY_NAME] $2",
- "ct": $3
+ "ct": $3,
+ "fa": __TILE_CATEGORY_FAMILY,
+ "de": __TILE_CATEGORY_DEPTH
},')m4_dnl
-m4_define(`__TILE_CATEGORY',`m4_define(`__TILE_CATEGORY_NAME', `$1')')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_ERLANG_SELECT_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_SELECT_STYLE')')m4_dnl
m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')')m4_dnl
diff --git a/tile/grassland.m4d b/tile/grassland.m4d
index ff9a8e4..9240730 100644
--- a/tile/grassland.m4d
+++ b/tile/grassland.m4d
@@ -1,5 +1,4 @@
-__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, 44)
+__TILE_CATEGORY(`Grassland', 1, 2)m4_dnl
+__TILE_CLASS(1, `Grass', 6)
+__TILE_CLASS(3, `Mushroom Infestation', 12)
+__TILE_CLASS(5, `Tree Remains', 24)
diff --git a/tile/mud.m4d b/tile/mud.m4d
new file mode 100644
index 0000000..0236b3c
--- /dev/null
+++ b/tile/mud.m4d
@@ -0,0 +1,2 @@
+__TILE_CATEGORY(`Mud', 2, 2)m4_dnl
+__TILE_CLASS(2, `Mud', 30)m4_dnl
diff --git a/tile/water.m4d b/tile/water.m4d
new file mode 100644
index 0000000..7f3ef7d
--- /dev/null
+++ b/tile/water.m4d
@@ -0,0 +1,2 @@
+__TILE_CATEGORY(`Water', 3, 1)m4_dnl
+__TILE_CLASS(4, `Clear Water', __TILE_COST_WHEN_OCCUPIED)