| summaryrefslogtreecommitdiff |
diff options
| author | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-08-29 16:43:58 +0200 |
|---|---|---|
| committer | Nathanael Sensfelder <SpamShield0@MultiAgentSystems.org> | 2019-08-29 16:43:58 +0200 |
| commit | b07f636ea1e905f494c57fd2de03e8f36a4d5061 (patch) | |
| tree | 6eebf81f1309332914764839bd45c442385e509e | |
| parent | 120b0b7f6df0c8978aac9a423cbf8364feac4779 (diff) | |
| -rw-r--r-- | src/asset/www/data/armors.json.m4 | 2 | ||||
| -rw-r--r-- | src/asset/www/data/weapons.json.m4 | 3 | ||||
| -rw-r--r-- | src/shared/battle/Battle/Struct/Attributes.elm | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/asset/www/data/armors.json.m4 b/src/asset/www/data/armors.json.m4 index f79eb3b..59be45d 100644 --- a/src/asset/www/data/armors.json.m4 +++ b/src/asset/www/data/armors.json.m4 @@ -1,6 +1,6 @@ [ m4_include(__MAKEFILE_DATA_DIR/armor/global.m4.conf)m4_dnl -m4_include(__MAKEFILE_DATA_DIR/armor/basic.m4d)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/armor/10_25_25.m4d)m4_dnl { "msg": "okay" } diff --git a/src/asset/www/data/weapons.json.m4 b/src/asset/www/data/weapons.json.m4 index 7daf71b..7b3ff1e 100644 --- a/src/asset/www/data/weapons.json.m4 +++ b/src/asset/www/data/weapons.json.m4 @@ -1,6 +1,7 @@ [ m4_include(__MAKEFILE_DATA_DIR/weapon/global.m4.conf)m4_dnl -m4_include(__MAKEFILE_DATA_DIR/weapon/basic.m4d)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/weapon/primary_melee_10_20_25.m4d)m4_dnl +m4_include(__MAKEFILE_DATA_DIR/weapon/primary_ranged_5_25_25.m4d)m4_dnl m4_include(__MAKEFILE_DATA_DIR/weapon/secondary.m4d)m4_dnl { "msg": "okay" diff --git a/src/shared/battle/Battle/Struct/Attributes.elm b/src/shared/battle/Battle/Struct/Attributes.elm index 159404e..134209d 100644 --- a/src/shared/battle/Battle/Struct/Attributes.elm +++ b/src/shared/battle/Battle/Struct/Attributes.elm @@ -121,17 +121,18 @@ mod cat v t = CriticalHits -> (mod_critical_hits v t) DamageModifier -> (mod_damage_modifier v t) +-- TODO: Link this to the server using tacticians-data. default : Type default = { - movement_points = 0, + movement_points = 8, max_health = 1, dodges = 0, parries = 0, accuracy = 0, double_hits = 0, critical_hits = 0, - damage_modifier = 100 + damage_modifier = 0 } decode_category : String -> Category |