From 094e33bb0cbffac06a81e42c7575bb70ccaead1f Mon Sep 17 00:00:00 2001 From: Kanewersa <30356293+Kanewersa@users.noreply.github.com> Date: Sat, 19 Jun 2021 00:03:08 +0200 Subject: [PATCH] Remove obsolete code --- survival/player.py | 78 --------------------------- survival/systems/automation_system.py | 2 - survival/tile_layer.py | 1 - 3 files changed, 81 deletions(-) delete mode 100644 survival/player.py diff --git a/survival/player.py b/survival/player.py deleted file mode 100644 index 995f5e6..0000000 --- a/survival/player.py +++ /dev/null @@ -1,78 +0,0 @@ -from random import randint - -import pygame - - -class Player: - def __init__(self): - # self.pos = [1024, 512] - # self.velocity = [0, 0] - # self.image = Image('stevenson.png') - # self.image.set_scale(2) - # self.speed = 30 - # self.movement_target = [self.pos[0], self.pos[1]] - # self.timer = 0 - pass - - def draw(self, camera): - - self.image.pos = self.pos - camera.draw(self.image) - - def is_moving(self): - return self.pos != self.movement_target - - def move_in_random_direction(self): - value = randint(0, 3) - random_movement = { - 0: self.move_up, - 1: self.move_down, - 2: self.move_left, - 3: self.move_right - } - random_movement[value]() - - def update(self, delta, pressed_keys): - if self.is_moving(): - if self.velocity[0] != 0: - self.pos[0] += self.velocity[0] * self.speed * delta / 100 - if abs(self.movement_target[0] - self.pos[0]) < 0.1 * self.speed: - self.velocity = [0, 0] - self.pos = self.movement_target - else: - self.pos[1] += self.velocity[1] * self.speed * delta / 100 - if abs(self.pos[1] - self.movement_target[1]) < 0.1 * self.speed: - self.velocity = [0, 0] - self.pos = self.movement_target - return - - self.timer += delta - - if self.timer > 1000: - self.move_in_random_direction() - self.timer = 0 - - if pressed_keys[pygame.K_LEFT]: - self.move_left() - elif pressed_keys[pygame.K_RIGHT]: - self.move_right() - elif pressed_keys[pygame.K_DOWN]: - self.move_down() - elif pressed_keys[pygame.K_UP]: - self.move_up() - - def move_left(self): - self.velocity = [-1, 0] - self.movement_target = [self.pos[0] - 32, self.pos[1]] - - def move_right(self): - self.velocity = [1, 0] - self.movement_target = [self.pos[0] + 32, self.pos[1]] - - def move_up(self): - self.velocity = [0, -1] - self.movement_target = [self.pos[0], self.pos[1] - 32] - - def move_down(self): - self.velocity = [0, 1] - self.movement_target = [self.pos[0], self.pos[1] + 32] diff --git a/survival/systems/automation_system.py b/survival/systems/automation_system.py index 4029701..4027fdb 100644 --- a/survival/systems/automation_system.py +++ b/survival/systems/automation_system.py @@ -7,8 +7,6 @@ from survival.components.resource_component import ResourceComponent class AutomationComponent: pass - # def __init__(self): - # self.resources = [] class AutomationSystem(esper.Processor): diff --git a/survival/tile_layer.py b/survival/tile_layer.py index f53d1e2..ef2dc22 100644 --- a/survival/tile_layer.py +++ b/survival/tile_layer.py @@ -8,7 +8,6 @@ class TileLayer: self.width = width self.height = height self.tiles: list[list[Tile]] = TileGenerator.generate_biome_tiles(width, height) - # self.tiles: list[list[Tile]] = TileGenerator.generate_random_tiles(width, height) self.image = Image('atlas.png') def draw(self, camera, visible_area):