Build fixes

SuperArcherG · Dec 31, 2022 · 88bbdb8 · 88bbdb8
1 parent 7261153
commit 88bbdb8
Show file tree

Hide file tree

Showing 26 changed files with 33 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,6 @@ Platformy.spec
 build/*
 build/Platformy
 Icon
-dist/assets
+dist/assets
+assets.zip
+__MACOSX/assets
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,7 +10,8 @@
             "request": "launch",
             "program": "Platformy.py",
             "console": "integratedTerminal",
-            "justMyCode": true
+            "justMyCode": true,
+            "sudo" : true
         }
     ]
 }
diff --git a/Platformy.py b/Platformy.py
@@ -9,14 +9,16 @@
 import urllib.request
 import zipfile
 
-print(platform.system)
-
-if platform.system == "Darwin" and not os.path.exists(os.path.join("assets")):
-    pathToZip = os.path.join("assets.zip")
-    urllib.request.urlretrieve(
-        "https://superarcherg.com/Platformy/assets.zip", pathToZip)
+print(os.name)
+print(platform.system())
+if platform.system() == "Darwin" and not os.path.exists(os.getcwd() + "/assets"):
+    pathToZip = os.getcwd() + "/assets.zip"
+    opener = urllib.request.URLopener()
+    opener.addheader('User-Agent', 'ARCHER_PROD/Platformy')
+    filename, headers = opener.retrieve(
+        "https://server.superarcherg.com/assets", pathToZip)
     with zipfile.ZipFile(pathToZip, 'r') as zip_ref:
-        zip_ref.extractall(os.path.join("assets"))
+        zip_ref.extractall(os.getcwd())
 
 
 pygame.init()  # initialize pygame
@@ -41,23 +43,24 @@
 gravity = 0.2
 Grounded = True
 
-jump = pygame.mixer.Sound(os.path.join("assets/audio/jump.wav"))
-land = pygame.mixer.Sound(os.path.join("assets/audio/land.wav"))
+jump = pygame.mixer.Sound(os.getcwd() + "/assets/audio/jump.wav")
+land = pygame.mixer.Sound(os.getcwd() + "/assets/audio/land.wav")
 
 # player coordinates
 Px, Py = 0, 0
 Vx, Vy = 0, 0
 Ox, Oy = 0, 0
 # Load the background image here. Make sure the file exists!
 
-Mountains = BG(screenwidth, screenheight,
-               os.path.join("assets/images/background/BG.png"))
-L, R, U, D, N = os.path.join("assets/images/Player/L.png"), os.path.join("assets/images/Player/R.png"), os.path.join(
-    "assets/images/Player/U.png"), os.path.join("assets/images/Player/D.png"), os.path.join("assets/images/Player/N.png")
+Mountains = BG(screenwidth, screenheight, os.getcwd() +
+               "/assets/images/background/BG.png")
+L, R, U, D, N = os.getcwd() + "/assets/images/Player/L.png", os.getcwd() + "/assets/images/Player/R.png",  os.getcwd() + \
+    "/assets/images/Player/U.png", os.getcwd() + "/assets/images/Player/D.png", os.getcwd() + \
+    "/assets/images/Player/N.png"
 Player = Player(L, R, U, D, N, screenwidth, screenheight)
 Floor = Floor(screenwidth, screenheight,
-              os.path.join("assets/images/tiles/Ground.png"), os.path.join(
-                  "assets/images/tiles/DirtGround.png"))
+              os.getcwd() + "/assets/images/tiles/Ground.png",  os.getcwd() +
+              "/assets/images/tiles/DirtGround.png")
 pygame.mouse.set_visible(0)
 pygame.display.set_caption('Platformy')
 pressedKeys = pygame.key.get_pressed()

diff --git a/Test.py b/Test.py
@@ -0,0 +1,6 @@
+import os
+import urllib.request
+
+pathToZip = os.path.join("assets.zip")
+urllib.request.urlretrieve(
+    "https://superarcherg.com/Platformy/assets.zip", pathToZip)
diff --git a/assets/audio/death.wav b/assets/audio/death.wav
diff --git a/assets/audio/explosion.wav b/assets/audio/explosion.wav
diff --git a/assets/audio/hurt.wav b/assets/audio/hurt.wav
diff --git a/assets/audio/jump.wav b/assets/audio/jump.wav
diff --git a/assets/audio/land.wav b/assets/audio/land.wav
diff --git a/assets/images/Player/B.png b/assets/images/Player/B.png
diff --git a/assets/images/Player/D.png b/assets/images/Player/D.png
diff --git a/assets/images/Player/L.png b/assets/images/Player/L.png
diff --git a/assets/images/Player/N.png b/assets/images/Player/N.png
diff --git a/assets/images/Player/R.png b/assets/images/Player/R.png
diff --git a/assets/images/Player/U.png b/assets/images/Player/U.png
diff --git a/assets/images/background/BG.png b/assets/images/background/BG.png
diff --git a/assets/images/background/BG2.png b/assets/images/background/BG2.png
diff --git a/assets/images/promo/SlimeCover.png b/assets/images/promo/SlimeCover.png
diff --git a/assets/images/tiles/DirtGround.png b/assets/images/tiles/DirtGround.png
diff --git a/assets/images/tiles/Ground.png b/assets/images/tiles/Ground.png
diff --git a/assets/images/tiles/GroundOLD.png b/assets/images/tiles/GroundOLD.png
diff --git a/assets/images/tiles/GroundRock.png b/assets/images/tiles/GroundRock.png
diff --git a/dist/Platformy.zip b/dist/Platformy.zip
diff --git a/dist/Platformy/Platformy b/dist/Platformy/Platformy
diff --git a/dist/Platformy/README.txt b/dist/Platformy/README.txt
@@ -0,0 +1,4 @@
+How to Launch:
+In this folder, there shold be a file labeled "Platformy"
+Right click it, and open with Terminal
+It may take a moment to download the assets
diff --git a/dist/Platformy/base_library.zip b/dist/Platformy/base_library.zip