diff --git a/assets/audio/README b/assets/audio/README deleted file mode 100644 index e0309b8..0000000 --- a/assets/audio/README +++ /dev/null @@ -1 +0,0 @@ -Music files, MP3 format, should be placed in this folder. They can be organized in sub-folders if necessary. \ No newline at end of file diff --git a/assets/audio/highDown.mp3 b/assets/audio/highDown.mp3 deleted file mode 100644 index bf3fe42..0000000 Binary files a/assets/audio/highDown.mp3 and /dev/null differ diff --git a/assets/audio/highUp.mp3 b/assets/audio/highUp.mp3 deleted file mode 100644 index c0b434b..0000000 Binary files a/assets/audio/highUp.mp3 and /dev/null differ diff --git a/assets/audio/jingleSounds_Kenney.zip b/assets/audio/jingleSounds_Kenney.zip deleted file mode 100644 index 8255f37..0000000 --- a/assets/audio/jingleSounds_Kenney.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:be324b6cf26e35c95c2a344569a2470512819d0246cc81328bef3499de3682e5 -size 1089319 diff --git a/assets/audio/laser1.mp3 b/assets/audio/laser1.mp3 deleted file mode 100644 index 687d976..0000000 Binary files a/assets/audio/laser1.mp3 and /dev/null differ diff --git a/assets/audio/laser2.mp3 b/assets/audio/laser2.mp3 deleted file mode 100644 index 60c1300..0000000 Binary files a/assets/audio/laser2.mp3 and /dev/null differ diff --git a/assets/audio/laser5.mp3 b/assets/audio/laser5.mp3 deleted file mode 100644 index 309288b..0000000 Binary files a/assets/audio/laser5.mp3 and /dev/null differ diff --git a/assets/audio/laser6.mp3 b/assets/audio/laser6.mp3 deleted file mode 100644 index e3dfc74..0000000 Binary files a/assets/audio/laser6.mp3 and /dev/null differ diff --git a/assets/audio/laser7.mp3 b/assets/audio/laser7.mp3 deleted file mode 100644 index d063db8..0000000 Binary files a/assets/audio/laser7.mp3 and /dev/null differ diff --git a/assets/audio/laser8.mp3 b/assets/audio/laser8.mp3 deleted file mode 100644 index 2ae1105..0000000 Binary files a/assets/audio/laser8.mp3 and /dev/null differ diff --git a/assets/audio/laser9.mp3 b/assets/audio/laser9.mp3 deleted file mode 100644 index 0ee70a3..0000000 Binary files a/assets/audio/laser9.mp3 and /dev/null differ diff --git a/assets/audio/lowDown.mp3 b/assets/audio/lowDown.mp3 deleted file mode 100644 index 716f121..0000000 Binary files a/assets/audio/lowDown.mp3 and /dev/null differ diff --git a/assets/audio/lowRandom.mp3 b/assets/audio/lowRandom.mp3 deleted file mode 100644 index 5b6b83a..0000000 Binary files a/assets/audio/lowRandom.mp3 and /dev/null differ diff --git a/assets/audio/lowThreeTone.mp3 b/assets/audio/lowThreeTone.mp3 deleted file mode 100644 index 9eda79f..0000000 Binary files a/assets/audio/lowThreeTone.mp3 and /dev/null differ diff --git a/assets/audio/pepSound1.mp3 b/assets/audio/pepSound1.mp3 deleted file mode 100644 index fd3bb56..0000000 Binary files a/assets/audio/pepSound1.mp3 and /dev/null differ diff --git a/assets/audio/pepSound2.mp3 b/assets/audio/pepSound2.mp3 deleted file mode 100644 index 47df8a0..0000000 Binary files a/assets/audio/pepSound2.mp3 and /dev/null differ diff --git a/assets/audio/pepSound3.mp3 b/assets/audio/pepSound3.mp3 deleted file mode 100644 index 992b4e3..0000000 Binary files a/assets/audio/pepSound3.mp3 and /dev/null differ diff --git a/assets/audio/pepSound4.mp3 b/assets/audio/pepSound4.mp3 deleted file mode 100644 index 9695598..0000000 Binary files a/assets/audio/pepSound4.mp3 and /dev/null differ diff --git a/assets/audio/pepSound5.mp3 b/assets/audio/pepSound5.mp3 deleted file mode 100644 index 6b5c208..0000000 Binary files a/assets/audio/pepSound5.mp3 and /dev/null differ diff --git a/assets/audio/phaseJump1.mp3 b/assets/audio/phaseJump1.mp3 deleted file mode 100644 index 2feb3e8..0000000 Binary files a/assets/audio/phaseJump1.mp3 and /dev/null differ diff --git a/assets/audio/phaseJump2.mp3 b/assets/audio/phaseJump2.mp3 deleted file mode 100644 index 1be48d9..0000000 Binary files a/assets/audio/phaseJump2.mp3 and /dev/null differ diff --git a/assets/audio/phaseJump3.mp3 b/assets/audio/phaseJump3.mp3 deleted file mode 100644 index cce6cba..0000000 Binary files a/assets/audio/phaseJump3.mp3 and /dev/null differ diff --git a/assets/audio/phaseJump4.mp3 b/assets/audio/phaseJump4.mp3 deleted file mode 100644 index 6588abc..0000000 Binary files a/assets/audio/phaseJump4.mp3 and /dev/null differ diff --git a/assets/audio/phaseJump5.mp3 b/assets/audio/phaseJump5.mp3 deleted file mode 100644 index 5c03e0c..0000000 Binary files a/assets/audio/phaseJump5.mp3 and /dev/null differ diff --git a/assets/audio/phaserDown1.mp3 b/assets/audio/phaserDown1.mp3 deleted file mode 100644 index d60c9f4..0000000 Binary files a/assets/audio/phaserDown1.mp3 and /dev/null differ diff --git a/assets/audio/phaserDown2.mp3 b/assets/audio/phaserDown2.mp3 deleted file mode 100644 index e497640..0000000 Binary files a/assets/audio/phaserDown2.mp3 and /dev/null differ diff --git a/assets/audio/phaserDown3.mp3 b/assets/audio/phaserDown3.mp3 deleted file mode 100644 index 3b65f05..0000000 Binary files a/assets/audio/phaserDown3.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp1.mp3 b/assets/audio/phaserUp1.mp3 deleted file mode 100644 index 7cb7969..0000000 Binary files a/assets/audio/phaserUp1.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp2.mp3 b/assets/audio/phaserUp2.mp3 deleted file mode 100644 index 3afdaa4..0000000 Binary files a/assets/audio/phaserUp2.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp3.mp3 b/assets/audio/phaserUp3.mp3 deleted file mode 100644 index 21b08b8..0000000 Binary files a/assets/audio/phaserUp3.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp4.mp3 b/assets/audio/phaserUp4.mp3 deleted file mode 100644 index 25f1bb2..0000000 Binary files a/assets/audio/phaserUp4.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp5.mp3 b/assets/audio/phaserUp5.mp3 deleted file mode 100644 index 66f5637..0000000 Binary files a/assets/audio/phaserUp5.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp6.mp3 b/assets/audio/phaserUp6.mp3 deleted file mode 100644 index 86470f8..0000000 Binary files a/assets/audio/phaserUp6.mp3 and /dev/null differ diff --git a/assets/audio/phaserUp7.mp3 b/assets/audio/phaserUp7.mp3 deleted file mode 100644 index 368ad2d..0000000 Binary files a/assets/audio/phaserUp7.mp3 and /dev/null differ diff --git a/assets/audio/powerUp1.mp3 b/assets/audio/powerUp1.mp3 deleted file mode 100644 index 285b5c9..0000000 Binary files a/assets/audio/powerUp1.mp3 and /dev/null differ diff --git a/assets/audio/powerUp10.mp3 b/assets/audio/powerUp10.mp3 deleted file mode 100644 index 938d076..0000000 Binary files a/assets/audio/powerUp10.mp3 and /dev/null differ diff --git a/assets/audio/powerUp11.mp3 b/assets/audio/powerUp11.mp3 deleted file mode 100644 index d7a5bc8..0000000 Binary files a/assets/audio/powerUp11.mp3 and /dev/null differ diff --git a/assets/audio/powerUp12.mp3 b/assets/audio/powerUp12.mp3 deleted file mode 100644 index 6aa5891..0000000 Binary files a/assets/audio/powerUp12.mp3 and /dev/null differ diff --git a/assets/audio/powerUp2.mp3 b/assets/audio/powerUp2.mp3 deleted file mode 100644 index a7803c4..0000000 Binary files a/assets/audio/powerUp2.mp3 and /dev/null differ diff --git a/assets/audio/powerUp3.mp3 b/assets/audio/powerUp3.mp3 deleted file mode 100644 index 34d0a93..0000000 Binary files a/assets/audio/powerUp3.mp3 and /dev/null differ diff --git a/assets/audio/powerUp4.mp3 b/assets/audio/powerUp4.mp3 deleted file mode 100644 index 6ef4463..0000000 Binary files a/assets/audio/powerUp4.mp3 and /dev/null differ diff --git a/assets/audio/powerUp5.mp3 b/assets/audio/powerUp5.mp3 deleted file mode 100644 index 8240172..0000000 Binary files a/assets/audio/powerUp5.mp3 and /dev/null differ diff --git a/assets/audio/powerUp7.mp3 b/assets/audio/powerUp7.mp3 deleted file mode 100644 index b070ae9..0000000 Binary files a/assets/audio/powerUp7.mp3 and /dev/null differ diff --git a/assets/audio/powerUp8.mp3 b/assets/audio/powerUp8.mp3 deleted file mode 100644 index 7c171cf..0000000 Binary files a/assets/audio/powerUp8.mp3 and /dev/null differ diff --git a/assets/audio/powerUp9.mp3 b/assets/audio/powerUp9.mp3 deleted file mode 100644 index 3007f07..0000000 Binary files a/assets/audio/powerUp9.mp3 and /dev/null differ diff --git a/assets/audio/readme.txt b/assets/audio/readme.txt deleted file mode 100644 index f400f17..0000000 --- a/assets/audio/readme.txt +++ /dev/null @@ -1,8 +0,0 @@ - --- - -Digital SFX set by Kenney Vleugels (www.kenney.nl) - -You may use these sounds in personal and commercial projects. -Credit (www.kenney.nl) would be nice but is not mandatory. - - -- \ No newline at end of file diff --git a/assets/audio/spaceTrash1.mp3 b/assets/audio/spaceTrash1.mp3 deleted file mode 100644 index 56c498c..0000000 Binary files a/assets/audio/spaceTrash1.mp3 and /dev/null differ diff --git a/assets/audio/spaceTrash2.mp3 b/assets/audio/spaceTrash2.mp3 deleted file mode 100644 index 135115b..0000000 Binary files a/assets/audio/spaceTrash2.mp3 and /dev/null differ diff --git a/assets/audio/spaceTrash3.mp3 b/assets/audio/spaceTrash3.mp3 deleted file mode 100644 index ca0a13f..0000000 Binary files a/assets/audio/spaceTrash3.mp3 and /dev/null differ diff --git a/assets/audio/spaceTrash4.mp3 b/assets/audio/spaceTrash4.mp3 deleted file mode 100644 index 7337baa..0000000 Binary files a/assets/audio/spaceTrash4.mp3 and /dev/null differ diff --git a/assets/audio/spaceTrash5.mp3 b/assets/audio/spaceTrash5.mp3 deleted file mode 100644 index bd7b1da..0000000 Binary files a/assets/audio/spaceTrash5.mp3 and /dev/null differ diff --git a/assets/audio/threeTone1.mp3 b/assets/audio/threeTone1.mp3 deleted file mode 100644 index badeb37..0000000 Binary files a/assets/audio/threeTone1.mp3 and /dev/null differ diff --git a/assets/audio/threeTone2.mp3 b/assets/audio/threeTone2.mp3 deleted file mode 100644 index 7e53681..0000000 Binary files a/assets/audio/threeTone2.mp3 and /dev/null differ diff --git a/assets/audio/tone1.mp3 b/assets/audio/tone1.mp3 deleted file mode 100644 index 7b89172..0000000 Binary files a/assets/audio/tone1.mp3 and /dev/null differ diff --git a/assets/audio/twoTone1.mp3 b/assets/audio/twoTone1.mp3 deleted file mode 100644 index 48e8906..0000000 Binary files a/assets/audio/twoTone1.mp3 and /dev/null differ diff --git a/assets/audio/twoTone2.mp3 b/assets/audio/twoTone2.mp3 deleted file mode 100644 index e97f265..0000000 Binary files a/assets/audio/twoTone2.mp3 and /dev/null differ diff --git a/assets/audio/zap1.mp3 b/assets/audio/zap1.mp3 deleted file mode 100644 index d753853..0000000 Binary files a/assets/audio/zap1.mp3 and /dev/null differ diff --git a/assets/audio/zap2.mp3 b/assets/audio/zap2.mp3 deleted file mode 100644 index a078d9c..0000000 Binary files a/assets/audio/zap2.mp3 and /dev/null differ diff --git a/assets/audio/zapThreeToneDown.mp3 b/assets/audio/zapThreeToneDown.mp3 deleted file mode 100644 index b1b0518..0000000 Binary files a/assets/audio/zapThreeToneDown.mp3 and /dev/null differ diff --git a/assets/audio/zapThreeToneUp.mp3 b/assets/audio/zapThreeToneUp.mp3 deleted file mode 100644 index 6c1d8f3..0000000 Binary files a/assets/audio/zapThreeToneUp.mp3 and /dev/null differ diff --git a/assets/audio/zapTwoTone.mp3 b/assets/audio/zapTwoTone.mp3 deleted file mode 100644 index 683f66b..0000000 Binary files a/assets/audio/zapTwoTone.mp3 and /dev/null differ diff --git a/assets/audio/zapTwoTone2.mp3 b/assets/audio/zapTwoTone2.mp3 deleted file mode 100644 index 89448cc..0000000 Binary files a/assets/audio/zapTwoTone2.mp3 and /dev/null differ diff --git a/assets/graphics/buttonRed.png b/assets/graphics/buttonRed.png deleted file mode 100644 index 9046ebb..0000000 Binary files a/assets/graphics/buttonRed.png and /dev/null differ diff --git a/assets/graphics/buttonYellow.png b/assets/graphics/buttonYellow.png deleted file mode 100644 index 9770341..0000000 Binary files a/assets/graphics/buttonYellow.png and /dev/null differ diff --git a/assets/graphics/cursor.png b/assets/graphics/cursor.png deleted file mode 100644 index 9a5c5c2..0000000 Binary files a/assets/graphics/cursor.png and /dev/null differ diff --git a/assets/graphics/explosion.png b/assets/graphics/explosion.png new file mode 100644 index 0000000..2f38fc6 Binary files /dev/null and b/assets/graphics/explosion.png differ diff --git a/assets/graphics/fire00.png b/assets/graphics/fire00.png deleted file mode 100644 index 4424075..0000000 Binary files a/assets/graphics/fire00.png and /dev/null differ diff --git a/assets/graphics/fire01.png b/assets/graphics/fire01.png deleted file mode 100644 index 4efed3d..0000000 Binary files a/assets/graphics/fire01.png and /dev/null differ diff --git a/assets/graphics/fire02.png b/assets/graphics/fire02.png deleted file mode 100644 index f574dbe..0000000 Binary files a/assets/graphics/fire02.png and /dev/null differ diff --git a/assets/graphics/fire03.png b/assets/graphics/fire03.png deleted file mode 100644 index 89a1fee..0000000 Binary files a/assets/graphics/fire03.png and /dev/null differ diff --git a/assets/graphics/fire04.png b/assets/graphics/fire04.png deleted file mode 100644 index 8cf6645..0000000 Binary files a/assets/graphics/fire04.png and /dev/null differ diff --git a/assets/graphics/fire06.png b/assets/graphics/fire06.png deleted file mode 100644 index c8ac319..0000000 Binary files a/assets/graphics/fire06.png and /dev/null differ diff --git a/assets/graphics/fire07.png b/assets/graphics/fire07.png deleted file mode 100644 index 243d5aa..0000000 Binary files a/assets/graphics/fire07.png and /dev/null differ diff --git a/assets/graphics/fire08.png b/assets/graphics/fire08.png deleted file mode 100644 index 37ed06f..0000000 Binary files a/assets/graphics/fire08.png and /dev/null differ diff --git a/assets/graphics/fire09.png b/assets/graphics/fire09.png deleted file mode 100644 index 4ab90ac..0000000 Binary files a/assets/graphics/fire09.png and /dev/null differ diff --git a/assets/graphics/fire10.png b/assets/graphics/fire10.png deleted file mode 100644 index 1b42c69..0000000 Binary files a/assets/graphics/fire10.png and /dev/null differ diff --git a/assets/graphics/fire18.png b/assets/graphics/fire18.png deleted file mode 100644 index 84dbb73..0000000 Binary files a/assets/graphics/fire18.png and /dev/null differ diff --git a/assets/graphics/fire19.png b/assets/graphics/fire19.png deleted file mode 100644 index db435cd..0000000 Binary files a/assets/graphics/fire19.png and /dev/null differ diff --git a/assets/graphics/laserBlue01.png b/assets/graphics/laserBlue01.png deleted file mode 100644 index b76aaf7..0000000 Binary files a/assets/graphics/laserBlue01.png and /dev/null differ diff --git a/assets/graphics/laserBlue02.png b/assets/graphics/laserBlue02.png deleted file mode 100644 index 3f923a3..0000000 Binary files a/assets/graphics/laserBlue02.png and /dev/null differ diff --git a/assets/graphics/laserBlue03.png b/assets/graphics/laserBlue03.png deleted file mode 100644 index a16e9a8..0000000 Binary files a/assets/graphics/laserBlue03.png and /dev/null differ diff --git a/assets/graphics/laserBlue04.png b/assets/graphics/laserBlue04.png deleted file mode 100644 index 6f3b910..0000000 Binary files a/assets/graphics/laserBlue04.png and /dev/null differ diff --git a/assets/graphics/laserBlue05.png b/assets/graphics/laserBlue05.png deleted file mode 100644 index 85cff7d..0000000 Binary files a/assets/graphics/laserBlue05.png and /dev/null differ diff --git a/assets/graphics/laserBlue06.png b/assets/graphics/laserBlue06.png deleted file mode 100644 index a621875..0000000 Binary files a/assets/graphics/laserBlue06.png and /dev/null differ diff --git a/assets/graphics/laserBlue07.png b/assets/graphics/laserBlue07.png deleted file mode 100644 index e1848bf..0000000 Binary files a/assets/graphics/laserBlue07.png and /dev/null differ diff --git a/assets/graphics/laserBlue08.png b/assets/graphics/laserBlue08.png deleted file mode 100644 index 7a46396..0000000 Binary files a/assets/graphics/laserBlue08.png and /dev/null differ diff --git a/assets/graphics/laserBlue09.png b/assets/graphics/laserBlue09.png deleted file mode 100644 index 35624e6..0000000 Binary files a/assets/graphics/laserBlue09.png and /dev/null differ diff --git a/assets/graphics/laserBlue10.png b/assets/graphics/laserBlue10.png deleted file mode 100644 index dd6b766..0000000 Binary files a/assets/graphics/laserBlue10.png and /dev/null differ diff --git a/assets/graphics/laserBlue11.png b/assets/graphics/laserBlue11.png deleted file mode 100644 index c062349..0000000 Binary files a/assets/graphics/laserBlue11.png and /dev/null differ diff --git a/assets/graphics/laserBlue12.png b/assets/graphics/laserBlue12.png deleted file mode 100644 index 48b6103..0000000 Binary files a/assets/graphics/laserBlue12.png and /dev/null differ diff --git a/assets/graphics/laserBlue13.png b/assets/graphics/laserBlue13.png deleted file mode 100644 index c5ec6a3..0000000 Binary files a/assets/graphics/laserBlue13.png and /dev/null differ diff --git a/assets/graphics/laserBlue14.png b/assets/graphics/laserBlue14.png deleted file mode 100644 index 254601e..0000000 Binary files a/assets/graphics/laserBlue14.png and /dev/null differ diff --git a/assets/graphics/laserBlue15.png b/assets/graphics/laserBlue15.png deleted file mode 100644 index 1ea1966..0000000 Binary files a/assets/graphics/laserBlue15.png and /dev/null differ diff --git a/assets/graphics/laserBlue16.png b/assets/graphics/laserBlue16.png deleted file mode 100644 index 1def98f..0000000 Binary files a/assets/graphics/laserBlue16.png and /dev/null differ diff --git a/assets/graphics/numeral0.png b/assets/graphics/numeral0.png deleted file mode 100644 index 4ac136f..0000000 Binary files a/assets/graphics/numeral0.png and /dev/null differ diff --git a/assets/graphics/numeral1.png b/assets/graphics/numeral1.png deleted file mode 100644 index 6ffeaaa..0000000 Binary files a/assets/graphics/numeral1.png and /dev/null differ diff --git a/assets/graphics/numeral2.png b/assets/graphics/numeral2.png deleted file mode 100644 index e1628bd..0000000 Binary files a/assets/graphics/numeral2.png and /dev/null differ diff --git a/assets/graphics/numeral3.png b/assets/graphics/numeral3.png deleted file mode 100644 index 386ac44..0000000 Binary files a/assets/graphics/numeral3.png and /dev/null differ diff --git a/assets/graphics/numeral4.png b/assets/graphics/numeral4.png deleted file mode 100644 index 3a40e32..0000000 Binary files a/assets/graphics/numeral4.png and /dev/null differ diff --git a/assets/graphics/numeral5.png b/assets/graphics/numeral5.png deleted file mode 100644 index fbcc76f..0000000 Binary files a/assets/graphics/numeral5.png and /dev/null differ diff --git a/assets/graphics/numeral6.png b/assets/graphics/numeral6.png deleted file mode 100644 index 2383268..0000000 Binary files a/assets/graphics/numeral6.png and /dev/null differ diff --git a/assets/graphics/numeral7.png b/assets/graphics/numeral7.png deleted file mode 100644 index e2e9d7a..0000000 Binary files a/assets/graphics/numeral7.png and /dev/null differ diff --git a/assets/graphics/numeral8.png b/assets/graphics/numeral8.png deleted file mode 100644 index 0f354ff..0000000 Binary files a/assets/graphics/numeral8.png and /dev/null differ diff --git a/assets/graphics/numeral9.png b/assets/graphics/numeral9.png deleted file mode 100644 index b1e4cb4..0000000 Binary files a/assets/graphics/numeral9.png and /dev/null differ diff --git a/assets/graphics/numeralX.png b/assets/graphics/numeralX.png deleted file mode 100644 index 7bad6ac..0000000 Binary files a/assets/graphics/numeralX.png and /dev/null differ diff --git a/assets/graphics/pill_blue.png b/assets/graphics/pill_blue.png deleted file mode 100644 index b07abfb..0000000 Binary files a/assets/graphics/pill_blue.png and /dev/null differ diff --git a/assets/graphics/pill_green.png b/assets/graphics/pill_green.png deleted file mode 100644 index af6b73a..0000000 Binary files a/assets/graphics/pill_green.png and /dev/null differ diff --git a/assets/graphics/pill_red.png b/assets/graphics/pill_red.png deleted file mode 100644 index 8d89b16..0000000 Binary files a/assets/graphics/pill_red.png and /dev/null differ diff --git a/assets/graphics/pill_yellow.png b/assets/graphics/pill_yellow.png deleted file mode 100644 index 9d7b2bb..0000000 Binary files a/assets/graphics/pill_yellow.png and /dev/null differ diff --git a/assets/graphics/playerLife1_blue.png b/assets/graphics/playerLife1_blue.png deleted file mode 100644 index 4a6c8b9..0000000 Binary files a/assets/graphics/playerLife1_blue.png and /dev/null differ diff --git a/assets/graphics/playerLife1_orange.png b/assets/graphics/playerLife1_orange.png deleted file mode 100644 index 8c02aa2..0000000 Binary files a/assets/graphics/playerLife1_orange.png and /dev/null differ diff --git a/assets/graphics/playerLife1_red.png b/assets/graphics/playerLife1_red.png deleted file mode 100644 index 6375095..0000000 Binary files a/assets/graphics/playerLife1_red.png and /dev/null differ diff --git a/assets/graphics/playerLife2_blue.png b/assets/graphics/playerLife2_blue.png deleted file mode 100644 index 17478e6..0000000 Binary files a/assets/graphics/playerLife2_blue.png and /dev/null differ diff --git a/assets/graphics/playerLife2_orange.png b/assets/graphics/playerLife2_orange.png deleted file mode 100644 index ae1bf6c..0000000 Binary files a/assets/graphics/playerLife2_orange.png and /dev/null differ diff --git a/assets/graphics/playerLife2_red.png b/assets/graphics/playerLife2_red.png deleted file mode 100644 index abada85..0000000 Binary files a/assets/graphics/playerLife2_red.png and /dev/null differ diff --git a/assets/graphics/playerLife3_blue.png b/assets/graphics/playerLife3_blue.png deleted file mode 100644 index a1411ec..0000000 Binary files a/assets/graphics/playerLife3_blue.png and /dev/null differ diff --git a/assets/graphics/playerLife3_orange.png b/assets/graphics/playerLife3_orange.png deleted file mode 100644 index b359359..0000000 Binary files a/assets/graphics/playerLife3_orange.png and /dev/null differ diff --git a/assets/graphics/playerLife3_red.png b/assets/graphics/playerLife3_red.png deleted file mode 100644 index 5417fd9..0000000 Binary files a/assets/graphics/playerLife3_red.png and /dev/null differ diff --git a/assets/graphics/playerShip2_green.png b/assets/graphics/playerShip2_green.png deleted file mode 100644 index 72e18c7..0000000 Binary files a/assets/graphics/playerShip2_green.png and /dev/null differ diff --git a/assets/graphics/playerShip3_green.png b/assets/graphics/playerShip3_green.png deleted file mode 100644 index b853be4..0000000 Binary files a/assets/graphics/playerShip3_green.png and /dev/null differ diff --git a/assets/graphics/powerupBlue.png b/assets/graphics/powerupBlue.png deleted file mode 100644 index 1118e1b..0000000 Binary files a/assets/graphics/powerupBlue.png and /dev/null differ diff --git a/assets/graphics/powerupBlue_bolt.png b/assets/graphics/powerupBlue_bolt.png deleted file mode 100644 index 28f7aeb..0000000 Binary files a/assets/graphics/powerupBlue_bolt.png and /dev/null differ diff --git a/assets/graphics/powerupBlue_shield.png b/assets/graphics/powerupBlue_shield.png deleted file mode 100644 index b6f2d4c..0000000 Binary files a/assets/graphics/powerupBlue_shield.png and /dev/null differ diff --git a/assets/graphics/powerupBlue_star.png b/assets/graphics/powerupBlue_star.png deleted file mode 100644 index eeda7bc..0000000 Binary files a/assets/graphics/powerupBlue_star.png and /dev/null differ diff --git a/assets/graphics/powerupGreen.png b/assets/graphics/powerupGreen.png deleted file mode 100644 index 252611e..0000000 Binary files a/assets/graphics/powerupGreen.png and /dev/null differ diff --git a/assets/graphics/powerupGreen_bolt.png b/assets/graphics/powerupGreen_bolt.png deleted file mode 100644 index 555ce79..0000000 Binary files a/assets/graphics/powerupGreen_bolt.png and /dev/null differ diff --git a/assets/graphics/powerupGreen_star.png b/assets/graphics/powerupGreen_star.png deleted file mode 100644 index 9a3897e..0000000 Binary files a/assets/graphics/powerupGreen_star.png and /dev/null differ diff --git a/assets/graphics/powerupRed.png b/assets/graphics/powerupRed.png deleted file mode 100644 index 645f1e3..0000000 Binary files a/assets/graphics/powerupRed.png and /dev/null differ diff --git a/assets/graphics/powerupRed_bolt.png b/assets/graphics/powerupRed_bolt.png deleted file mode 100644 index ddd1417..0000000 Binary files a/assets/graphics/powerupRed_bolt.png and /dev/null differ diff --git a/assets/graphics/powerupRed_shield.png b/assets/graphics/powerupRed_shield.png deleted file mode 100644 index 7e0efd5..0000000 Binary files a/assets/graphics/powerupRed_shield.png and /dev/null differ diff --git a/assets/graphics/powerupYellow.png b/assets/graphics/powerupYellow.png deleted file mode 100644 index 7ba781e..0000000 Binary files a/assets/graphics/powerupYellow.png and /dev/null differ diff --git a/assets/graphics/powerupYellow_bolt.png b/assets/graphics/powerupYellow_bolt.png deleted file mode 100644 index beb6db1..0000000 Binary files a/assets/graphics/powerupYellow_bolt.png and /dev/null differ diff --git a/assets/graphics/powerupYellow_shield.png b/assets/graphics/powerupYellow_shield.png deleted file mode 100644 index ac01e3d..0000000 Binary files a/assets/graphics/powerupYellow_shield.png and /dev/null differ diff --git a/assets/graphics/powerupYellow_star.png b/assets/graphics/powerupYellow_star.png deleted file mode 100644 index fc7b6c8..0000000 Binary files a/assets/graphics/powerupYellow_star.png and /dev/null differ diff --git a/assets/graphics/shield2.png b/assets/graphics/shield2.png deleted file mode 100644 index 485a3f7..0000000 Binary files a/assets/graphics/shield2.png and /dev/null differ diff --git a/assets/graphics/shield3.png b/assets/graphics/shield3.png deleted file mode 100644 index 2925cd6..0000000 Binary files a/assets/graphics/shield3.png and /dev/null differ diff --git a/assets/graphics/star1.png b/assets/graphics/star1.png deleted file mode 100644 index 67551ae..0000000 Binary files a/assets/graphics/star1.png and /dev/null differ diff --git a/assets/graphics/star2.png b/assets/graphics/star2.png deleted file mode 100644 index a047ef6..0000000 Binary files a/assets/graphics/star2.png and /dev/null differ diff --git a/assets/graphics/star3.png b/assets/graphics/star3.png deleted file mode 100644 index c9026d3..0000000 Binary files a/assets/graphics/star3.png and /dev/null differ diff --git a/assets/graphics/ufoBlue.png b/assets/graphics/ufoBlue.png new file mode 100644 index 0000000..6397792 Binary files /dev/null and b/assets/graphics/ufoBlue.png differ diff --git a/assets/graphics/ufoGreen.png b/assets/graphics/ufoGreen.png new file mode 100644 index 0000000..7d441b2 Binary files /dev/null and b/assets/graphics/ufoGreen.png differ diff --git a/assets/graphics/ufoYellow.png b/assets/graphics/ufoYellow.png new file mode 100644 index 0000000..838c4e8 Binary files /dev/null and b/assets/graphics/ufoYellow.png differ diff --git a/src/Boss.hx b/src/Boss.hx new file mode 100644 index 0000000..24de7a1 --- /dev/null +++ b/src/Boss.hx @@ -0,0 +1,88 @@ +import com.haxepunk.Entity; +import com.haxepunk.graphics.Image; +import com.haxepunk.masks.Circle; +import com.haxepunk.masks.Hitbox; +import com.haxepunk.HXP; + +import Enemy; + +class Boss extends Entity { + + public function new () { + + var color:Int = Math.floor(Math.random() * 4); + currentSprite = sprites[color]; + currentSprite.scale = 8; + currentSprite.smooth = false; + + maxEnemies = Math.floor(Math.random() * (color + 1) * 4); + + graphic = currentSprite; + + super(HXP.halfWidth - (currentSprite.width * 4), currentSprite.height * -8); + + this.mask = new Circle(currentSprite.width * 4); + + layer = -3; + + healthBarBackground = Image.createRect(350, 20, 0xFF0000); + + health = originalHealth = (color + 1) * 50; + healthBar = Image.createRect(350, 20, 0x00FF00); + + this.addGraphic(healthBarBackground); + this.addGraphic(healthBar); + + healthBarBackground.centerOrigin(); + healthBar.centerOrigin(); + + healthBarBackground.x = healthBar.x = this.width / 2; + healthBarBackground.y = healthBar.y = this.height - 100; + + } + + public override function update() { + super.update(); + + spawnTimer -= HXP.elapsed; + var enemies:Array = []; + this.scene.getClass(Enemy, enemies); + + if (spawnTimer < 0 && enemies.length != maxEnemies) { + this.scene.add(new Enemy(this.width / 2, this.height / 2)); + spawnTimer = .75; + } + + enemies = null; + + if (this.y < currentSprite.height * 8 * -.5) + this.y += 2; + + healthBar.scaledWidth = (healthBar.width / originalHealth) * health; + + var bullet:Entity = this.collide("bullet", this.x, this.y); + + if (bullet != null) { + this.health -= 1; + this.scene.remove(bullet); + } + } + + private var currentSprite:Image; + + private var sprites:Array = [ + new Image("graphics/ufoGreen.png"), + new Image("graphics/ufoBlue.png"), + new Image("graphics/ufoRed.png"), + new Image("graphics/ufoYellow.png") + ]; + + private var health:Int; + private var originalHealth:Int; + private var healthBar:Image; + private var healthBarBackground:Image; + + private var maxEnemies:Int; + private var spawnTimer:Float = .75; + +} \ No newline at end of file diff --git a/src/Enemy.hx b/src/Enemy.hx index 03928ab..09befab 100644 --- a/src/Enemy.hx +++ b/src/Enemy.hx @@ -36,7 +36,7 @@ class Enemy extends Entity { setHitbox(sprite.width, sprite.height); - layer = -1; + layer = -4; } private function assignLocation() { @@ -111,7 +111,7 @@ class Enemy extends Entity { healthSprite.scaledWidth = (sprite.width / originalHealth) * health; - if (this.x != loc[0] && this.y != loc[1]) + if (this.x != loc[0] && this.y != loc[1] && !dying) this.moveTowards(loc[0], loc[1], moveSpeed); if (turnTimer < 0) { @@ -148,8 +148,18 @@ class Enemy extends Entity { this.scene.remove(bullet); } - if (health == 0) - this.scene.remove(this); + if (health == 0) { + die(); + } + } + + private function die() { + if (!died) { + dying = true; + died = true; + this.visible = false; + this.scene.add(new Explosion(this.x, this.y, this)); + } } private var enemies:Array = [ @@ -167,6 +177,8 @@ class Enemy extends Entity { private var enemyType:Int; private var health:Int; private var originalHealth:Int; + private var dying:Bool = false; + private var died:Bool = false; private var arr:Array; private var antX:Float; diff --git a/src/Explosion.hx b/src/Explosion.hx new file mode 100644 index 0000000..9880ec2 --- /dev/null +++ b/src/Explosion.hx @@ -0,0 +1,31 @@ +import com.haxepunk.Entity; +import com.haxepunk.graphics.Spritemap; + +class Explosion extends Entity { + + public function new (x:Float, y:Float, e:Entity) { + super(x, y); + + entity = e; + + sprite = new Spritemap("graphics/explosion.png", 49, 49, die); + sprite.add("explosion", [0,1,2,3,4,5], 10); + sprite.scale = 3; + + graphic = sprite; + sprite.play("explosion"); + + this.centerOrigin(); + sprite.centerOrigin(); + } + + private function die () { + this.scene.remove(this); + if (entity.type != "player") + this.scene.remove(entity); + } + + private var sprite:Spritemap; + private var entity:Entity; + +} \ No newline at end of file diff --git a/src/Lives.hx b/src/Lives.hx index f0bcc22..a0d34bf 100644 --- a/src/Lives.hx +++ b/src/Lives.hx @@ -33,6 +33,7 @@ class Lives extends Entity { damage = 0; + layer = -4; } diff --git a/src/MainScene.hx b/src/MainScene.hx index 5c303b4..133456d 100644 --- a/src/MainScene.hx +++ b/src/MainScene.hx @@ -21,6 +21,8 @@ class MainScene extends Scene var enemy = new Enemy(-160, 0); var lives = new Lives(); var score = new Score(); + var boss = new Boss(); + #if flash music = new Sfx("audio/loop.mp3"); #else @@ -34,6 +36,7 @@ class MainScene extends Scene add(button); #end + add(boss); add(player); add(lives); add(score); diff --git a/src/Player.hx b/src/Player.hx index 819b49b..1b4e5d0 100644 --- a/src/Player.hx +++ b/src/Player.hx @@ -11,6 +11,7 @@ import openfl.Assets; import Bullet; import Lives; import Score; +import Explosion; class Player extends Entity { public function new() { @@ -41,13 +42,12 @@ class Player extends Entity { ]; fireEffectLeft = fireEffectsLeft[currentAnim]; - fireEffectLeft.x = 17; - fireEffectLeft.y = 55; + fireEffectLeft.x = -30; + fireEffectLeft.y = 24; fireEffectRight = fireEffectsRight[currentAnim]; - fireEffectRight.x = 67; - fireEffectRight.y = 55; - + fireEffectRight.x = 19; + fireEffectRight.y = 24; this.addGraphic(fireEffectLeft); this.addGraphic(fireEffectRight); @@ -62,6 +62,9 @@ class Player extends Entity { name = type = "player"; + this.centerOrigin(); + baseSprite.centerOrigin(); + layer = -1; } @@ -88,7 +91,7 @@ class Player extends Entity { } private function onTouch(touch:Touch) { - if (touch.y < HXP.height - 100 && (touch.y > 500) && this.y > 0) + if (touch.y < HXP.height - 100 && (touch.y > 700) && this.y > 0) this.moveTowards(touch.x - (this.width / 2), touch.y - (this.height * 2), moveSpeed * 1.5); } @@ -99,13 +102,16 @@ class Player extends Entity { this.scene.getClass(Score, score); score[0].rem(500); - this.scene.add(new Bullet(this.x + this.width / 2, this.y)); + this.scene.add(new Bullet(this.x, this.y - this.height / 2)); laser.play(); } } public function die() { this.visible = false; + + this.scene.add(new Explosion(this.x, this.y, this)); + this.x = HXP.halfWidth; this.y = -200; var txt:Text = new Text("You died!", HXP.halfWidth - 225, HXP.halfHeight - 250, 500, 50, {size: 100}); @@ -131,12 +137,12 @@ class Player extends Entity { currentAnim = 0; fireEffectLeft = fireEffectsLeft[currentAnim]; - fireEffectLeft.x = 17; - fireEffectLeft.y = 60; + fireEffectLeft.x = -30; + fireEffectLeft.y = 24; fireEffectRight = fireEffectsRight[currentAnim]; - fireEffectRight.x = 67; - fireEffectRight.y = 60; + fireEffectRight.x = 19; + fireEffectRight.y = 24; graphic = baseSprite; this.addGraphic(fireEffectLeft); diff --git a/src/Spawner.hx b/src/Spawner.hx index 2774f9a..360805b 100644 --- a/src/Spawner.hx +++ b/src/Spawner.hx @@ -12,7 +12,7 @@ class Spawner extends Entity { public override function update() { spawnStarTime -= HXP.elapsed; spawnAsteroidTime -= HXP.elapsed; - spawnEnemyTime -= HXP.elapsed; + // spawnEnemyTime -= HXP.elapsed; spawnPickupTime -= HXP.elapsed; if (spawnAsteroidTime < 0) {