fix(combat): heal health up to max and improve enemy AI

game/combat/enemy_turn.rpy

@@ -2,15 +2,15 @@ label enemy_turn:
 
     $ enemy_attack = renpy.random.randint(1 + victories, 5 + victories)
     $ enemy_heal = renpy.random.randint(1 + victories, 5 + victories)
-    $ coinflip = renpy.random.choice([True, False])
 
-    if coinflip:
+    if enemy.health < enemy.health_max and coinflip():
+        "Enemy healed [enemy_heal] health."
+        $ enemy.health = enemy.health_max if enemy.health + enemy_heal >= enemy.health_max else enemy.health + enemy_heal
+
+    else:
         "Enemy dealt [enemy_attack] damage to you."
         show placeholder boy with vpunch
         $ player.health -= enemy_attack
-    else:
-        "Enemy healed [enemy_heal] health."
-        $ enemy.health += enemy_heal
 
     $ player.energy = player.energy_max
 

game/combat/functions.rpy

@@ -0,0 +1,3 @@
+init python:
+    def coinflip() -> bool:
+        return renpy.random.choice([True, False])

game/combat/player_turn.rpy

@@ -6,15 +6,18 @@ label player_turn:
         "You defeated the enemy!"
         jump combat
 
+    if not player.energy:
+        jump enemy_turn
+
     $ player_attack = renpy.random.randint(1, 5)
     $ player_heal = renpy.random.randint(1, 5)
 
     menu:
         "Choose your action."
 
         "{color=#EE4B2B}Attack [player_attack]\n{color=#add8e6}Energy -1" if player.energy >= 1:
-            $ enemy.health -= player_attack
             $ player.energy -= 1
+            $ enemy.health -= player_attack
 
             show placeholder boy at shake, center
 
@@ -23,8 +26,8 @@ label player_turn:
             jump player_turn
 
         "{color=#af0}Heal [player_heal]\n{color=#add8e6}Energy -2" if player.energy >= 2:
-            $ player.health += player_heal
             $ player.energy -= 2
+            $ player.health = player.health_max if player.health + player_heal >= player.health_max else player.health + player_heal
 
             "You healed [player_heal] health."
 

game/combat/screens.rpy

@@ -1,5 +1,5 @@
 screen stat(name, current, max):
-    text "[name]: [current]"
+    text "[name]: [current]/[max]"
     bar value AnimatedValue(current, max):
         xalign 0.5
         xsize 300