From b0496a0b9bb5bd02fe23be5d5945ededc99c220f Mon Sep 17 00:00:00 2001 From: arngo <27396817+arngo@users.noreply.github.com> Date: Sun, 26 Dec 2021 19:34:23 -0500 Subject: add itch metadata --- metadata/game_metadata.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/metadata/game_metadata.txt b/metadata/game_metadata.txt index fc32760..5d2b271 100644 --- a/metadata/game_metadata.txt +++ b/metadata/game_metadata.txt @@ -1,8 +1,8 @@ -#devid=myname -#devtitle=My Name -#gameid=mygame -#gametitle=My Game -#version=0.1 +devid=argo +devtitle=Arnold and Tradam +gameid=steelwings +gametitle=SteelWings +version=0.8.2 #icon=metadata/icon.png # Uncomment the entry below to bytecode compile your Ruby code (Pro License Only) -- cgit v1.2.3 From 32416f5d5daf61fe0a2f16a96678a9d679c433d7 Mon Sep 17 00:00:00 2001 From: realtradam Date: Sun, 26 Dec 2021 20:35:53 -0500 Subject: optimized collision checks --- app/factories/ships/sample_enemy.rb | 1 + app/scenes/scenes.rb | 2 +- app/systems/collision_damage.rb | 50 ++++++++++++++++++++++++++++++------- 3 files changed, 43 insertions(+), 10 deletions(-) diff --git a/app/factories/ships/sample_enemy.rb b/app/factories/ships/sample_enemy.rb index a2a3a21..af8c4ca 100644 --- a/app/factories/ships/sample_enemy.rb +++ b/app/factories/ships/sample_enemy.rb @@ -41,6 +41,7 @@ class Factory FF::Cmp::Team.new, FF::Cmp::SingletonDebugVectorArrow[0], FF::Cmp::SingletonCamera[0], + FF::Cmp::SingletonEnemyTeam[0], ) end end diff --git a/app/scenes/scenes.rb b/app/scenes/scenes.rb index f0cdf17..cd41c37 100644 --- a/app/scenes/scenes.rb +++ b/app/scenes/scenes.rb @@ -4,5 +4,5 @@ FF::Scn.new('Cleanup') FF::Stg.add( FF::Scn.new('UI'), FF::Scn.new('Render'), - FF::Scn.new('Debug') ) +FF::Scn.new('Debug') diff --git a/app/systems/collision_damage.rb b/app/systems/collision_damage.rb index cc052bd..df2e050 100644 --- a/app/systems/collision_damage.rb +++ b/app/systems/collision_damage.rb @@ -1,20 +1,52 @@ FF::Scn::BoidRules.add( FF::Sys.new("CollisionDamage", priority: 65) do - FF::Cmp::Hitcircle.each do |hitcircle_self| + + FF::Cmp::SingletonEnemyTeam[0].entities.each do |enemy_entity| + hitcircle_self = enemy_entity.components[FF::Cmp::Hitcircle][0] boid_self = hitcircle_self.entities[0].components[FF::Cmp::Boid][0] - FF::Cmp::Hitcircle.each do |hitcircle_target| - next if hitcircle_self == hitcircle_target - next if hitcircle_self.entities[0].components[FF::Cmp::Team][0].team == hitcircle_target.entities[0].components[FF::Cmp::Team][0].team - #puts 'passed first check' + FF::Cmp::SingletonBullet[0].entities.each do |bullet_entity| + hitcircle_target = bullet_entity.components[FF::Cmp::Hitcircle][0] boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) - puts 'checks here'.upcase - puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil? - puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil? - puts 'checks end'.upcase + #puts 'checks here'.upcase + #puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil? + #puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil? + #puts 'checks end'.upcase hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage + hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage end + end + + player = FF::Cmp::SingletonPlayer[0].entities[0] + unless player.nil? + hitcircle_target = player.components[FF::Cmp::Hitcircle][0] + boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] + if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) + hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage + hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage + end + end + end + end +) +=begin +FF::Cmp::Hitcircle.each do |hitcircle_self| + boid_self = hitcircle_self.entities[0].components[FF::Cmp::Boid][0] + FF::Cmp::Hitcircle.each do |hitcircle_target| + next if hitcircle_self == hitcircle_target + next if hitcircle_self.entities[0].components[FF::Cmp::Team][0].team == hitcircle_target.entities[0].components[FF::Cmp::Team][0].team + #puts 'passed first check' + boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] + if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) + puts 'checks here'.upcase + puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil? + puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil? + puts 'checks end'.upcase + hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage end end +end +end ) +=end -- cgit v1.2.3 From 70b2499a8753331b68fb7a61a8882c9ff0b017d8 Mon Sep 17 00:00:00 2001 From: realtradam Date: Sun, 26 Dec 2021 20:44:27 -0500 Subject: purged unused assets --- sprites/circle/black.png | Bin 2511 -> 0 bytes sprites/circle/blue.png | Bin 4096 -> 0 bytes sprites/circle/gray.png | Bin 3719 -> 0 bytes sprites/circle/green.png | Bin 4105 -> 0 bytes sprites/circle/indigo.png | Bin 4430 -> 0 bytes sprites/circle/orange.png | Bin 4093 -> 0 bytes sprites/circle/red.png | Bin 4133 -> 0 bytes sprites/circle/violet.png | Bin 4383 -> 0 bytes sprites/circle/white.png | Bin 3463 -> 0 bytes sprites/circle/yellow.png | Bin 3408 -> 0 bytes sprites/hexagon/black.png | Bin 2202 -> 0 bytes sprites/hexagon/blue.png | Bin 2060 -> 0 bytes sprites/hexagon/gray.png | Bin 2011 -> 0 bytes sprites/hexagon/green.png | Bin 2064 -> 0 bytes sprites/hexagon/indigo.png | Bin 2169 -> 0 bytes sprites/hexagon/orange.png | Bin 2045 -> 0 bytes sprites/hexagon/red.png | Bin 2017 -> 0 bytes sprites/hexagon/violet.png | Bin 2166 -> 0 bytes sprites/hexagon/white.png | Bin 1627 -> 0 bytes sprites/hexagon/yellow.png | Bin 1656 -> 0 bytes sprites/isometric/black.png | Bin 2444 -> 0 bytes sprites/isometric/blue.png | Bin 2771 -> 0 bytes sprites/isometric/gray.png | Bin 2475 -> 0 bytes sprites/isometric/green.png | Bin 2785 -> 0 bytes sprites/isometric/indigo.png | Bin 2844 -> 0 bytes sprites/isometric/orange.png | Bin 2444 -> 0 bytes sprites/isometric/red.png | Bin 2469 -> 0 bytes sprites/isometric/violet.png | Bin 2852 -> 0 bytes sprites/isometric/white.png | Bin 2033 -> 0 bytes sprites/isometric/yellow.png | Bin 1449 -> 0 bytes sprites/kenny/License.txt | 22 ---------------------- sprites/kenny/Preview.png | Bin 19720 -> 0 bytes sprites/kenny/Sample.png | Bin 48141 -> 0 bytes sprites/kenny/Ships/Bunting.png | Bin 222 -> 0 bytes sprites/kenny/Ships/FalconGrey.png | Bin 296 -> 0 bytes sprites/kenny/Ships/GrosbeakGrey.png | Bin 279 -> 0 bytes sprites/kenny/Ships/Longspur.png | Bin 221 -> 0 bytes sprites/kenny/Ships/Magpie.png | Bin 251 -> 0 bytes sprites/kenny/Ships/Nighthawk.png | Bin 238 -> 0 bytes sprites/kenny/Ships/Nutcracker.png | Bin 270 -> 0 bytes sprites/kenny/Ships/OspreyGrey.png | Bin 300 -> 0 bytes sprites/kenny/Ships/PintailGrey.png | Bin 286 -> 0 bytes sprites/kenny/Ships/Warbler.png | Bin 237 -> 0 bytes sprites/kenny/Ships/Waxwing.png | Bin 226 -> 0 bytes sprites/kenny/Ships/Weebill.png | Bin 236 -> 0 bytes sprites/kenny/Ships/unused/Bunting.png | Bin 0 -> 222 bytes sprites/kenny/Ships/unused/FalconGrey.png | Bin 0 -> 296 bytes sprites/kenny/Ships/unused/GrosbeakGrey.png | Bin 0 -> 279 bytes sprites/kenny/Ships/unused/Longspur.png | Bin 0 -> 221 bytes sprites/kenny/Ships/unused/Magpie.png | Bin 0 -> 251 bytes sprites/kenny/Ships/unused/Nighthawk.png | Bin 0 -> 238 bytes sprites/kenny/Ships/unused/Nutcracker.png | Bin 0 -> 270 bytes sprites/kenny/Ships/unused/OspreyGrey.png | Bin 0 -> 300 bytes sprites/kenny/Ships/unused/PintailGrey.png | Bin 0 -> 286 bytes sprites/kenny/Ships/unused/Warbler.png | Bin 0 -> 237 bytes sprites/kenny/Ships/unused/Waxwing.png | Bin 0 -> 226 bytes sprites/kenny/Ships/unused/Weebill.png | Bin 0 -> 236 bytes sprites/kenny/Tilemap/ships.png | Bin 2305 -> 0 bytes sprites/kenny/Tilemap/ships_packed.png | Bin 2255 -> 0 bytes sprites/kenny/Tilemap/tiles.png | Bin 3973 -> 0 bytes sprites/kenny/Tilemap/tiles_packed.png | Bin 3759 -> 0 bytes sprites/kenny/Tiles/tile_0010.png | Bin 162 -> 0 bytes sprites/kenny/Tiles/tile_0011.png | Bin 163 -> 0 bytes sprites/kenny/Tiles/tile_0017.png | Bin 182 -> 0 bytes sprites/kenny/Tiles/tile_0018.png | Bin 181 -> 0 bytes sprites/kenny/Tiles/tile_0019.png | Bin 158 -> 0 bytes sprites/kenny/Tiles/tile_0020.png | Bin 142 -> 0 bytes sprites/kenny/Tiles/tile_0021.png | Bin 165 -> 0 bytes sprites/kenny/Tiles/tile_0022.png | Bin 156 -> 0 bytes sprites/kenny/Tiles/tile_0023.png | Bin 147 -> 0 bytes sprites/kenny/Tiles/tile_0024.png | Bin 173 -> 0 bytes sprites/kenny/Tiles/tile_0025.png | Bin 168 -> 0 bytes sprites/kenny/Tiles/tile_0026.png | Bin 176 -> 0 bytes sprites/kenny/Tiles/tile_0028.png | Bin 200 -> 0 bytes sprites/kenny/Tiles/tile_0029.png | Bin 179 -> 0 bytes sprites/kenny/Tiles/tile_0030.png | Bin 159 -> 0 bytes sprites/kenny/Tiles/tile_0031.png | Bin 162 -> 0 bytes sprites/kenny/Tiles/tile_0032.png | Bin 174 -> 0 bytes sprites/kenny/Tiles/tile_0033.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0034.png | Bin 160 -> 0 bytes sprites/kenny/Tiles/tile_0035.png | Bin 177 -> 0 bytes sprites/kenny/Tiles/tile_0036.png | Bin 163 -> 0 bytes sprites/kenny/Tiles/tile_0037.png | Bin 165 -> 0 bytes sprites/kenny/Tiles/tile_0038.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0039.png | Bin 152 -> 0 bytes sprites/kenny/Tiles/tile_0040.png | Bin 145 -> 0 bytes sprites/kenny/Tiles/tile_0041.png | Bin 149 -> 0 bytes sprites/kenny/Tiles/tile_0042.png | Bin 99 -> 0 bytes sprites/kenny/Tiles/tile_0043.png | Bin 165 -> 0 bytes sprites/kenny/Tiles/tile_0044.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0045.png | Bin 152 -> 0 bytes sprites/kenny/Tiles/tile_0046.png | Bin 145 -> 0 bytes sprites/kenny/Tiles/tile_0047.png | Bin 149 -> 0 bytes sprites/kenny/Tiles/tile_0048.png | Bin 156 -> 0 bytes sprites/kenny/Tiles/tile_0049.png | Bin 143 -> 0 bytes sprites/kenny/Tiles/tile_0050.png | Bin 127 -> 0 bytes sprites/kenny/Tiles/tile_0051.png | Bin 137 -> 0 bytes sprites/kenny/Tiles/tile_0052.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0053.png | Bin 146 -> 0 bytes sprites/kenny/Tiles/tile_0054.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0055.png | Bin 143 -> 0 bytes sprites/kenny/Tiles/tile_0056.png | Bin 127 -> 0 bytes sprites/kenny/Tiles/tile_0057.png | Bin 137 -> 0 bytes sprites/kenny/Tiles/tile_0058.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0059.png | Bin 146 -> 0 bytes sprites/kenny/Tiles/tile_0060.png | Bin 175 -> 0 bytes sprites/kenny/Tiles/tile_0061.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0062.png | Bin 169 -> 0 bytes sprites/kenny/Tiles/tile_0063.png | Bin 156 -> 0 bytes sprites/kenny/Tiles/tile_0064.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0065.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0066.png | Bin 178 -> 0 bytes sprites/kenny/Tiles/tile_0067.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0068.png | Bin 169 -> 0 bytes sprites/kenny/Tiles/tile_0069.png | Bin 156 -> 0 bytes sprites/kenny/Tiles/tile_0070.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0071.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0072.png | Bin 177 -> 0 bytes sprites/kenny/Tiles/tile_0073.png | Bin 160 -> 0 bytes sprites/kenny/Tiles/tile_0074.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0075.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0076.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0077.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0078.png | Bin 171 -> 0 bytes sprites/kenny/Tiles/tile_0079.png | Bin 160 -> 0 bytes sprites/kenny/Tiles/tile_0080.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0081.png | Bin 154 -> 0 bytes sprites/kenny/Tiles/tile_0082.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0083.png | Bin 164 -> 0 bytes sprites/kenny/Tiles/tile_0084.png | Bin 188 -> 0 bytes sprites/kenny/Tiles/tile_0085.png | Bin 145 -> 0 bytes sprites/kenny/Tiles/tile_0086.png | Bin 167 -> 0 bytes sprites/kenny/Tiles/tile_0087.png | Bin 132 -> 0 bytes sprites/kenny/Tiles/tile_0088.png | Bin 162 -> 0 bytes sprites/kenny/Tiles/tile_0089.png | Bin 175 -> 0 bytes sprites/kenny/Tiles/tile_0090.png | Bin 182 -> 0 bytes sprites/kenny/Tiles/tile_0091.png | Bin 146 -> 0 bytes sprites/kenny/Tiles/tile_0092.png | Bin 167 -> 0 bytes sprites/kenny/Tiles/tile_0093.png | Bin 132 -> 0 bytes sprites/kenny/Tiles/tile_0094.png | Bin 162 -> 0 bytes sprites/kenny/Tiles/tile_0095.png | Bin 175 -> 0 bytes sprites/kenny/Tiles/tile_0096.png | Bin 172 -> 0 bytes sprites/kenny/Tiles/tile_0097.png | Bin 159 -> 0 bytes sprites/kenny/Tiles/tile_0098.png | Bin 166 -> 0 bytes sprites/kenny/Tiles/tile_0099.png | Bin 170 -> 0 bytes sprites/kenny/Tiles/tile_0100.png | Bin 144 -> 0 bytes sprites/kenny/Tiles/tile_0101.png | Bin 149 -> 0 bytes sprites/kenny/Tiles/tile_0102.png | Bin 172 -> 0 bytes sprites/kenny/Tiles/tile_0103.png | Bin 160 -> 0 bytes sprites/kenny/Tiles/tile_0104.png | Bin 157 -> 0 bytes sprites/kenny/Tiles/tile_0105.png | Bin 170 -> 0 bytes sprites/kenny/Tiles/tile_0106.png | Bin 147 -> 0 bytes sprites/kenny/Tiles/tile_0107.png | Bin 156 -> 0 bytes sprites/kenny/Tiles/tile_0108.png | Bin 176 -> 0 bytes sprites/kenny/Tiles/tile_0109.png | Bin 137 -> 0 bytes sprites/kenny/Tiles/tile_0110.png | Bin 132 -> 0 bytes sprites/kenny/Tiles/tile_0111.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0112.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0113.png | Bin 159 -> 0 bytes sprites/kenny/Tiles/tile_0114.png | Bin 176 -> 0 bytes sprites/kenny/Tiles/tile_0115.png | Bin 137 -> 0 bytes sprites/kenny/Tiles/tile_0116.png | Bin 134 -> 0 bytes sprites/kenny/Tiles/tile_0117.png | Bin 151 -> 0 bytes sprites/kenny/Tiles/tile_0118.png | Bin 135 -> 0 bytes sprites/kenny/Tiles/tile_0119.png | Bin 146 -> 0 bytes sprites/kenny/Tilesheet (Ships).txt | 9 --------- sprites/kenny/Tilesheet (Tiles).txt | 9 --------- sprites/kenny/Visit Kenney.url | 2 -- sprites/kenny/Visit Patreon.url | 2 -- sprites/kenny/kenney_pixelshmup.zip | Bin 127424 -> 0 bytes sprites/misc/dragon-0.png | Bin 12896 -> 0 bytes sprites/misc/dragon-1.png | Bin 2964 -> 0 bytes sprites/misc/dragon-2.png | Bin 3047 -> 0 bytes sprites/misc/dragon-3.png | Bin 2655 -> 0 bytes sprites/misc/dragon-4.png | Bin 2725 -> 0 bytes sprites/misc/dragon-5.png | Bin 2655 -> 0 bytes sprites/misc/explosion-0.png | Bin 267 -> 0 bytes sprites/misc/explosion-1.png | Bin 4585 -> 0 bytes sprites/misc/explosion-2.png | Bin 4675 -> 0 bytes sprites/misc/explosion-3.png | Bin 4724 -> 0 bytes sprites/misc/explosion-4.png | Bin 4773 -> 0 bytes sprites/misc/explosion-5.png | Bin 4742 -> 0 bytes sprites/misc/explosion-6.png | Bin 4665 -> 0 bytes sprites/misc/explosion-sheet.png | Bin 2584 -> 0 bytes sprites/misc/lowrez-ship-blue.png | Bin 109 -> 0 bytes sprites/misc/lowrez-ship-red.png | Bin 104 -> 0 bytes sprites/misc/simple-mood-16x16.png | Bin 14424 -> 0 bytes sprites/misc/star.png | Bin 711 -> 0 bytes sprites/misc/tiny-star.png | Bin 112 -> 0 bytes sprites/square/black.png | Bin 326 -> 0 bytes sprites/square/blue.png | Bin 329 -> 0 bytes sprites/square/gray.png | Bin 325 -> 0 bytes sprites/square/green.png | Bin 329 -> 0 bytes sprites/square/indigo.png | Bin 335 -> 0 bytes sprites/square/orange.png | Bin 335 -> 0 bytes sprites/square/red.png | Bin 335 -> 0 bytes sprites/square/violet.png | Bin 334 -> 0 bytes sprites/square/white.png | Bin 325 -> 0 bytes sprites/square/yellow.png | Bin 319 -> 0 bytes sprites/tile/wall-0000.png | Bin 93 -> 0 bytes sprites/tile/wall-0001.png | Bin 99 -> 0 bytes sprites/tile/wall-0010.png | Bin 98 -> 0 bytes sprites/tile/wall-0011.png | Bin 101 -> 0 bytes sprites/tile/wall-0100.png | Bin 98 -> 0 bytes sprites/tile/wall-0101.png | Bin 100 -> 0 bytes sprites/tile/wall-0110.png | Bin 100 -> 0 bytes sprites/tile/wall-0111.png | Bin 102 -> 0 bytes sprites/tile/wall-1000.png | Bin 99 -> 0 bytes sprites/tile/wall-1001.png | Bin 101 -> 0 bytes sprites/tile/wall-1010.png | Bin 100 -> 0 bytes sprites/tile/wall-1011.png | Bin 101 -> 0 bytes sprites/tile/wall-1100.png | Bin 101 -> 0 bytes sprites/tile/wall-1101.png | Bin 102 -> 0 bytes sprites/tile/wall-1110.png | Bin 101 -> 0 bytes sprites/tile/wall-1111.png | Bin 102 -> 0 bytes 215 files changed, 44 deletions(-) delete mode 100644 sprites/circle/black.png delete mode 100644 sprites/circle/blue.png delete mode 100644 sprites/circle/gray.png delete mode 100644 sprites/circle/green.png delete mode 100644 sprites/circle/indigo.png delete mode 100644 sprites/circle/orange.png delete mode 100644 sprites/circle/red.png delete mode 100644 sprites/circle/violet.png delete mode 100644 sprites/circle/white.png delete mode 100644 sprites/circle/yellow.png delete mode 100644 sprites/hexagon/black.png delete mode 100644 sprites/hexagon/blue.png delete mode 100644 sprites/hexagon/gray.png delete mode 100644 sprites/hexagon/green.png delete mode 100644 sprites/hexagon/indigo.png delete mode 100644 sprites/hexagon/orange.png delete mode 100644 sprites/hexagon/red.png delete mode 100644 sprites/hexagon/violet.png delete mode 100644 sprites/hexagon/white.png delete mode 100644 sprites/hexagon/yellow.png delete mode 100644 sprites/isometric/black.png delete mode 100644 sprites/isometric/blue.png delete mode 100644 sprites/isometric/gray.png delete mode 100644 sprites/isometric/green.png delete mode 100644 sprites/isometric/indigo.png delete mode 100644 sprites/isometric/orange.png delete mode 100644 sprites/isometric/red.png delete mode 100644 sprites/isometric/violet.png delete mode 100644 sprites/isometric/white.png delete mode 100644 sprites/isometric/yellow.png delete mode 100644 sprites/kenny/License.txt delete mode 100644 sprites/kenny/Preview.png delete mode 100644 sprites/kenny/Sample.png delete mode 100644 sprites/kenny/Ships/Bunting.png delete mode 100644 sprites/kenny/Ships/FalconGrey.png delete mode 100644 sprites/kenny/Ships/GrosbeakGrey.png delete mode 100644 sprites/kenny/Ships/Longspur.png delete mode 100644 sprites/kenny/Ships/Magpie.png delete mode 100644 sprites/kenny/Ships/Nighthawk.png delete mode 100644 sprites/kenny/Ships/Nutcracker.png delete mode 100644 sprites/kenny/Ships/OspreyGrey.png delete mode 100644 sprites/kenny/Ships/PintailGrey.png delete mode 100644 sprites/kenny/Ships/Warbler.png delete mode 100644 sprites/kenny/Ships/Waxwing.png delete mode 100644 sprites/kenny/Ships/Weebill.png create mode 100644 sprites/kenny/Ships/unused/Bunting.png create mode 100644 sprites/kenny/Ships/unused/FalconGrey.png create mode 100644 sprites/kenny/Ships/unused/GrosbeakGrey.png create mode 100644 sprites/kenny/Ships/unused/Longspur.png create mode 100644 sprites/kenny/Ships/unused/Magpie.png create mode 100644 sprites/kenny/Ships/unused/Nighthawk.png create mode 100644 sprites/kenny/Ships/unused/Nutcracker.png create mode 100644 sprites/kenny/Ships/unused/OspreyGrey.png create mode 100644 sprites/kenny/Ships/unused/PintailGrey.png create mode 100644 sprites/kenny/Ships/unused/Warbler.png create mode 100644 sprites/kenny/Ships/unused/Waxwing.png create mode 100644 sprites/kenny/Ships/unused/Weebill.png delete mode 100644 sprites/kenny/Tilemap/ships.png delete mode 100644 sprites/kenny/Tilemap/ships_packed.png delete mode 100644 sprites/kenny/Tilemap/tiles.png delete mode 100644 sprites/kenny/Tilemap/tiles_packed.png delete mode 100644 sprites/kenny/Tiles/tile_0010.png delete mode 100644 sprites/kenny/Tiles/tile_0011.png delete mode 100644 sprites/kenny/Tiles/tile_0017.png delete mode 100644 sprites/kenny/Tiles/tile_0018.png delete mode 100644 sprites/kenny/Tiles/tile_0019.png delete mode 100644 sprites/kenny/Tiles/tile_0020.png delete mode 100644 sprites/kenny/Tiles/tile_0021.png delete mode 100644 sprites/kenny/Tiles/tile_0022.png delete mode 100644 sprites/kenny/Tiles/tile_0023.png delete mode 100644 sprites/kenny/Tiles/tile_0024.png delete mode 100644 sprites/kenny/Tiles/tile_0025.png delete mode 100644 sprites/kenny/Tiles/tile_0026.png delete mode 100644 sprites/kenny/Tiles/tile_0028.png delete mode 100644 sprites/kenny/Tiles/tile_0029.png delete mode 100644 sprites/kenny/Tiles/tile_0030.png delete mode 100644 sprites/kenny/Tiles/tile_0031.png delete mode 100644 sprites/kenny/Tiles/tile_0032.png delete mode 100644 sprites/kenny/Tiles/tile_0033.png delete mode 100644 sprites/kenny/Tiles/tile_0034.png delete mode 100644 sprites/kenny/Tiles/tile_0035.png delete mode 100644 sprites/kenny/Tiles/tile_0036.png delete mode 100644 sprites/kenny/Tiles/tile_0037.png delete mode 100644 sprites/kenny/Tiles/tile_0038.png delete mode 100644 sprites/kenny/Tiles/tile_0039.png delete mode 100644 sprites/kenny/Tiles/tile_0040.png delete mode 100644 sprites/kenny/Tiles/tile_0041.png delete mode 100644 sprites/kenny/Tiles/tile_0042.png delete mode 100644 sprites/kenny/Tiles/tile_0043.png delete mode 100644 sprites/kenny/Tiles/tile_0044.png delete mode 100644 sprites/kenny/Tiles/tile_0045.png delete mode 100644 sprites/kenny/Tiles/tile_0046.png delete mode 100644 sprites/kenny/Tiles/tile_0047.png delete mode 100644 sprites/kenny/Tiles/tile_0048.png delete mode 100644 sprites/kenny/Tiles/tile_0049.png delete mode 100644 sprites/kenny/Tiles/tile_0050.png delete mode 100644 sprites/kenny/Tiles/tile_0051.png delete mode 100644 sprites/kenny/Tiles/tile_0052.png delete mode 100644 sprites/kenny/Tiles/tile_0053.png delete mode 100644 sprites/kenny/Tiles/tile_0054.png delete mode 100644 sprites/kenny/Tiles/tile_0055.png delete mode 100644 sprites/kenny/Tiles/tile_0056.png delete mode 100644 sprites/kenny/Tiles/tile_0057.png delete mode 100644 sprites/kenny/Tiles/tile_0058.png delete mode 100644 sprites/kenny/Tiles/tile_0059.png delete mode 100644 sprites/kenny/Tiles/tile_0060.png delete mode 100644 sprites/kenny/Tiles/tile_0061.png delete mode 100644 sprites/kenny/Tiles/tile_0062.png delete mode 100644 sprites/kenny/Tiles/tile_0063.png delete mode 100644 sprites/kenny/Tiles/tile_0064.png delete mode 100644 sprites/kenny/Tiles/tile_0065.png delete mode 100644 sprites/kenny/Tiles/tile_0066.png delete mode 100644 sprites/kenny/Tiles/tile_0067.png delete mode 100644 sprites/kenny/Tiles/tile_0068.png delete mode 100644 sprites/kenny/Tiles/tile_0069.png delete mode 100644 sprites/kenny/Tiles/tile_0070.png delete mode 100644 sprites/kenny/Tiles/tile_0071.png delete mode 100644 sprites/kenny/Tiles/tile_0072.png delete mode 100644 sprites/kenny/Tiles/tile_0073.png delete mode 100644 sprites/kenny/Tiles/tile_0074.png delete mode 100644 sprites/kenny/Tiles/tile_0075.png delete mode 100644 sprites/kenny/Tiles/tile_0076.png delete mode 100644 sprites/kenny/Tiles/tile_0077.png delete mode 100644 sprites/kenny/Tiles/tile_0078.png delete mode 100644 sprites/kenny/Tiles/tile_0079.png delete mode 100644 sprites/kenny/Tiles/tile_0080.png delete mode 100644 sprites/kenny/Tiles/tile_0081.png delete mode 100644 sprites/kenny/Tiles/tile_0082.png delete mode 100644 sprites/kenny/Tiles/tile_0083.png delete mode 100644 sprites/kenny/Tiles/tile_0084.png delete mode 100644 sprites/kenny/Tiles/tile_0085.png delete mode 100644 sprites/kenny/Tiles/tile_0086.png delete mode 100644 sprites/kenny/Tiles/tile_0087.png delete mode 100644 sprites/kenny/Tiles/tile_0088.png delete mode 100644 sprites/kenny/Tiles/tile_0089.png delete mode 100644 sprites/kenny/Tiles/tile_0090.png delete mode 100644 sprites/kenny/Tiles/tile_0091.png delete mode 100644 sprites/kenny/Tiles/tile_0092.png delete mode 100644 sprites/kenny/Tiles/tile_0093.png delete mode 100644 sprites/kenny/Tiles/tile_0094.png delete mode 100644 sprites/kenny/Tiles/tile_0095.png delete mode 100644 sprites/kenny/Tiles/tile_0096.png delete mode 100644 sprites/kenny/Tiles/tile_0097.png delete mode 100644 sprites/kenny/Tiles/tile_0098.png delete mode 100644 sprites/kenny/Tiles/tile_0099.png delete mode 100644 sprites/kenny/Tiles/tile_0100.png delete mode 100644 sprites/kenny/Tiles/tile_0101.png delete mode 100644 sprites/kenny/Tiles/tile_0102.png delete mode 100644 sprites/kenny/Tiles/tile_0103.png delete mode 100644 sprites/kenny/Tiles/tile_0104.png delete mode 100644 sprites/kenny/Tiles/tile_0105.png delete mode 100644 sprites/kenny/Tiles/tile_0106.png delete mode 100644 sprites/kenny/Tiles/tile_0107.png delete mode 100644 sprites/kenny/Tiles/tile_0108.png delete mode 100644 sprites/kenny/Tiles/tile_0109.png delete mode 100644 sprites/kenny/Tiles/tile_0110.png delete mode 100644 sprites/kenny/Tiles/tile_0111.png delete mode 100644 sprites/kenny/Tiles/tile_0112.png delete mode 100644 sprites/kenny/Tiles/tile_0113.png delete mode 100644 sprites/kenny/Tiles/tile_0114.png delete mode 100644 sprites/kenny/Tiles/tile_0115.png delete mode 100644 sprites/kenny/Tiles/tile_0116.png delete mode 100644 sprites/kenny/Tiles/tile_0117.png delete mode 100644 sprites/kenny/Tiles/tile_0118.png delete mode 100644 sprites/kenny/Tiles/tile_0119.png delete mode 100644 sprites/kenny/Tilesheet (Ships).txt delete mode 100644 sprites/kenny/Tilesheet (Tiles).txt delete mode 100644 sprites/kenny/Visit Kenney.url delete mode 100644 sprites/kenny/Visit Patreon.url delete mode 100644 sprites/kenny/kenney_pixelshmup.zip delete mode 100644 sprites/misc/dragon-0.png delete mode 100644 sprites/misc/dragon-1.png delete mode 100644 sprites/misc/dragon-2.png delete mode 100644 sprites/misc/dragon-3.png delete mode 100644 sprites/misc/dragon-4.png delete mode 100644 sprites/misc/dragon-5.png delete mode 100644 sprites/misc/explosion-0.png delete mode 100644 sprites/misc/explosion-1.png delete mode 100644 sprites/misc/explosion-2.png delete mode 100644 sprites/misc/explosion-3.png delete mode 100644 sprites/misc/explosion-4.png delete mode 100644 sprites/misc/explosion-5.png delete mode 100644 sprites/misc/explosion-6.png delete mode 100644 sprites/misc/explosion-sheet.png delete mode 100644 sprites/misc/lowrez-ship-blue.png delete mode 100644 sprites/misc/lowrez-ship-red.png delete mode 100644 sprites/misc/simple-mood-16x16.png delete mode 100644 sprites/misc/star.png delete mode 100644 sprites/misc/tiny-star.png delete mode 100644 sprites/square/black.png delete mode 100644 sprites/square/blue.png delete mode 100644 sprites/square/gray.png delete mode 100644 sprites/square/green.png delete mode 100644 sprites/square/indigo.png delete mode 100644 sprites/square/orange.png delete mode 100644 sprites/square/red.png delete mode 100644 sprites/square/violet.png delete mode 100644 sprites/square/white.png delete mode 100644 sprites/square/yellow.png delete mode 100644 sprites/tile/wall-0000.png delete mode 100644 sprites/tile/wall-0001.png delete mode 100644 sprites/tile/wall-0010.png delete mode 100644 sprites/tile/wall-0011.png delete mode 100644 sprites/tile/wall-0100.png delete mode 100644 sprites/tile/wall-0101.png delete mode 100644 sprites/tile/wall-0110.png delete mode 100644 sprites/tile/wall-0111.png delete mode 100644 sprites/tile/wall-1000.png delete mode 100644 sprites/tile/wall-1001.png delete mode 100644 sprites/tile/wall-1010.png delete mode 100644 sprites/tile/wall-1011.png delete mode 100644 sprites/tile/wall-1100.png delete mode 100644 sprites/tile/wall-1101.png delete mode 100644 sprites/tile/wall-1110.png delete mode 100644 sprites/tile/wall-1111.png diff --git a/sprites/circle/black.png b/sprites/circle/black.png deleted file mode 100644 index 7ec40e9..0000000 Binary files a/sprites/circle/black.png and /dev/null differ diff --git a/sprites/circle/blue.png b/sprites/circle/blue.png deleted file mode 100644 index 96bf51b..0000000 Binary files a/sprites/circle/blue.png and /dev/null differ diff --git a/sprites/circle/gray.png b/sprites/circle/gray.png deleted file mode 100644 index e13f8c3..0000000 Binary files a/sprites/circle/gray.png and /dev/null differ diff --git a/sprites/circle/green.png b/sprites/circle/green.png deleted file mode 100644 index 73fcea0..0000000 Binary files a/sprites/circle/green.png and /dev/null differ diff --git a/sprites/circle/indigo.png b/sprites/circle/indigo.png deleted file mode 100644 index 6afb0e0..0000000 Binary files a/sprites/circle/indigo.png and /dev/null differ diff --git a/sprites/circle/orange.png b/sprites/circle/orange.png deleted file mode 100644 index 8623103..0000000 Binary files a/sprites/circle/orange.png and /dev/null differ diff --git a/sprites/circle/red.png b/sprites/circle/red.png deleted file mode 100644 index c4cc37c..0000000 Binary files a/sprites/circle/red.png and /dev/null differ diff --git a/sprites/circle/violet.png b/sprites/circle/violet.png deleted file mode 100644 index 3dc5c37..0000000 Binary files a/sprites/circle/violet.png and /dev/null differ diff --git a/sprites/circle/white.png b/sprites/circle/white.png deleted file mode 100644 index 2ec542a..0000000 Binary files a/sprites/circle/white.png and /dev/null differ diff --git a/sprites/circle/yellow.png b/sprites/circle/yellow.png deleted file mode 100644 index eca1037..0000000 Binary files a/sprites/circle/yellow.png and /dev/null differ diff --git a/sprites/hexagon/black.png b/sprites/hexagon/black.png deleted file mode 100644 index 03a6c8a..0000000 Binary files a/sprites/hexagon/black.png and /dev/null differ diff --git a/sprites/hexagon/blue.png b/sprites/hexagon/blue.png deleted file mode 100644 index ca45f9b..0000000 Binary files a/sprites/hexagon/blue.png and /dev/null differ diff --git a/sprites/hexagon/gray.png b/sprites/hexagon/gray.png deleted file mode 100644 index 230b436..0000000 Binary files a/sprites/hexagon/gray.png and /dev/null differ diff --git a/sprites/hexagon/green.png b/sprites/hexagon/green.png deleted file mode 100644 index e740746..0000000 Binary files a/sprites/hexagon/green.png and /dev/null differ diff --git a/sprites/hexagon/indigo.png b/sprites/hexagon/indigo.png deleted file mode 100644 index 13b7065..0000000 Binary files a/sprites/hexagon/indigo.png and /dev/null differ diff --git a/sprites/hexagon/orange.png b/sprites/hexagon/orange.png deleted file mode 100644 index 85988f1..0000000 Binary files a/sprites/hexagon/orange.png and /dev/null differ diff --git a/sprites/hexagon/red.png b/sprites/hexagon/red.png deleted file mode 100644 index bb0740f..0000000 Binary files a/sprites/hexagon/red.png and /dev/null differ diff --git a/sprites/hexagon/violet.png b/sprites/hexagon/violet.png deleted file mode 100644 index ca3f1c7..0000000 Binary files a/sprites/hexagon/violet.png and /dev/null differ diff --git a/sprites/hexagon/white.png b/sprites/hexagon/white.png deleted file mode 100644 index 7d0ee81..0000000 Binary files a/sprites/hexagon/white.png and /dev/null differ diff --git a/sprites/hexagon/yellow.png b/sprites/hexagon/yellow.png deleted file mode 100644 index 3b4de18..0000000 Binary files a/sprites/hexagon/yellow.png and /dev/null differ diff --git a/sprites/isometric/black.png b/sprites/isometric/black.png deleted file mode 100644 index 698f791..0000000 Binary files a/sprites/isometric/black.png and /dev/null differ diff --git a/sprites/isometric/blue.png b/sprites/isometric/blue.png deleted file mode 100644 index 175141d..0000000 Binary files a/sprites/isometric/blue.png and /dev/null differ diff --git a/sprites/isometric/gray.png b/sprites/isometric/gray.png deleted file mode 100644 index 6b776d8..0000000 Binary files a/sprites/isometric/gray.png and /dev/null differ diff --git a/sprites/isometric/green.png b/sprites/isometric/green.png deleted file mode 100644 index f2099e6..0000000 Binary files a/sprites/isometric/green.png and /dev/null differ diff --git a/sprites/isometric/indigo.png b/sprites/isometric/indigo.png deleted file mode 100644 index 952a093..0000000 Binary files a/sprites/isometric/indigo.png and /dev/null differ diff --git a/sprites/isometric/orange.png b/sprites/isometric/orange.png deleted file mode 100644 index 1f0d433..0000000 Binary files a/sprites/isometric/orange.png and /dev/null differ diff --git a/sprites/isometric/red.png b/sprites/isometric/red.png deleted file mode 100644 index 45e565a..0000000 Binary files a/sprites/isometric/red.png and /dev/null differ diff --git a/sprites/isometric/violet.png b/sprites/isometric/violet.png deleted file mode 100644 index e9ca156..0000000 Binary files a/sprites/isometric/violet.png and /dev/null differ diff --git a/sprites/isometric/white.png b/sprites/isometric/white.png deleted file mode 100644 index 3360681..0000000 Binary files a/sprites/isometric/white.png and /dev/null differ diff --git a/sprites/isometric/yellow.png b/sprites/isometric/yellow.png deleted file mode 100644 index b4cd60c..0000000 Binary files a/sprites/isometric/yellow.png and /dev/null differ diff --git a/sprites/kenny/License.txt b/sprites/kenny/License.txt deleted file mode 100644 index dce291a..0000000 --- a/sprites/kenny/License.txt +++ /dev/null @@ -1,22 +0,0 @@ - - - Pixel Shmup (1.1) - - Created/distributed by Kenney (www.kenney.nl) - Creation date: 01-11-2021 - - ------------------------------ - - License: (Creative Commons Zero, CC0) - http://creativecommons.org/publicdomain/zero/1.0/ - - This content is free to use in personal, educational and commercial projects. - Support us by crediting Kenney or www.kenney.nl (this is not mandatory) - - ------------------------------ - - Donate: http://support.kenney.nl - Patreon: http://patreon.com/kenney/ - - Follow on Twitter for updates: - http://twitter.com/KenneyNL \ No newline at end of file diff --git a/sprites/kenny/Preview.png b/sprites/kenny/Preview.png deleted file mode 100644 index 42f6036..0000000 Binary files a/sprites/kenny/Preview.png and /dev/null differ diff --git a/sprites/kenny/Sample.png b/sprites/kenny/Sample.png deleted file mode 100644 index cd5d365..0000000 Binary files a/sprites/kenny/Sample.png and /dev/null differ diff --git a/sprites/kenny/Ships/Bunting.png b/sprites/kenny/Ships/Bunting.png deleted file mode 100644 index 2b9ed7b..0000000 Binary files a/sprites/kenny/Ships/Bunting.png and /dev/null differ diff --git a/sprites/kenny/Ships/FalconGrey.png b/sprites/kenny/Ships/FalconGrey.png deleted file mode 100644 index a161479..0000000 Binary files a/sprites/kenny/Ships/FalconGrey.png and /dev/null differ diff --git a/sprites/kenny/Ships/GrosbeakGrey.png b/sprites/kenny/Ships/GrosbeakGrey.png deleted file mode 100644 index 0fce519..0000000 Binary files a/sprites/kenny/Ships/GrosbeakGrey.png and /dev/null differ diff --git a/sprites/kenny/Ships/Longspur.png b/sprites/kenny/Ships/Longspur.png deleted file mode 100644 index 8ccccbf..0000000 Binary files a/sprites/kenny/Ships/Longspur.png and /dev/null differ diff --git a/sprites/kenny/Ships/Magpie.png b/sprites/kenny/Ships/Magpie.png deleted file mode 100644 index 4c5dec1..0000000 Binary files a/sprites/kenny/Ships/Magpie.png and /dev/null differ diff --git a/sprites/kenny/Ships/Nighthawk.png b/sprites/kenny/Ships/Nighthawk.png deleted file mode 100644 index 9a02dba..0000000 Binary files a/sprites/kenny/Ships/Nighthawk.png and /dev/null differ diff --git a/sprites/kenny/Ships/Nutcracker.png b/sprites/kenny/Ships/Nutcracker.png deleted file mode 100644 index ac7ba5c..0000000 Binary files a/sprites/kenny/Ships/Nutcracker.png and /dev/null differ diff --git a/sprites/kenny/Ships/OspreyGrey.png b/sprites/kenny/Ships/OspreyGrey.png deleted file mode 100644 index 8747b09..0000000 Binary files a/sprites/kenny/Ships/OspreyGrey.png and /dev/null differ diff --git a/sprites/kenny/Ships/PintailGrey.png b/sprites/kenny/Ships/PintailGrey.png deleted file mode 100644 index d1a9c32..0000000 Binary files a/sprites/kenny/Ships/PintailGrey.png and /dev/null differ diff --git a/sprites/kenny/Ships/Warbler.png b/sprites/kenny/Ships/Warbler.png deleted file mode 100644 index 327f745..0000000 Binary files a/sprites/kenny/Ships/Warbler.png and /dev/null differ diff --git a/sprites/kenny/Ships/Waxwing.png b/sprites/kenny/Ships/Waxwing.png deleted file mode 100644 index 076afbb..0000000 Binary files a/sprites/kenny/Ships/Waxwing.png and /dev/null differ diff --git a/sprites/kenny/Ships/Weebill.png b/sprites/kenny/Ships/Weebill.png deleted file mode 100644 index 5ef6075..0000000 Binary files a/sprites/kenny/Ships/Weebill.png and /dev/null differ diff --git a/sprites/kenny/Ships/unused/Bunting.png b/sprites/kenny/Ships/unused/Bunting.png new file mode 100644 index 0000000..2b9ed7b Binary files /dev/null and b/sprites/kenny/Ships/unused/Bunting.png differ diff --git a/sprites/kenny/Ships/unused/FalconGrey.png b/sprites/kenny/Ships/unused/FalconGrey.png new file mode 100644 index 0000000..a161479 Binary files /dev/null and b/sprites/kenny/Ships/unused/FalconGrey.png differ diff --git a/sprites/kenny/Ships/unused/GrosbeakGrey.png b/sprites/kenny/Ships/unused/GrosbeakGrey.png new file mode 100644 index 0000000..0fce519 Binary files /dev/null and b/sprites/kenny/Ships/unused/GrosbeakGrey.png differ diff --git a/sprites/kenny/Ships/unused/Longspur.png b/sprites/kenny/Ships/unused/Longspur.png new file mode 100644 index 0000000..8ccccbf Binary files /dev/null and b/sprites/kenny/Ships/unused/Longspur.png differ diff --git a/sprites/kenny/Ships/unused/Magpie.png b/sprites/kenny/Ships/unused/Magpie.png new file mode 100644 index 0000000..4c5dec1 Binary files /dev/null and b/sprites/kenny/Ships/unused/Magpie.png differ diff --git a/sprites/kenny/Ships/unused/Nighthawk.png b/sprites/kenny/Ships/unused/Nighthawk.png new file mode 100644 index 0000000..9a02dba Binary files /dev/null and b/sprites/kenny/Ships/unused/Nighthawk.png differ diff --git a/sprites/kenny/Ships/unused/Nutcracker.png b/sprites/kenny/Ships/unused/Nutcracker.png new file mode 100644 index 0000000..ac7ba5c Binary files /dev/null and b/sprites/kenny/Ships/unused/Nutcracker.png differ diff --git a/sprites/kenny/Ships/unused/OspreyGrey.png b/sprites/kenny/Ships/unused/OspreyGrey.png new file mode 100644 index 0000000..8747b09 Binary files /dev/null and b/sprites/kenny/Ships/unused/OspreyGrey.png differ diff --git a/sprites/kenny/Ships/unused/PintailGrey.png b/sprites/kenny/Ships/unused/PintailGrey.png new file mode 100644 index 0000000..d1a9c32 Binary files /dev/null and b/sprites/kenny/Ships/unused/PintailGrey.png differ diff --git a/sprites/kenny/Ships/unused/Warbler.png b/sprites/kenny/Ships/unused/Warbler.png new file mode 100644 index 0000000..327f745 Binary files /dev/null and b/sprites/kenny/Ships/unused/Warbler.png differ diff --git a/sprites/kenny/Ships/unused/Waxwing.png b/sprites/kenny/Ships/unused/Waxwing.png new file mode 100644 index 0000000..076afbb Binary files /dev/null and b/sprites/kenny/Ships/unused/Waxwing.png differ diff --git a/sprites/kenny/Ships/unused/Weebill.png b/sprites/kenny/Ships/unused/Weebill.png new file mode 100644 index 0000000..5ef6075 Binary files /dev/null and b/sprites/kenny/Ships/unused/Weebill.png differ diff --git a/sprites/kenny/Tilemap/ships.png b/sprites/kenny/Tilemap/ships.png deleted file mode 100644 index 8451c10..0000000 Binary files a/sprites/kenny/Tilemap/ships.png and /dev/null differ diff --git a/sprites/kenny/Tilemap/ships_packed.png b/sprites/kenny/Tilemap/ships_packed.png deleted file mode 100644 index e586a1b..0000000 Binary files a/sprites/kenny/Tilemap/ships_packed.png and /dev/null differ diff --git a/sprites/kenny/Tilemap/tiles.png b/sprites/kenny/Tilemap/tiles.png deleted file mode 100644 index 7bbef6a..0000000 Binary files a/sprites/kenny/Tilemap/tiles.png and /dev/null differ diff --git a/sprites/kenny/Tilemap/tiles_packed.png b/sprites/kenny/Tilemap/tiles_packed.png deleted file mode 100644 index 20b6292..0000000 Binary files a/sprites/kenny/Tilemap/tiles_packed.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0010.png b/sprites/kenny/Tiles/tile_0010.png deleted file mode 100644 index 844f9e8..0000000 Binary files a/sprites/kenny/Tiles/tile_0010.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0011.png b/sprites/kenny/Tiles/tile_0011.png deleted file mode 100644 index 8817ead..0000000 Binary files a/sprites/kenny/Tiles/tile_0011.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0017.png b/sprites/kenny/Tiles/tile_0017.png deleted file mode 100644 index 0aad36f..0000000 Binary files a/sprites/kenny/Tiles/tile_0017.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0018.png b/sprites/kenny/Tiles/tile_0018.png deleted file mode 100644 index a69e582..0000000 Binary files a/sprites/kenny/Tiles/tile_0018.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0019.png b/sprites/kenny/Tiles/tile_0019.png deleted file mode 100644 index 9417c79..0000000 Binary files a/sprites/kenny/Tiles/tile_0019.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0020.png b/sprites/kenny/Tiles/tile_0020.png deleted file mode 100644 index 3b72616..0000000 Binary files a/sprites/kenny/Tiles/tile_0020.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0021.png b/sprites/kenny/Tiles/tile_0021.png deleted file mode 100644 index 49de17a..0000000 Binary files a/sprites/kenny/Tiles/tile_0021.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0022.png b/sprites/kenny/Tiles/tile_0022.png deleted file mode 100644 index bb569e5..0000000 Binary files a/sprites/kenny/Tiles/tile_0022.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0023.png b/sprites/kenny/Tiles/tile_0023.png deleted file mode 100644 index eb8e429..0000000 Binary files a/sprites/kenny/Tiles/tile_0023.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0024.png b/sprites/kenny/Tiles/tile_0024.png deleted file mode 100644 index c37dcb4..0000000 Binary files a/sprites/kenny/Tiles/tile_0024.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0025.png b/sprites/kenny/Tiles/tile_0025.png deleted file mode 100644 index 3ea4b57..0000000 Binary files a/sprites/kenny/Tiles/tile_0025.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0026.png b/sprites/kenny/Tiles/tile_0026.png deleted file mode 100644 index 0efd5b5..0000000 Binary files a/sprites/kenny/Tiles/tile_0026.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0028.png b/sprites/kenny/Tiles/tile_0028.png deleted file mode 100644 index fe77955..0000000 Binary files a/sprites/kenny/Tiles/tile_0028.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0029.png b/sprites/kenny/Tiles/tile_0029.png deleted file mode 100644 index ebac093..0000000 Binary files a/sprites/kenny/Tiles/tile_0029.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0030.png b/sprites/kenny/Tiles/tile_0030.png deleted file mode 100644 index 38c2902..0000000 Binary files a/sprites/kenny/Tiles/tile_0030.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0031.png b/sprites/kenny/Tiles/tile_0031.png deleted file mode 100644 index 315fdbb..0000000 Binary files a/sprites/kenny/Tiles/tile_0031.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0032.png b/sprites/kenny/Tiles/tile_0032.png deleted file mode 100644 index ddab4bd..0000000 Binary files a/sprites/kenny/Tiles/tile_0032.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0033.png b/sprites/kenny/Tiles/tile_0033.png deleted file mode 100644 index b7269fd..0000000 Binary files a/sprites/kenny/Tiles/tile_0033.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0034.png b/sprites/kenny/Tiles/tile_0034.png deleted file mode 100644 index 58eb4f2..0000000 Binary files a/sprites/kenny/Tiles/tile_0034.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0035.png b/sprites/kenny/Tiles/tile_0035.png deleted file mode 100644 index 620fcbd..0000000 Binary files a/sprites/kenny/Tiles/tile_0035.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0036.png b/sprites/kenny/Tiles/tile_0036.png deleted file mode 100644 index 67d3c05..0000000 Binary files a/sprites/kenny/Tiles/tile_0036.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0037.png b/sprites/kenny/Tiles/tile_0037.png deleted file mode 100644 index 71a37c9..0000000 Binary files a/sprites/kenny/Tiles/tile_0037.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0038.png b/sprites/kenny/Tiles/tile_0038.png deleted file mode 100644 index d651aae..0000000 Binary files a/sprites/kenny/Tiles/tile_0038.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0039.png b/sprites/kenny/Tiles/tile_0039.png deleted file mode 100644 index 367b6a9..0000000 Binary files a/sprites/kenny/Tiles/tile_0039.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0040.png b/sprites/kenny/Tiles/tile_0040.png deleted file mode 100644 index c8edb1e..0000000 Binary files a/sprites/kenny/Tiles/tile_0040.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0041.png b/sprites/kenny/Tiles/tile_0041.png deleted file mode 100644 index 91a9763..0000000 Binary files a/sprites/kenny/Tiles/tile_0041.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0042.png b/sprites/kenny/Tiles/tile_0042.png deleted file mode 100644 index ce0040f..0000000 Binary files a/sprites/kenny/Tiles/tile_0042.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0043.png b/sprites/kenny/Tiles/tile_0043.png deleted file mode 100644 index 5dd66ba..0000000 Binary files a/sprites/kenny/Tiles/tile_0043.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0044.png b/sprites/kenny/Tiles/tile_0044.png deleted file mode 100644 index e3011a0..0000000 Binary files a/sprites/kenny/Tiles/tile_0044.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0045.png b/sprites/kenny/Tiles/tile_0045.png deleted file mode 100644 index 4717045..0000000 Binary files a/sprites/kenny/Tiles/tile_0045.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0046.png b/sprites/kenny/Tiles/tile_0046.png deleted file mode 100644 index 28ab59d..0000000 Binary files a/sprites/kenny/Tiles/tile_0046.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0047.png b/sprites/kenny/Tiles/tile_0047.png deleted file mode 100644 index 96771d7..0000000 Binary files a/sprites/kenny/Tiles/tile_0047.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0048.png b/sprites/kenny/Tiles/tile_0048.png deleted file mode 100644 index 17f80dc..0000000 Binary files a/sprites/kenny/Tiles/tile_0048.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0049.png b/sprites/kenny/Tiles/tile_0049.png deleted file mode 100644 index 0310829..0000000 Binary files a/sprites/kenny/Tiles/tile_0049.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0050.png b/sprites/kenny/Tiles/tile_0050.png deleted file mode 100644 index 32a8747..0000000 Binary files a/sprites/kenny/Tiles/tile_0050.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0051.png b/sprites/kenny/Tiles/tile_0051.png deleted file mode 100644 index 1a58296..0000000 Binary files a/sprites/kenny/Tiles/tile_0051.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0052.png b/sprites/kenny/Tiles/tile_0052.png deleted file mode 100644 index f4cc30d..0000000 Binary files a/sprites/kenny/Tiles/tile_0052.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0053.png b/sprites/kenny/Tiles/tile_0053.png deleted file mode 100644 index 0eb497b..0000000 Binary files a/sprites/kenny/Tiles/tile_0053.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0054.png b/sprites/kenny/Tiles/tile_0054.png deleted file mode 100644 index f572a44..0000000 Binary files a/sprites/kenny/Tiles/tile_0054.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0055.png b/sprites/kenny/Tiles/tile_0055.png deleted file mode 100644 index 388d84f..0000000 Binary files a/sprites/kenny/Tiles/tile_0055.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0056.png b/sprites/kenny/Tiles/tile_0056.png deleted file mode 100644 index 5d09b88..0000000 Binary files a/sprites/kenny/Tiles/tile_0056.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0057.png b/sprites/kenny/Tiles/tile_0057.png deleted file mode 100644 index c007a88..0000000 Binary files a/sprites/kenny/Tiles/tile_0057.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0058.png b/sprites/kenny/Tiles/tile_0058.png deleted file mode 100644 index 18d1c04..0000000 Binary files a/sprites/kenny/Tiles/tile_0058.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0059.png b/sprites/kenny/Tiles/tile_0059.png deleted file mode 100644 index 8a254a5..0000000 Binary files a/sprites/kenny/Tiles/tile_0059.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0060.png b/sprites/kenny/Tiles/tile_0060.png deleted file mode 100644 index 1df1e2e..0000000 Binary files a/sprites/kenny/Tiles/tile_0060.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0061.png b/sprites/kenny/Tiles/tile_0061.png deleted file mode 100644 index a91abeb..0000000 Binary files a/sprites/kenny/Tiles/tile_0061.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0062.png b/sprites/kenny/Tiles/tile_0062.png deleted file mode 100644 index 4be82e7..0000000 Binary files a/sprites/kenny/Tiles/tile_0062.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0063.png b/sprites/kenny/Tiles/tile_0063.png deleted file mode 100644 index 6674da4..0000000 Binary files a/sprites/kenny/Tiles/tile_0063.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0064.png b/sprites/kenny/Tiles/tile_0064.png deleted file mode 100644 index 221f305..0000000 Binary files a/sprites/kenny/Tiles/tile_0064.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0065.png b/sprites/kenny/Tiles/tile_0065.png deleted file mode 100644 index 7ca8b3f..0000000 Binary files a/sprites/kenny/Tiles/tile_0065.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0066.png b/sprites/kenny/Tiles/tile_0066.png deleted file mode 100644 index 40d0565..0000000 Binary files a/sprites/kenny/Tiles/tile_0066.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0067.png b/sprites/kenny/Tiles/tile_0067.png deleted file mode 100644 index f058b05..0000000 Binary files a/sprites/kenny/Tiles/tile_0067.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0068.png b/sprites/kenny/Tiles/tile_0068.png deleted file mode 100644 index 82fa685..0000000 Binary files a/sprites/kenny/Tiles/tile_0068.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0069.png b/sprites/kenny/Tiles/tile_0069.png deleted file mode 100644 index 28bcd42..0000000 Binary files a/sprites/kenny/Tiles/tile_0069.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0070.png b/sprites/kenny/Tiles/tile_0070.png deleted file mode 100644 index a9e45dd..0000000 Binary files a/sprites/kenny/Tiles/tile_0070.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0071.png b/sprites/kenny/Tiles/tile_0071.png deleted file mode 100644 index 871e7b7..0000000 Binary files a/sprites/kenny/Tiles/tile_0071.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0072.png b/sprites/kenny/Tiles/tile_0072.png deleted file mode 100644 index 7350b3a..0000000 Binary files a/sprites/kenny/Tiles/tile_0072.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0073.png b/sprites/kenny/Tiles/tile_0073.png deleted file mode 100644 index 8beee53..0000000 Binary files a/sprites/kenny/Tiles/tile_0073.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0074.png b/sprites/kenny/Tiles/tile_0074.png deleted file mode 100644 index 557106e..0000000 Binary files a/sprites/kenny/Tiles/tile_0074.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0075.png b/sprites/kenny/Tiles/tile_0075.png deleted file mode 100644 index e57811b..0000000 Binary files a/sprites/kenny/Tiles/tile_0075.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0076.png b/sprites/kenny/Tiles/tile_0076.png deleted file mode 100644 index ab9d5ee..0000000 Binary files a/sprites/kenny/Tiles/tile_0076.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0077.png b/sprites/kenny/Tiles/tile_0077.png deleted file mode 100644 index 0304e8d..0000000 Binary files a/sprites/kenny/Tiles/tile_0077.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0078.png b/sprites/kenny/Tiles/tile_0078.png deleted file mode 100644 index 3c95c11..0000000 Binary files a/sprites/kenny/Tiles/tile_0078.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0079.png b/sprites/kenny/Tiles/tile_0079.png deleted file mode 100644 index ee40e8b..0000000 Binary files a/sprites/kenny/Tiles/tile_0079.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0080.png b/sprites/kenny/Tiles/tile_0080.png deleted file mode 100644 index 96b9b7f..0000000 Binary files a/sprites/kenny/Tiles/tile_0080.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0081.png b/sprites/kenny/Tiles/tile_0081.png deleted file mode 100644 index 9ae4a86..0000000 Binary files a/sprites/kenny/Tiles/tile_0081.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0082.png b/sprites/kenny/Tiles/tile_0082.png deleted file mode 100644 index 835a36c..0000000 Binary files a/sprites/kenny/Tiles/tile_0082.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0083.png b/sprites/kenny/Tiles/tile_0083.png deleted file mode 100644 index 615ab9c..0000000 Binary files a/sprites/kenny/Tiles/tile_0083.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0084.png b/sprites/kenny/Tiles/tile_0084.png deleted file mode 100644 index 5d7c797..0000000 Binary files a/sprites/kenny/Tiles/tile_0084.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0085.png b/sprites/kenny/Tiles/tile_0085.png deleted file mode 100644 index 989ffb8..0000000 Binary files a/sprites/kenny/Tiles/tile_0085.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0086.png b/sprites/kenny/Tiles/tile_0086.png deleted file mode 100644 index ea2edd0..0000000 Binary files a/sprites/kenny/Tiles/tile_0086.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0087.png b/sprites/kenny/Tiles/tile_0087.png deleted file mode 100644 index d6a5717..0000000 Binary files a/sprites/kenny/Tiles/tile_0087.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0088.png b/sprites/kenny/Tiles/tile_0088.png deleted file mode 100644 index 5646e9c..0000000 Binary files a/sprites/kenny/Tiles/tile_0088.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0089.png b/sprites/kenny/Tiles/tile_0089.png deleted file mode 100644 index f93b5db..0000000 Binary files a/sprites/kenny/Tiles/tile_0089.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0090.png b/sprites/kenny/Tiles/tile_0090.png deleted file mode 100644 index 6843b95..0000000 Binary files a/sprites/kenny/Tiles/tile_0090.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0091.png b/sprites/kenny/Tiles/tile_0091.png deleted file mode 100644 index bae6960..0000000 Binary files a/sprites/kenny/Tiles/tile_0091.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0092.png b/sprites/kenny/Tiles/tile_0092.png deleted file mode 100644 index f8dfb94..0000000 Binary files a/sprites/kenny/Tiles/tile_0092.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0093.png b/sprites/kenny/Tiles/tile_0093.png deleted file mode 100644 index e976c31..0000000 Binary files a/sprites/kenny/Tiles/tile_0093.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0094.png b/sprites/kenny/Tiles/tile_0094.png deleted file mode 100644 index 692cd2f..0000000 Binary files a/sprites/kenny/Tiles/tile_0094.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0095.png b/sprites/kenny/Tiles/tile_0095.png deleted file mode 100644 index 4b22d9c..0000000 Binary files a/sprites/kenny/Tiles/tile_0095.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0096.png b/sprites/kenny/Tiles/tile_0096.png deleted file mode 100644 index 77f0756..0000000 Binary files a/sprites/kenny/Tiles/tile_0096.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0097.png b/sprites/kenny/Tiles/tile_0097.png deleted file mode 100644 index 3a0ea5f..0000000 Binary files a/sprites/kenny/Tiles/tile_0097.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0098.png b/sprites/kenny/Tiles/tile_0098.png deleted file mode 100644 index 1cd89a4..0000000 Binary files a/sprites/kenny/Tiles/tile_0098.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0099.png b/sprites/kenny/Tiles/tile_0099.png deleted file mode 100644 index cddfe15..0000000 Binary files a/sprites/kenny/Tiles/tile_0099.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0100.png b/sprites/kenny/Tiles/tile_0100.png deleted file mode 100644 index c58f462..0000000 Binary files a/sprites/kenny/Tiles/tile_0100.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0101.png b/sprites/kenny/Tiles/tile_0101.png deleted file mode 100644 index f1a0af9..0000000 Binary files a/sprites/kenny/Tiles/tile_0101.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0102.png b/sprites/kenny/Tiles/tile_0102.png deleted file mode 100644 index faa774a..0000000 Binary files a/sprites/kenny/Tiles/tile_0102.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0103.png b/sprites/kenny/Tiles/tile_0103.png deleted file mode 100644 index c022e1b..0000000 Binary files a/sprites/kenny/Tiles/tile_0103.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0104.png b/sprites/kenny/Tiles/tile_0104.png deleted file mode 100644 index 04b99a9..0000000 Binary files a/sprites/kenny/Tiles/tile_0104.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0105.png b/sprites/kenny/Tiles/tile_0105.png deleted file mode 100644 index 9314993..0000000 Binary files a/sprites/kenny/Tiles/tile_0105.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0106.png b/sprites/kenny/Tiles/tile_0106.png deleted file mode 100644 index 1c380d3..0000000 Binary files a/sprites/kenny/Tiles/tile_0106.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0107.png b/sprites/kenny/Tiles/tile_0107.png deleted file mode 100644 index 7045c44..0000000 Binary files a/sprites/kenny/Tiles/tile_0107.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0108.png b/sprites/kenny/Tiles/tile_0108.png deleted file mode 100644 index 0379acc..0000000 Binary files a/sprites/kenny/Tiles/tile_0108.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0109.png b/sprites/kenny/Tiles/tile_0109.png deleted file mode 100644 index be8455d..0000000 Binary files a/sprites/kenny/Tiles/tile_0109.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0110.png b/sprites/kenny/Tiles/tile_0110.png deleted file mode 100644 index edaaa59..0000000 Binary files a/sprites/kenny/Tiles/tile_0110.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0111.png b/sprites/kenny/Tiles/tile_0111.png deleted file mode 100644 index deba627..0000000 Binary files a/sprites/kenny/Tiles/tile_0111.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0112.png b/sprites/kenny/Tiles/tile_0112.png deleted file mode 100644 index 283cd6b..0000000 Binary files a/sprites/kenny/Tiles/tile_0112.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0113.png b/sprites/kenny/Tiles/tile_0113.png deleted file mode 100644 index 5ec836c..0000000 Binary files a/sprites/kenny/Tiles/tile_0113.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0114.png b/sprites/kenny/Tiles/tile_0114.png deleted file mode 100644 index 797bf84..0000000 Binary files a/sprites/kenny/Tiles/tile_0114.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0115.png b/sprites/kenny/Tiles/tile_0115.png deleted file mode 100644 index eba06af..0000000 Binary files a/sprites/kenny/Tiles/tile_0115.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0116.png b/sprites/kenny/Tiles/tile_0116.png deleted file mode 100644 index f47f95a..0000000 Binary files a/sprites/kenny/Tiles/tile_0116.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0117.png b/sprites/kenny/Tiles/tile_0117.png deleted file mode 100644 index 76afcd9..0000000 Binary files a/sprites/kenny/Tiles/tile_0117.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0118.png b/sprites/kenny/Tiles/tile_0118.png deleted file mode 100644 index e5e2581..0000000 Binary files a/sprites/kenny/Tiles/tile_0118.png and /dev/null differ diff --git a/sprites/kenny/Tiles/tile_0119.png b/sprites/kenny/Tiles/tile_0119.png deleted file mode 100644 index 94d799e..0000000 Binary files a/sprites/kenny/Tiles/tile_0119.png and /dev/null differ diff --git a/sprites/kenny/Tilesheet (Ships).txt b/sprites/kenny/Tilesheet (Ships).txt deleted file mode 100644 index 9e48a73..0000000 --- a/sprites/kenny/Tilesheet (Ships).txt +++ /dev/null @@ -1,9 +0,0 @@ -Tilesheet information: - -Tile size • 32px × 32px -Space between tiles • 1px × 1px ---- -Total tiles (horizontal) • 4 tiles -Total tiles (vertical) • 6 tiles ---- -Total tiles in sheet • 24 tiles \ No newline at end of file diff --git a/sprites/kenny/Tilesheet (Tiles).txt b/sprites/kenny/Tilesheet (Tiles).txt deleted file mode 100644 index f2b5fea..0000000 --- a/sprites/kenny/Tilesheet (Tiles).txt +++ /dev/null @@ -1,9 +0,0 @@ -Tilesheet information: - -Tile size • 16px × 16px -Space between tiles • 1px × 1px ---- -Total tiles (horizontal) • 12 tiles -Total tiles (vertical) • 10 tiles ---- -Total tiles in sheet • 120 tiles \ No newline at end of file diff --git a/sprites/kenny/Visit Kenney.url b/sprites/kenny/Visit Kenney.url deleted file mode 100644 index c220c41..0000000 --- a/sprites/kenny/Visit Kenney.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=http://www.kenney.nl/ \ No newline at end of file diff --git a/sprites/kenny/Visit Patreon.url b/sprites/kenny/Visit Patreon.url deleted file mode 100644 index 67e9ea5..0000000 --- a/sprites/kenny/Visit Patreon.url +++ /dev/null @@ -1,2 +0,0 @@ -[InternetShortcut] -URL=https://www.patreon.com/kenney/ \ No newline at end of file diff --git a/sprites/kenny/kenney_pixelshmup.zip b/sprites/kenny/kenney_pixelshmup.zip deleted file mode 100644 index 64f536b..0000000 Binary files a/sprites/kenny/kenney_pixelshmup.zip and /dev/null differ diff --git a/sprites/misc/dragon-0.png b/sprites/misc/dragon-0.png deleted file mode 100644 index fb179af..0000000 Binary files a/sprites/misc/dragon-0.png and /dev/null differ diff --git a/sprites/misc/dragon-1.png b/sprites/misc/dragon-1.png deleted file mode 100644 index 8cfe531..0000000 Binary files a/sprites/misc/dragon-1.png and /dev/null differ diff --git a/sprites/misc/dragon-2.png b/sprites/misc/dragon-2.png deleted file mode 100644 index cb462e1..0000000 Binary files a/sprites/misc/dragon-2.png and /dev/null differ diff --git a/sprites/misc/dragon-3.png b/sprites/misc/dragon-3.png deleted file mode 100644 index 04c4977..0000000 Binary files a/sprites/misc/dragon-3.png and /dev/null differ diff --git a/sprites/misc/dragon-4.png b/sprites/misc/dragon-4.png deleted file mode 100644 index b29fa3d..0000000 Binary files a/sprites/misc/dragon-4.png and /dev/null differ diff --git a/sprites/misc/dragon-5.png b/sprites/misc/dragon-5.png deleted file mode 100644 index 99f4e74..0000000 Binary files a/sprites/misc/dragon-5.png and /dev/null differ diff --git a/sprites/misc/explosion-0.png b/sprites/misc/explosion-0.png deleted file mode 100644 index f48636f..0000000 Binary files a/sprites/misc/explosion-0.png and /dev/null differ diff --git a/sprites/misc/explosion-1.png b/sprites/misc/explosion-1.png deleted file mode 100644 index b4018d9..0000000 Binary files a/sprites/misc/explosion-1.png and /dev/null differ diff --git a/sprites/misc/explosion-2.png b/sprites/misc/explosion-2.png deleted file mode 100644 index 3abaedd..0000000 Binary files a/sprites/misc/explosion-2.png and /dev/null differ diff --git a/sprites/misc/explosion-3.png b/sprites/misc/explosion-3.png deleted file mode 100644 index fe94a5a..0000000 Binary files a/sprites/misc/explosion-3.png and /dev/null differ diff --git a/sprites/misc/explosion-4.png b/sprites/misc/explosion-4.png deleted file mode 100644 index ed04237..0000000 Binary files a/sprites/misc/explosion-4.png and /dev/null differ diff --git a/sprites/misc/explosion-5.png b/sprites/misc/explosion-5.png deleted file mode 100644 index 2cd8f06..0000000 Binary files a/sprites/misc/explosion-5.png and /dev/null differ diff --git a/sprites/misc/explosion-6.png b/sprites/misc/explosion-6.png deleted file mode 100644 index e55909c..0000000 Binary files a/sprites/misc/explosion-6.png and /dev/null differ diff --git a/sprites/misc/explosion-sheet.png b/sprites/misc/explosion-sheet.png deleted file mode 100644 index 8559a5c..0000000 Binary files a/sprites/misc/explosion-sheet.png and /dev/null differ diff --git a/sprites/misc/lowrez-ship-blue.png b/sprites/misc/lowrez-ship-blue.png deleted file mode 100644 index 7a3d3aa..0000000 Binary files a/sprites/misc/lowrez-ship-blue.png and /dev/null differ diff --git a/sprites/misc/lowrez-ship-red.png b/sprites/misc/lowrez-ship-red.png deleted file mode 100644 index dd1a1d4..0000000 Binary files a/sprites/misc/lowrez-ship-red.png and /dev/null differ diff --git a/sprites/misc/simple-mood-16x16.png b/sprites/misc/simple-mood-16x16.png deleted file mode 100644 index 0eca11e..0000000 Binary files a/sprites/misc/simple-mood-16x16.png and /dev/null differ diff --git a/sprites/misc/star.png b/sprites/misc/star.png deleted file mode 100644 index e0ee0f9..0000000 Binary files a/sprites/misc/star.png and /dev/null differ diff --git a/sprites/misc/tiny-star.png b/sprites/misc/tiny-star.png deleted file mode 100644 index e04786a..0000000 Binary files a/sprites/misc/tiny-star.png and /dev/null differ diff --git a/sprites/square/black.png b/sprites/square/black.png deleted file mode 100644 index 1a80bda..0000000 Binary files a/sprites/square/black.png and /dev/null differ diff --git a/sprites/square/blue.png b/sprites/square/blue.png deleted file mode 100644 index 3194ff5..0000000 Binary files a/sprites/square/blue.png and /dev/null differ diff --git a/sprites/square/gray.png b/sprites/square/gray.png deleted file mode 100644 index b94f1dd..0000000 Binary files a/sprites/square/gray.png and /dev/null differ diff --git a/sprites/square/green.png b/sprites/square/green.png deleted file mode 100644 index d14a892..0000000 Binary files a/sprites/square/green.png and /dev/null differ diff --git a/sprites/square/indigo.png b/sprites/square/indigo.png deleted file mode 100644 index f66aa46..0000000 Binary files a/sprites/square/indigo.png and /dev/null differ diff --git a/sprites/square/orange.png b/sprites/square/orange.png deleted file mode 100644 index bf023bc..0000000 Binary files a/sprites/square/orange.png and /dev/null differ diff --git a/sprites/square/red.png b/sprites/square/red.png deleted file mode 100644 index a59443e..0000000 Binary files a/sprites/square/red.png and /dev/null differ diff --git a/sprites/square/violet.png b/sprites/square/violet.png deleted file mode 100644 index c8f3db8..0000000 Binary files a/sprites/square/violet.png and /dev/null differ diff --git a/sprites/square/white.png b/sprites/square/white.png deleted file mode 100644 index 7a233ea..0000000 Binary files a/sprites/square/white.png and /dev/null differ diff --git a/sprites/square/yellow.png b/sprites/square/yellow.png deleted file mode 100644 index 3b586c4..0000000 Binary files a/sprites/square/yellow.png and /dev/null differ diff --git a/sprites/tile/wall-0000.png b/sprites/tile/wall-0000.png deleted file mode 100644 index 469795c..0000000 Binary files a/sprites/tile/wall-0000.png and /dev/null differ diff --git a/sprites/tile/wall-0001.png b/sprites/tile/wall-0001.png deleted file mode 100644 index afcac7a..0000000 Binary files a/sprites/tile/wall-0001.png and /dev/null differ diff --git a/sprites/tile/wall-0010.png b/sprites/tile/wall-0010.png deleted file mode 100644 index b791e98..0000000 Binary files a/sprites/tile/wall-0010.png and /dev/null differ diff --git a/sprites/tile/wall-0011.png b/sprites/tile/wall-0011.png deleted file mode 100644 index 9e7d664..0000000 Binary files a/sprites/tile/wall-0011.png and /dev/null differ diff --git a/sprites/tile/wall-0100.png b/sprites/tile/wall-0100.png deleted file mode 100644 index e49aadb..0000000 Binary files a/sprites/tile/wall-0100.png and /dev/null differ diff --git a/sprites/tile/wall-0101.png b/sprites/tile/wall-0101.png deleted file mode 100644 index b040a4a..0000000 Binary files a/sprites/tile/wall-0101.png and /dev/null differ diff --git a/sprites/tile/wall-0110.png b/sprites/tile/wall-0110.png deleted file mode 100644 index 2273582..0000000 Binary files a/sprites/tile/wall-0110.png and /dev/null differ diff --git a/sprites/tile/wall-0111.png b/sprites/tile/wall-0111.png deleted file mode 100644 index ae2faca..0000000 Binary files a/sprites/tile/wall-0111.png and /dev/null differ diff --git a/sprites/tile/wall-1000.png b/sprites/tile/wall-1000.png deleted file mode 100644 index 900990d..0000000 Binary files a/sprites/tile/wall-1000.png and /dev/null differ diff --git a/sprites/tile/wall-1001.png b/sprites/tile/wall-1001.png deleted file mode 100644 index 45aa962..0000000 Binary files a/sprites/tile/wall-1001.png and /dev/null differ diff --git a/sprites/tile/wall-1010.png b/sprites/tile/wall-1010.png deleted file mode 100644 index 9333835..0000000 Binary files a/sprites/tile/wall-1010.png and /dev/null differ diff --git a/sprites/tile/wall-1011.png b/sprites/tile/wall-1011.png deleted file mode 100644 index 439f135..0000000 Binary files a/sprites/tile/wall-1011.png and /dev/null differ diff --git a/sprites/tile/wall-1100.png b/sprites/tile/wall-1100.png deleted file mode 100644 index 67a2433..0000000 Binary files a/sprites/tile/wall-1100.png and /dev/null differ diff --git a/sprites/tile/wall-1101.png b/sprites/tile/wall-1101.png deleted file mode 100644 index 8e06769..0000000 Binary files a/sprites/tile/wall-1101.png and /dev/null differ diff --git a/sprites/tile/wall-1110.png b/sprites/tile/wall-1110.png deleted file mode 100644 index d92e46c..0000000 Binary files a/sprites/tile/wall-1110.png and /dev/null differ diff --git a/sprites/tile/wall-1111.png b/sprites/tile/wall-1111.png deleted file mode 100644 index e5ce32f..0000000 Binary files a/sprites/tile/wall-1111.png and /dev/null differ -- cgit v1.2.3 From 5f8a4b6b17d6ada0097412b13605717dd5a310df Mon Sep 17 00:00:00 2001 From: realtradam Date: Sun, 26 Dec 2021 21:42:56 -0500 Subject: added rate of fire, tweaked ai --- app/components/weapon.rb | 2 +- app/factories/bullet.rb | 2 +- app/factories/ships/sample_enemy.rb | 12 ++++++------ app/systems/ai/randomize_ai.rb | 4 ++-- app/systems/ai/rejoin.rb | 1 + app/systems/ai/scatter.rb | 3 ++- app/systems/ai/target_player.rb | 5 +++-- app/systems/player_weapon.rb | 10 ++++++---- app/systems/start_game.rb | 13 +++++++------ app/tick.rb | 8 +++++--- 10 files changed, 34 insertions(+), 26 deletions(-) diff --git a/app/components/weapon.rb b/app/components/weapon.rb index bb7becd..0c0963a 100644 --- a/app/components/weapon.rb +++ b/app/components/weapon.rb @@ -1,5 +1,5 @@ FF::Cmp.new('Weapon', damage: 35, cooldown: 0, - cooldown_max: 15, + cooldown_max: 7, speed: 20) diff --git a/app/factories/bullet.rb b/app/factories/bullet.rb index 1731999..39d3f3c 100644 --- a/app/factories/bullet.rb +++ b/app/factories/bullet.rb @@ -8,7 +8,7 @@ class Factory sprite, FF::Cmp::Boid.new(x: x, y: y, vx: vx, vy: vy, w: 16, h: 16), FF::Cmp::SingletonCamera[0], - FF::Cmp::Hitcircle.new(r: 10), + FF::Cmp::Hitcircle.new(r: 20), FF::Cmp::Hp.new(health: 1), FF::Cmp::Team.new, FF::Cmp::CollisionDamage.new(damage: damage), diff --git a/app/factories/ships/sample_enemy.rb b/app/factories/ships/sample_enemy.rb index af8c4ca..9355c2f 100644 --- a/app/factories/ships/sample_enemy.rb +++ b/app/factories/ships/sample_enemy.rb @@ -3,15 +3,15 @@ class Factory def self.defaults @defaults ||= { boid_bounds_strength: 0.6, - boids_alignment_strength: 0.005, - boids_seperation_strength: 0.005, - boids_seperation_distance: 50, - boids_cohesion_strength: 0.003, + boids_alignment_strength: 0.002, + boids_seperation_strength: 0.001, + boids_seperation_distance: 150, + boids_cohesion_strength: 0.0005, hp_health: 100, collision_damage_damage: 100, hitcircle_r: 12, - boid_minimum_speed_speed: 5, - decay_speed_multiplier: 0.9, + boid_minimum_speed_speed: 7, + decay_speed_multiplier: 0.8, } end def self.new(x: 0, y: 0, vx: -3, vy: -3) diff --git a/app/systems/ai/randomize_ai.rb b/app/systems/ai/randomize_ai.rb index f272181..b3ab59b 100644 --- a/app/systems/ai/randomize_ai.rb +++ b/app/systems/ai/randomize_ai.rb @@ -9,7 +9,7 @@ FF::Scn::BoidRules.add( #puts 'remove pick' end FF::Cmp::BoidsSeparation.each do |sep| - if rand < 0.3 + if rand < 0.05 sep.entities[0].add random_ai_pick #puts 'pick' end @@ -26,7 +26,7 @@ FF::Scn::BoidRules.add( #puts 'target' end #timer.interval = (300..1200).to_a.sample - timer.interval = 60 + timer.interval = (5..20).to_a.sample #puts timer.interval timer.timer = 0 end diff --git a/app/systems/ai/rejoin.rb b/app/systems/ai/rejoin.rb index 9e06eb7..bc804de 100644 --- a/app/systems/ai/rejoin.rb +++ b/app/systems/ai/rejoin.rb @@ -2,6 +2,7 @@ FF::Sys.new("Rejoin", priority: 40) do FF::Cmp::SingletonRandomAIPick[0].entities.each do |entity| sep = entity.components[FF::Cmp::BoidsSeparation][0] sep.distance = Factory::SampleEnemy.defaults[:boids_seperation_distance] + sep.strength = Factory::SampleEnemy.defaults[:boids_seperation_strength] alignment_mgr = entity.components[FF::Cmp::BoidsAlignment] cohesion_mgr = entity.components[FF::Cmp::BoidsCohesion] if alignment_mgr.nil? || alignment_mgr.empty? diff --git a/app/systems/ai/scatter.rb b/app/systems/ai/scatter.rb index 82bcb65..034fa28 100644 --- a/app/systems/ai/scatter.rb +++ b/app/systems/ai/scatter.rb @@ -5,7 +5,8 @@ FF::Sys.new("Scatter", priority: 40) do # what it was before and that means it will force a # seperation to happen even if the default value is # changed and you forget to update this number here - sep.distance = Factory::SampleEnemy.defaults[:boids_seperation_distance] * 3 + sep.distance = Factory::SampleEnemy.defaults[:boids_seperation_distance] * 10 + sep.strength = Factory::SampleEnemy.defaults[:boids_seperation_strength] #puts 'remove align/cohesion/follow'.upcase alignment_mgr = entity.components[FF::Cmp::BoidsAlignment] cohesion_mgr = entity.components[FF::Cmp::BoidsCohesion] diff --git a/app/systems/ai/target_player.rb b/app/systems/ai/target_player.rb index 1e4a3ea..5e5ac18 100644 --- a/app/systems/ai/target_player.rb +++ b/app/systems/ai/target_player.rb @@ -1,11 +1,12 @@ FF::Sys.new("TargetPlayer", priority: 40) do FF::Cmp::SingletonRandomAIPick[0].entities.each do |entity| sep = entity.components[FF::Cmp::BoidsSeparation][0] - sep.distance = 200 + sep.distance = Factory::SampleEnemy.defaults[:boids_seperation_distance] + sep.strength = Factory::SampleEnemy.defaults[:boids_seperation_strength] follow_mgr = entity.components[FF::Cmp::Follow] player_boid = FF::Cmp::SingletonPlayer[0].entities[0].components[FF::Cmp::Boid][0] if follow_mgr.nil? || follow_mgr.empty? - entity.add FF::Cmp::Follow.new(target: player_boid, strength: 1.2) + entity.add FF::Cmp::Follow.new(target: player_boid, strength: 0.5) end end end diff --git a/app/systems/player_weapon.rb b/app/systems/player_weapon.rb index 2ecd250..9cb4df0 100644 --- a/app/systems/player_weapon.rb +++ b/app/systems/player_weapon.rb @@ -1,11 +1,13 @@ FF::Scn::BoidRules.add( FF::Sys.new('PlayerWeapon') do - if $gtk.args.inputs.mouse.down - player = FF::Cmp::SingletonPlayer[0].entities[0] - unless player.nil? + player = FF::Cmp::SingletonPlayer[0].entities[0] + unless player.nil? + weapon = player.components[FF::Cmp::Weapon][0] + weapon.cooldown -= 1 unless weapon.cooldown <= 0 + if $gtk.args.inputs.mouse.button_left boid = player.components[FF::Cmp::Boid][0] - weapon = player.components[FF::Cmp::Weapon][0] if player.components[FF::Cmp::Weapon][0].cooldown <= 0 + weapon.cooldown += weapon.cooldown_max # spawn bullet facing correct angle mag = Math.sqrt((boid.vx ** 2) + (boid.vy ** 2)) bullet = Factory::Bullet.new(damage: weapon.damage, vx: (boid.vx/mag) * weapon.speed, vy: (boid.vy/mag) * weapon.speed, x: boid.x, y: boid.y) diff --git a/app/systems/start_game.rb b/app/systems/start_game.rb index 4d6289e..9efbf14 100644 --- a/app/systems/start_game.rb +++ b/app/systems/start_game.rb @@ -18,7 +18,7 @@ FF::Sys.new('StartGame', priority: 50 ) do {x: 700, y: 200}, {x: 150, y: 250}, ] - position_range = (500..1000).to_a + position_range = (400..(1280*2)).to_a sprite = FF::Cmp::Sprite.new sprite.props[:path] = 'sprites/background.png' @@ -27,8 +27,9 @@ FF::Sys.new('StartGame', priority: 50 ) do FF::Cmp::SingletonCamera[0], FF::Cmp::Boid.new(h: 1920 * 2, w: 1920 * 2) ) - 8.times do |pos| - Factory::SampleEnemy.new(x: position_range.sample, y: position_range.sample) + posneg = [1,-1] + 20.times do |pos| + Factory::SampleEnemy.new(x: position_range.sample * posneg.sample, y: position_range.sample * posneg.sample) end sprite = FF::Cmp::Sprite.new @@ -44,16 +45,16 @@ FF::Sys.new('StartGame', priority: 50 ) do debug_arrow, FF::Cmp::SingletonCamera[0], FF::Cmp::SingletonMoveCamera[0], - FF::Cmp::BoidBounds.new, + FF::Cmp::BoidBounds.new(strength: 3), FF::Cmp::Follow.new(target: :mouse, strength: 0.007), FF::Cmp::SingletonPlayer[0], FF::Cmp::Team.new(team: 'player'), FF::Cmp::Weapon.new, FF::Cmp::BoidMinimumSpeed.new(speed: 5), FF::Cmp::DecaySpeed.new(strength: 0.8), - FF::Cmp::Hp.new(health: 100), + FF::Cmp::Hp.new(health: 300), FF::Cmp::CollisionDamage.new(damage: 100), - FF::Cmp::Hitcircle.new(r: 32), + FF::Cmp::Hitcircle.new(r: 16), ) diff --git a/app/tick.rb b/app/tick.rb index a48fce3..a7904bc 100644 --- a/app/tick.rb +++ b/app/tick.rb @@ -12,11 +12,12 @@ def tick args FelFlame::Stage.call # Spawn Bullet - if args.inputs.keyboard.keys[:down].include?(:b) - Factory::Bullet.new(x: @camera.x, y: @camera.y) - end + #if args.inputs.keyboard.keys[:down].include?(:b) + # Factory::Bullet.new(x: @camera.x, y: @camera.y) + #end # Moving Camera +=begin if args.inputs.keyboard.keys[:down_or_held].include?(:d) @camera.x += (Math.cos(-@camera.angle * (Math::PI / 180.0)) * 5) @camera.y += (Math.sin(-@camera.angle * (Math::PI / 180.0)) * 5) @@ -35,6 +36,7 @@ def tick args @camera.x -= (Math.sin(-@camera.angle * (Math::PI / 180.0)) * -5) @camera.y += (Math.cos(-@camera.angle * (Math::PI / 180.0)) * -5) end +=end if args.inputs.keyboard.keys[:down_or_held].include?(:q) @camera.angle += 3 end -- cgit v1.2.3 From 41da3e4ad9d938e488f268b2d30d1867ac2ab943 Mon Sep 17 00:00:00 2001 From: realtradam Date: Sun, 26 Dec 2021 22:10:21 -0500 Subject: more optimizations --- app/factories/ships/sample_enemy.rb | 2 +- app/systems/ai/scatter.rb | 4 ---- app/systems/ai/target_player.rb | 2 +- app/systems/collision_damage.rb | 47 ++++++++++++++++++++----------------- app/systems/start_game.rb | 2 +- 5 files changed, 28 insertions(+), 29 deletions(-) diff --git a/app/factories/ships/sample_enemy.rb b/app/factories/ships/sample_enemy.rb index 9355c2f..6ebaef3 100644 --- a/app/factories/ships/sample_enemy.rb +++ b/app/factories/ships/sample_enemy.rb @@ -4,7 +4,7 @@ class Factory @defaults ||= { boid_bounds_strength: 0.6, boids_alignment_strength: 0.002, - boids_seperation_strength: 0.001, + boids_seperation_strength: 0.0005, boids_seperation_distance: 150, boids_cohesion_strength: 0.0005, hp_health: 100, diff --git a/app/systems/ai/scatter.rb b/app/systems/ai/scatter.rb index 034fa28..1b51061 100644 --- a/app/systems/ai/scatter.rb +++ b/app/systems/ai/scatter.rb @@ -1,10 +1,6 @@ FF::Sys.new("Scatter", priority: 40) do FF::Cmp::SingletonRandomAIPick[0].entities.each do |entity| sep = entity.components[FF::Cmp::BoidsSeparation][0] - # I did times 3 becase then it will always be greater then - # what it was before and that means it will force a - # seperation to happen even if the default value is - # changed and you forget to update this number here sep.distance = Factory::SampleEnemy.defaults[:boids_seperation_distance] * 10 sep.strength = Factory::SampleEnemy.defaults[:boids_seperation_strength] #puts 'remove align/cohesion/follow'.upcase diff --git a/app/systems/ai/target_player.rb b/app/systems/ai/target_player.rb index 5e5ac18..bf8b9e8 100644 --- a/app/systems/ai/target_player.rb +++ b/app/systems/ai/target_player.rb @@ -6,7 +6,7 @@ FF::Sys.new("TargetPlayer", priority: 40) do follow_mgr = entity.components[FF::Cmp::Follow] player_boid = FF::Cmp::SingletonPlayer[0].entities[0].components[FF::Cmp::Boid][0] if follow_mgr.nil? || follow_mgr.empty? - entity.add FF::Cmp::Follow.new(target: player_boid, strength: 0.5) + entity.add FF::Cmp::Follow.new(target: player_boid, strength: 0.6) end end end diff --git a/app/systems/collision_damage.rb b/app/systems/collision_damage.rb index df2e050..676589d 100644 --- a/app/systems/collision_damage.rb +++ b/app/systems/collision_damage.rb @@ -1,30 +1,33 @@ FF::Scn::BoidRules.add( - FF::Sys.new("CollisionDamage", priority: 65) do + FF::Sys.new("CollisionDamage", priority: 98) do FF::Cmp::SingletonEnemyTeam[0].entities.each do |enemy_entity| - hitcircle_self = enemy_entity.components[FF::Cmp::Hitcircle][0] - boid_self = hitcircle_self.entities[0].components[FF::Cmp::Boid][0] - FF::Cmp::SingletonBullet[0].entities.each do |bullet_entity| - hitcircle_target = bullet_entity.components[FF::Cmp::Hitcircle][0] - boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] - if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) - #puts 'checks here'.upcase - #puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil? - #puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil? - #puts 'checks end'.upcase - hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage - hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage - end + sprite = enemy_entity.components[FF::Cmp::Sprite][0].props + if (sprite[:x] < 1312) && (sprite[:x] > -32) && (sprite[:y] < 752) && (sprite[:y] > -32) + hitcircle_self = enemy_entity.components[FF::Cmp::Hitcircle][0] + boid_self = hitcircle_self.entities[0].components[FF::Cmp::Boid][0] + FF::Cmp::SingletonBullet[0].entities.each do |bullet_entity| + hitcircle_target = bullet_entity.components[FF::Cmp::Hitcircle][0] + boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] + if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) + #puts 'checks here'.upcase + #puts 'hp dont exist' if hitcircle_target.entities[0].components[FF::Cmp::Hp].nil? + #puts 'collision damage dont exist' if hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage].nil? + #puts 'checks end'.upcase + hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage + hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage + end - end + end - player = FF::Cmp::SingletonPlayer[0].entities[0] - unless player.nil? - hitcircle_target = player.components[FF::Cmp::Hitcircle][0] - boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] - if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) - hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage - hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage + player = FF::Cmp::SingletonPlayer[0].entities[0] + unless player.nil? + hitcircle_target = player.components[FF::Cmp::Hitcircle][0] + boid_target = hitcircle_target.entities[0].components[FF::Cmp::Boid][0] + if Math.sqrt(((boid_self.x - boid_target.x) ** 2) + ((boid_self.y - boid_target.y) ** 2)) < (hitcircle_target.r + hitcircle_self.r) + hitcircle_target.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_self.entities[0].components[FF::Cmp::CollisionDamage][0].damage + hitcircle_self.entities[0].components[FF::Cmp::Hp][0].health -= hitcircle_target.entities[0].components[FF::Cmp::CollisionDamage][0].damage + end end end end diff --git a/app/systems/start_game.rb b/app/systems/start_game.rb index 9efbf14..a936c21 100644 --- a/app/systems/start_game.rb +++ b/app/systems/start_game.rb @@ -28,7 +28,7 @@ FF::Sys.new('StartGame', priority: 50 ) do FF::Cmp::Boid.new(h: 1920 * 2, w: 1920 * 2) ) posneg = [1,-1] - 20.times do |pos| + 16.times do |pos| Factory::SampleEnemy.new(x: position_range.sample * posneg.sample, y: position_range.sample * posneg.sample) end -- cgit v1.2.3 From 09fe8467d670a9eace7c0c60e21e5aa81fc0b8e9 Mon Sep 17 00:00:00 2001 From: realtradam Date: Sun, 26 Dec 2021 22:21:36 -0500 Subject: added enemy spawning --- app/main.rb | 1 + app/systems/spawn_enemy.rb | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 app/systems/spawn_enemy.rb diff --git a/app/main.rb b/app/main.rb index 5f59b42..1854893 100644 --- a/app/main.rb +++ b/app/main.rb @@ -58,6 +58,7 @@ require 'app/systems/ai/scatter.rb' require 'app/systems/ai/rejoin.rb' require 'app/systems/ai/target_player.rb' require 'app/systems/ai/randomize_ai.rb' +require 'app/systems/spawn_enemy.rb' require 'app/factories/bullet.rb' require 'app/factories/ships/sample_enemy.rb' diff --git a/app/systems/spawn_enemy.rb b/app/systems/spawn_enemy.rb new file mode 100644 index 0000000..6bb2253 --- /dev/null +++ b/app/systems/spawn_enemy.rb @@ -0,0 +1,9 @@ +FF::Scn::BoidRules.add( + FF::Sys.new("SpawnEnemy", priority: 500) do + while FF::Cmp::SingletonEnemyTeam[0].entities.length < 16 + position_range = ((1280*2.5).to_i..(1280*3)).to_a + posneg = [1,-1] + Factory::SampleEnemy.new(x: position_range.sample * posneg.sample, y: position_range.sample * posneg.sample) + end + end +) -- cgit v1.2.3 From 930802e49e33c87ef0fd2f102b9205a4098878d3 Mon Sep 17 00:00:00 2001 From: arngo <27396817+arngo@users.noreply.github.com> Date: Sun, 26 Dec 2021 22:30:44 -0500 Subject: implement score ui --- app/components/label.rb | 13 +++++++++++++ app/components/singleton_score.rb | 4 ++++ app/main.rb | 3 +++ app/systems/death.rb | 2 ++ app/systems/render.rb | 3 +++ app/systems/start_game.rb | 28 ++++++++++++++++++++++++++-- app/systems/ui/score.rb | 7 +++++++ fonts/kenvector_future_thin.ttf | Bin 0 -> 34100 bytes 8 files changed, 58 insertions(+), 2 deletions(-) create mode 100644 app/components/label.rb create mode 100644 app/components/singleton_score.rb create mode 100644 app/systems/ui/score.rb create mode 100644 fonts/kenvector_future_thin.ttf diff --git a/app/components/label.rb b/app/components/label.rb new file mode 100644 index 0000000..25b5529 --- /dev/null +++ b/app/components/label.rb @@ -0,0 +1,13 @@ +FF::Cmp.new("Label", props: { + x: 0, + y: 0, + text: 'label', + size_enum: 2, + alignment_enum: 1, + r: 255, + g: 255, + b: 255, + a: 255, + font: "font.ttf", + vertical_alignment_enum: 0 +}) diff --git a/app/components/singleton_score.rb b/app/components/singleton_score.rb new file mode 100644 index 0000000..4f6514b --- /dev/null +++ b/app/components/singleton_score.rb @@ -0,0 +1,4 @@ +FF::Cmp.new('SingletonScore', + score: 0, + singleton: true) +FF::Cmp::SingletonScore.new diff --git a/app/main.rb b/app/main.rb index 5f59b42..cd07f6e 100644 --- a/app/main.rb +++ b/app/main.rb @@ -29,8 +29,11 @@ require 'app/components/teams/team.rb' require 'app/components/singleton_title.rb' require 'app/components/singleton_ai_timer.rb' require 'app/components/singleton_random_ai_pick.rb' +require 'app/components/label.rb' +require 'app/components/singleton_score.rb' +require 'app/systems/ui/score.rb' require 'app/systems/init_title_screen.rb' require 'app/systems/ui/button.rb' require 'app/systems/ui/return_to_menu.rb' diff --git a/app/systems/death.rb b/app/systems/death.rb index edeb493..ae02dec 100644 --- a/app/systems/death.rb +++ b/app/systems/death.rb @@ -5,6 +5,8 @@ FF::Scn::BoidRules.add( hp.entities[0].components.each do |manager, manager_array| if manager.equal?(FF::Cmp::SingletonPlayer) FF::Sys::EndGame.call + elsif manager.equal?(FF::Cmp::SingletonEnemyTeam) + FF::Sys::Score.call end next if manager.equal?(FF::Cmp::Hp) manager_array.reverse_each do |component| diff --git a/app/systems/render.rb b/app/systems/render.rb index 4bd117c..a067613 100644 --- a/app/systems/render.rb +++ b/app/systems/render.rb @@ -3,5 +3,8 @@ FF::Scn::Render.add( FF::Cmp::Sprite.each do |sprite| $gtk.args.outputs.sprites << sprite.props end + FF::Cmp::Label.each do |label| + $gtk.args.outputs.labels << label.props + end end ) diff --git a/app/systems/start_game.rb b/app/systems/start_game.rb index 4d6289e..a0073bd 100644 --- a/app/systems/start_game.rb +++ b/app/systems/start_game.rb @@ -56,14 +56,38 @@ FF::Sys.new('StartGame', priority: 50 ) do FF::Cmp::Hitcircle.new(r: 32), ) - + score_label_shadow = FF::Cmp::Label.new + score_label_shadow.props.merge!({ + x: 50, + y: 667, + text: '0', + size_enum: 8, + r: 100, + g: 100, + b: 100, + font: 'fonts/kenvector_future_thin.ttf', + }) + score_label = FF::Cmp::Label.new + score_label.props.merge!({ + x: 50, + y: 670, + text: '0', + size_enum: 8, + font: 'fonts/kenvector_future_thin.ttf', + }) + score = FF::Cmp::SingletonScore[0] + score.score = 0 + FF::Ent.new( + score_label, + score_label_shadow, + score, + ) FF::Stg.add( FF::Scn::BoidRules, FF::Scn::Camera, FF::Scn::Cleanup, ) - FF::Scn::Debug.add(FF::Sys::DebugRenderVectorArrow) @pause = false #FF::Stg.remove FF::Scn::BoidRules diff --git a/app/systems/ui/score.rb b/app/systems/ui/score.rb new file mode 100644 index 0000000..c761561 --- /dev/null +++ b/app/systems/ui/score.rb @@ -0,0 +1,7 @@ +FF::Sys.new("Score", priority: 50) do + score = FF::Cmp::SingletonScore[0] + score.score += 100 + score.entities[0].components[FF::Cmp::Label].each do |label| + label.props[:text] = score.score.to_s + end +end diff --git a/fonts/kenvector_future_thin.ttf b/fonts/kenvector_future_thin.ttf new file mode 100644 index 0000000..9f4b4fa Binary files /dev/null and b/fonts/kenvector_future_thin.ttf differ -- cgit v1.2.3 From e61ba8cc576465f2c01283bfad1c0eb452e34769 Mon Sep 17 00:00:00 2001 From: arngo <27396817+arngo@users.noreply.github.com> Date: Sun, 26 Dec 2021 23:04:51 -0500 Subject: add shooting sounds --- app/systems/player_weapon.rb | 1 + sounds/shoot.mp3 | Bin 0 -> 40750 bytes 2 files changed, 1 insertion(+) create mode 100644 sounds/shoot.mp3 diff --git a/app/systems/player_weapon.rb b/app/systems/player_weapon.rb index 9cb4df0..e16570c 100644 --- a/app/systems/player_weapon.rb +++ b/app/systems/player_weapon.rb @@ -13,6 +13,7 @@ FF::Scn::BoidRules.add( bullet = Factory::Bullet.new(damage: weapon.damage, vx: (boid.vx/mag) * weapon.speed, vy: (boid.vy/mag) * weapon.speed, x: boid.x, y: boid.y) bullet.remove(bullet.components[FF::Cmp::Team][0]) bullet.add(FF::Cmp::Team.new(team: 'player')) + $gtk.args.gtk.queue_sound "sounds/shoot.mp3" end end end diff --git a/sounds/shoot.mp3 b/sounds/shoot.mp3 new file mode 100644 index 0000000..33be5cd Binary files /dev/null and b/sounds/shoot.mp3 differ -- cgit v1.2.3 From 20da68139878d9286cb642c9bcb5e20c28077ba7 Mon Sep 17 00:00:00 2001 From: arngo <27396817+arngo@users.noreply.github.com> Date: Sun, 26 Dec 2021 23:05:43 -0500 Subject: update version to 1.0 --- metadata/game_metadata.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/game_metadata.txt b/metadata/game_metadata.txt index 5d2b271..92ac035 100644 --- a/metadata/game_metadata.txt +++ b/metadata/game_metadata.txt @@ -2,7 +2,7 @@ devid=argo devtitle=Arnold and Tradam gameid=steelwings gametitle=SteelWings -version=0.8.2 +version=1.0 #icon=metadata/icon.png # Uncomment the entry below to bytecode compile your Ruby code (Pro License Only) -- cgit v1.2.3