From 9609e9a3f294996f77936ec75ae3bf971cde6eba Mon Sep 17 00:00:00 2001 From: Dash Date: Thu, 11 Dec 2025 14:55:44 +0100 Subject: [PATCH] misc: fix style issues --- pqcli/__main__.py | 2 +- pqcli/mechanic.py | 43 ++++++++++++++++++- pqcli/ui/basic/__init__.py | 1 - pqcli/ui/curses/views/__init__.py | 12 ++++++ pqcli/ui/curses/views/confirm_view.py | 2 +- .../views/create_character_view/__init__.py | 7 +++ pqcli/ui/curses/widgets/__init__.py | 12 ++++++ 7 files changed, 74 insertions(+), 5 deletions(-) diff --git a/pqcli/__main__.py b/pqcli/__main__.py index 3d12ffc..7d870a1 100644 --- a/pqcli/__main__.py +++ b/pqcli/__main__.py @@ -79,7 +79,7 @@ def main() -> None: try: player = list(roster.players)[args.load_save - 1] except IndexError: - print(f"Invalid player. Available players:", file=sys.stderr) + print("Invalid player. Available players:", file=sys.stderr) list_players(roster, file=sys.stderr) exit(1) diff --git a/pqcli/mechanic.py b/pqcli/mechanic.py index c6b7ff5..cadf235 100644 --- a/pqcli/mechanic.py +++ b/pqcli/mechanic.py @@ -1,10 +1,49 @@ +import datetime import itertools import logging import math +import typing as T from collections import defaultdict +from dataclasses import dataclass -from pqcli.config import * -from pqcli.lingo import * +from pqcli import random +from pqcli.config import ( + ARMORS, + BORING_ITEMS, + CLASSES, + DEFENSE_ATTRIB, + DEFENSE_BAD, + IMPRESSIVE_TITLES, + ITEM_ATTRIB, + ITEM_OFS, + MONSTERS, + OFFENSE_ATTRIB, + OFFENSE_BAD, + PRIME_STATS, + RACES, + SHIELDS, + SPECIALS, + SPELLS, + TITLES, + WEAPONS, + Class, + EquipmentPreset, + EquipmentType, + Modifier, + Monster, + Race, + StatType, +) +from pqcli.lingo import ( + act_name, + big, + definite, + generate_name, + indefinite, + sick, + special, + young, +) logger = logging.getLogger(__name__) diff --git a/pqcli/ui/basic/__init__.py b/pqcli/ui/basic/__init__.py index 7f90e14..b50ec6b 100644 --- a/pqcli/ui/basic/__init__.py +++ b/pqcli/ui/basic/__init__.py @@ -130,7 +130,6 @@ class BasicUserInterface(BaseUserInterface): def play(self, player: Player) -> None: print(f"Playing as {player.name}") simulation = Simulation(player) - last_save = datetime.now() last_tick = datetime.now() last_level = 0 while True: diff --git a/pqcli/ui/curses/views/__init__.py b/pqcli/ui/curses/views/__init__.py index 6af44e4..e0a6ccb 100644 --- a/pqcli/ui/curses/views/__init__.py +++ b/pqcli/ui/curses/views/__init__.py @@ -9,3 +9,15 @@ from .create_character_view import ( ) from .game_view import GameView from .roster_view import RosterView + +__all__ = [ + "BaseView", + "ChooseCharacterView", + "ConfirmView", + "ChooseCharacterClassView", + "ChooseCharacterNameView", + "ChooseCharacterRaceView", + "ChooseCharacterStatsView", + "GameView", + "RosterView", +] diff --git a/pqcli/ui/curses/views/confirm_view.py b/pqcli/ui/curses/views/confirm_view.py index c393376..1d456b0 100644 --- a/pqcli/ui/curses/views/confirm_view.py +++ b/pqcli/ui/curses/views/confirm_view.py @@ -18,7 +18,7 @@ class ConfirmView(BaseView): self.choices: T.List[Choice] = [ Choice( keys=list(map(ord, "yY")), - desc=f"[Y] Yes", + desc="[Y] Yes", callback=self.on_confirm, ), Choice( diff --git a/pqcli/ui/curses/views/create_character_view/__init__.py b/pqcli/ui/curses/views/create_character_view/__init__.py index 9e28c9e..b4152ca 100644 --- a/pqcli/ui/curses/views/create_character_view/__init__.py +++ b/pqcli/ui/curses/views/create_character_view/__init__.py @@ -2,3 +2,10 @@ from .choose_character_class_view import ChooseCharacterClassView from .choose_character_name_view import ChooseCharacterNameView from .choose_character_race_view import ChooseCharacterRaceView from .choose_character_stats_view import ChooseCharacterStatsView + +__all__ = [ + "ChooseCharacterClassView", + "ChooseCharacterNameView", + "ChooseCharacterRaceView", + "ChooseCharacterStatsView", +] diff --git a/pqcli/ui/curses/widgets/__init__.py b/pqcli/ui/curses/widgets/__init__.py index 53232e6..38dd854 100644 --- a/pqcli/ui/curses/widgets/__init__.py +++ b/pqcli/ui/curses/widgets/__init__.py @@ -6,3 +6,15 @@ from .list_box import ListBox from .menu import Menu from .progress_bar import ProgressBar from .scrollable import Scrollable + +__all__ = [ + "Widget", + "WindowWrapper", + "DataTable", + "Focusable", + "Label", + "ListBox", + "Menu", + "ProgressBar", + "Scrollable", +]