feat(py): Adding function to use area damage spell and fixing some procedures issues

Author: Nanashii76

src/__init__.py

@@ -1,3 +1,8 @@
+import os
+
+# To work on windows
+os.chdir(os.path.dirname(os.path.abspath(__file__)))
+
 from database.Database import Database
 from default import populate_database
 import sys

src/database/dml/procedures.sql

@@ -272,13 +272,13 @@ DECLARE
     v_item_id INT;
 BEGIN
     -- Criar o item da poção
-    INSERT INTO item (tipo, descricao, drop_inimigos_media, nome, peso, preco)
-    VALUES ('Poção', p_descricao, p_drop_inimigos_media, p_nome, p_peso, p_preco)
+    INSERT INTO item (tipo)
+    VALUES ('Poção')
     RETURNING id INTO v_item_id;
 
     -- Criar a poção
-    INSERT INTO pocao (id, turnos, usado)
-    VALUES (v_item_id, p_turnos, FALSE);
+    INSERT INTO pocao (id, turnos, usado, descricao, drop_inimigos_media, nome, peso, preco)
+    VALUES (v_item_id, p_turnos, FALSE, p_descricao, p_drop_inimigos_media, p_nome, p_peso, p_preco);
 
     RETURN v_item_id;
 END;

src/database/dql/query.py

@@ -1,8 +1,8 @@
-# get regions and respective elements
 from numpy import character
 from logic.enemy import Enemy
 from logic.character import Character
 
+# get regions and respective elements
 def regions(conn):
     with conn.cursor() as cur:
         cur.execute(
@@ -146,21 +146,47 @@ def list_item_inventory(conn, character_id):
         cur.execute("""
             SELECT id FROM inventario WHERE personagem_id = %s AND tipo = 'Mochila'
         """, (character_id,))
-        
+
         inventarios = cur.fetchall()
-        
+
         items = []
         for inventario in inventarios:
             inventario_id = inventario[0]
             cur.execute("""
-                SELECT item.nome, item.descricao, COUNT(item_instancia.id) as quantidade
-                FROM item_instancia
-                JOIN item ON item_instancia.item_id = item.id
-                WHERE item_instancia.inventario_id = %s
-                GROUP BY item.nome, item.descricao
+                -- Seleciona os itens que estão na mochila do personagem
+                SELECT 
+                    i.tipo,
+                    CASE 
+                        WHEN i.tipo = 'Poção' THEN p.nome
+                        WHEN i.tipo = 'Pergaminho' THEN pe.nome
+                        WHEN i.tipo = 'Acessório' THEN a.nome
+                        ELSE 'Desconhecido'
+                    END AS nome,
+                    CASE 
+                        WHEN i.tipo = 'Poção' THEN p.descricao
+                        WHEN i.tipo = 'Pergaminho' THEN pe.descricao
+                        WHEN i.tipo = 'Acessório' THEN a.descricao
+                        ELSE 'Sem descrição'
+                    END AS descricao,
+                    COUNT(ii.id) AS quantidade
+                FROM item_instancia ii
+                JOIN item i ON ii.item_id = i.id
+                LEFT JOIN pocao p ON i.id = p.id
+                LEFT JOIN pergaminho pe ON i.id = pe.id
+                LEFT JOIN acessorio a ON i.id = a.id
+                WHERE ii.mochila_id = %s
+                GROUP BY 
+                    i.tipo, 
+                    p.nome, 
+                    pe.nome, 
+                    a.nome, 
+                    p.descricao, 
+                    pe.descricao, 
+                    a.descricao
             """, (inventario_id,))
-            
+
             items.extend(cur.fetchall())
+
     return items
 
 def get_civilian_info(conn, npc_name):
@@ -281,7 +307,7 @@ def update_mp(conn, character_id, new_energia_arcana):
         cur.execute(
             f"""
                 UPDATE personagem
-                SET energia_arcana = GREATEST(0, energia_arcana - {new_energia_arcana})
+                SET energia_arcana = GREATEST(0, {new_energia_arcana})
                 WHERE id = {character_id}
             """
         )
@@ -299,12 +325,9 @@ def update_combat(conn , enemies: Enemy, character: Character):
     with conn.cursor() as cursor:
         for enemy in enemies:
             cursor.execute(
-                f"""
-                SELECT atualizar_combate (
-                    {character.id},
-                    {enemy.id},
-                    {character.vida},
-                    {enemy.vida}
-                )"""
+                """
+                SELECT atualizar_combate(%s, %s, %s, %s)
+                """,
+                (character.id, enemy.id, int(character.vida), int(enemy.vida)) 
             )
             conn.commit()

src/default.py

@@ -61,9 +61,9 @@ def populate_database(db: Database):
         #enemie_storage.enemie_storage(db)
         #quest.quests(db)
 #
-        ##potions
-        #potions.potions(db)
-        #potion_effect.potion_effect(db)
+        #potions
+        potions.potions(db)
+        potion_effect.potion_effect(db)
 
 
         db.conn.commit()

src/logic/character.py

@@ -164,19 +164,19 @@ def add_initial_items(self, conn):
 
             with conn.cursor() as cur:
                 cur.execute("""
-                    INSERT INTO item_instancia (item_id, inventario_id)
+                    INSERT INTO item_instancia (item_id, mochila_id)
                     VALUES (%s, %s)
                     RETURNING item_id;
                 """, (elixir_da_vida_id, inventory_id))
 
                 cur.execute("""
-                    INSERT INTO item_instancia (item_id, inventario_id)
+                    INSERT INTO item_instancia (item_id, mochila_id)
                     VALUES (%s, %s)
                     RETURNING item_id;
                 """, (elixir_da_vida_id, inventory_id))
 
                 cur.execute("""
-                    INSERT INTO item_instancia (item_id, inventario_id)
+                    INSERT INTO item_instancia (item_id, mochila_id)
                     VALUES (%s, %s)
                     RETURNING item_id;
                 """, (mana_liquida_id, inventory_id))

src/logic/combat.py

@@ -1,3 +1,4 @@
+from ast import For
 from typing import List
 import random
 from colorama import Fore, Style
@@ -87,13 +88,16 @@ def get_spell(self) -> tuple:
             selected_spell = spells[option_i - 1]
             _, _, _, energia_arcana, *_ = selected_spell
 
-    
+            # Energia_arcana != None
+            energia_arcana = energia_arcana if energia_arcana is not None else 0
+
             if energia_arcana > self.character.energia_arcana:
                 print(Fore.RED + "Energia Arcana insuficiente!" + Style.RESET_ALL)
                 display.press_enter()
                 continue
             # To-do: Add to query
-            self.character.energia_arcana = query.update_mp(self.conn, self.character.id, energia_arcana)
+            self.character.energia_arcana -= energia_arcana
+            self.character.energia_arcana = query.update_mp(self.conn, self.character.id, self.character.energia_arcana)
             break
 
         return selected_spell
@@ -108,7 +112,7 @@ def apply_spell_effect(self, spell) -> None:
         # ..
         # To-do: debug test...
         # ..
-        debug(tipo, energia_arcana)
+        debug(f" tipo do feitiço: {tipo}, qtd_energia: {energia_arcana}")
         display.press_enter()
 
         if tipo == 'Dano':
@@ -117,9 +121,10 @@ def apply_spell_effect(self, spell) -> None:
 
 
         elif tipo == 'Dano de área':
-            enemy = self.select_enemy()
-            debug('to-do: area damage')
-            display.press_enter()
+            # enemy = self.select_enemy()
+            # debug('to-do: area damage')
+            # display.press_enter()
+            self.apply_area_damage_spell(spell)
 
 
         elif tipo == 'Cura':
@@ -128,19 +133,30 @@ def apply_spell_effect(self, spell) -> None:
     # Functionality:
     #   Returns true if enemy was killed.
     def apply_damage_spell(self, spell, enemy) -> bool:
-        damage = spell[3]
+        damage = spell[4]
 
         damage *= self.advantage_element(self.character.elemento, enemy.elemento)
 
         enemy.vida = min(enemy.vida - damage, 0)
 
         # To-do: put this into a interface file.
         print(f"{Fore.BLUE} Foi conjurado {spell[0]} causando {damage} de dano! {Style.RESET_ALL}")
-        
         return enemy.vida <= 0
 
     # Functionality:
     #   Apply area damage spell
+    def apply_area_damage_spell(self, spell):
+        nome, _, _, _, dano, qtd_inimigos_afetados = spell
+        print(f"{Fore.MAGENTA} {nome} foi conjurado! {Style.RESET_ALL}")
+
+        # filter enemies alive and random chose enemies
+        alive_enemies = [enemy for enemy in self.enemies if enemy.vida > 0]
+        affected_enemies = random.sample(alive_enemies, min(qtd_inimigos_afetados, len(alive_enemies)))
+
+        for enemy in affected_enemies:
+            final_damage = dano * self.advantage_element(self.character.elemento, enemy.elemento)
+            enemy.vida = max(enemy.vida - final_damage, 0)
+            print(f"{Fore.BLUE} {enemy.nome} recebeu {final_damage} de dano! {Style.RESET_ALL}")
 
     # Functionality:
     #   Apply recover from healing spell 
@@ -157,6 +173,20 @@ def enemy_delay(self):
         print(Style.BRIGHT + Fore.YELLOW + "..." + Style.RESET_ALL)
         time.sleep(1)
 
+    # Functionality
+    # Enemy turn
+    def enemy_turn(self):
+        print(Style.BRIGHT + Fore.YELLOW + "Os inimigos estão atacando!!!" + Style.RESET_ALL)
+        time.sleep(1)
+
+        for enemy in self.enemies:
+            if enemy.vida > 0:
+                damage = random.randint(3, 10)
+                damage *= self.advantage_element(enemy.elemento, self.character.elemento)
+                self.character.vida = max(self.character.vida - damage, 0)
+
+                print(f"{Fore.RED} {enemy.nome} te atacou e causou {damage} de dano! {Style.RESET_ALL}")
+
     # Functionality:
     #   Select and returns an enemy.
     def select_enemy(self) -> Enemy:
@@ -170,6 +200,19 @@ def select_enemy(self) -> Enemy:
         ], False)
         return self.enemies[enemy_i - 1]
 
+    # Functionality
+    # check if combat has terminated
+    def check_combat_end(self):
+        if self.character.vida <= 0:
+            print(Fore.RED + "Você foi derrotado..." + Style.RESET_ALL)
+            return True
+        
+        if all(enemy.vida <= 0 for enemy in self.enemies):
+            print(Fore.GREEN + "Todos os inimigos foram derrotados!" + Style.RESET_ALL)
+            return True
+
+        return False
+
     # Logic:
     #   True: if the player ran away or won the combat
     #   False: if the player died.
@@ -221,17 +264,18 @@ def init(self):
 
                 debug(self.character.energia_arcana)
                 display.press_enter()
-                
-                # to-do:
-                query.update_combat(self.conn, self.enemies, self.character)
-
 
             elif option == "Usar Poção":
                 debug("to-do: usar poção")
                 display.press_enter()
-                
-            # ---
-            # ....
-            # To-do: enemies turn.
+
+            query.update_combat(self.conn, self.enemies, self.character)
+            if self.check_combat_end():
+                return True
 
+            self.enemy_turn()
+
+            if self.check_combat_end():
+                return True
+
         return True