Оптимизация

Author: kotazzz

CHANGELOG.md

@@ -5,16 +5,22 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.2.2]
+
+### Изменено
+
+- Оптизированы некоторые части кода, в том числе события и состояние игры
+
 ## [1.2.1] - 2023-11-24
 
 [1.2.1]: https://github.com/kotazzz/krpg/compare/1.2.0...1.2.1
 
-## Изменено
+### Изменено
 
 - Перенесены некоторые данные в файлы data/
 - Обработка параметров запуска перенесена в `__main__.py`
 
-## Добавлено
+### Добавлено
 
 - Добавлены инструменты сборки, позволяющие автоматизировать процесс установки версии
 - Теперь black являются частью зависимостей

CODE_OF_CONDUCT.md

@@ -116,13 +116,13 @@ the community.
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
-https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+<https://www.contributor-covenant.org/version/2/0/code_of_conduct.html>.
 
 Community Impact Guidelines were inspired by [Mozilla's code of conduct
 enforcement ladder](https://github.com/mozilla/diversity).
 
 [homepage]: https://www.contributor-covenant.org
 
 For answers to common questions about this code of conduct, see the FAQ at
-https://www.contributor-covenant.org/faq. Translations are available at
-https://www.contributor-covenant.org/translations.
+<https://www.contributor-covenant.org/faq>. Translations are available at
+<https://www.contributor-covenant.org/translations>.

krpg/actions.py

@@ -109,10 +109,9 @@ def get_actions(self) -> list[Action]:
         actions.extend(self.actions)
         names = {}
         for action in actions:
-            if action.name not in names:
-                names[action.name] = action
-            else:
+            if action.name in names:
                 raise Exception(f"Same names: {names[action.name]} and {action}")
+            names[action.name] = action
         return actions
 
     def __repr__(self):

krpg/battle.py

@@ -36,6 +36,7 @@ def predict(self, player: Entity, enemy: Entity) -> int:
         # player, enemy - Entity
         # actions: 0 - attack, 1 - defend
         # Rule format: ([...expressions (str)], action, weight)
+        # TODO: Lambda functions
         rules = [
             # If enemy have 50%+ hp, then attack
             (["enemy.hp / enemy.max_hp >= 0.5"], 0, 1),

krpg/builder.py

@@ -206,10 +206,7 @@ def build_action(self, command: Section):
         name, description = command.args
         block = self.game.executer.create_block(command)
 
-        def new_command(game: Game):
-            block.run()
-
-        return action(name, description)(new_command)
+        return action(name, description)(block.run)
 
     def build_triggers(self, triggers: Section | None):
         # Build triggers for a location in the game

krpg/events.py

@@ -1,45 +1,46 @@
 from collections import defaultdict
+from enum import StrEnum, auto
 from typing import Callable
 
 
-class Events:
+class Events(StrEnum):
     # clock.py
-    TIMEPASS = "timepass"  # minutes: int
-    NEWDAY = "newday"  # day: int
+    TIMEPASS = auto()  # minutes: int
+    NEWDAY = auto()  # day: int
 
     # game.py
-    SAVE = "save"  # -
-    LOAD = "load"  # successcb=None
-    STATE_CHANGE = "state_change"  # state: str
-    COMMAND = "command"  # command: str
+    SAVE = auto()  # -
+    LOAD = auto()  # successcb=None
+    STATE_CHANGE = auto()  # state: str
+    COMMAND = auto()  # command: str
 
     # player.py
-    PICKUP = "pickup"  # item: Item, amount: int
-    ADD_MONEY = "add_money"  # amount: int, new_balance: int
-    REMOVE_MONEY = "remove_money"  # amount: int, new_balance: int
-    ADD_FREE = "add_free"  # amount: int, new_balance: int
-    REMOVE_FREE = "remove_free"  # amount: int, new_balance: int
-    HEAL = "heal"  # amount: int
-    DAMAGE = "damage"  # amount: int
-    DEAD = "dead"  # -
+    PICKUP = auto()  # item: Item, amount: int
+    ADD_MONEY = auto()  # amount: int, new_balance: int
+    REMOVE_MONEY = auto()  # amount: int, new_balance: int
+    ADD_FREE = auto()  # amount: int, new_balance: int
+    REMOVE_FREE = auto()  # amount: int, new_balance: int
+    HEAL = auto()  # amount: int
+    DAMAGE = auto()  # amount: int
+    DEAD = auto()  # -
 
     # world.py
-    WORLD_ITEM_TAKE = "world_item_take"  # item_id: str, remain: int
-    WORLD_ITEM_DROP = "world_item_drop"  # item_id: str, count: int
-    MOVE = "move"  # before: Location, after: Location
+    WORLD_ITEM_TAKE = auto()  # item_id: str, remain: int
+    WORLD_ITEM_DROP = auto()  # item_id: str, count: int
+    MOVE = auto()  # before: Location, after: Location
 
     # settings.py
-    SETTING_CHANGE = "setting_change"  # setting: str, value: Any
+    SETTING_CHANGE = auto()  # setting: str, value: Any
 
     # battle.py
-    KILL = "kill"  # monster_id: str
+    KILL = auto()  # monster_id: str
 
     # quests.py
-    QUEST_START = "quest_start"  # quest_id: str
+    QUEST_START = auto()  # quest_id: str
 
     # nps.py
-    NPC_MEET = "npc_meet"  # npc_id: str
-    NPC_STATE = "npc_state"  # npc_id: str, state: str
+    NPC_MEET = auto()  # npc_id: str
+    NPC_STATE = auto()  # npc_id: str, state: str
 
 
 class EventHandler:
@@ -48,9 +49,6 @@ def __init__(self, *lookup: object):
         for obj in lookup:
             self.lookup(obj)
 
-    def lock(self):
-        self._lock = True
-
     def listen(self, event: str, callback: Callable):
         self.listeners[event].append(callback)
 
@@ -63,7 +61,6 @@ def lookup(self, obj: object):
     def dispatch(self, event: str, *args, **kwargs):
         for listener in self.listeners["*"] + self.listeners["event"]:
             listener(event, *args, **kwargs)
-
         if event not in ["*", "event"]:
             for listener in self.listeners[event]:
                 listener(*args, **kwargs)

krpg/executer.py

@@ -91,7 +91,7 @@ def print_block_command(game: Game):
 
         self.print_block_command = print_block_command
 
-    def run(self, from_start: bool = True):
+    def run(self, from_start: bool = True, *args, **kwargs):
         """
         Runs the block of code.
 

krpg/game.py

@@ -33,14 +33,21 @@
 from krpg.settings import Settings
 from krpg.stats import StatsManager
 from krpg.world import World
+from enum import Enum
 
 
+class GameState(Enum):
+    NONE = 0
+    PLAYING = 1
+    EXIT = 2
+    DEAD = 3
+
 class Game:
     savers: dict[str, set[callable, callable]] = {}
 
     def __init__(self, debug_mode: bool = False):
         self.version = __version__
-        self.state = "none"
+        self.state = GameState.NONE
         self.console = KrpgConsole()
         self.log = self.console.log
         self.set_debug(debug_mode)
@@ -128,7 +135,7 @@ def main_menu(self):
         self.console.set_bar(
             f"[magenta]K[/][red]-[/][blue]R[/][yellow]P[/][green]G[/] {random.choice(BRAND_COLORS)}{self.version}[/]"
         )
-        while self.state != "playing":
+        while self.state != GameState.PLAYING:
             menu = {
                 "start": "Начать новую игру",
                 "load": "Загрузить сохранение",
@@ -172,7 +179,7 @@ def main_menu(self):
                 self.executer.create_block(init).run()
                 self.world.set()
                 self.world.current.locked = False
-                self.events.dispatch(Events.STATE_CHANGE, state="playing")
+                self.events.dispatch(Events.STATE_CHANGE, state=GameState.PLAYING)
 
             elif select == "load":
                 self.new_game()
@@ -185,15 +192,15 @@ def main_menu(self):
     def playing(self):
 
         try:
-            while self.state == "playing":
+            while self.state == GameState.PLAYING:
                 self.console.set_bar(f"[yellow]{self.player.name}[/]")
                 actions = self.actions.get_actions()
                 cmds_data = {cmd.name: cmd.description for cmd in actions}
                 cmd = self.console.prompt(1, cmds_data)
                 self.events.dispatch(Events.COMMAND, command=cmd)
         except KeyboardInterrupt:
             self.console.print("[red]Выход из игры[/]")
-            self.state = "None"
+            self.state = GameState.NONE
 
     def timestamp(self):
         return int(time.time()) - TIMESHIFT
@@ -219,12 +226,12 @@ def deco(*args, **kwargs):
         )
 
     def on_dead(self):
-        self.events.dispatch(Events.STATE_CHANGE, "dead")
+        self.events.dispatch(Events.STATE_CHANGE, GameState.DEAD)
 
-    def on_state_change(self, state):
+    def on_state_change(self, state: GameState):
         old = self.state
         self.state = state
-        if old != "playing" and state == "playing":
+        if old != GameState.PLAYING and state == GameState.PLAYING:
             self.playing()
 
     def on_save(self):
@@ -273,7 +280,7 @@ def on_load(self):
                     self.log.exception(e)
             else:
                 self.console.print("[green]Игра загружена[/]")
-                self.events.dispatch(Events.STATE_CHANGE, state="playing")
+                self.events.dispatch(Events.STATE_CHANGE, state=GameState.PLAYING)
                 return
 
     def on_event(self, event, *args, **kwargs):
@@ -306,7 +313,7 @@ def show_logo(self):
                 "{0}│     ╰─╮{1}       {2}│   ╭──╮ │{3}│   ╭───╯{4}│   ││  │\n"
                 "{0}│   ╭─╮ │{1}       {2}│   │  │ │{3}│   │    {4}│   ╰╯  │\n"
                 "{0}╰───╯ ╰─╯{1}       {2}╰───╯  ╰─╯{3}╰───╯    {4}╰───────╯\n".format(
-                    *clrs
+                    *BRAND_COLORS
                 )
             )
         )
@@ -364,7 +371,7 @@ def action_guide(game: Game):
 
     @action("exit", "Выйти из игры", "Игра")
     def action_exit(game: Game):
-        game.state = "exit"
+        game.state = GameState.EXIT
 
     @action("save", "Сохранить игру", "Игра")
     def action_save(game: Game):

krpg/world.py

@@ -12,6 +12,7 @@
 
 
 class Location:
+    
     def __init__(self, id: str, name: str, description: str):
         self.id = id
         self.name = name