added new things

Author: jossse69

components/equipment.py

@@ -1,12 +1,14 @@
 from __future__ import annotations
 
-from typing import Optional, TYPE_CHECKING
+from typing import Optional, TYPE_CHECKING, Type
 
 from components.base_component import BaseComponent
 from equipment_types import EquipmentType
 
 if TYPE_CHECKING:
     from entity import Actor, Item
+    from status_effect import StatusEffect
+
 
 
 class Equipment(BaseComponent):
@@ -52,6 +54,26 @@ def dodge_bonus(self) -> int:
 
         return bonus
 
+    @property
+    def extra_immunities(self) -> list[Type[StatusEffect]]:
+        immunities = []
+
+        if self.weapon is not None and self.weapon.equippable is not None:
+            # Add the extra immunities from the weapon to the list.
+            for immunity in self.weapon.equippable.extra_immunities:
+                # Check if the immunity is already in the list.
+                if immunity not in immunities:
+                    immunities.append(immunity)
+
+        if self.armor is not None and self.armor.equippable is not None:
+            # Add the extra immunities from the armor to the list.
+            for immunity in self.armor.equippable.extra_immunities:
+                # Check if the immunity is already in the list.
+                if immunity not in immunities:
+                    immunities.append(immunity)
+
+        return immunities
+
     def item_is_equipped(self, item: Item) -> bool:
         return self.weapon == item or self.armor == item
 

components/equippable.py

@@ -1,15 +1,16 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Type
 
 from components.base_component import BaseComponent
 from entity import Actor
 from equipment_types import EquipmentType
-from status_effect import Poisoned, Bleeding
+from status_effect import Poisoned, Bleeding, Spored
 
 if TYPE_CHECKING:
     from entity import Item
     from entity import Actor
+    from status_effect import StatusEffect
 
 
 
@@ -22,12 +23,14 @@ def __init__(
         power_bonus: int = 0,
         defense_bonus: int = 0,
         dodge_bonus: int = 0,
+        extra_immunities: list[Type[StatusEffect]] = [],
     ):
         self.equipment_type = equipment_type
 
         self.power_bonus = power_bonus
         self.defense_bonus = defense_bonus
         self.dodge_bonus = dodge_bonus
+        self.extra_immunities = extra_immunities
 
 
     def on_equip(self, parent: Actor) -> None:
@@ -90,6 +93,14 @@ def on_attack(self, target: Actor):
         # Add the poisoned status effect to the target.
         target.fighter.apply_status_effect(Poisoned(duration=8, value=2))
 
+class SilverKinfe(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.WEAPON, power_bonus=7)
+
+    def on_attack(self, target: Actor):
+        # Add the bleeding status effect to the target.
+        target.fighter.apply_status_effect(Bleeding(duration=6, value=2))
+
 class ScrapChestPlate(Equippable):
     def __init__(self) -> None:
         super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=1)
@@ -118,14 +129,22 @@ def __init__(self) -> None:
 
     def on_hit(self, target: Actor, damage: int):
         # Add the bleeding status effect to the target.
-        target.fighter.apply_status_effect(Bleeding(duration=6, value=damage // 2))
-        # make the target take 4 damage
-        target.fighter.take_damage(4)
+        target.fighter.apply_status_effect(Bleeding(duration=6, value= 2 + (damage // 2)))
+        # make the target take damage
+        target.fighter.take_damage(4 + (damage // 2))
 
 class AcidMetalChestPlate(Equippable):
     def __init__(self) -> None:
         super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=5)
 
     def on_hit(self, target: Actor, damage: int):
         # Add the poisoned status effect to the target.
-        target.fighter.apply_status_effect(Poisoned(duration=6, value=2))
+        target.fighter.apply_status_effect(Poisoned(duration=6, value=2))
+
+class HazmatSuit(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=3, extra_immunities=[Poisoned, Spored])
+
+class LeadHazmatSuit(Equippable):
+    def __init__(self) -> None:
+        super().__init__(equipment_type=EquipmentType.ARMOR, defense_bonus=5, extra_immunities=[Poisoned, Spored])

components/fighter.py

@@ -23,10 +23,9 @@ def __init__(self, hp: int, base_dodge: int, base_defence, base_power: int, immu
         self.base_defence = base_defence
         self.base_power = base_power
         self.status_effects = []
-        self.immune_effects = immune_effects if immune_effects else []
+        self.base_immune_effects = immune_effects if immune_effects else []
         self.last_actor_hurt_by = ""
 
-
     @property
     def dodge(self) -> int:
         return self.base_dodge + self.dodge_bonus
@@ -59,6 +58,14 @@ def defense_bonus(self) -> int:
             return self.parent.equipment.defense_bonus
         else:
             return 0
+        
+    @property
+    def immune_effects(self) -> list[type[StatusEffect]]:
+        if self.parent.equipment:
+            # Merge the base immunities with the extra immunities from the equipment. Avoiding duplicates.
+            return list(set(self.base_immune_effects + self.parent.equipment.extra_immunities))
+        else:
+            return self.base_immune_effects
 
     @property
     def hp(self) -> int:
@@ -86,7 +93,6 @@ def heal(self, amount: int) -> int:
         return amount_recovered
 
     def apply_status_effect(self, effect: StatusEffect) -> None:
-
         # If the fighter is immune to the effect, then don't apply it.
         for immune_effect in self.immune_effects:
             if isinstance(effect, immune_effect):
@@ -96,8 +102,8 @@ def apply_status_effect(self, effect: StatusEffect) -> None:
             if status_effect.name == effect.name:
                 status_effect.duration += effect.duration
                 return
+            
         self.status_effects.append(copy.deepcopy(effect))
-
         self.engine.message_log.add_message(f"{self.parent.name} is now {effect.name}!", color.status_effect_applied)
 
     def update_status_effects(self) -> None:

entity_factories.py

@@ -68,12 +68,12 @@
     color=(0, 204, 102),
     name="Acid Mold",
     ai_cls=HostileEnemy,
-    fighter=Fighter(hp=19, base_defence=2, base_power=6, base_dodge=5, immune_effects=[Poisoned]),
+    fighter=Fighter(hp=14, base_defence=2, base_power=6, base_dodge=5, immune_effects=[Poisoned]),
     inventory=Inventory(capacity=0),
     level=Level(xp_given=50),
     equipment=Equipment(),
     inspect_message="It's a slime mold, but it's acidic. Don't touch it! It's hurts to the touch.",
-    effect=Poisoned(duration=4, value=1),
+    effect=Poisoned(duration=2, value=1),
 )
 ALL_ENTITIES.append(acid_mold)
 mama_mold = Actor(
@@ -310,4 +310,30 @@
     inspect_message="It's a hunter humanoid that looks a lot more scarier! Dark fur, red blood eyes and long fangs make it look like a monster.",
 )
 wild_hunter_humanoid.ai.setup(HostileEnemy, 5)
-ALL_ENTITIES.append(wild_hunter_humanoid)
+ALL_ENTITIES.append(wild_hunter_humanoid)
+silver_kinfe = Item(
+    char="/",
+    color=(102, 255, 255),
+    name="Silver kinfe",
+    equippable=equippable.SilverKinfe(),
+    inspect_message="It's a silver kinfe, polished to the most extreme! It's fine kinfe for bleeding foes!",
+    value=175,
+)
+ALL_ENTITIES.append(silver_kinfe)
+hazmat_suit = Item(
+    char="[",
+    color=(102, 255, 255),
+    name="Hazmat suit",
+    equippable=equippable.HazmatSuit(),
+    inspect_message="It's a suit that's made of a special material. It's made to protect you from poison and spores. It's very effective at that!",
+    value=200,
+)
+ALL_ENTITIES.append(hazmat_suit)
+lead_hazmat_suit = Item(
+    char="[",
+    color=(102, 255, 255),
+    name="Lead hazmat suit",
+    equippable=equippable.LeadHazmatSuit(),
+    inspect_message="It's a hazmat suit that's made of lead. It's tougher than the normal hazmat suit, but it's also more expensive!",
+    value=250,
+)

input_handlers.py

@@ -787,7 +787,7 @@ def ev_keydown(self, event: tcod.event.KeyDown) -> Optional[ActionOrHandler]:
         key = event.sym
         index = key - tcod.event.KeySym.a
 
-        if 0 <= index <= 2:
+        if 0 <= index <= self.items.__len__() - 1:
             item = copy.deepcopy(self.items[index])
 
             if self.engine.game_world.credits >= item.value:

npc_handler.py

@@ -25,6 +25,9 @@
     ("acid_kinfe", 5),
     ("spikey_chest_plate", 5),
     ("fireball_gun", 5),
+    ("hazmat_suit", 5),
+    ("lead_hazmat_suit", 5),
+    ("silver_kinfe", 5),
 ]