finished parts 12 and 13!

Author: jossse69

actions.py

@@ -72,7 +72,8 @@ def target_actor(self) -> Optional[Actor]:
 
     def perform(self) -> None:
         """Invoke the items ability, this action will be given to provide context."""
-        self.item.consumable.activate(self)
+        if self.item.consumable:
+            self.item.consumable.activate(self)
 
 class MeleeAction(ActionWithDirection):
     def perform(self) -> None:
@@ -165,4 +166,20 @@ def perform(self) -> None:
                 "You descend the staircase.", color.descend
             )
         else:
-            raise exceptions.Impossible("There are no stairs here.")
+            raise exceptions.Impossible("There are no stairs here.")
+        
+class EquipAction(Action):
+    def __init__(self, entity: Actor, item: Item):
+        super().__init__(entity)
+
+        self.item = item
+
+    def perform(self) -> None:
+        self.entity.equipment.toggle_equip(self.item)
+
+class DropItem(ItemAction):
+    def perform(self) -> None:
+        if self.entity.equipment.item_is_equipped(self.item):
+            self.entity.equipment.toggle_equip(self.item)
+
+        self.entity.inventory.drop(self.item)

components/equipment.py

@@ -0,0 +1,87 @@
+from __future__ import annotations
+
+from typing import Optional, TYPE_CHECKING
+
+from components.base_component import BaseComponent
+from equipment_types import EquipmentType
+
+if TYPE_CHECKING:
+    from entity import Actor, Item
+
+
+class Equipment(BaseComponent):
+    parent: Actor
+
+    def __init__(self, weapon: Optional[Item] = None, armor: Optional[Item] = None):
+        self.weapon = weapon
+        self.armor = armor
+
+    @property
+    def defense_bonus(self) -> int:
+        bonus = 0
+
+        if self.weapon is not None and self.weapon.equippable is not None:
+            bonus += self.weapon.equippable.defense_bonus
+
+        if self.armor is not None and self.armor.equippable is not None:
+            bonus += self.armor.equippable.defense_bonus
+
+        return bonus
+
+    @property
+    def power_bonus(self) -> int:
+        bonus = 0
+
+        if self.weapon is not None and self.weapon.equippable is not None:
+            bonus += self.weapon.equippable.power_bonus
+
+        if self.armor is not None and self.armor.equippable is not None:
+            bonus += self.armor.equippable.power_bonus
+
+        return bonus
+
+    def item_is_equipped(self, item: Item) -> bool:
+        return self.weapon == item or self.armor == item
+
+    def unequip_message(self, item_name: str) -> None:
+        self.parent.gamemap.engine.message_log.add_message(
+            f"You remove the {item_name}."
+        )
+
+    def equip_message(self, item_name: str) -> None:
+        self.parent.gamemap.engine.message_log.add_message(
+            f"You equip the {item_name}."
+        )
+
+    def equip_to_slot(self, slot: str, item: Item, add_message: bool) -> None:
+        current_item = getattr(self, slot)
+
+        if current_item is not None:
+            self.unequip_from_slot(slot, add_message)
+
+        setattr(self, slot, item)
+
+        if add_message:
+            self.equip_message(item.name)
+
+    def unequip_from_slot(self, slot: str, add_message: bool) -> None:
+        current_item = getattr(self, slot)
+
+        if add_message:
+            self.unequip_message(current_item.name)
+
+        setattr(self, slot, None)
+
+    def toggle_equip(self, equippable_item: Item, add_message: bool = True) -> None:
+        if (
+            equippable_item.equippable
+            and equippable_item.equippable.equipment_type == EquipmentType.WEAPON
+        ):
+            slot = "weapon"
+        else:
+            slot = "armor"
+
+        if getattr(self, slot) == equippable_item:
+            self.unequip_from_slot(slot, add_message)
+        else:
+            self.equip_to_slot(slot, equippable_item, add_message)

components/equippable.py

@@ -0,0 +1,50 @@
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from components.base_component import BaseComponent
+from equipment_types import EquipmentType
+
+if TYPE_CHECKING:
+    from entity import Item
+
+
+class Equippable(BaseComponent):
+    parent: Item
+
+    def __init__(
+        self,
+        equipment_type: EquipmentType,
+        power_bonus: int = 0,
+        defense_bonus: int = 0,
+    ):
+        self.equipment_type = equipment_type
+
+        self.power_bonus = power_bonus
+        self.defense_bonus = defense_bonus
+
+class PocketKinfe(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.WEAPON, power_bonus=1)
+
+class OldKinfe(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.WEAPON, power_bonus=2)
+
+
+class SharpKinfe(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.WEAPON, power_bonus=4)
+
+class ScrapChestPlate(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=1)
+
+class IronChestPlate(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=2)
+
+
+class SteelChestPlate(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=3)

components/fighter.py

@@ -13,11 +13,33 @@
 class Fighter(BaseComponent):
     parent: Actor
 
-    def __init__(self, hp: int, defense: int, power: int):
+    def __init__(self, hp: int, base_defense: int, base_power: int):
         self.max_hp = hp
         self._hp = hp
-        self.defense = defense
-        self.power = power
+        self.base_defense = base_defense
+        self.base_power = base_power
+
+    @property
+    def defense(self) -> int:
+        return self.base_defense + self.defense_bonus
+
+    @property
+    def power(self) -> int:
+        return self.base_power + self.power_bonus
+
+    @property
+    def defense_bonus(self) -> int:
+        if self.parent.equipment:
+            return self.parent.equipment.defense_bonus
+        else:
+            return 0
+
+    @property
+    def power_bonus(self) -> int:
+        if self.parent.equipment:
+            return self.parent.equipment.power_bonus
+        else:
+            return 0
 
     @property
     def hp(self) -> int:

components/level.py

@@ -60,14 +60,14 @@ def increase_max_hp(self, amount: int = 20) -> None:
         self.increase_level()
 
     def increase_power(self, amount: int = 1) -> None:
-        self.parent.fighter.power += amount
+        self.parent.fighter.base_power += amount
 
         self.engine.message_log.add_message("You feel stronger!")
 
         self.increase_level()
 
     def increase_defense(self, amount: int = 1) -> None:
-        self.parent.fighter.defense += amount
+        self.parent.fighter.base_defense += amount
 
         self.engine.message_log.add_message("Your movements are getting swifter!")
 

entity.py

@@ -10,6 +10,8 @@
     from components.ai import BaseAI
     from components.fighter import Fighter
     from components.consumable import Consumable
+    from components.equipment import Equipment
+    from components.equippable import Equippable
     from components.inventory import Inventory
     from components.level import Level
     from game_map import GameMap
@@ -105,6 +107,7 @@ def __init__(
         name: str = "<Unnamed>",
         inspect_message: Optional[str] = "I don't know what this thing is.",
         ai_cls: Type[BaseAI],
+        equipment: Equipment,
         fighter: Fighter,
         inventory: Inventory,
         level: Level,
@@ -122,6 +125,9 @@ def __init__(
 
         self.ai: Optional[BaseAI] = ai_cls(self)
 
+        self.equipment: Equipment = equipment
+        self.equipment.parent = self
+
         self.fighter = fighter
         self.fighter.parent = self
 
@@ -149,7 +155,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.",
-        consumable: Consumable,
+        consumable: Optional[Consumable] = None,
+        equippable: Optional[Equippable] = None,
     ):
         super().__init__(
             x=x,
@@ -163,4 +170,10 @@ def __init__(
         )
 
         self.consumable = consumable
-        self.consumable.parent = self
+        if self.consumable:
+            self.consumable.parent = self
+
+        self.equippable = equippable
+
+        if self.equippable:
+            self.equippable.parent = self

entity_factories.py

@@ -1,40 +1,44 @@
 from components.ai import HostileEnemy
-from components import consumable
+from components import consumable, equippable
 from components.fighter import Fighter
 from components.inventory import Inventory
 from components.level import Level
 from entity import Actor, Item
+from components.equipment import Equipment
 
 player = Actor(
     char="@",
     color=(255, 255, 0),
     name="Player",
     ai_cls=HostileEnemy,
-    fighter=Fighter(hp=30, defense=2, power=5),
+    fighter=Fighter(hp=30, base_defense=1, base_power=2),
     inventory=Inventory(capacity=26),
     inspect_message="It's yourself. What would you ask for?",
     level=Level(level_up_base=200),
+    equipment=Equipment(),
 )
 
 smile_mold = Actor(
     char="m", 
     color=(255, 80, 80), 
     name="Slime Mold", 
     ai_cls=HostileEnemy,
-    fighter=Fighter(hp=10, defense=0, power=3),
+    fighter=Fighter(hp=10, base_defense=0, base_power=3),
     inventory=Inventory(capacity=0),
     inspect_message="It's a slime mold... That is alive! It looks hungry for your flesh.",
     level=Level(xp_given=35),
+    equipment=Equipment(),
 )
 rusty_automaton = Actor(
     char="a",
     color=(200, 174, 137),
     name="Rusty Automaton",
     ai_cls=HostileEnemy,
-    fighter=Fighter(hp=16, defense=1, power=4),
+    fighter=Fighter(hp=16, base_defense=1, base_power=4),
     inventory=Inventory(capacity=0),
     inspect_message="He looks like he's been here a while. I Won't say he's having a great time existing.",
     level=Level(xp_given=100),
+    equipment=Equipment(),
 )
 
 healing_gel = Item(
@@ -58,10 +62,41 @@
     consumable=consumable.ConfusionConsumable(number_of_turns=10),
     inspect_message="Bright flashes always makes everyone disoriented. I'd get confused if i were to look at it.",
 )
-fireball_Gun = Item(
+fireball_gun = Item(
     char="~",
     color=(255, 0, 0),
     name="Fireball Gun",
     consumable=consumable.FireballDamageConsumable(damage=12, radius=3),
     inspect_message="It's a gun that shoots fireballs. Like the ones from fantasy games. It's pretty effective!",
+)
+
+pocket_kinfe = Item(    char="/", color=(102, 255, 255), name="Pocket kinfe", equippable=equippable.PocketKinfe(),
+    inspect_message="The most pesonal kinfe you'll ever find. Use it if you're in a pinch."
+)
+
+old_kinfe = Item(
+    char="/", color=(102, 255, 255), name="Old kinfe", equippable=equippable.OldKinfe(),
+    inspect_message="It's a old rusty kitchen kinfe. It's not very sharp, but it's still effective."
+)
+sharp_kinfe = Item(char="/", color=(102, 255, 255), name="Sharp kinfe", equippable=equippable.SharpKinfe(),
+    inspect_message="It's a kitchen kinfe that was not let outside at least."
+)
+
+scrap_chest_plate = Item(
+    char="[",
+    color=(102, 255, 255),
+    name="Scrap chest plate",
+    equippable=equippable.ScrapChestPlate(),
+    inspect_message="It's a chest plate made of scrap metal. It's not very strong, but it's still effective.",
+)
+iron_chest_plate = Item(
+    char="[",
+    color=(102, 255, 255),
+    name="Iron chest plate",
+    equippable=equippable.IronChestPlate(),
+    inspect_message="It's a chest plate made of iron. Put it on and you'll be able to take a beating.")
+
+steel_chest_plate  = Item(
+    char="[", color=(102, 255, 255), name="Steel chest plate", equippable=equippable.SteelChestPlate(),
+    inspect_message="It's a chest plate, now made of steel. You'll be able to take quite the beating!"
 )

equipment_types.py

@@ -0,0 +1,6 @@
+from enum import auto, Enum
+
+
+class EquipmentType(Enum):
+    WEAPON = auto()
+    ARMOR = auto()