diff --git a/test.py b/generate_test_data.py similarity index 100% rename from test.py rename to generate_test_data.py diff --git a/survival/components/inventory_component.py b/survival/components/inventory_component.py index 5fe81fb..9452dc4 100644 --- a/survival/components/inventory_component.py +++ b/survival/components/inventory_component.py @@ -1,5 +1,5 @@ class InventoryComponent: - def __init__(self, maxitems=10): + def __init__(self, maxitems=100): self.maxitems = maxitems self.items = {} diff --git a/survival/generators/player_generator.py b/survival/generators/player_generator.py index 121e7f6..e5febc7 100644 --- a/survival/generators/player_generator.py +++ b/survival/generators/player_generator.py @@ -21,7 +21,7 @@ class PlayerGenerator: world.add_component(player, InventoryComponent()) camera_target = CameraTargetComponent(pos) world.add_component(player, camera_target) - # world.add_component(player, AutomationComponent()) + world.add_component(player, AutomationComponent()) game_map.add_entity(player, pos) sprite = SpriteComponent('stevenson.png') sprite.set_scale(1) diff --git a/survival/generators/resource_generator.py b/survival/generators/resource_generator.py index 80221b9..289be88 100644 --- a/survival/generators/resource_generator.py +++ b/survival/generators/resource_generator.py @@ -54,6 +54,6 @@ class ResourceGenerator: inventory = world.component_for_entity(player, InventoryComponent) answer = decision_tree.predict_answer(resource) # print(answer) - inventory.add_item(resource.resource_type, 1) + inventory.add_item(ResourceType.get_from_string(answer), 1) game_map.remove_entity(pos.grid_position) world.delete_entity(resource_ent, immediate=True) diff --git a/survival/generators/resource_type.py b/survival/generators/resource_type.py index 4e8ac50..54e1625 100644 --- a/survival/generators/resource_type.py +++ b/survival/generators/resource_type.py @@ -4,4 +4,15 @@ from enum import Enum class ResourceType(Enum): FOOD = 1 WATER = 2 - WOOD = 3 \ No newline at end of file + WOOD = 3 + + @staticmethod + def get_from_string(string): + if string == 'food': + return ResourceType.FOOD + elif string == 'water': + return ResourceType.WATER + elif string == 'wood': + return ResourceType.WOOD + else: + raise Exception("Unknown resource type")