aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-09-09 21:24:26 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2019-09-09 21:24:26 +0200
commit027ab65faef27c68a93c7c886c2ddd02f2cb27fd (patch)
tree307edd95a024c9d15fbc5698986a7d93fd6cfa21
parent1eaca6c3fcd4b36b38a51d639341179ce3858eba (diff)
downloadtacticians-client-027ab65faef27c68a93c7c886c2ddd02f2cb27fd.zip
tacticians-client-027ab65faef27c68a93c7c886c2ddd02f2cb27fd.tar.bz2
...
-rw-r--r--src/css/src/roster-editor/controlled-panel.scss4
-rw-r--r--src/css/src/shared/battle-characters/info-card.scss1
-rw-r--r--src/roster-editor/src/View/CharacterCard.elm65
-rw-r--r--src/shared/battle-characters/BattleCharacters/Struct/Glyph.elm7
4 files changed, 45 insertions, 32 deletions
diff --git a/src/css/src/roster-editor/controlled-panel.scss b/src/css/src/roster-editor/controlled-panel.scss
index c5a8030..6b6f687 100644
--- a/src/css/src/roster-editor/controlled-panel.scss
+++ b/src/css/src/roster-editor/controlled-panel.scss
@@ -33,6 +33,10 @@
padding: 2px;
}
+.roster-editor-atts > *
+{
+ justify-items: space-evenly;
+}
.roster-editor-invalid-character > .info-card-name,
.roster-editor-invalid-character > .character-card-name
{
diff --git a/src/css/src/shared/battle-characters/info-card.scss b/src/css/src/shared/battle-characters/info-card.scss
index 2ef980f..5529a74 100644
--- a/src/css/src/shared/battle-characters/info-card.scss
+++ b/src/css/src/shared/battle-characters/info-card.scss
@@ -158,4 +158,3 @@
flex-direction: row;
flex-wrap: wrap;
}
-
diff --git a/src/roster-editor/src/View/CharacterCard.elm b/src/roster-editor/src/View/CharacterCard.elm
index 1f64f38..0a37317 100644
--- a/src/roster-editor/src/View/CharacterCard.elm
+++ b/src/roster-editor/src/View/CharacterCard.elm
@@ -346,43 +346,46 @@ get_relevant_atts omnimods atts =
(Html.Attributes.class "character-card-atts"),
(Html.Attributes.class "roster-editor-atts")
]
- (
- [
- (
- let
- damage_multiplier =
- (Battle.Struct.Attributes.get_damage_multiplier atts)
- in
- (Html.div
- [
- (Html.Attributes.class "omnimod-attack-mods")
- ]
- (List.map
- (
- \(s, i) ->
- (get_mod_html
- (
- s,
- (ceiling ((toFloat i) * damage_multiplier))
- )
+ [
+ (
+ let
+ damage_multiplier =
+ (Battle.Struct.Attributes.get_damage_multiplier atts)
+ in
+ (Html.div
+ [
+ (Html.Attributes.class "omnimod-attack-mods")
+ ]
+ (List.map
+ (
+ \(s, i) ->
+ (get_mod_html
+ (
+ s,
+ (ceiling ((toFloat i) * damage_multiplier))
)
)
- (Battle.Struct.Omnimods.get_attack_mods omnimods)
)
+ (Battle.Struct.Omnimods.get_attack_mods omnimods)
)
- ),
- (Html.div
- [
- (Html.Attributes.class "omnimod-defense-mods")
- ]
- (List.map
- (get_mod_html)
- (Battle.Struct.Omnimods.get_defense_mods omnimods)
)
+ ),
+ (Html.div
+ [
+ (Html.Attributes.class "omnimod-defense-mods")
+ ]
+ (List.map
+ (get_mod_html)
+ (Battle.Struct.Omnimods.get_defense_mods omnimods)
)
- ]
- ++ (Battle.View.Attribute.get_true_all_html atts)
- )
+ ),
+ (Html.div
+ [
+ (Html.Attributes.class "character-card-actual-attributes")
+ ]
+ (Battle.View.Attribute.get_true_all_html atts)
+ )
+ ]
)
--------------------------------------------------------------------------------
diff --git a/src/shared/battle-characters/BattleCharacters/Struct/Glyph.elm b/src/shared/battle-characters/BattleCharacters/Struct/Glyph.elm
index 9a86fb4..2a5054d 100644
--- a/src/shared/battle-characters/BattleCharacters/Struct/Glyph.elm
+++ b/src/shared/battle-characters/BattleCharacters/Struct/Glyph.elm
@@ -5,6 +5,7 @@ module BattleCharacters.Struct.Glyph exposing
find,
get_name,
get_id,
+ get_family_id,
get_omnimods,
none,
default,
@@ -27,6 +28,7 @@ type alias Type =
{
id : String,
name : String,
+ family_id : String,
omnimods : Battle.Struct.Omnimods.Type
}
@@ -48,6 +50,9 @@ find dict ref =
get_id : Type -> Ref
get_id g = g.id
+get_family_id : Type -> Ref
+get_family_id g = g.family_id
+
get_name : Type -> String
get_name g = g.name
@@ -60,6 +65,7 @@ decoder =
Type
|> (Json.Decode.Pipeline.required "id" Json.Decode.string)
|> (Json.Decode.Pipeline.required "nam" Json.Decode.string)
+ |> (Json.Decode.Pipeline.required "fam" Json.Decode.string)
|> (Json.Decode.Pipeline.required "omni" Battle.Struct.Omnimods.decoder)
)
@@ -68,6 +74,7 @@ none =
{
id = "0",
name = "Empty",
+ family_id = "0",
omnimods = (Battle.Struct.Omnimods.none)
}