More formatting changes

Author: Vesper-arch

dagascii.py

@@ -8,12 +8,9 @@
 import pydoc
 import sys
 
-from grandalf.graphs import Edge
-from grandalf.graphs import Graph
-from grandalf.graphs import Vertex
+from grandalf.graphs import Edge, Graph, Vertex
 from grandalf.layouts import SugiyamaLayout
-from grandalf.routing import EdgeViewer
-from grandalf.routing import route_with_lines
+from grandalf.routing import EdgeViewer, route_with_lines
 
 DVC_PAGER = "DVC_PAGER"
 

definitions.py

@@ -1,5 +1,6 @@
 from enum import StrEnum, auto
 
+
 class CombatTier(StrEnum):
     NORMAL = 'Normal'
     ELITE = 'Elite'
@@ -60,4 +61,4 @@ class EnemyState(StrEnum):
     ALIVE = 'alive'
     DEAD = 'dead'
     ESCAPED = 'escaped'
-    INTANGIBLE = 'intangible' # Enemies that revive have a period where they cannot be attacked and have no intent.
+    INTANGIBLE = 'intangible' # Enemies that revive have a period where they cannot be attacked and have no intent.

entities.py

@@ -753,7 +753,6 @@ def move_spam_check(self, target_move, max_count):
         return True
 
     def attack(self, dmg: int, times: int):
-        dmg_affected_by = ''
         for _ in range(times):
             bus.publish(Message.BEFORE_ATTACK, (self, dmg, player.block))
             if dmg <= player.block:

events.py

@@ -1,12 +1,13 @@
-import random
 import math
+import random
 from time import sleep
 from typing import Callable
+
 from ansi_tags import ansiprint
-from items import cards, potions, relics
+from definitions import CombatTier
 from entities import player
 from helper import gen, view
-from definitions import CombatTier
+from items import cards, potions, relics
 
 
 def event_Neow():

game.py

@@ -79,9 +79,9 @@ def end_combat(self, killed_enemies=False, escaped=False, robbed=False):
             player.gain_gold(random.randint(10, 20) * 1 if relics['Golden Idol'] not in self.player.relics else 1.25)
             if potion_roll < self.player.potion_dropchance or relics['White Beast Statue'] in self.player.relics:
                 gen.claim_potions(True, 1, player, potions)
-                potion_dropchance -= 10
+                player.potion_dropchance -= 10
             else:
-                potion_dropchance += 10
+                player.potion_dropchance += 10
             for _ in range(int(relics['Prayer Wheel'] in self.player.relics) + 1):
                 gen.card_rewards(self.tier, True, self.player, cards)
             sleep(1.5)
@@ -296,38 +296,6 @@ def play_potion():
     view.view_potions(player.potions, player.max_potions)
     input('This is currently not implemented. Press enter to leave > ')
 
-
-
-def play_card(card):
-    while True:
-        # Prevents the player from using a card that they don't have enough energy for.
-        energy_cost = card.get("Energy", float('inf')) if card.get("Energy", float('inf')) != -1 else player.energy
-        if energy_cost > player.energy:
-            ansiprint("<red>You don't have enough energy to use this card.</red>")
-            sleep(1)
-            view.clear()
-            return
-        if player.choker_cards_played == 6:
-            ansiprint("You have already played 6 cards this turn!")
-            sleep(1)
-            view.clear()
-            return
-        if card.get("Target") == 'Single' and len(active_enemies) > 1:
-            try:
-                target = int(input("Choose an enemy to target > ")) - 1
-                _ = active_enemies[target]
-            except (IndexError, ValueError):
-                ansiprint(f"\u001b[1A\u001b[100D<red>You have to enter a number between 1 and {len(active_enemies)}</red>", end='')
-                sleep(1)
-                print("\u001b[2K\u001b[100D", end='')
-                continue
-        elif len(active_enemies) == 1:
-            target = 0
-        else:
-            target = 0
-        player.use_card(card, active_enemies[target], False, player.hand)
-        break
-
 def play(encounter: EncounterType, gm: game_map.GameMap):
     if encounter.type == EncounterType.START:
         pass

game_map.py

@@ -1,12 +1,15 @@
 # game_map.py
 from __future__ import annotations
-from enum import StrEnum, auto
+
 import random
+from enum import StrEnum, auto
 from typing import List
-from typing import List
+
+from grandalf.graphs import Edge, Graph, Vertex
+
 from dagascii import draw
 from definitions import EncounterType
-from grandalf.graphs import Vertex, Edge, Graph
+
 
 class MapError(Exception):
   pass
@@ -138,4 +141,4 @@ def create_first_map():
 
     boss = Encounter(ET.BOSS, parents=[F4a, F4b, F4c, F4d])
 
-    return GameMap(start)
+    return GameMap(start)

helper.py

@@ -2,7 +2,7 @@
 import random
 import re
 from copy import deepcopy
-from os import system
+from os import name, system
 from time import sleep
 from typing import Callable
 
@@ -169,7 +169,7 @@ def display_actual_block(self, string: str, entity) -> tuple[str, str]:
         return string, affected_by
 
     def clear(self):
-        system('cls' if os.name == 'nt' else 'clear')
+        system('cls' if name == 'nt' else 'clear')
 
 class Generators():
     '''Generates relic_pool, potions, and cards'''
@@ -190,9 +190,9 @@ def generate_card_rewards(self, reward_tier: CombatTier, amount: int, entity: ob
         common_cards = [card() for card in card_pool if card.rarity == Rarity.COMMON and card.type not in (CardType.STATUS, CardType.CURSE) and card.player_class == entity.player_class]
         uncommon_cards = [card() for card in card_pool if card.rarity == Rarity.UNCOMMON and card.type not in (CardType.STATUS, CardType.CURSE) and card.player_class == entity.player_class]
         rare_cards = [card() for card in card_pool if card.rarity == Rarity.RARE and card.type not in (CardType.STATUS, CardType.CURSE) and card.player_class == entity.player_class]
-        assert len(common_cards) > 0, f"Common pool is empty."
-        assert len(uncommon_cards) > 0, f"Uncommon pool is empty."
-        assert len(rare_cards) > 0, f"Rare pool is empty."
+        assert len(common_cards) > 0, "Common pool is empty."
+        assert len(uncommon_cards) > 0, "Uncommon pool is empty."
+        assert len(rare_cards) > 0, "Rare pool is empty."
 
         rarities =  [common_cards, uncommon_cards, rare_cards]
         rewards = []
@@ -215,9 +215,9 @@ def generate_potion_rewards(self, amount: int, entity: object, potion_pool: dict
         common_potions: list[dict] = [potion() for potion in potion_pool if potion.rarity == Rarity.COMMON and (potion.player_class == PlayerClass.ANY or potion.player_class == entity.player_class)]
         uncommon_potions: list[dict] = [potion() for potion in potion_pool if potion.rarity == Rarity.UNCOMMON and (potion.player_class == PlayerClass.ANY or potion.player_class == entity.player_class)]
         rare_potions: list[dict] = [potion() for potion in potion_pool if potion.rarity == Rarity.RARE and (potion.player_class == PlayerClass.ANY or potion.player_class == entity.player_class)]
-        assert len(common_potions) > 0, f"Common potions pool is empty."
-        assert len(uncommon_potions) > 0, f"Uncommon potions pool is empty."
-        assert len(rare_potions) > 0, f"Rare potions pool is empty."
+        assert len(common_potions) > 0, "Common potions pool is empty."
+        assert len(uncommon_potions) > 0, "Uncommon potions pool is empty."
+        assert len(rare_potions) > 0, "Rare potions pool is empty."
 
         all_potions = common_potions + uncommon_potions + rare_potions
         rarities = [common_potions, uncommon_potions, rare_potions]
@@ -257,7 +257,7 @@ def generate_relic_rewards(self, source: str, amount: int, entity, relic_pool: d
         return rewards
 
     def claim_relics(self, choice: bool, entity: object, relic_amount: int, relic_pool: dict=None, rewards: list=None, chance_based=True):
-        relic_pool = relic_pool if not relic_pool else relic_pool
+        relic_pool = relic_pool if relic_pool else relic_pool
         if not rewards:
             rewards = self.generate_relic_rewards('Other', relic_amount, entity, relic_pool, chance_based)
         if not choice:
@@ -325,11 +325,7 @@ def card_rewards(self, tier: str, choice: bool, entity, card_pool: dict, rewards
             if choice:
                 chosen_reward = view.list_input('What card do you want? > ', rewards, view.view_piles)
                 # This could probably be condensed
-                if entity.upgrade_attacks and rewards[chosen_reward].type == 'Attack':
-                    rewards[chosen_reward].upgrade()
-                elif entity.upgrade_skills and rewards[chosen_reward].type == 'Skill':
-                    rewards[chosen_reward].upgrade()
-                elif entity.upgrade_powers and rewards[chosen_reward].type == 'Power':
+                if entity.upgrade_attacks and rewards[chosen_reward].type == 'Attack' or (entity.upgrade_skills and rewards[chosen_reward].type == 'Skill' or entity.upgrade_powers and rewards[chosen_reward].type == 'Power'):
                     rewards[chosen_reward].upgrade()
                 entity.deck.append(rewards[chosen_reward])
                 ansiprint(f"{entity.name} obtained <bold>{rewards[chosen_reward].name}</bold>")