Merge branch 'dev' of https://github.com/HagenSR/byte_le_royale_2022 …

…into Create-Gun-Object
HagenSR · May 29, 2021 · bb30112 · bb30112
2 parents 67ca167 + 2cbd4b7
commit bb30112
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 0 deletions.
diff --git a/.vs/byte_le_royale_2022/v16/.suo b/.vs/byte_le_royale_2022/v16/.suo
diff --git a/game/common/items/__init__.py b/game/common/items/__init__.py
diff --git a/game/common/items/item.py b/game/common/items/item.py
@@ -0,0 +1,15 @@
+from game.common.map_object import MapObject
+
+class Item(MapObject):
+    def __init__(self, coordinates, hitbox, health=None, count = 1):
+        super().__init__(health, coordinates, hitbox, True)
+        self.count = count
+
+    def to_json(self):
+        data = super().to_json()
+        data['count'] = self.count
+        return data
+
+    def from_json(self, data):
+        super().from_json(data)
+        self.count = data['count']