Revert state refactors

Author: HexDecimal

g.py

@@ -1,20 +1,11 @@
 """This module stores globally mutable variables used by this program."""
 from __future__ import annotations
 
-import tcod.console
 import tcod.context
 import tcod.ecs
 
-import game.state
-
-console: tcod.console.Console
-"""The main console."""
-
 context: tcod.context.Context
 """The window managed by tcod."""
 
-states: list[game.state.State] = []
-"""A stack of states with the last item being the active state."""
-
 world: tcod.ecs.Registry
 """The active ECS registry and current session."""

game/state.py

@@ -44,7 +44,7 @@
 }
 
 
-@attrs.define()
+@attrs.define(eq=False)
 class InGame:
     """Primary in-game state."""
 
@@ -59,7 +59,8 @@ def on_event(self, event: tcod.event.Event) -> None:
                 # Auto pickup gold
                 for gold in g.world.Q.all_of(components=[Gold], tags=[player.components[Position], IsItem]):
                     player.components[Gold] += gold.components[Gold]
-                    print(f"Picked up {gold.components[Gold]}g, total: {player.components[Gold]}g")
+                    text = f"Picked up {gold.components[Gold]}g, total: {player.components[Gold]}g"
+                    g.world[None].components[("Text", str)] = text
                     gold.clear()
 
     def on_draw(self, console: tcod.console.Console) -> None:
@@ -70,3 +71,6 @@ def on_draw(self, console: tcod.console.Console) -> None:
                 continue
             graphic = entity.components[Graphic]
             console.rgb[["ch", "fg"]][pos.y, pos.x] = graphic.ch, graphic.fg
+
+        if text := g.world[None].components.get(("Text", str)):
+            console.print(x=0, y=console.height - 1, string=text, fg=(255, 255, 255), bg=(0, 0, 0))

game/state_tools.py

@@ -4,10 +4,10 @@
 
 import tcod.console
 import tcod.context
+import tcod.event
 import tcod.tileset
 
 import g
-import game.state_tools
 import game.states
 import game.world_tools
 
@@ -18,11 +18,17 @@ def main() -> None:
         "data/Alloy_curses_12x12.png", columns=16, rows=16, charmap=tcod.tileset.CHARMAP_CP437
     )
     tcod.tileset.procedural_block_elements(tileset=tileset)
-    g.console = tcod.console.Console(80, 50)
-    g.states = [game.states.InGame()]
+    console = tcod.console.Console(80, 50)
+    state = game.states.InGame()
     g.world = game.world_tools.new_world()
-    with tcod.context.new(console=g.console, tileset=tileset) as g.context:
-        game.state_tools.main_loop()
+    with tcod.context.new(console=console, tileset=tileset) as g.context:
+        while True:  # Main loop
+            console.clear()  # Clear the console before any drawing
+            state.on_draw(console)  # Draw the current state
+            g.context.present(console)  # Render the console to the window and show it
+            for event in tcod.event.wait():  # Event loop, blocks until pending events exist
+                print(event)
+                state.on_event(event)  # Dispatch events to the state
 
 
 if __name__ == "__main__":