More tests

squirrelbattle/entities/items.py

@@ -54,17 +54,7 @@ class Item(Entity):
         """
         Indicates what should be done when the item is unequipped.
         """
-        if isinstance(self, Chestplate):
-            self.held_by.equipped_armor = None
-        elif isinstance(self, Helmet):
-            self.held_by.equipped_helmet = None
-        elif isinstance(self, Weapon):
-            if self.held_by.equipped_main == self:
-                self.held_by.equipped_main = None
-            else:
-                self.held_by.equipped_secondary = None
-        else:
-            self.held_by.equipped_secondary = None
+        self.held_by.remove_from_inventory(self)
         self.held_by.add_to_inventory(self)
 
     def hold(self, holder: InventoryHolder) -> None:
@@ -211,7 +201,6 @@ class Explosion(Item):
         """
         The player can't hold any explosion.
         """
-        pass
 
 
 class Weapon(Item):
@@ -304,7 +293,6 @@ class Helmet(Armor):
                          *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)
@@ -322,7 +310,6 @@ class Chestplate(Armor):
                          *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)
@@ -414,7 +401,14 @@ class Ring(Item):
 
     def save_state(self) -> dict:
         d = super().save_state()
+        d["maxhealth"] = self.maxhealth
+        d["strength"] = self.strength
+        d["intelligence"] = self.intelligence
+        d["charisma"] = self.charisma
+        d["dexterity"] = self.dexterity
         d["constitution"] = self.constitution
+        d["critical"] = self.critical
+        d["experience"] = self.experience
         return d