| summaryrefslogtreecommitdiff |
diff options
| author | nsensfel <SpamShield0@noot-noot.org> | 2018-07-06 17:59:50 +0200 |
|---|---|---|
| committer | nsensfel <SpamShield0@noot-noot.org> | 2018-07-06 17:59:50 +0200 |
| commit | 46083840cd9a3160906518e272904bc0dc6c50e0 (patch) | |
| tree | c271152425f1766b459e88ed88d38d6fcda3e90a /src | |
| parent | 9766626c96c325f98d302a235f8bf569375e7af7 (diff) | |
| parent | 924c651aa7ff2470358704cd794f4ccdbbe9fa38 (diff) | |
Merge branch 'master' of dreamhost:~/repositories/git/tacticians-client
Diffstat (limited to 'src')
| -rw-r--r-- | src/battlemap/src/Struct/Armor.elm | 4 | ||||
| -rw-r--r-- | src/battlemap/src/Struct/Weapon.elm | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battlemap/src/Struct/Armor.elm b/src/battlemap/src/Struct/Armor.elm index ccd32d7..58f27d7 100644 --- a/src/battlemap/src/Struct/Armor.elm +++ b/src/battlemap/src/Struct/Armor.elm @@ -119,8 +119,8 @@ get_resistance_to dmg_type ar = apply_to_attributes : Type -> Struct.Attributes.Type -> Struct.Attributes.Type apply_to_attributes ar atts = let - impact = (ceiling (-20.0 * ar.coef)) - half_impact = (ceiling (-10.0 * ar.coef)) + impact = (-1 * (ceiling (20.0 * ar.coef))) + half_impact = (-1 * (ceiling (10.0 * ar.coef))) in case ar.category of Kinetic -> (Struct.Attributes.mod_mind impact atts) diff --git a/src/battlemap/src/Struct/Weapon.elm b/src/battlemap/src/Struct/Weapon.elm index 6b38238..248e8f8 100644 --- a/src/battlemap/src/Struct/Weapon.elm +++ b/src/battlemap/src/Struct/Weapon.elm @@ -161,9 +161,9 @@ get_min_damage wp = wp.dmg_min apply_to_attributes : Type -> Struct.Attributes.Type -> Struct.Attributes.Type apply_to_attributes wp atts = let - impact = (-20.0 * wp.coef) - full_impact = (ceiling impact) - quarter_impact = (ceiling (impact / 4.0)) + impact = (20.0 * wp.coef) + full_impact = (-1 * (ceiling impact)) + quarter_impact = (-1 * (ceiling (impact / 4.0))) in case (wp.range_mod, wp.dmg_mod) of (Long, Heavy) -> |