made shopkeepers have randomly generated inventories

Author: jossse69

entity.py

@@ -21,6 +21,7 @@
     from game_map import GameMap
     from input_handlers import EventHandler
     from status_effect import StatusEffect
+    from npc_handler import NPCHandler
 
 
 T = TypeVar("T", bound="Entity")
@@ -176,7 +177,8 @@ def __init__(
         color: Tuple[int, int, int] = (255, 255, 255),
         name: str = "<Unnamed>",
         inspect_message: Optional[str] = "I don't know what this thing is.",
-        interact_input_handler_cls: Type[EventHandler]
+        npc_handler_cls: Type[NPCHandler],
+        input_handler_cls: Type[EventHandler],
     ):
         super().__init__(
             x=x,
@@ -189,10 +191,16 @@ def __init__(
             inspect_message=inspect_message,
         )
         self.is_npc = True
-        self.input_handler_class = interact_input_handler_cls
+        self.npc_handler_class = npc_handler_cls
+        self.input_handler_class = input_handler_cls
 
     def init_handler(self, engine: Engine) -> None:
-        self.input_handler = self.input_handler_class(engine)
+        self.npc_handler = self.npc_handler_class(engine, self.input_handler_class, self)
+        self.npc_handler.init_handler()
+
+    @property
+    def input_handler(self) -> EventHandler:
+        return self.npc_handler.input_handler
 
     def interact(self) -> EventHandler:
         """
@@ -258,6 +266,7 @@ def __init__(
         inspect_message: Optional[str] = "I don't know what this thing is.",
         duration: int = 0,
         is_permanent: bool = False,
+        moves_around: bool = False,
         zone_component: type[ZoneComponent],
     ):
         super().__init__(
@@ -275,24 +284,32 @@ def __init__(
         self.is_permanent = is_permanent
         self.zone_component = zone_component(self)
         self.zone_component.parent = self
+        self.moves_around = moves_around
 
     def on_tick_actor(self, actor: Actor) -> None:
         self.zone_component.on_actor_tick(actor)
     def on_update(self) -> None:
-        # Pick a random direction to move to
-        direction_x, direction_y = random.choice(
-            [
-                (-1, -1),  # Northwest
-                (0, -1),  # North
-                (1, -1),  # Northeast
-                (-1, 0),  # West
-                (1, 0),  # East
-                (-1, 1),  # Southwest
-                (0, 1),  # South
-                (1, 1),  # Southeast
-            ]
-        )
-
-        # Check if there's a walkble tile in the random direction
-        if self.gamemap.is_walkable_tile(self.x + direction_x, self.y + direction_y):
-            self.move(direction_x, direction_y)
+        if self.moves_around:
+            # Pick a random direction to move to
+            direction_x, direction_y = random.choice(
+                [
+                    (-1, -1),  # Northwest
+                    (0, -1),  # North
+                    (1, -1),  # Northeast
+                    (-1, 0),  # West
+                    (1, 0),  # East
+                    (-1, 1),  # Southwest
+                    (0, 1),  # South
+                    (1, 1),  # Southeast
+                ]
+            )
+
+            # Check if there's a walkble tile in the random direction
+            if self.gamemap.is_walkable_tile(self.x + direction_x, self.y + direction_y):
+                # Check if there's not anoder zone in the random direction.
+                if not any(
+                    entity
+                    for entity in self.gamemap.zones
+                    if entity.x == self.x + direction_x and entity.y == self.y + direction_y
+                ):
+                    self.move(direction_x, direction_y)

entity_factories.py

@@ -1,3 +1,5 @@
+
+
 from components.ai import HostileEnemy, SpawnerEnemy, ZoneSpawnerEnemy, InvisblePouncerEnemy
 from components import consumable, equippable
 from components.fighter import Fighter
@@ -8,6 +10,7 @@
 from input_handlers import ShopkeepMenuEventHandler
 from status_effect import Poisoned, Bleeding, Spored
 from components.zone import HydrogenSulfideGas, NitrousOxideGas, SporeAir
+from npc_handler import ShopKeeperHandler
 
 ALL_ENTITIES = []
 
@@ -95,15 +98,15 @@
     value=10,
 )
 ALL_ENTITIES.append(healing_gel)
-XL_healing_gel = Item(
+xl_healing_gel = Item(
     char="!",
     color=(0, 255, 0),
     name="XL Healing Gel",
     consumable=consumable.HealingConsumable(amount=18),
     inspect_message="A Extra Large healing Gel. Don't choke while gobbling it up!",
     value=25,
 )
-ALL_ENTITIES.append(XL_healing_gel)
+ALL_ENTITIES.append(xl_healing_gel)
 taser = Item(
     char="~",
     color=(255, 255, 0),
@@ -145,7 +148,7 @@
 acid_kinfe = Item(
     char="/", color=(102, 255, 255), name="Acid kinfe", equippable=equippable.AcidKinfe(),
     inspect_message="It's kinfe that's acidic. Be careful when holding it!",
-    value=50,
+    value=75,
 )
 ALL_ENTITIES.append(acid_kinfe)
 sharp_kinfe = Item(char="/", color=(102, 255, 255), name="Sharp kinfe", equippable=equippable.SharpKinfe(),
@@ -159,7 +162,7 @@
     name="Professional acid kinfe",
     equippable=equippable.ProfessionalAcidKinfe(),
     inspect_message="It's a acid kinfe that's been professionally made, for all kinds of industries. Very useful!",
-    value=100,
+    value=150,
 )
 ALL_ENTITIES.append(professional_acid_kinfe)
 scrap_chest_plate = Item(
@@ -198,7 +201,7 @@
     name="Steelpike chest plate",
     equippable=equippable.SteelPikeChestPlate(),
     inspect_message="Steel chest plate + spikes = this. Quite a good one if i say so myself!",
-    value=120,
+    value=140,
 )
 ALL_ENTITIES.append(steelpike_chest_plate)
 acid_metal_chest_plate = Item(
@@ -207,14 +210,15 @@
     name="Acid metal chest plate",
     equippable=equippable.AcidMetalChestPlate(),
     inspect_message="It's a chest plate made of acid metal. I don't know the chemistry of this material, but it's corrosive on touch, like a lot of acid.",
-    value=145,
+    value=185,
 )
 ALL_ENTITIES.append(acid_metal_chest_plate)
 shopkeep_npc = NPC(
     char="@",
     color=(102, 255, 102),
     name="Shop Keeper",
-    interact_input_handler_cls=ShopkeepMenuEventHandler,
+    npc_handler_cls=ShopKeeperHandler,
+    input_handler_cls=ShopkeepMenuEventHandler,
     inspect_message="It's a shop keeper. He's a friendly humanoid robot. He's selling some items. At least some freind in this world.",
 )
 ALL_ENTITIES.append(shopkeep_npc)
@@ -226,6 +230,7 @@
     duration=10,
     is_permanent=False,
     zone_component=HydrogenSulfideGas,
+    moves_around=True
 )
 ALL_ENTITIES.append(hydrogen_sulfide_gas)
 poison_gas_granade = Item(
@@ -245,6 +250,7 @@
     duration=10,
     is_permanent=False,
     zone_component=NitrousOxideGas,
+    moves_around=True
 )
 ALL_ENTITIES.append(nitrous_oxide_gas)
 stun_gas_granade = Item(
@@ -272,10 +278,11 @@
     char="▒",
     color=(255, 153, 0),
     name="Spore filled air",
-    inspect_message="It's a cloud full of spores. They look sticky.",
+    inspect_message="It's a cloud full of spores. They look sticky, and they will probably crawl under your skin for a while... Yikes...",
     duration=10,
     is_permanent=False,
     zone_component=SporeAir,
+    moves_around=True
 )
 ALL_ENTITIES.append(spore_filled_air)
 bloom_shroom = Actor(
@@ -287,7 +294,7 @@
     inventory=Inventory(capacity=0),
     level=Level(xp_given=200),
     equipment=Equipment(),
-    inspect_message="It's a large mushroom, like the little baby ones. It's releasing spores from it's cap. Is that a bad thing?",
+    inspect_message="It's a large mushroom, like the little baby ones. It's releasing spores like it's a breeding season! Is that a bad thing?",
 )
 bloom_shroom.ai.setup(spore_filled_air, 3)
 ALL_ENTITIES.append(bloom_shroom)

input_handlers.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import random
-from typing import Callable, Optional, Tuple, TYPE_CHECKING, Union
+from typing import Callable, List, Optional, Tuple, TYPE_CHECKING, Union
 
 import tcod.event
 from tcod import libtcodpy
@@ -17,6 +17,7 @@
     MovementAction
 )
 import color
+import entity_factories
 import exceptions
 import os
 import threading
@@ -25,6 +26,7 @@
 if TYPE_CHECKING:
     from engine import Engine
     from entity import Item
+    from entity import NPC
 
 
 MOVE_KEYS = {
@@ -736,13 +738,13 @@ class BuyItemsEventHandler(AskUserEventHandler):
     def __init__(self, engine: actions.Engine, previous_handler: EventHandler):
         super().__init__(engine)
 
-        from entity_factories import healing_gel, XL_healing_gel, taser
         self.previous_handler = previous_handler
-        self.items = [
-            copy.deepcopy(healing_gel),
-            copy.deepcopy(XL_healing_gel),
-            copy.deepcopy(taser) 
-        ]
+        self.items = []
+        for item in previous_handler.item_list:
+            for entity in entity_factories.ALL_ENTITIES:
+                if entity.internal_name == item:
+                    self.items.append(copy.deepcopy(entity))
+                        
 
     def on_exit(self) -> Action | BaseEventHandler | None:
         return self.previous_handler
@@ -771,14 +773,13 @@ def on_render(self, console: tcod.event.Any) -> None:
         )
 
         # Draw the avaible items in a list, similar to the inventory menu.
-        # TODO: Add the items in, for now its placeholder items.
         for i, item in enumerate(self.items):
             item_key = chr(ord("a") + i)
             console.print(
                 x=x + 1,
                 y=y + 1 + i,
                 fg=color.text_console,
-                string=f"{item_key}) {item.name} - {item.value} Credit".upper(),
+                string=f"{item_key}) {item.name} - {item.value} Credits".upper(),
             )
 
     def ev_keydown(self, event: tcod.event.KeyDown) -> Optional[ActionOrHandler]:
@@ -808,6 +809,12 @@ def ev_keydown(self, event: tcod.event.KeyDown) -> Optional[ActionOrHandler]:
 class ShopkeepMenuEventHandler(AskUserEventHandler):
     TITLE = "SHOP"
 
+    def __init__(self, engine: actions.Engine, NPC: NPC, item_list: List[Item]):
+        super().__init__(engine)
+
+        self.NPC = NPC
+        self.item_list = item_list
+
     def on_render(self, console: tcod.Console) -> None:
         super().on_render(console)
 

npc_handler.py

@@ -0,0 +1,73 @@
+from __future__ import annotations
+
+
+import random
+from typing import List, Optional, Tuple, Type, TypeVar, TYPE_CHECKING, Union
+
+from engine import Engine
+
+from render_order import RenderOrder
+
+if TYPE_CHECKING:
+    from input_handlers import EventHandler
+    from entity import NPC, Item
+
+shop_item_chances: List[Tuple[int, int]] = [
+    ("healing_gel", 15),
+    ("stun_gun", 15),
+    ("old_kinfe", 15),
+    ("iron_chest_plate", 15),
+    ("xl_healing_gel", 5),
+    ("taser", 10),
+    ("sharp_kinfe", 10),
+    ("stun_gas_granade", 5),
+    ("poison_gas_granade", 5),
+    ("acid_kinfe", 5),
+    ("spikey_chest_plate", 5),
+    ("fireball_gun", 5),
+]
+
+
+def get_weighted_elements_at_random(
+    weighted_chances: List[Tuple[int, int]],
+    amount: int,
+) -> List[int]:
+    chosen_weights = random.choices(
+        population=[element for element, weight in weighted_chances for i in range(weight)],
+        k=amount,
+    )
+
+    return chosen_weights
+
+class NPCHandler:
+    """
+    A class used in NPCs to setup their input handler with more data that is sorted in this class.
+    """
+    def __init__(self, engine: Engine, input_handler_cls: Type[EventHandler], npc: NPC):
+        self.engine = engine
+        self.input_handler_cls = input_handler_cls
+        self.npc = npc
+        self.input_handler = None
+
+    def init_handler(self) -> None:
+        """
+        Initialize the input handler for the NPC. This method can be overridden to add more data to the input handler.
+        """
+        self.input_handler = self.input_handler_cls(self.engine, self.npc)
+
+class ShopKeeperHandler(NPCHandler):
+    """
+    Used to handler diferent kinds of shops. Along with tracking the inventory of the shop.
+    """
+    def __init__(self, engine: Engine, input_handler_cls: Type[EventHandler], npc: NPC):
+        super().__init__(engine, input_handler_cls, npc)
+        items = get_weighted_elements_at_random(shop_item_chances, random.randint(3, 8))
+        self.shop_items = []
+        for item in items:
+            # Check for repeats and do not add if there is a repeat.
+            if item in self.shop_items:
+                continue
+            self.shop_items.append(item)
+    
+    def init_handler(self) -> None:
+        self.input_handler = self.input_handler_cls(self.engine, self.npc, self.shop_items)

procgen.py

@@ -25,9 +25,9 @@
 
 item_chances: Dict[int, List[Tuple[Entity, int]]] = {
     0: [(entity_factories.healing_gel, 35)],
-    2: [(entity_factories.stun_gun, 10), (entity_factories.old_kinfe, 5), (entity_factories.iron_chest_plate, 5), (entity_factories.XL_healing_gel, 5)],
+    2: [(entity_factories.stun_gun, 10), (entity_factories.old_kinfe, 5), (entity_factories.iron_chest_plate, 5), (entity_factories.xl_healing_gel, 5)],
     4: [(entity_factories.taser, 25), (entity_factories.sharp_kinfe, 15), (entity_factories.spikey_chest_plate, 12)],
-    5: [(entity_factories.acid_kinfe, 15)],
+    5: [(entity_factories.acid_kinfe, 15), (entity_factories.xl_healing_gel, 25)],
     6: [(entity_factories.fireball_gun, 25), (entity_factories.steel_chest_plate, 12), (entity_factories.professional_acid_kinfe, 15)],
     7: [(entity_factories.steelpike_chest_plate, 15)],
     8: [(entity_factories.acid_metal_chest_plate, 15)],