summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-08-28 21:16:53 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-08-28 21:16:53 +0200
commitcbc2ba3d9e073d1d8a7f6d2f18f1e15098927e38 (patch)
tree1a08493b9a4efb39e889bef8511f7481c097c0cc
parent08424056d861650e68cdb6fb3a126a98a74edc13 (diff)
downloadtacticians-data-omnimods.zip
tacticians-data-omnimods.tar.bz2
Fixes various mistakes.omnimods
-rw-r--r--omnimods.m4.conf6
-rw-r--r--tile/global.m4.conf6
-rw-r--r--weapon/basic.m4d122
-rw-r--r--weapon/global.m4.conf4
4 files changed, 70 insertions, 68 deletions
diff --git a/omnimods.m4.conf b/omnimods.m4.conf
index a7b3b01..f97c8b2 100644
--- a/omnimods.m4.conf
+++ b/omnimods.m4.conf
@@ -8,10 +8,10 @@ m4_define(`__MOD_CHOOSE_STYLE', `m4_define(`__MOD',m4_defn(`$1'))m4_undefine(`$1
m4_dnl
m4_dnl
m4_dnl
-m4_define(`__MOD_LIST_ERLANG_STYLE',```[{none, 0} ''$1``]''')m4_dnl
-m4_define(`__MOD_ERLANG_STYLE',```, {''$1``, ''$2``}''')m4_dnl
+m4_define(`__MOD_LIST_ERLANG_STYLE', ``[{none`,' 0}$1]'')m4_dnl
+m4_define(`__MOD_ERLANG_STYLE',``, {$1, $2}'')m4_dnl
m4_define(`__OMNIMODS_ERLANG_STYLE',
- `shr_omnimods:new_dirty($1``,'' $2``,'' $3``,'' $4)')m4_dnl
+ ``shr_omnimods:new_dirty($1, $2, $3, $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
diff --git a/tile/global.m4.conf b/tile/global.m4.conf
index 6d38d5b..619de8b 100644
--- a/tile/global.m4.conf
+++ b/tile/global.m4.conf
@@ -23,7 +23,8 @@ m4_define(`__TILE_CLASS_ERLANG_STYLE',`from_class_id (`$1') ->
family = __TILE_CATEGORY_FAMILY,
depth = __TILE_CATEGORY_DEPTH
};')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_ERLANG_STYLE',
+ `__TILE_CHOOSE_STYLE(`__TILE_CLASS_ERLANG_STYLE')')m4_dnl
m4_dnl
m4_dnl
m4_dnl
@@ -36,7 +37,8 @@ m4_define(`__TILE_CLASS_JSON_STYLE',` {
"fa": __TILE_CATEGORY_FAMILY,
"de": __TILE_CATEGORY_DEPTH
},')m4_dnl
-m4_define(`__TILE_CLASS_USE_JSON_STYLE',`__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')__MOD_USE_JSON_STYLE()')m4_dnl
+m4_define(`__TILE_CLASS_USE_JSON_STYLE',
+ `__TILE_CHOOSE_STYLE(`__TILE_CLASS_JSON_STYLE')')m4_dnl
m4_dnl
m4_dnl
m4_dnl
diff --git a/weapon/basic.m4d b/weapon/basic.m4d
index 86132bf..4d1faf6 100644
--- a/weapon/basic.m4d
+++ b/weapon/basic.m4d
@@ -5,196 +5,196 @@ __WEAPON(0,
__MOD_LIST(),
__MOD_LIST(),
__MOD_LIST(__MOD_BLUNT(5)),
- __MOD_LIST()))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(1,
Old Dagger,
0,
1,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-5)),
__MOD_LIST(),
__MOD_LIST(__MOD_SLASH(10)__MOD_PIERCE(10)),
- __MOD_LIST(__MOD_SPEED(-5)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(2,
Old Sword,
0,
1,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)),
__MOD_LIST(),
__MOD_LIST(__MOD_SLASH(20)__MOD_PIERCE(10)),
- __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(3,
Old Claymore,
0,
2,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)),
__MOD_LIST(),
__MOD_LIST(__MOD_SLASH(20)__MOD_PIERCE(10)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(4,
Old Bardiche,
0,
3,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-17)__MOD_DEXTERITY(-30)),
__MOD_LIST(),
__MOD_LIST(__MOD_SLASH(20)__MOD_PIERCE(10)),
- __MOD_LIST(__MOD_SPEED(-17)__MOD_DEXTERITY(-30)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(5,
Old Stiletto,
0,
1,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)),
__MOD_LIST(),
__MOD_LIST(__MOD_PIERCE(20)__MOD_SLASH(10)),
- __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(6,
Old Pickaxe,
0,
2,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
__MOD_LIST(),
__MOD_LIST(__MOD_PIERCE(30)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(7,
Old Rapier,
0,
1,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)),
__MOD_LIST(),
__MOD_LIST(__MOD_PIERCE(30)__MOD_SLASH(10)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-10)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(8,
Old Pike,
0,
3,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-20)),
__MOD_LIST(),
__MOD_LIST(__MOD_PIERCE(30)__MOD_SLASH(10)),
- __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-20)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(9,
Old Club,
0,
1,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-5)),
__MOD_LIST(),
__MOD_LIST(__MOD_BLUNT(15)),
- __MOD_LIST(__MOD_SPEED(-5)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(10,
Old Mace,
0,
1,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)),
__MOD_LIST(),
__MOD_LIST(__MOD_BLUNT(25)),
- __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-5)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(11,
Old Staff,
0,
2,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-10)),
__MOD_LIST(),
__MOD_LIST(__MOD_BLUNT(20)),
- __MOD_LIST(__MOD_SPEED(-10)__MOD_DEXTERITY(-10)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(12,
Old War Hammer,
0,
2,
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
__MOD_LIST(),
__MOD_LIST(__MOD_BLUNT(30)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(13,
Old Short Bow (Broadhead),
1,
5,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(5)__MOD_SLASH(15)__MOD_PIERCE(5)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(14,
Old Short Bow (Blunt),
1,
5,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(20)__MOD_PIERCE(5)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(15,
Old Short Bow (Bodkin points),
1,
6,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_PIERCE(17)),
- __MOD_LIST(__MOD_SPEED(-15)__MOD_DEXTERITY(-15)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(16,
Old Long Bow (Broadhead),
2,
8,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(5)__MOD_SLASH(15)__MOD_PIERCE(5)),
- __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(17,
Old Long Bow (Blunt),
2,
8,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(20)__MOD_PIERCE(5)),
- __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(18,
Old Long Bow (Bodkin points),
2,
9,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_PIERCE(17)),
- __MOD_LIST(__MOD_SPEED(-20)__MOD_DEXTERITY(-25)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(19,
Old Crossbow (Broadhead),
2,
6,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(7)__MOD_SLASH(23)__MOD_PIERCE(10)),
- __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(20,
Old Crossbow (Blunt),
2,
6,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(27)__MOD_PIERCE(13)),
- __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(21,
Old Crossbow (Bodkin points),
2,
6,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_PIERCE(25)),
- __MOD_LIST(__MOD_SPEED(-30)__MOD_DEXTERITY(-35)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(22,
Old Arbalest (Broadhead),
4,
9,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(15)__MOD_SLASH(35)__MOD_PIERCE(20)),
- __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(23,
Old Arbalest (Blunt),
4,
9,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_BLUNT(37)__MOD_PIERCE(20)),
- __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)))m4_dnl
+ __MOD_LIST())m4_dnl
__WEAPON(24,
Old Arbalest (Bodkin points),
4,
10,
- __MOD_LIST(),
- __MOD_LIST(),
+ __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)),
+ __MOD_LIST(__MOD_PARRY(-40)),
__MOD_LIST(__MOD_PIERCE(43)),
- __MOD_LIST(__MOD_SPEED(-45)__MOD_DEXTERITY(-50)))m4_dnl
+ __MOD_LIST())m4_dnl
diff --git a/weapon/global.m4.conf b/weapon/global.m4.conf
index 5d2f473..2bd8bcc 100644
--- a/weapon/global.m4.conf
+++ b/weapon/global.m4.conf
@@ -12,8 +12,8 @@ m4_define(`__WEAPON_ERLANG_STYLE',`from_id (`$1') ->
{
id = $1,
name = <<"$2">>,
- min_range = $3,
- max_range = $4,
+ range_min = $3,
+ range_max = $4,
omnimods = __OMNIMODS($5, $6, $7, $8)
};
')m4_dnl