Merge pull request #10 from juanzq10dev/POKEMON-Clean-battles-turn-code

Pokemon clean battles turn code

Author: juanzq10dev

reference-vault/projects/pokemon/src/app/game/battle.py

@@ -5,83 +5,68 @@
 
 
 class Battle:
-    def __init__(self):
-        self.trainer1 = Pokemon_Trainer(
-            "Player 1", [Pokemon("Pikachu", 100), Pokemon("Raychu", 200)]
-        )
-        self.trainer2 = Pokemon_Trainer(
-            "Player 2", [Pokemon("Charizard", 100), Pokemon("Bulbasaur", 200)]
-        )
-        self.pokemon1 = self.trainer1.pokemon_team[0]
-        self.pokemon2 = self.trainer2.pokemon_team[0]
-        self.players_turn = self.pokemon2
-        self.not_players_turn = self.pokemon1
+    def __init__(self, trainer1: Pokemon_Trainer, trainer2: Pokemon_Trainer):
+        self.trainer1 = trainer1
+        self.trainer2 = trainer2
+        self.players_turn = self.trainer2
+        self.not_players_turn = self.trainer1
         pass
 
     def change_turn(self):
-        if self.players_turn == self.pokemon1:
-            self.players_turn = self.pokemon2
-            self.not_players_turn = self.pokemon1
+        if self.players_turn == self.trainer1:
+            self.players_turn = self.trainer2
+            self.not_players_turn = self.trainer1
         else:
-            self.players_turn = self.pokemon1
-            self.not_players_turn = self.pokemon2
-    
-    
-    def update_pokemon(self):
-        if self.players_turn is self.pokemon1:
-            self.pokemon1 =  self.trainer1.choose_pokemon()
-        else:
-            self.pokemon2 = self.trainer2.choose_pokemon()
-            
+            self.players_turn = self.trainer1
+            self.not_players_turn = self.trainer2
 
     def game_loop(self):
         game_finished = False
         while not game_finished:
             self.show_health_bars()
-            self.action()
+            self.action(self.players_turn, self.not_players_turn)
             game_finished = self.check_game_finished()
             self.change_turn()
 
         self.show_health_bars()
 
     def check_game_finished(self) -> bool:
-        if self.pokemon1.hp <= 0:
-            display_message.show_winner(self.pokemon2.name)
+        if self.trainer1.get_pokemon_in_battle().hp <= 0:
+            display_message.show_winner(self.trainer2.name)
             return True
 
-        if self.pokemon2.hp <= 0:
-            display_message.show_winner(self.pokemon1.name)
+        if self.trainer2.get_pokemon_in_battle().hp <= 0:
+            display_message.show_winner(self.trainer1.name)
             return True
 
         return False
 
-    def action(self):
-        display_message.choose_action(self.players_turn.name)
+    def action(self, attacker: Pokemon_Trainer, defender: Pokemon_Trainer):
+        display_message.choose_action(attacker.name)
 
         user_input_int = io.read_input_int("Select action: ")
 
         if user_input_int is None:
             display_message.invalid_action()
             self.action()
 
+        attacker_pokemon = attacker.get_pokemon_in_battle()
+        defender_pokemon = defender.get_pokemon_in_battle()
+
         match user_input_int:
             case 1:
-                self.use_movement()
+                display_message.choose_movement(attacker_pokemon.moves)
+                attacker_pokemon.use_move(attacker.choose_attack(), defender_pokemon)
             case 2:
-                self.players_turn.heal()
+                attacker_pokemon.heal()
             case 3:
-                self.update_pokemon()
+                attacker.choose_pokemon()
             case _:
                 display_message.invalid_action()
                 self.action()
 
         self.players_turn
 
-    def use_movement(self):
-        display_message.choose_movement(self.players_turn.moves)
-        user_input_int = io.read_input_int("Select an option: ")
-        self.players_turn.use_move(user_input_int, self.not_players_turn)
-
     def show_health_bars(self):
-        display_message.show_pokemon_healthbar(self.pokemon1)
-        display_message.show_pokemon_healthbar(self.pokemon2)
+        display_message.show_pokemon_healthbar(self.trainer1.get_pokemon_in_battle())
+        display_message.show_pokemon_healthbar(self.trainer2.get_pokemon_in_battle())

reference-vault/projects/pokemon/src/app/game/trainer.py

@@ -8,13 +8,32 @@ class Pokemon_Trainer:
     def __init__(self, name: str, pokemon_team: List["Pokemon"]):
         self.name = name
         self.pokemon_team = pokemon_team
-        self.pokemon_in_battle = pokemon_team[0]
+        self.pokemon_in_battle_index = 0
 
-    def choose_pokemon(self) -> "Pokemon":
+    def get_pokemon_in_battle(self) -> "Pokemon":
+        return self.pokemon_team[self.pokemon_in_battle_index]
+
+    def choose_attack(self) -> int:
+        user_input_int = io.read_input_int("Select an option")
+        if (
+            user_input_int is None
+            or user_input_int < 0
+            or user_input_int >= len(self.get_pokemon_in_battle().moves)
+        ):
+            self.choose_attack()
+        
+        return user_input_int
+
+    def choose_pokemon(self) -> None:
         display_messages.select_pokemon(self.pokemon_team)
         user_input_int = io.read_input_int("Select action: ")
 
-        if user_input_int < 0 or user_input_int > len(self.pokemon_team):
+        if (
+            user_input_int is None
+            or user_input_int < 0
+            or user_input_int >= len(self.pokemon_team)
+            or user_input_int == self.pokemon_in_battle_index
+        ):
             self.choose_pokemon()
 
-        return self.pokemon_team[user_input_int]
+        self.pokemon_in_battle_index = user_input_int

reference-vault/projects/pokemon/src/app/main.py

@@ -1,7 +1,18 @@
 import app.game.battle as battle
+from app.lib.pokemon import Pokemon
+from app.game.trainer import Pokemon_Trainer
+
 
 def main() -> None:
-    battle.Battle().game_loop()
+    trainer1 = Pokemon_Trainer(
+        "Player 1", [Pokemon("Pikachu", 100), Pokemon("Raychu", 200)]
+    )
+    trainer2 = Pokemon_Trainer(
+        "Player 2", [Pokemon("Charizard", 100), Pokemon("Bulbasaur", 200)]
+    )
 
+    battle.Battle(trainer1, trainer2).game_loop()
+
+
 if __name__ == "__main__":
-    main()
+    main()