char.act(target) changed to char.next_move(target) - stun is now work…

…ing properly
czubert · Aug 4, 2019 · ba2e631 · ba2e631
1 parent a7afa32
commit ba2e631
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/characters.py b/characters.py
@@ -68,16 +68,11 @@ def regenerate(self):
         self.regenerate_mana()
 
     def regenerate_hp(self):
-        if self.current_hp + self.hp_regen * self.current_hp >= self.max_hp:
-            self.current_hp = self.max_hp
-        else:
-            self.current_hp = self.current_hp + self.hp_regen * self.max_hp  # hp regeneration
+        self.current_hp = min(self.max_hp, self.current_hp + self.hp_regen * self.max_hp)  # hp regeneration
 
     def regenerate_mana(self):
-        if self.current_mana + self.mana_regen * self.current_mana >= self.max_mana:
-            self.current_mana = self.max_mana
-        else:
-            self.current_mana = self.current_mana + self.mana_regen * self.max_mana  # hp regeneration
+        self.current_mana = min(self.max_mana,
+                                self.current_mana + self.mana_regen * self.max_mana)  # hp regeneration# mana regeneration
 
     def get_exp(self):
         self.exp += 250

diff --git a/teams.py b/teams.py
@@ -1,5 +1,4 @@
 import random
-import math
 
 import characters
 
@@ -47,11 +46,9 @@ def team_act(self, char):
         if char.current_hp < 0:
             return
 
-        # target = self.find_weakest_character(self.opponent_team)
-
         target = char.find_weakest_character()
 
-        char.act(target)
+        char.next_move(target)
 
         char.get_exp()