Move equip functions for items
This commit is contained in:
parent
a8c0c197ed
commit
1a78ad584c
|
@ -44,32 +44,11 @@ class Item(Entity):
|
||||||
"""
|
"""
|
||||||
Indicates what should be done when the item is equipped.
|
Indicates what should be done when the item is equipped.
|
||||||
"""
|
"""
|
||||||
if isinstance(self, Chestplate):
|
# Other objects are only equipped as secondary.
|
||||||
if self.held_by.equipped_armor:
|
if self.held_by.equipped_secondary:
|
||||||
self.held_by.equipped_armor.unequip()
|
self.held_by.equipped_secondary.unequip()
|
||||||
self.held_by.remove_from_inventory(self)
|
self.held_by.remove_from_inventory(self)
|
||||||
self.held_by.equipped_armor = self
|
self.held_by.equipped_secondary = self
|
||||||
elif isinstance(self, Helmet):
|
|
||||||
if self.held_by.equipped_helmet:
|
|
||||||
self.held_by.equipped_helmet.unequip()
|
|
||||||
self.held_by.remove_from_inventory(self)
|
|
||||||
self.held_by.equipped_helmet = self
|
|
||||||
elif isinstance(self, Weapon):
|
|
||||||
if self.held_by.equipped_main:
|
|
||||||
if self.held_by.equipped_secondary:
|
|
||||||
self.held_by.equipped_secondary.unequip()
|
|
||||||
self.held_by.remove_from_inventory(self)
|
|
||||||
self.held_by.equipped_secondary = self
|
|
||||||
# For weapons, they are equipped as main only if main is empty.
|
|
||||||
else:
|
|
||||||
self.held_by.remove_from_inventory(self)
|
|
||||||
self.held_by.equipped_main = self
|
|
||||||
else:
|
|
||||||
# Other objects are only equipped as secondary.
|
|
||||||
if self.held_by.equipped_secondary:
|
|
||||||
self.held_by.equipped_secondary.unequip()
|
|
||||||
self.held_by.remove_from_inventory(self)
|
|
||||||
self.held_by.equipped_secondary = self
|
|
||||||
|
|
||||||
def unequip(self) -> None:
|
def unequip(self) -> None:
|
||||||
"""
|
"""
|
||||||
|
@ -257,7 +236,8 @@ class Weapon(Item):
|
||||||
"""
|
"""
|
||||||
When a weapon is equipped, the player gains strength.
|
When a weapon is equipped, the player gains strength.
|
||||||
"""
|
"""
|
||||||
super().equip()
|
self.held_by.remove_from_inventory(self)
|
||||||
|
self.held_by.equipped_main = self
|
||||||
self.held_by.strength += self.damage
|
self.held_by.strength += self.damage
|
||||||
|
|
||||||
def unequip(self) -> None:
|
def unequip(self) -> None:
|
||||||
|
@ -309,7 +289,8 @@ class Shield(Armor):
|
||||||
|
|
||||||
def __init__(self, name: str = "shield", constitution: int = 2,
|
def __init__(self, name: str = "shield", constitution: int = 2,
|
||||||
price: int = 6, *args, **kwargs):
|
price: int = 6, *args, **kwargs):
|
||||||
super().__init__(name=name, constitution=constitution, *args, **kwargs)
|
super().__init__(name=name, constitution=constitution, price=price,
|
||||||
|
*args, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
class Helmet(Armor):
|
class Helmet(Armor):
|
||||||
|
@ -319,7 +300,15 @@ class Helmet(Armor):
|
||||||
|
|
||||||
def __init__(self, name: str = "helmet", constitution: int = 2,
|
def __init__(self, name: str = "helmet", constitution: int = 2,
|
||||||
price: int = 8, *args, **kwargs):
|
price: int = 8, *args, **kwargs):
|
||||||
super().__init__(name=name, constitution=constitution, *args, **kwargs)
|
super().__init__(name=name, constitution=constitution, price=price,
|
||||||
|
*args, **kwargs)
|
||||||
|
|
||||||
|
def equip(self) -> None:
|
||||||
|
super().equip()
|
||||||
|
if self.held_by.equipped_helmet:
|
||||||
|
self.held_by.equipped_helmet.unequip()
|
||||||
|
self.held_by.remove_from_inventory(self)
|
||||||
|
self.held_by.equipped_helmet = self
|
||||||
|
|
||||||
|
|
||||||
class Chestplate(Armor):
|
class Chestplate(Armor):
|
||||||
|
@ -329,7 +318,15 @@ class Chestplate(Armor):
|
||||||
|
|
||||||
def __init__(self, name: str = "chestplate", constitution: int = 4,
|
def __init__(self, name: str = "chestplate", constitution: int = 4,
|
||||||
price: int = 15, *args, **kwargs):
|
price: int = 15, *args, **kwargs):
|
||||||
super().__init__(name=name, constitution=constitution, *args, **kwargs)
|
super().__init__(name=name, constitution=constitution, price=price,
|
||||||
|
*args, **kwargs)
|
||||||
|
|
||||||
|
def equip(self) -> None:
|
||||||
|
super().equip()
|
||||||
|
if self.held_by.equipped_armor:
|
||||||
|
self.held_by.equipped_armor.unequip()
|
||||||
|
self.held_by.remove_from_inventory(self)
|
||||||
|
self.held_by.equipped_armor = self
|
||||||
|
|
||||||
|
|
||||||
class BodySnatchPotion(Item):
|
class BodySnatchPotion(Item):
|
||||||
|
|
Loading…
Reference in New Issue