| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2019-09-12 17:43:48 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2019-09-12 17:43:48 +0200 |
| commit | 5267b264049c890fdbf689fe4bd247b7fb0a4198 (patch) | |
| tree | c3f490e2813e28a8264a059ff93603e2a6a636a7 /tile | |
| parent | f57632243fc634b8564a413c964f720f518621ef (diff) | |
| parent | 69462b1eb363d386acb94f670067572f00e818d0 (diff) | |
Merge branch 'attributes_removal'
Still missing:
- Secondary weapons are not balanced.
Diffstat (limited to 'tile')
| -rw-r--r-- | tile/global.m4.conf | 4 | ||||
| -rw-r--r-- | tile/grassland.m4d | 3 | ||||
| -rw-r--r-- | tile/mud.m4d | 1 | ||||
| -rw-r--r-- | tile/special.m4d | 9 | ||||
| -rw-r--r-- | tile/water.m4d | 1 |
5 files changed, 2 insertions, 16 deletions
diff --git a/tile/global.m4.conf b/tile/global.m4.conf index f286e4b..c4079d3 100644 --- a/tile/global.m4.conf +++ b/tile/global.m4.conf @@ -19,7 +19,7 @@ m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_id (<<"`$1'">>) -> id = <<"$1">>, name = <<"[__TILE_CATEGORY_NAME] $2">>, cost = $3, - omnimods = __OMNIMODS($4, $5, $6, $7), + omnimods = __OMNIMODS($4, $5, $6), family = <<"__TILE_CATEGORY_FAMILY">>, depth = __TILE_CATEGORY_DEPTH };')m4_dnl @@ -33,7 +33,7 @@ m4_define(`__TILE_CLASS_JSON_STYLE',` { "id": "$1", "nam": "[__TILE_CATEGORY_NAME] $2", "ct": $3, - "omni": __OMNIMODS($4, $5, $6, $7), + "omni": __OMNIMODS($4, $5, $6), "fa": "__TILE_CATEGORY_FAMILY", "de": __TILE_CATEGORY_DEPTH },')m4_dnl diff --git a/tile/grassland.m4d b/tile/grassland.m4d index 59d8969..332d44a 100644 --- a/tile/grassland.m4d +++ b/tile/grassland.m4d @@ -4,19 +4,16 @@ __TILE_CLASS(1, 6, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(3, `Mushroom Infestation', 12, - __MOD_LIST(__FIRST_MOD_MIND(-10)), __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_MAX_HEALTH(25)), __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(5, `Pine Forest', 24, - __MOD_LIST(), __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_ACCURACY(-25)__MOD_DODGE(25)), __MOD_LIST(), __MOD_LIST())m4_dnl diff --git a/tile/mud.m4d b/tile/mud.m4d index 59270ad..a110417 100644 --- a/tile/mud.m4d +++ b/tile/mud.m4d @@ -2,7 +2,6 @@ __TILE_CATEGORY(`Mud', 3, 2)m4_dnl __TILE_CLASS(2, `Mud', 30, - __MOD_LIST(), __MOD_LIST(__FIRST_MOD_MOVEMENT_POINTS(-10)__MOD_DODGE(-15)), __MOD_LIST(), __MOD_LIST())m4_dnl diff --git a/tile/special.m4d b/tile/special.m4d index 6a6f0c6..11bf437 100644 --- a/tile/special.m4d +++ b/tile/special.m4d @@ -4,61 +4,52 @@ __TILE_CLASS(0, __TILE_COST_WHEN_OCCUPIED, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp0, `Player 0 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp1, `Player 1 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp2, `Player 2 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp3, `Player 3 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp4, `Player 4 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp5, `Player 5 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp6, `Player 6 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl __TILE_CLASS(sp7, `Player 7 Spawn', 1, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl diff --git a/tile/water.m4d b/tile/water.m4d index 80ad28f..381ee1e 100644 --- a/tile/water.m4d +++ b/tile/water.m4d @@ -4,5 +4,4 @@ __TILE_CLASS(4, __TILE_COST_WHEN_OCCUPIED, __MOD_LIST(), __MOD_LIST(), - __MOD_LIST(), __MOD_LIST())m4_dnl |