summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornsensfel <SpamShield0@noot-noot.org>2018-06-21 18:31:06 +0200
committernsensfel <SpamShield0@noot-noot.org>2018-06-21 18:31:06 +0200
commit0f041f72c3d7c116eeb307d339f934d801c5b43a (patch)
tree905a7eaa9901d99b1dd268307d913477322a73e5
parent1114c662e477f048ec22ee73bb01121aba954ba7 (diff)
Changes in max_health during battle are an issue.
Let's not allow them.
-rw-r--r--src/battlemap/src/Struct/Statistics.elm5
-rw-r--r--src/battlemap/src/Update/HandleAnimationEnded.elm2
2 files changed, 2 insertions, 5 deletions
diff --git a/src/battlemap/src/Struct/Statistics.elm b/src/battlemap/src/Struct/Statistics.elm
index de18466..5c1a08f 100644
--- a/src/battlemap/src/Struct/Statistics.elm
+++ b/src/battlemap/src/Struct/Statistics.elm
@@ -136,10 +136,7 @@ new att wp_set ar =
(gentle_squared_growth_f
(average [mind, constitution, constitution, speed, speed, speed])
),
- max_health =
- (gentle_squared_growth_f
- (average [mind, constitution, constitution])
- ),
+ max_health = (gentle_squared_growth constitution),
dodges =
(clamp
0
diff --git a/src/battlemap/src/Update/HandleAnimationEnded.elm b/src/battlemap/src/Update/HandleAnimationEnded.elm
index 741e9bd..60011ac 100644
--- a/src/battlemap/src/Update/HandleAnimationEnded.elm
+++ b/src/battlemap/src/Update/HandleAnimationEnded.elm
@@ -126,6 +126,6 @@ apply_to model =
new_model = (Struct.Model.apply_animator_step model)
in
case new_model.animator of
- Nothing -> (model, Cmd.none)
+ Nothing -> (new_model, Cmd.none)
(Just animator) ->
(prepare_next_animation new_model animator)