finished

71 files changed, 12 insertions, 24 deletions

diff --git a/assets/music/Ace Combat  Megalith.ogg b/assets/music/Ace Combat  Megalith.ogg
deleted file mode 100644
index e7302a5..0000000
--- a/assets/music/Ace Combat  Megalith.ogg
+++ /dev/null
diff --git a/assets/sounds/AHHHHHHHHHHHHHHHHHHHHHHHHHHHH.ogg b/assets/sounds/AHHHHHHHHHHHHHHHHHHHHHHHHHHHH.ogg
deleted file mode 100644
index a6628f3..0000000
--- a/assets/sounds/AHHHHHHHHHHHHHHHHHHHHHHHHHHHH.ogg
+++ /dev/null
diff --git a/assets/sounds/BloodExplo.ogg b/assets/sounds/BloodExplo.ogg
deleted file mode 100644
index fd607ee..0000000
--- a/assets/sounds/BloodExplo.ogg
+++ /dev/null
diff --git a/assets/sounds/Ihatehellokitty.ogg b/assets/sounds/Ihatehellokitty.ogg
deleted file mode 100644
index 8365b65..0000000
--- a/assets/sounds/Ihatehellokitty.ogg
+++ /dev/null
diff --git a/assets/sounds/SF33RD_0014.wav b/assets/sounds/SF33RD_0014.wav
deleted file mode 100644
index f917a0d..0000000
--- a/assets/sounds/SF33RD_0014.wav
+++ /dev/null
diff --git a/assets/sounds/SF33RD_0054.wav b/assets/sounds/SF33RD_0054.wav
deleted file mode 100644
index ab1926a..0000000
--- a/assets/sounds/SF33RD_0054.wav
+++ /dev/null
diff --git a/assets/sounds/Shoot (2).wav b/assets/sounds/Shoot (2).wav
deleted file mode 100644
index 7a7cf99..0000000
--- a/assets/sounds/Shoot (2).wav
+++ /dev/null
diff --git a/assets/sounds/Small_Explosion.ogg b/assets/sounds/Small_Explosion.ogg
deleted file mode 100644
index ae3d702..0000000
--- a/assets/sounds/Small_Explosion.ogg
+++ /dev/null
diff --git a/assets/sounds/Solgryn_OMNOMNOM.ogg b/assets/sounds/Solgryn_OMNOMNOM.ogg
deleted file mode 100644
index 80584e5..0000000
--- a/assets/sounds/Solgryn_OMNOMNOM.ogg
+++ /dev/null
diff --git a/assets/sounds/Solgryn_roar.ogg b/assets/sounds/Solgryn_roar.ogg
deleted file mode 100644
index bd0631f..0000000
--- a/assets/sounds/Solgryn_roar.ogg
+++ /dev/null
diff --git a/assets/sounds/ahhhahhahhhh.ogg b/assets/sounds/ahhhahhahhhh.ogg
deleted file mode 100644
index 63a4b04..0000000
--- a/assets/sounds/ahhhahhahhhh.ogg
+++ /dev/null
diff --git a/assets/sounds/alien bomb explosion 2.ogg b/assets/sounds/alien bomb explosion 2.ogg
deleted file mode 100644
index 4a10eda..0000000
--- a/assets/sounds/alien bomb explosion 2.ogg
+++ /dev/null
diff --git a/assets/sounds/alienbomb explosion.ogg b/assets/sounds/alienbomb explosion.ogg
deleted file mode 100644
index 02ef2b1..0000000
--- a/assets/sounds/alienbomb explosion.ogg
+++ /dev/null
diff --git a/assets/sounds/darkBoshy_shoot.ogg b/assets/sounds/darkBoshy_shoot.ogg
deleted file mode 100644
index 5989d5d..0000000
--- a/assets/sounds/darkBoshy_shoot.ogg
+++ /dev/null
diff --git a/assets/sounds/dino_shoot.ogg b/assets/sounds/dino_shoot.ogg
deleted file mode 100644
index 86d3cca..0000000
--- a/assets/sounds/dino_shoot.ogg
+++ /dev/null
diff --git a/assets/sounds/hyperbeam.ogg b/assets/sounds/hyperbeam.ogg
deleted file mode 100644
index 791933b..0000000
--- a/assets/sounds/hyperbeam.ogg
+++ /dev/null
diff --git a/assets/sounds/solgryn_laser.ogg b/assets/sounds/solgryn_laser.ogg
deleted file mode 100644
index 1bc6825..0000000
--- a/assets/sounds/solgryn_laser.ogg
+++ /dev/null
diff --git a/assets/sounds/solgryn_shielf_hurt.ogg b/assets/sounds/solgryn_shielf_hurt.ogg
deleted file mode 100644
index baf0f4c..0000000
--- a/assets/sounds/solgryn_shielf_hurt.ogg
+++ /dev/null
diff --git a/assets/sounds/splash.ogg b/assets/sounds/splash.ogg
deleted file mode 100644
index d27a941..0000000
--- a/assets/sounds/splash.ogg
+++ /dev/null
diff --git a/assets/sprites/bigexplosion1.png b/assets/sprites/bigexplosion1.png
deleted file mode 100644
index 947d00a..0000000
--- a/assets/sprites/bigexplosion1.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion10.png b/assets/sprites/bigexplosion10.png
deleted file mode 100644
index ff2322d..0000000
--- a/assets/sprites/bigexplosion10.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion11.png b/assets/sprites/bigexplosion11.png
deleted file mode 100644
index dc7abe4..0000000
--- a/assets/sprites/bigexplosion11.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion12.png b/assets/sprites/bigexplosion12.png
deleted file mode 100644
index 1b0bf12..0000000
--- a/assets/sprites/bigexplosion12.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion13.png b/assets/sprites/bigexplosion13.png
deleted file mode 100644
index 3925601..0000000
--- a/assets/sprites/bigexplosion13.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion14.png b/assets/sprites/bigexplosion14.png
deleted file mode 100644
index 96ded1c..0000000
--- a/assets/sprites/bigexplosion14.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion15.png b/assets/sprites/bigexplosion15.png
deleted file mode 100644
index f1780c3..0000000
--- a/assets/sprites/bigexplosion15.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion16.png b/assets/sprites/bigexplosion16.png
deleted file mode 100644
index 7160306..0000000
--- a/assets/sprites/bigexplosion16.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion17.png b/assets/sprites/bigexplosion17.png
deleted file mode 100644
index 6442f68..0000000
--- a/assets/sprites/bigexplosion17.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion18.png b/assets/sprites/bigexplosion18.png
deleted file mode 100644
index 337e3e3..0000000
--- a/assets/sprites/bigexplosion18.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion19.png b/assets/sprites/bigexplosion19.png
deleted file mode 100644
index c852418..0000000
--- a/assets/sprites/bigexplosion19.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion2.png b/assets/sprites/bigexplosion2.png
deleted file mode 100644
index 182bc65..0000000
--- a/assets/sprites/bigexplosion2.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion3.png b/assets/sprites/bigexplosion3.png
deleted file mode 100644
index 97d1cb0..0000000
--- a/assets/sprites/bigexplosion3.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion4.png b/assets/sprites/bigexplosion4.png
deleted file mode 100644
index 0018213..0000000
--- a/assets/sprites/bigexplosion4.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion5.png b/assets/sprites/bigexplosion5.png
deleted file mode 100644
index ead38f3..0000000
--- a/assets/sprites/bigexplosion5.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion6.png b/assets/sprites/bigexplosion6.png
deleted file mode 100644
index 41bf524..0000000
--- a/assets/sprites/bigexplosion6.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion7.png b/assets/sprites/bigexplosion7.png
deleted file mode 100644
index 1302e55..0000000
--- a/assets/sprites/bigexplosion7.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion8.png b/assets/sprites/bigexplosion8.png
deleted file mode 100644
index f0f07c7..0000000
--- a/assets/sprites/bigexplosion8.png
+++ /dev/null
diff --git a/assets/sprites/bigexplosion9.png b/assets/sprites/bigexplosion9.png
deleted file mode 100644
index 9c6cb34..0000000
--- a/assets/sprites/bigexplosion9.png
+++ /dev/null
diff --git a/assets/sprites/black_background.png b/assets/sprites/black_background.png
deleted file mode 100644
index 7926ec7..0000000
--- a/assets/sprites/black_background.png
+++ /dev/null
diff --git a/assets/sprites/black_sun_background.png b/assets/sprites/black_sun_background.png
deleted file mode 100644
index 62fb81c..0000000
--- a/assets/sprites/black_sun_background.png
+++ /dev/null
diff --git a/assets/sprites/boshy1.png b/assets/sprites/boshy.png
index dd1a996..dd1a996 100644
--- a/assets/sprites/boshy1.png
+++ b/assets/sprites/boshy.png
diff --git a/assets/sprites/boshy2.png b/assets/sprites/boshy2.png
deleted file mode 100644
index cdc24c0..0000000
--- a/assets/sprites/boshy2.png
+++ /dev/null
diff --git a/assets/sprites/explosion1.png b/assets/sprites/explosion1.png
deleted file mode 100644
index 4164985..0000000
--- a/assets/sprites/explosion1.png
+++ /dev/null
diff --git a/assets/sprites/explosion2.png b/assets/sprites/explosion2.png
deleted file mode 100644
index 7d1e6b1..0000000
--- a/assets/sprites/explosion2.png
+++ /dev/null
diff --git a/assets/sprites/explosion3.png b/assets/sprites/explosion3.png
deleted file mode 100644
index 9552877..0000000
--- a/assets/sprites/explosion3.png
+++ /dev/null
diff --git a/assets/sprites/fucking_idiot.png b/assets/sprites/fucking_idiot.png
deleted file mode 100644
index 8c39df5..0000000
--- a/assets/sprites/fucking_idiot.png
+++ /dev/null
diff --git a/assets/sprites/nomnomnom1.png b/assets/sprites/nomnomnom1.png
deleted file mode 100644
index 50781a1..0000000
--- a/assets/sprites/nomnomnom1.png
+++ /dev/null
diff --git a/assets/sprites/nomnomnom2.png b/assets/sprites/nomnomnom2.png
deleted file mode 100644
index 2d5f5b7..0000000
--- a/assets/sprites/nomnomnom2.png
+++ /dev/null
diff --git a/assets/sprites/nomnomnom3.png b/assets/sprites/nomnomnom3.png
deleted file mode 100644
index a526060..0000000
--- a/assets/sprites/nomnomnom3.png
+++ /dev/null
diff --git a/assets/sprites/oatmeal1.png b/assets/sprites/oatmeal1.png
deleted file mode 100644
index 0a088a2..0000000
--- a/assets/sprites/oatmeal1.png
+++ /dev/null
diff --git a/assets/sprites/oatmeal2.png b/assets/sprites/oatmeal2.png
deleted file mode 100644
index 9c1f340..0000000
--- a/assets/sprites/oatmeal2.png
+++ /dev/null
diff --git a/assets/sprites/oatmeal3.png b/assets/sprites/oatmeal3.png
deleted file mode 100644
index c633671..0000000
--- a/assets/sprites/oatmeal3.png
+++ /dev/null
diff --git a/assets/sprites/shitbullet.png b/assets/sprites/shitbullet.png
deleted file mode 100644
index d53a4cf..0000000
--- a/assets/sprites/shitbullet.png
+++ /dev/null
diff --git a/assets/sprites/skylaser1.png b/assets/sprites/skylaser1.png
deleted file mode 100644
index 762cd21..0000000
--- a/assets/sprites/skylaser1.png
+++ /dev/null
diff --git a/assets/sprites/skylaser2.png b/assets/sprites/skylaser2.png
deleted file mode 100644
index 65421e8..0000000
--- a/assets/sprites/skylaser2.png
+++ /dev/null
diff --git a/assets/sprites/skylaser3.png b/assets/sprites/skylaser3.png
deleted file mode 100644
index eb55807..0000000
--- a/assets/sprites/skylaser3.png
+++ /dev/null
diff --git a/assets/sprites/skylaser4.png b/assets/sprites/skylaser4.png
deleted file mode 100644
index f02bdb6..0000000
--- a/assets/sprites/skylaser4.png
+++ /dev/null
diff --git a/assets/sprites/skylaser5.png b/assets/sprites/skylaser5.png
deleted file mode 100644
index aec41ff..0000000
--- a/assets/sprites/skylaser5.png
+++ /dev/null
diff --git a/assets/sprites/skylaser6.png b/assets/sprites/skylaser6.png
deleted file mode 100644
index 3b87e39..0000000
--- a/assets/sprites/skylaser6.png
+++ /dev/null
diff --git a/assets/sprites/solgryn.png b/assets/sprites/solgryn.png
deleted file mode 100644
index 0071230..0000000
--- a/assets/sprites/solgryn.png
+++ /dev/null
diff --git a/assets/sprites/solgryn_fight.png b/assets/sprites/solgryn_fight.png
deleted file mode 100644
index b169e07..0000000
--- a/assets/sprites/solgryn_fight.png
+++ /dev/null
diff --git a/assets/sprites/solgryn_open1.png b/assets/sprites/solgryn_open1.png
deleted file mode 100644
index f01d25a..0000000
--- a/assets/sprites/solgryn_open1.png
+++ /dev/null
diff --git a/assets/sprites/solgryn_open2.png b/assets/sprites/solgryn_open2.png
deleted file mode 100644
index c77a14f..0000000
--- a/assets/sprites/solgryn_open2.png
+++ /dev/null
diff --git a/assets/sprites/solgryn_open3.png b/assets/sprites/solgryn_open3.png
deleted file mode 100644
index ec27484..0000000
--- a/assets/sprites/solgryn_open3.png
+++ /dev/null
diff --git a/assets/sprites/solgryn_sun.png b/assets/sprites/solgryn_sun.png
deleted file mode 100644
index 6fa73ac..0000000
--- a/assets/sprites/solgryn_sun.png
+++ /dev/null
diff --git a/assets/sprites/spike.png b/assets/sprites/spike.png
deleted file mode 100644
index c65bf7c..0000000
--- a/assets/sprites/spike.png
+++ /dev/null
diff --git a/assets/sprites/wall.png b/assets/sprites/wall.png
deleted file mode 100644
index 75d6e14..0000000
--- a/assets/sprites/wall.png
+++ /dev/null
diff --git a/preloader.js b/preloader.js
index 214421e..5c9cbae 100644
--- a/preloader.js
+++ b/preloader.js
@@ -11,10 +11,18 @@ function preloadAudio(a) {
 }
 
 export function preloadAll() {
+Array.from([ASSETS.BOSHY.BULLET, ASSETS.BOSHY.NORMAL, ASSETS.BOSHY.BLOOD]).map(preload)
+Object.keys(ASSETS.BOSHY.SOUNDS).map(key => preloadAudio(ASSETS.BOSHY.SOUNDS[key]))
+Object.keys(ASSETS.MUSIC).map(key => preloadAudio(ASSETS.MUSIC[key]))
 ASSETS.PORTAL.map(preload)
-Array.from([ASSETS.BOSHY.BULLET, ASSETS.BOSHY.NORMAL]).map(preload)
-Array.from([ASSETS.MUSIC.PREQUEL, ASSETS.MUSIC.HELL, ASSETS.MUSIC.DEATH]).map(preloadAudio)
-Array.from([ASSETS.BACKGROUND.DEFAULT, ASSETS.BACKGROUND.DARK_SUN]).map(preload)
+ASSETS.HELLO_KITTY.MAIN.map(preload)
+ASSETS.HELLO_KITTY.SMALL.map(preload)
+preload(ASSETS.HELLO_KITTY.BULLET)
+Object.keys(ASSETS.HELLO_KITTY.SOUNDS).map(key => preloadAudio(ASSETS.HELLO_KITTY.SOUNDS[key]))
+preload(ASSETS.WHITE)
+preload(ASSETS.GAME_OVER)
+preload(ASSETS.ANTICHEESE)
+preload(ASSETS.BACKGROUND.KITTY)
 }
 
 preloadAll()
diff --git a/src/assets.js b/src/assets.js
index 6becf4e..2828fc3 100644
--- a/src/assets.js
+++ b/src/assets.js
@@ -1,6 +1,5 @@
 export const BOSHY = {
-    NORMAL: "./assets/sprites/boshy1.png",
-    DAMAGED:"./assets/sprites/boshy2.png",
+    NORMAL: "./assets/sprites/boshy.png",
     BULLET: "./assets/sprites/boshy_bullet.png",
     BLOOD: "./assets/sprites/blood.png",
 
@@ -17,8 +16,6 @@ export const BOSHY = {
 }
 
 export const BACKGROUND = {
-    DEFAULT: "./assets/sprites/black_background.png",
-    DARK_SUN: "./assets/sprites/black_sun_background.png",
     KITTY: "./assets/sprites/hello_kitty_bg.png",
 }
 
diff --git a/src/engine/screen.js b/src/engine/screen.js
index b1da92d..0cc4a8f 100644
--- a/src/engine/screen.js
+++ b/src/engine/screen.js
@@ -1,5 +1,4 @@
 import { Vector } from "./vector.js"
-import { BACKGROUND } from "../assets.js"
 
 export class Screen {
     viewport = new Vector(650, 500)
@@ -13,7 +12,6 @@ export class Screen {
 
     createHTMLElements() {
         this.div
-        this.background
         this.spawn
 
         /* create main div */
@@ -22,14 +20,6 @@ export class Screen {
         this.div.style.backgroundColor = "black"
         this.div.style.zIndex = -11
 
-        /* create background image */
-        this.background = document.createElement("img")
-        this.background.className = "background"
-        this.background.src = `${BACKGROUND.DEFAULT}`
-        this.background.style.visibility = "hidden"
-        this.background.style.zIndex = -10
-        this.div.appendChild(this.background)
-
         /* create relative div to append children */
         this.spawn = document.createElement("div")
         this.div.appendChild(this.spawn)
@@ -84,10 +74,6 @@ export class Screen {
         span.style.rotate = `${rotation}deg`
     }
 
-    setBackground(img) { this.background.src = img }
-    showBackground() { this.background.visibility = "visible" }
-    hideBackground() { this.background.visibility = "hidden" }
-
     isOffLimits(position, size) {
         return (
             position.x + size.x / 2 < 0 ||
diff --git a/src/entities/bigdump.js b/src/entities/bigdump.js
index d7a20ba..545aab5 100644
--- a/src/entities/bigdump.js
+++ b/src/entities/bigdump.js
@@ -30,8 +30,5 @@ export class BigDump extends Entity {
 
         this.updateAsHazard()
         this.checkBounds()
-        if (Engine.screen.isOffLimits(this.position, this.size)) {
-            this.remove()
-        }
     }
 }