From 2843336d64b4aa0d595bb36bee10f6dbf86ac53b Mon Sep 17 00:00:00 2001
From: mian <mian@firemail.cc>
Date: Mon, 19 Sep 2022 14:25:07 +0300
Subject: [PATCH] Made it a package

---
 JunkSpace/__init__.py                  |  0
 main.py => JunkSpace/__main__.py       | 10 +++++-----
 asteroid.py => JunkSpace/asteroid.py   |  3 +--
 crosshair.py => JunkSpace/crosshair.py |  0
 ship.py => JunkSpace/ship.py           |  3 +--
 sprite.py => JunkSpace/sprite.py       |  0
 starfield.py => JunkSpace/starfield.py |  0
 torpedo.py => JunkSpace/torpedo.py     |  2 +-
 test_units.py                          | 12 ------------
 9 files changed, 8 insertions(+), 22 deletions(-)
 create mode 100644 JunkSpace/__init__.py
 rename main.py => JunkSpace/__main__.py (97%)
 rename asteroid.py => JunkSpace/asteroid.py (98%)
 rename crosshair.py => JunkSpace/crosshair.py (100%)
 rename ship.py => JunkSpace/ship.py (97%)
 rename sprite.py => JunkSpace/sprite.py (100%)
 rename starfield.py => JunkSpace/starfield.py (100%)
 rename torpedo.py => JunkSpace/torpedo.py (97%)
 delete mode 100644 test_units.py

diff --git a/JunkSpace/__init__.py b/JunkSpace/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/main.py b/JunkSpace/__main__.py
similarity index 97%
rename from main.py
rename to JunkSpace/__main__.py
index 278611a..89f884c 100755
--- a/main.py
+++ b/JunkSpace/__main__.py
@@ -2,10 +2,10 @@
 from sys import argv, exit
 import pygame as pg
 # locals
-from ship import Ship
-from starfield import Starfield
-from torpedo import Torpedo
-from asteroid import Asteroid
+from .ship import Ship
+from .starfield import Starfield
+from .torpedo import Torpedo
+from .asteroid import Asteroid
 
 # Colors
 BLACK = (0,)*3
@@ -26,7 +26,7 @@ start = (WIN_SIZE[0]//2,WIN_SIZE[1]//2)
 ## Setup
 pg.init()
 clock = pg.time.Clock()
-pg.display.set_caption(f"Space Collector")
+pg.display.set_caption("Junk Space")
 screen = pg.display.set_mode(WIN_SIZE)
 scr_rect = screen.get_rect()
 
diff --git a/asteroid.py b/JunkSpace/asteroid.py
similarity index 98%
rename from asteroid.py
rename to JunkSpace/asteroid.py
index 0315e33..33169e7 100644
--- a/asteroid.py
+++ b/JunkSpace/asteroid.py
@@ -1,7 +1,6 @@
 import pygame as pg
-from sprite import Sprite
 from random import randint
-
+from .sprite import Sprite
 
 class Asteroid(Sprite):
     COOLTIME = 15
diff --git a/crosshair.py b/JunkSpace/crosshair.py
similarity index 100%
rename from crosshair.py
rename to JunkSpace/crosshair.py
diff --git a/ship.py b/JunkSpace/ship.py
similarity index 97%
rename from ship.py
rename to JunkSpace/ship.py
index a3ff200..1bb6321 100644
--- a/ship.py
+++ b/JunkSpace/ship.py
@@ -1,6 +1,5 @@
 import pygame as pg
-from sprite import Sprite
-
+from .sprite import Sprite
 
 
 class Ship(Sprite):
diff --git a/sprite.py b/JunkSpace/sprite.py
similarity index 100%
rename from sprite.py
rename to JunkSpace/sprite.py
diff --git a/starfield.py b/JunkSpace/starfield.py
similarity index 100%
rename from starfield.py
rename to JunkSpace/starfield.py
diff --git a/torpedo.py b/JunkSpace/torpedo.py
similarity index 97%
rename from torpedo.py
rename to JunkSpace/torpedo.py
index fb03864..de94e48 100644
--- a/torpedo.py
+++ b/JunkSpace/torpedo.py
@@ -1,5 +1,5 @@
 import pygame as pg
-from sprite import Sprite
+from .sprite import Sprite
 
 SPEED = 6
 COLOR = (255,0,0)
diff --git a/test_units.py b/test_units.py
deleted file mode 100644
index 5d45e74..0000000
--- a/test_units.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import pygame as pg
-import pytest
-from ship import Ship
-
-def test_ship_constructor():
-    scr_rect = pg.Rect(0,0,100,100)
-    a_ship = Ship((10+Ship.SIZE/2, 20+Ship.SIZE/2), scr_rect)
-    assert a_ship.rect.centerx == scr_rect.centerx
-    assert a_ship.rect.centery == scr_rect.centery
-    assert a_ship.map_rect.left == 10+1
-    assert a_ship.map_rect.top == 20+1
-