From fe9fc14849bc9db440046ac0553babf6f04c4517 Mon Sep 17 00:00:00 2001 From: nejdetckenobi Date: Sat, 10 Oct 2026 23:59:59 +0300 Subject: [PATCH] Before periodic planet generation refactor --- helpers.py | 2 +- libs/ecs | 2 +- systems.py | 2 +- ui.py | 10 ++++------ 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/helpers.py b/helpers.py index 119c654..865f4d8 100644 --- a/helpers.py +++ b/helpers.py @@ -1,5 +1,5 @@ from pyglet.shapes import Circle, Line -from libs.ecs import World +from libs.ecs.world import World from components import ( Color, PlanetMarker, diff --git a/libs/ecs b/libs/ecs index cf87f07..4769b8d 160000 --- a/libs/ecs +++ b/libs/ecs @@ -1 +1 @@ -Subproject commit cf87f073e7600210f93fd4823f8053a9d7c4ab25 +Subproject commit 4769b8d707be60860efd75011365cf260d68d3ea diff --git a/systems.py b/systems.py index 5f01d62..e95a3cf 100644 --- a/systems.py +++ b/systems.py @@ -1,6 +1,6 @@ from pyglet.shapes import Circle -from libs.ecs import World +from libs.ecs.world import World from components import ( PlanetMarker, Position, diff --git a/ui.py b/ui.py index 7ddf106..cb52d8e 100644 --- a/ui.py +++ b/ui.py @@ -1,11 +1,11 @@ -from functools import partial from random import randint import pyglet from pyglet.shapes import Circle, Line from components import PlanetMarker, SpaceShipMarker from helpers import generate_random_planet, generate_random_spaceship -from libs.ecs import World +from libs.ecs.world import World +from libs.ecs.event import EventBus from systems import ( PlanetRenderSyncSystem, SpaceShipKillSystem, @@ -24,6 +24,7 @@ world.systems.extend( ) ) + window = pyglet.window.Window( caption="SpaceTrader", width=SCREEN_WIDTH, @@ -34,9 +35,6 @@ window = pyglet.window.Window( for _ in range(12): generate_random_planet(world) -for i in range(10): - generate_random_spaceship(world) - @window.event def on_draw(): @@ -56,7 +54,7 @@ def on_update(dt): def periodic_random_spaceship_generation(*args, **kwargs): - for i in range(randint(1, 5)): + for i in range(randint(0, 5)): generate_random_spaceship(world=world)