summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/src/Struct/HelpRequest.elm2
-rw-r--r--src/battle/src/View/Controlled/CharacterCard.elm16
-rw-r--r--src/battle/src/View/MessageBoard/Help.elm4
3 files changed, 8 insertions, 14 deletions
diff --git a/src/battle/src/Struct/HelpRequest.elm b/src/battle/src/Struct/HelpRequest.elm
index 905bdf7..0e30162 100644
--- a/src/battle/src/Struct/HelpRequest.elm
+++ b/src/battle/src/Struct/HelpRequest.elm
@@ -3,7 +3,6 @@ module Struct.HelpRequest exposing (Type(..))
-- Elm -------------------------------------------------------------------------
-- Battle ----------------------------------------------------------------------
-import Battle.Struct.Attributes
import Battle.Struct.Statistics
import Battle.Struct.DamageType
@@ -16,6 +15,5 @@ import Struct.Character
type Type =
None
| Rank Struct.Character.Rank
- | Attribute Battle.Struct.Attributes.Category
| Statistic Battle.Struct.Statistics.Category
| DamageType Battle.Struct.DamageType.Type
diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm
index f4202e8..7484cb3 100644
--- a/src/battle/src/View/Controlled/CharacterCard.elm
+++ b/src/battle/src/View/Controlled/CharacterCard.elm
@@ -419,8 +419,8 @@ get_summary_html char_turn player_ix char =
base_char = (Struct.Character.get_base_character char)
char_statistics =
(BattleCharacters.Struct.Character.get_statistics base_char)
- damage_modifier =
- (Battle.Struct.Statistics.get_damage_modifier
+ damage_multiplier =
+ (Battle.Struct.Statistics.get_damage_multiplier
char_statistics
)
omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char)
@@ -453,7 +453,7 @@ get_summary_html char_turn player_ix char =
),
(get_weapon_details
omnimods
- damage_modifier
+ damage_multiplier
(BattleCharacters.Struct.Character.get_active_weapon
base_char
)
@@ -469,7 +469,7 @@ get_summary_html char_turn player_ix char =
)
),
(get_weapon_summary
- damage_modifier
+ damage_multiplier
(BattleCharacters.Struct.Character.get_inactive_weapon
base_char
)
@@ -487,8 +487,8 @@ get_full_html player_ix char =
base_char = (Struct.Character.get_base_character char)
char_statistics =
(BattleCharacters.Struct.Character.get_statistics base_char)
- damage_modifier =
- (Battle.Struct.Statistics.get_damage_modifier
+ damage_multiplier =
+ (Battle.Struct.Statistics.get_damage_multiplier
char_statistics
)
omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char)
@@ -522,7 +522,7 @@ get_full_html player_ix char =
),
(get_weapon_details
omnimods
- damage_modifier
+ damage_multiplier
(BattleCharacters.Struct.Character.get_active_weapon
base_char
)
@@ -538,7 +538,7 @@ get_full_html player_ix char =
)
),
(get_weapon_summary
- damage_modifier
+ damage_multiplier
(BattleCharacters.Struct.Character.get_inactive_weapon
base_char
)
diff --git a/src/battle/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm
index 7b1984e..5fcdabd 100644
--- a/src/battle/src/View/MessageBoard/Help.elm
+++ b/src/battle/src/View/MessageBoard/Help.elm
@@ -5,7 +5,6 @@ import Html
import Html.Attributes
-- Battle ----------------------------------------------------------------------
-import Battle.View.Help.Attribute
import Battle.View.Help.DamageType
import Battle.View.Help.Statistic
@@ -39,9 +38,6 @@ get_html model =
(Struct.HelpRequest.Rank rank) ->
(View.MessageBoard.Help.Rank.get_html_contents rank)
- (Struct.HelpRequest.Attribute att_cat) ->
- (Battle.View.Help.Attribute.get_html_contents att_cat)
-
(Struct.HelpRequest.Statistic stat_cat) ->
(Battle.View.Help.Statistic.get_html_contents stat_cat)