summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2019-09-16 17:54:29 +0200
committernsensfel <SpamShield0@noot-noot.org>2019-09-16 17:54:29 +0200
commit511cf3d3d11d8bbe6a11f439cc1786bed19b059d (patch)
treeae96e650823e4cd49a62ae35e555dddf689e0304 /src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm
parent7bd57ea12ba9dde0b88b2476a91737fd4d3de840 (diff)
Dmg type from T-Data, no more atk sum.
Diffstat (limited to 'src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm')
-rw-r--r--src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm32
1 files changed, 10 insertions, 22 deletions
diff --git a/src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm b/src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm
index cea3b0f..f50409d 100644
--- a/src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm
+++ b/src/shared/battle-characters/BattleCharacters/Struct/Weapon.elm
@@ -9,7 +9,6 @@ module BattleCharacters.Struct.Weapon exposing
get_attack_range,
get_defense_range,
get_omnimods,
- get_damage_sum,
decoder,
default,
none
@@ -34,8 +33,7 @@ type alias Type =
is_primary : Bool,
def_range : Int,
atk_range : Int,
- omnimods : Battle.Struct.Omnimods.Type,
- damage_sum : Int
+ omnimods : Battle.Struct.Omnimods.Type
}
type alias Ref = String
@@ -71,25 +69,16 @@ get_defense_range wp = wp.def_range
get_omnimods : Type -> Battle.Struct.Omnimods.Type
get_omnimods wp = wp.omnimods
-get_damage_sum : Type -> Int
-get_damage_sum wp = wp.damage_sum
-
decoder : (Json.Decode.Decoder Type)
decoder =
- (Json.Decode.map
- (\e ->
- {e | damage_sum = (Battle.Struct.Omnimods.get_damage_sum e.omnimods)}
- )
- (Json.Decode.succeed
- Type
- |> (Json.Decode.Pipeline.required "id" Json.Decode.string)
- |> (Json.Decode.Pipeline.required "nam" Json.Decode.string)
- |> (Json.Decode.Pipeline.required "pri" Json.Decode.bool)
- |> (Json.Decode.Pipeline.required "rmi" Json.Decode.int)
- |> (Json.Decode.Pipeline.required "rma" Json.Decode.int)
- |> (Json.Decode.Pipeline.required "omni" Battle.Struct.Omnimods.decoder)
- |> (Json.Decode.Pipeline.hardcoded 0)
- )
+ (Json.Decode.succeed
+ Type
+ |> (Json.Decode.Pipeline.required "id" Json.Decode.string)
+ |> (Json.Decode.Pipeline.required "nam" Json.Decode.string)
+ |> (Json.Decode.Pipeline.required "pri" Json.Decode.bool)
+ |> (Json.Decode.Pipeline.required "rmi" Json.Decode.int)
+ |> (Json.Decode.Pipeline.required "rma" Json.Decode.int)
+ |> (Json.Decode.Pipeline.required "omni" Battle.Struct.Omnimods.decoder)
)
none : Type
@@ -100,8 +89,7 @@ none =
is_primary = False,
def_range = 0,
atk_range = 0,
- omnimods = (Battle.Struct.Omnimods.none),
- damage_sum = 0
+ omnimods = (Battle.Struct.Omnimods.none)
}
default : Type