diff --git a/survival/__init__.py b/survival/__init__.py index 8fd5730..9819353 100644 --- a/survival/__init__.py +++ b/survival/__init__.py @@ -1,9 +1,8 @@ import pygame from settings import SCREEN_WIDTH, SCREEN_HEIGHT -from survival.camera import Camera from survival.components.inventory_component import InventoryComponent -from survival.game_map import GameMap +from survival.game.game_map import GameMap from survival.generators.building_generator import BuildingGenerator from survival.generators.player_generator import PlayerGenerator from survival.generators.resource_generator import ResourceGenerator diff --git a/survival/decision_tree.py b/survival/ai/decision_tree.py similarity index 96% rename from survival/decision_tree.py rename to survival/ai/decision_tree.py index f5c3b65..5b00d5e 100644 --- a/survival/decision_tree.py +++ b/survival/ai/decision_tree.py @@ -13,7 +13,7 @@ class DecisionTree: self.vec = None def build(self, depth: int): - path = os.path.join("..", "data.txt") + path = os.path.join("../..", "data.txt") samples = list() results = list() diff --git a/survival/graph_search.py b/survival/ai/graph_search.py similarity index 99% rename from survival/graph_search.py rename to survival/ai/graph_search.py index 1691a5b..295c6d1 100644 --- a/survival/graph_search.py +++ b/survival/ai/graph_search.py @@ -6,7 +6,7 @@ from survival.components.direction_component import DirectionChangeComponent from survival.components.moving_component import MovingComponent from survival.components.position_component import PositionComponent from survival.components.resource_component import ResourceComponent -from survival.enums import Direction +from survival.game.enums import Direction from survival.esper import World diff --git a/survival/learning_utils.py b/survival/ai/learning_utils.py similarity index 98% rename from survival/learning_utils.py rename to survival/ai/learning_utils.py index 21edf0b..f08687f 100644 --- a/survival/learning_utils.py +++ b/survival/ai/learning_utils.py @@ -4,8 +4,8 @@ from matplotlib import pyplot as plt from survival.components.learning_component import LearningComponent from survival.components.position_component import PositionComponent -from survival.enums import Direction -from survival.graph_search import Action +from survival.game.enums import Direction +from survival.ai.graph_search import Action class LearningUtils: diff --git a/survival/model.py b/survival/ai/model.py similarity index 100% rename from survival/model.py rename to survival/ai/model.py diff --git a/survival/pathfinding.py b/survival/ai/pathfinding.py similarity index 100% rename from survival/pathfinding.py rename to survival/ai/pathfinding.py diff --git a/survival/components/direction_component.py b/survival/components/direction_component.py index e768a48..45eca28 100644 --- a/survival/components/direction_component.py +++ b/survival/components/direction_component.py @@ -1,4 +1,4 @@ -from survival.enums import Direction +from survival.game.enums import Direction class DirectionChangeComponent: diff --git a/survival/components/position_component.py b/survival/components/position_component.py index 2838d6f..ee1c0bc 100644 --- a/survival/components/position_component.py +++ b/survival/components/position_component.py @@ -1,4 +1,4 @@ -from survival.enums import Direction +from survival.game.enums import Direction class PositionComponent: diff --git a/survival/components/sprite_component.py b/survival/components/sprite_component.py index 9d6ef95..0d66dcf 100644 --- a/survival/components/sprite_component.py +++ b/survival/components/sprite_component.py @@ -1,4 +1,4 @@ -from survival.image import Image +from survival.game.image import Image class SpriteComponent: diff --git a/survival/biomes/biome_data.py b/survival/game/biomes/biome_data.py similarity index 83% rename from survival/biomes/biome_data.py rename to survival/game/biomes/biome_data.py index eae1966..6a0a64b 100644 --- a/survival/biomes/biome_data.py +++ b/survival/game/biomes/biome_data.py @@ -1,4 +1,4 @@ -from survival.biomes.biome_preset import BiomePreset +from survival.game.biomes.biome_preset import BiomePreset class BiomeData: diff --git a/survival/biomes/biome_preset.py b/survival/game/biomes/biome_preset.py similarity index 94% rename from survival/biomes/biome_preset.py rename to survival/game/biomes/biome_preset.py index f1289b3..10cf287 100644 --- a/survival/biomes/biome_preset.py +++ b/survival/game/biomes/biome_preset.py @@ -1,7 +1,7 @@ import random from typing import List -from survival.tile import Tile +from survival.game.tile import Tile class BiomePreset: diff --git a/survival/biomes/noise.py b/survival/game/biomes/noise.py similarity index 100% rename from survival/biomes/noise.py rename to survival/game/biomes/noise.py diff --git a/survival/camera.py b/survival/game/camera.py similarity index 100% rename from survival/camera.py rename to survival/game/camera.py diff --git a/survival/entity_layer.py b/survival/game/entity_layer.py similarity index 100% rename from survival/entity_layer.py rename to survival/game/entity_layer.py diff --git a/survival/enums.py b/survival/game/enums.py similarity index 100% rename from survival/enums.py rename to survival/game/enums.py diff --git a/survival/game_map.py b/survival/game/game_map.py similarity index 95% rename from survival/game_map.py rename to survival/game/game_map.py index 60c6251..8857901 100644 --- a/survival/game_map.py +++ b/survival/game/game_map.py @@ -1,10 +1,10 @@ from survival.components.position_component import PositionComponent from survival.components.resource_component import ResourceComponent -from survival.entity_layer import EntityLayer +from survival.game.entity_layer import EntityLayer from survival.esper import World -from survival.graph_search import graph_search +from survival.ai.graph_search import graph_search from survival.settings import AGENT_VISION_RANGE -from survival.tile_layer import TileLayer +from survival.game.tile_layer import TileLayer class GameMap: diff --git a/survival/image.py b/survival/game/image.py similarity index 90% rename from survival/image.py rename to survival/game/image.py index 0e4ad46..43b9073 100644 --- a/survival/image.py +++ b/survival/game/image.py @@ -6,7 +6,7 @@ import pygame class Image: def __init__(self, filename='', pos=(0, 0), scale=1, surface=None): if surface is None: - self.texture = pygame.image.load(os.path.join('..', 'assets', filename)).convert_alpha() + self.texture = pygame.image.load(os.path.join('../', 'assets', filename)).convert_alpha() else: self.texture = surface self.image = self.texture diff --git a/survival/tile.py b/survival/game/tile.py similarity index 100% rename from survival/tile.py rename to survival/game/tile.py diff --git a/survival/tile_layer.py b/survival/game/tile_layer.py similarity index 91% rename from survival/tile_layer.py rename to survival/game/tile_layer.py index ef2dc22..782e531 100644 --- a/survival/tile_layer.py +++ b/survival/game/tile_layer.py @@ -1,6 +1,6 @@ from survival.generators.tile_generator import TileGenerator -from survival.image import Image -from survival.tile import Tile +from survival.game.image import Image +from survival.game.tile import Tile class TileLayer: diff --git a/survival/user_interface.py b/survival/game/user_interface.py similarity index 97% rename from survival/user_interface.py rename to survival/game/user_interface.py index 0bf66b9..b1acb76 100644 --- a/survival/user_interface.py +++ b/survival/game/user_interface.py @@ -3,7 +3,7 @@ import pygame.font from survival import settings from survival.components.inventory_component import InventoryComponent from survival.generators.resource_type import ResourceType -from survival.image import Image +from survival.game.image import Image class UserInterface: diff --git a/survival/generators/tile_generator.py b/survival/generators/tile_generator.py index 473d9e5..b505e55 100644 --- a/survival/generators/tile_generator.py +++ b/survival/generators/tile_generator.py @@ -3,10 +3,10 @@ import random from pathlib import Path from typing import List -from survival.biomes.biome_data import BiomeData -from survival.biomes.biome_preset import BiomePreset -from survival.biomes.noise import generate_noise -from survival.tile import Tile +from survival.game.biomes.biome_data import BiomeData +from survival.game.biomes.biome_preset import BiomePreset +from survival.game.biomes.noise import generate_noise +from survival.game.tile import Tile class TileGenerator: diff --git a/survival/generators/world_generator.py b/survival/generators/world_generator.py index c30829e..ed26bf2 100644 --- a/survival/generators/world_generator.py +++ b/survival/generators/world_generator.py @@ -1,5 +1,4 @@ -from survival import esper, PlayerGenerator, ResourceGenerator, SCREEN_WIDTH, SCREEN_HEIGHT, GameMap, \ - Camera +from survival import esper, PlayerGenerator, ResourceGenerator, SCREEN_WIDTH, SCREEN_HEIGHT from survival.components.consumption_component import ConsumptionComponent from survival.components.direction_component import DirectionChangeComponent from survival.components.inventory_component import InventoryComponent @@ -10,6 +9,8 @@ from survival.components.position_component import PositionComponent from survival.components.resource_component import ResourceComponent from survival.components.time_component import TimeComponent from survival.esper import World +from survival.game.camera import Camera +from survival.game.game_map import GameMap from survival.generators.resource_type import ResourceType from survival.settings import PLAYER_START_POSITION, STARTING_RESOURCES_AMOUNT from survival.systems.automation_system import AutomationSystem diff --git a/survival/systems/collision_system.py b/survival/systems/collision_system.py index b3cdd0b..e6ef9c3 100644 --- a/survival/systems/collision_system.py +++ b/survival/systems/collision_system.py @@ -4,7 +4,7 @@ from survival import esper from survival.components.on_collision_component import OnCollisionComponent from survival.components.moving_component import MovingComponent from survival.components.position_component import PositionComponent -from survival.enums import Direction +from survival.game.enums import Direction class CollisionSystem(esper.Processor): diff --git a/survival/systems/draw_system.py b/survival/systems/draw_system.py index 82692c2..37de885 100644 --- a/survival/systems/draw_system.py +++ b/survival/systems/draw_system.py @@ -1,7 +1,7 @@ from survival import esper from survival.components.position_component import PositionComponent from survival.components.sprite_component import SpriteComponent -from survival.user_interface import UserInterface +from survival.game.user_interface import UserInterface class DrawSystem(esper.Processor): diff --git a/survival/systems/neural_system.py b/survival/systems/neural_system.py index a4a3aeb..a7d68b0 100644 --- a/survival/systems/neural_system.py +++ b/survival/systems/neural_system.py @@ -10,9 +10,9 @@ from survival.components.moving_component import MovingComponent from survival.components.position_component import PositionComponent from survival.components.learning_component import LearningComponent from survival.components.time_component import TimeComponent -from survival.graph_search import Action -from survival.learning_utils import get_state, LearningUtils -from survival.model import LinearQNetwork, QTrainer +from survival.ai.graph_search import Action +from survival.ai.learning_utils import get_state, LearningUtils +from survival.ai.model import LinearQNetwork, QTrainer MAX_MEMORY = 100_000 BATCH_SIZE = 1000 diff --git a/survival/systems/pathfinding_movement_system.py b/survival/systems/pathfinding_movement_system.py index 0c34ebc..61d506d 100644 --- a/survival/systems/pathfinding_movement_system.py +++ b/survival/systems/pathfinding_movement_system.py @@ -3,8 +3,8 @@ from survival.components.direction_component import DirectionChangeComponent from survival.components.movement_component import MovementComponent from survival.components.moving_component import MovingComponent from survival.components.position_component import PositionComponent -from survival.enums import Direction -from survival.graph_search import graph_search, Action +from survival.game.enums import Direction +from survival.ai.graph_search import graph_search, Action from survival.systems.input_system import PathfindingComponent