summaryrefslogtreecommitdiff
path: root/src/battle
diff options
context:
space:
mode:
Diffstat (limited to 'src/battle')
-rw-r--r--src/battle/src/Struct/Character.elm14
-rw-r--r--src/battle/src/Struct/HelpRequest.elm4
-rw-r--r--src/battle/src/Update/SelectCharacter.elm6
-rw-r--r--src/battle/src/Update/UndoAction.elm6
-rw-r--r--src/battle/src/View/Controlled/CharacterCard.elm56
-rw-r--r--src/battle/src/View/Controlled/Targets.elm10
-rw-r--r--src/battle/src/View/MessageBoard/Help.elm6
-rw-r--r--src/battle/src/View/MessageBoard/Help/Guide.elm2
8 files changed, 52 insertions, 52 deletions
diff --git a/src/battle/src/Struct/Character.elm b/src/battle/src/Struct/Character.elm
index 73531f0..327d23c 100644
--- a/src/battle/src/Struct/Character.elm
+++ b/src/battle/src/Struct/Character.elm
@@ -32,7 +32,7 @@ import Json.Decode.Pipeline
-- Battle ----------------------------------------------------------------------
import Battle.Struct.Omnimods
-import Battle.Struct.Statistics
+import Battle.Struct.Attributes
-- Battle Characters -----------------------------------------------------------
import BattleCharacters.Struct.Character
@@ -88,8 +88,8 @@ fix_health : Int -> Type -> Type
fix_health previous_max_health char =
let
new_max_health =
- (Battle.Struct.Statistics.get_max_health
- (BattleCharacters.Struct.Character.get_statistics char.base)
+ (Battle.Struct.Attributes.get_max_health
+ (BattleCharacters.Struct.Character.get_attributes char.base)
)
in
{char |
@@ -162,8 +162,8 @@ set_location : (
set_location location omnimods char =
let
previous_max_health =
- (Battle.Struct.Statistics.get_max_health
- (BattleCharacters.Struct.Character.get_statistics char.base)
+ (Battle.Struct.Attributes.get_max_health
+ (BattleCharacters.Struct.Character.get_attributes char.base)
)
in
(fix_health
@@ -188,8 +188,8 @@ set_base_character : BattleCharacters.Struct.Character.Type -> Type -> Type
set_base_character new_base char =
let
previous_max_health =
- (Battle.Struct.Statistics.get_max_health
- (BattleCharacters.Struct.Character.get_statistics char.base)
+ (Battle.Struct.Attributes.get_max_health
+ (BattleCharacters.Struct.Character.get_attributes char.base)
)
in
(fix_health
diff --git a/src/battle/src/Struct/HelpRequest.elm b/src/battle/src/Struct/HelpRequest.elm
index 0e30162..7df06cb 100644
--- a/src/battle/src/Struct/HelpRequest.elm
+++ b/src/battle/src/Struct/HelpRequest.elm
@@ -3,7 +3,7 @@ module Struct.HelpRequest exposing (Type(..))
-- Elm -------------------------------------------------------------------------
-- Battle ----------------------------------------------------------------------
-import Battle.Struct.Statistics
+import Battle.Struct.Attributes
import Battle.Struct.DamageType
-- Local Module ----------------------------------------------------------------
@@ -15,5 +15,5 @@ import Struct.Character
type Type =
None
| Rank Struct.Character.Rank
- | Statistic Battle.Struct.Statistics.Category
+ | Attribute Battle.Struct.Attributes.Category
| DamageType Battle.Struct.DamageType.Type
diff --git a/src/battle/src/Update/SelectCharacter.elm b/src/battle/src/Update/SelectCharacter.elm
index 8817797..9dfe73d 100644
--- a/src/battle/src/Update/SelectCharacter.elm
+++ b/src/battle/src/Update/SelectCharacter.elm
@@ -6,7 +6,7 @@ import Array
import Task
-- Battle ----------------------------------------------------------------------
-import Battle.Struct.Statistics
+import Battle.Struct.Attributes
-- Battle Characters -----------------------------------------------------------
import BattleCharacters.Struct.Character
@@ -42,8 +42,8 @@ get_character_navigator model char =
in
(Struct.Navigator.new
(Struct.Character.get_location char)
- (Battle.Struct.Statistics.get_movement_points
- (BattleCharacters.Struct.Character.get_statistics base_char)
+ (Battle.Struct.Attributes.get_movement_points
+ (BattleCharacters.Struct.Character.get_attributes base_char)
)
(BattleCharacters.Struct.Weapon.get_defense_range weapon)
(BattleCharacters.Struct.Weapon.get_attack_range weapon)
diff --git a/src/battle/src/Update/UndoAction.elm b/src/battle/src/Update/UndoAction.elm
index 23c9e89..b171d6c 100644
--- a/src/battle/src/Update/UndoAction.elm
+++ b/src/battle/src/Update/UndoAction.elm
@@ -4,7 +4,7 @@ module Update.UndoAction exposing (apply_to)
import Array
-- Battle ----------------------------------------------------------------------
-import Battle.Struct.Statistics
+import Battle.Struct.Attributes
-- Battle Characters -----------------------------------------------------------
import BattleCharacters.Struct.Character
@@ -35,8 +35,8 @@ get_character_navigator model char =
in
(Struct.Navigator.new
(Struct.Character.get_location char)
- (Battle.Struct.Statistics.get_movement_points
- (BattleCharacters.Struct.Character.get_statistics base_char)
+ (Battle.Struct.Attributes.get_movement_points
+ (BattleCharacters.Struct.Character.get_attributes base_char)
)
(BattleCharacters.Struct.Weapon.get_defense_range weapon)
(BattleCharacters.Struct.Weapon.get_attack_range weapon)
diff --git a/src/battle/src/View/Controlled/CharacterCard.elm b/src/battle/src/View/Controlled/CharacterCard.elm
index 7484cb3..0dcde2f 100644
--- a/src/battle/src/View/Controlled/CharacterCard.elm
+++ b/src/battle/src/View/Controlled/CharacterCard.elm
@@ -18,10 +18,10 @@ import Util.Html
-- Battle ----------------------------------------------------------------------
import Battle.Struct.DamageType
import Battle.Struct.Omnimods
-import Battle.Struct.Statistics
+import Battle.Struct.Attributes
import Battle.View.Gauge
-import Battle.View.Statistic
+import Battle.View.Attribute
import Battle.View.DamageType
-- Battle Characters -----------------------------------------------------------
@@ -66,8 +66,8 @@ get_health_bar char =
let
current = (Struct.Character.get_sane_current_health char)
max =
- (Battle.Struct.Statistics.get_max_health
- (BattleCharacters.Struct.Character.get_statistics
+ (Battle.Struct.Attributes.get_max_health
+ (BattleCharacters.Struct.Character.get_attributes
(Struct.Character.get_base_character char)
)
)
@@ -80,8 +80,8 @@ get_health_bar char =
(Html.Attributes.class "clickable"),
(Html.Events.onClick
(Struct.Event.RequestedHelp
- (Struct.HelpRequest.Statistic
- Battle.Struct.Statistics.MaxHealth
+ (Struct.HelpRequest.Attribute
+ Battle.Struct.Attributes.MaxHealth
)
)
)
@@ -139,8 +139,8 @@ get_active_movement_bar : (
get_active_movement_bar maybe_navigator char =
let
max =
- (Battle.Struct.Statistics.get_movement_points
- (BattleCharacters.Struct.Character.get_statistics
+ (Battle.Struct.Attributes.get_movement_points
+ (BattleCharacters.Struct.Character.get_attributes
(Struct.Character.get_base_character char)
)
)
@@ -160,8 +160,8 @@ get_active_movement_bar maybe_navigator char =
(Html.Attributes.class "clickable"),
(Html.Events.onClick
(Struct.Event.RequestedHelp
- (Struct.HelpRequest.Statistic
- Battle.Struct.Statistics.MovementPoints
+ (Struct.HelpRequest.Attribute
+ Battle.Struct.Attributes.MovementPoints
)
)
)
@@ -177,8 +177,8 @@ get_inactive_movement_bar : (
get_inactive_movement_bar char =
let
max =
- (Battle.Struct.Statistics.get_movement_points
- (BattleCharacters.Struct.Character.get_statistics
+ (Battle.Struct.Attributes.get_movement_points
+ (BattleCharacters.Struct.Character.get_attributes
(Struct.Character.get_base_character char)
)
)
@@ -191,8 +191,8 @@ get_inactive_movement_bar char =
(Html.Attributes.class "clickable"),
(Html.Events.onClick
(Struct.Event.RequestedHelp
- (Struct.HelpRequest.Statistic
- Battle.Struct.Statistics.MovementPoints
+ (Struct.HelpRequest.Attribute
+ Battle.Struct.Attributes.MovementPoints
)
)
)
@@ -417,11 +417,11 @@ get_summary_html : (
get_summary_html char_turn player_ix char =
let
base_char = (Struct.Character.get_base_character char)
- char_statistics =
- (BattleCharacters.Struct.Character.get_statistics base_char)
+ char_attributes =
+ (BattleCharacters.Struct.Character.get_attributes base_char)
damage_multiplier =
- (Battle.Struct.Statistics.get_damage_multiplier
- char_statistics
+ (Battle.Struct.Attributes.get_damage_multiplier
+ char_attributes
)
omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char)
equipment = (BattleCharacters.Struct.Character.get_equipment base_char)
@@ -463,9 +463,9 @@ get_summary_html char_turn player_ix char =
(BattleCharacters.Struct.Equipment.get_armor equipment)
),
(Html.div
- [(Html.Attributes.class "character-card-stats")]
- (Battle.View.Statistic.get_all_but_gauges_html
- char_statistics
+ [(Html.Attributes.class "character-card-atts")]
+ (Battle.View.Attribute.get_all_but_gauges_html
+ char_attributes
)
),
(get_weapon_summary
@@ -485,11 +485,11 @@ get_full_html : (
get_full_html player_ix char =
let
base_char = (Struct.Character.get_base_character char)
- char_statistics =
- (BattleCharacters.Struct.Character.get_statistics base_char)
+ char_attributes =
+ (BattleCharacters.Struct.Character.get_attributes base_char)
damage_multiplier =
- (Battle.Struct.Statistics.get_damage_multiplier
- char_statistics
+ (Battle.Struct.Attributes.get_damage_multiplier
+ char_attributes
)
omnimods = (BattleCharacters.Struct.Character.get_omnimods base_char)
equipment = (BattleCharacters.Struct.Character.get_equipment base_char)
@@ -532,9 +532,9 @@ get_full_html player_ix char =
(BattleCharacters.Struct.Equipment.get_armor equipment)
),
(Html.div
- [(Html.Attributes.class "character-card-stats")]
- (Battle.View.Statistic.get_all_but_gauges_html
- char_statistics
+ [(Html.Attributes.class "character-card-atts")]
+ (Battle.View.Attribute.get_all_but_gauges_html
+ char_attributes
)
),
(get_weapon_summary
diff --git a/src/battle/src/View/Controlled/Targets.elm b/src/battle/src/View/Controlled/Targets.elm
index 4b36f03..3457731 100644
--- a/src/battle/src/View/Controlled/Targets.elm
+++ b/src/battle/src/View/Controlled/Targets.elm
@@ -7,7 +7,7 @@ import Html
import Html.Attributes
-- Battle ----------------------------------------------------------------------
-import Battle.Struct.Statistics
+import Battle.Struct.Attributes
-- Local Module ----------------------------------------------------------------
import Struct.Character
@@ -36,8 +36,8 @@ get_target_info_html model char_ref =
++ "): "
++
(String.fromInt
- (Battle.Struct.Statistics.get_movement_points
- (Struct.Character.get_statistics char)
+ (Battle.Struct.Attributes.get_movement_points
+ (Struct.Character.get_attributes char)
)
)
++ " movement points; "
@@ -50,8 +50,8 @@ get_target_info_html model char_ref =
++ "/"
++
(String.fromInt
- (Battle.Struct.Statistics.get_max_health
- (Struct.Character.get_statistics char)
+ (Battle.Struct.Attributes.get_max_health
+ (Struct.Character.get_attributes char)
)
)
)
diff --git a/src/battle/src/View/MessageBoard/Help.elm b/src/battle/src/View/MessageBoard/Help.elm
index 5fcdabd..89af283 100644
--- a/src/battle/src/View/MessageBoard/Help.elm
+++ b/src/battle/src/View/MessageBoard/Help.elm
@@ -6,7 +6,7 @@ import Html.Attributes
-- Battle ----------------------------------------------------------------------
import Battle.View.Help.DamageType
-import Battle.View.Help.Statistic
+import Battle.View.Help.Attribute
-- Local Module ----------------------------------------------------------------
import Struct.Event
@@ -38,8 +38,8 @@ get_html model =
(Struct.HelpRequest.Rank rank) ->
(View.MessageBoard.Help.Rank.get_html_contents rank)
- (Struct.HelpRequest.Statistic stat_cat) ->
- (Battle.View.Help.Statistic.get_html_contents stat_cat)
+ (Struct.HelpRequest.Attribute att_cat) ->
+ (Battle.View.Help.Attribute.get_html_contents att_cat)
(Struct.HelpRequest.DamageType dmg_cat) ->
(Battle.View.Help.DamageType.get_html_contents dmg_cat)
diff --git a/src/battle/src/View/MessageBoard/Help/Guide.elm b/src/battle/src/View/MessageBoard/Help/Guide.elm
index deb5190..d60dd6b 100644
--- a/src/battle/src/View/MessageBoard/Help/Guide.elm
+++ b/src/battle/src/View/MessageBoard/Help/Guide.elm
@@ -87,7 +87,7 @@ get_default_html_contents =
(Html.text
(
"Click once on a character to focus them. This will show you"
- ++ " their stats, equipment, and other infos. If they are in"
+ ++ " their attributes, equipment, and other infos. If they are in"
++ " your team and active (the pulsating characters),"
++ " clicking on them again will let you take control."
)