Merge branch 'develop' into use-all-function

Author: Jackojc

src/player.py

@@ -1,13 +1,15 @@
 """ Player class file """
 
+from collections import defaultdict
+
 class Player(object):
     """Describe the player, his inventory, traits, position and history"""
 
     def __init__(self, state=None):
         self.state = state
-        self.items = {}
-        self.traits = {}
-        self.history = {}
+        self.items = defaultdict(lambda: 0)
+        self.traits = defaultdict(lambda: 0)
+        self.history = defaultdict(lambda: False)
 
 
     def save_to(self, filename):
@@ -35,7 +37,7 @@ def set_traits(self, traits):
     def update_traits(self, traits):
         """Update the players traits to reflect the parameter traits. (Adds to the previous value)"""
         for trait, value in traits.items():
-            self.traits[trait] = self.traits.get(trait, 0) + value
+            self.traits[trait] += value
 
 
     def has_traits(self, traits):
@@ -48,7 +50,7 @@ def has_traits(self, traits):
     def update_items(self, items: dict):
         """Update the players inventory to reflect the parameter items. (Adds to the previous value)"""
         for item, count in items.items():
-            self.items[item] = max(self.items.get(item, 0) + count, 0)  # clamps value to zero if result is negative
+            self.items[item] = max(self.items[item] + count, 0)  # clamps value to zero if result is negative
 
 
     def has_items(self, items: dict):