diff --git a/source/assets/audio/quad.wav b/source/assets/audio/quad.wav deleted file mode 100644 index 04d6030..0000000 Binary files a/source/assets/audio/quad.wav and /dev/null differ diff --git a/source/assets/images/background1.png b/source/assets/images/background1.png deleted file mode 100644 index 09d02d2..0000000 Binary files a/source/assets/images/background1.png and /dev/null differ diff --git a/source/assets/images/background2.png b/source/assets/images/background2.png deleted file mode 100644 index 796d4ea..0000000 Binary files a/source/assets/images/background2.png and /dev/null differ diff --git a/source/assets/images/card.png b/source/assets/images/card.png deleted file mode 100644 index 4a4105c..0000000 Binary files a/source/assets/images/card.png and /dev/null differ diff --git a/source/assets/images/card1.png b/source/assets/images/card1.png deleted file mode 100644 index 9eb87dc..0000000 Binary files a/source/assets/images/card1.png and /dev/null differ diff --git a/source/assets/images/card2.png b/source/assets/images/card2.png deleted file mode 100644 index 37614e7..0000000 Binary files a/source/assets/images/card2.png and /dev/null differ diff --git a/source/assets/images/card3.png b/source/assets/images/card3.png deleted file mode 100644 index 9914ae9..0000000 Binary files a/source/assets/images/card3.png and /dev/null differ diff --git a/source/assets/images/card4.png b/source/assets/images/card4.png deleted file mode 100644 index 8dec163..0000000 Binary files a/source/assets/images/card4.png and /dev/null differ diff --git a/source/assets/images/logo.png b/source/assets/images/logo.png deleted file mode 100644 index 39cdc54..0000000 Binary files a/source/assets/images/logo.png and /dev/null differ diff --git a/source/assets/images/unk.png b/source/assets/images/unk.png deleted file mode 100644 index 6d64644..0000000 Binary files a/source/assets/images/unk.png and /dev/null differ diff --git a/source/assets/sprites/bg.png b/source/assets/sprites/bg.png deleted file mode 100644 index 3121cd2..0000000 Binary files a/source/assets/sprites/bg.png and /dev/null differ diff --git a/source/assets/sprites/bgTest.png b/source/assets/sprites/bgTest.png deleted file mode 100644 index ff3b8c4..0000000 Binary files a/source/assets/sprites/bgTest.png and /dev/null differ diff --git a/source/assets/sprites/groundDbg.png b/source/assets/sprites/groundDbg.png deleted file mode 100644 index 300b536..0000000 Binary files a/source/assets/sprites/groundDbg.png and /dev/null differ diff --git a/source/assets/sprites/old_player-table-64-64.png b/source/assets/sprites/old_player-table-64-64.png deleted file mode 100644 index 0c1d467..0000000 Binary files a/source/assets/sprites/old_player-table-64-64.png and /dev/null differ diff --git a/source/assets/sprites/oldbaleba-table-64-64.png b/source/assets/sprites/oldbaleba-table-64-64.png deleted file mode 100644 index 4a86467..0000000 Binary files a/source/assets/sprites/oldbaleba-table-64-64.png and /dev/null differ diff --git a/source/assets/sprites/selectionBg.png b/source/assets/sprites/selectionBg.png deleted file mode 100644 index d3c05b1..0000000 Binary files a/source/assets/sprites/selectionBg.png and /dev/null differ diff --git a/source/assets/sprites/selectionBg1.png b/source/assets/sprites/selectionBg1.png deleted file mode 100644 index aa86220..0000000 Binary files a/source/assets/sprites/selectionBg1.png and /dev/null differ diff --git a/source/assets/sprites/selectionanim-table-40-39.png b/source/assets/sprites/selectionanim-table-40-39.png deleted file mode 100644 index 54db5d7..0000000 Binary files a/source/assets/sprites/selectionanim-table-40-39.png and /dev/null differ diff --git a/source/main.lua b/source/main.lua index eb05d82..ea3a9a8 100644 --- a/source/main.lua +++ b/source/main.lua @@ -5,7 +5,6 @@ import "CoreLibs/timer" import "CoreLibs/ui" import "CoreLibs/math" - -- Libraries import 'libraries/noble/Noble' import "libraries/AnimatedSprite" @@ -87,7 +86,6 @@ import "scripts/pageSprite" import "scenes/BaseScene" import 'scenes/Assemble' -import 'scenes/DroneSelection' import 'scenes/DroneCardSelector' import 'scenes/Menu' import 'scenes/Game' @@ -101,12 +99,15 @@ Difficulty = { DifficultySettings = { [Difficulty.Easy] = { assebleTime = 1700, + distance = 200 }, [Difficulty.Medium] = { assebleTime = 1000, + distance = 350 }, [Difficulty.Hard] = { assebleTime = 500, + distance = 500 } } diff --git a/source/pdxinfo b/source/pdxinfo index eecb1a1..9e2d82c 100644 --- a/source/pdxinfo +++ b/source/pdxinfo @@ -2,7 +2,7 @@ name=FPV Game author=ut3usw description=This is a FPV Game bundleID=guru.dead.fpv -version=0.0.1 -buildNumber=1 +version=0.1.1 +buildNumber=2 imagePath=assets/launcher/ launchSoundPath=assets/launcher/sound.wav \ No newline at end of file diff --git a/source/scenes/DroneSelection.lua b/source/scenes/DroneSelection.lua deleted file mode 100644 index e238fed..0000000 --- a/source/scenes/DroneSelection.lua +++ /dev/null @@ -1,117 +0,0 @@ -DroneSelection = {} -class("DroneSelection").extends(BaseScene) -local scene = DroneSelection - -local fontSimple = Graphics.font.new('assets/fonts/peridot_7') -local fontMed = Graphics.font.new('assets/fonts/onyx_9') -local fontBig = Graphics.font.new('assets/fonts/diamond_20') - -scene.inputHandler = { - AButtonDown = function() - scene.menuConfirmSound:play(1) - Noble.transition(Assemble) - end, - BButtonDown = function() end, - downButtonDown = function() - scene.menuSelSound:play(1) - if scene.menuIndex < 4 then - scene.menuIndex = scene.menuIndex + 1 - else - scene.menuIndex = 1 - end - end, - leftButtonDown = function() end, - rightButtonDown = function() end, - upButtonDown = function() - scene.menuSelSound:play(1) - if scene.menuIndex > 1 then - scene.menuIndex = scene.menuIndex - 1 - else - scene.menuIndex = 4 - end - end, -} - -function scene:setValues() - self.dronesPreview = {} - self.background = Graphics.image.new("assets/sprites/selectionBg1") - self.dronesPreview[1] = Graphics.image.new("assets/sprites/assemble/1/8.png") - - self.aKey = Graphics.image.new("assets/sprites/buttons/A") - - scene.menuSelSound = playdate.sound.fileplayer.new("assets/audio/menu_select") - scene.menuSelSound:setVolume(0.5) - - scene.menuConfirmSound = playdate.sound.fileplayer.new("assets/audio/confirm") - -- scene.menuConfirmSound:setVolume(0.5) - - scene.unknownDrone = Graphics.image.new("assets/images/unk.png") - - self.menuIndex = 1 -end - -function scene:init() - scene.super.init(self) - scene:setValues() -end - -function scene:start() - scene.super.start(self) - - self.optionsMenu:addMenuItem("Main Menu", function() Noble.transition(Menu) end) - Noble.showFPS = false -end - -function scene:enter() - scene.super.enter(self) - - scene.selectionAnim = Selection(23, 54) -end - -local elapsedTime = 0 -function scene:update() - scene.super.update(self) - Noble.Text.draw("Select Drone", 200, 10, Noble.Text.ALIGN_CENTER, false, fontMed) - scene.selectionAnim:moveTo(23, 54 + (self.menuIndex - 1) * 46) - - elapsedTime = elapsedTime + 1 / playdate.display.getRefreshRate() - local dy = 1 * math.sin(10 * elapsedTime) - - local offset = 42 - - for i = 1, #Drones do - if Drones[i].locked == true then - Noble.Text.draw("UNAVAILABLE", 47, offset + 7, Noble.Text.ALIGN_LEFT, false, fontMed) - Noble.Text.draw("?", 16, offset + 4, Noble.Text.ALIGN_LEFT, false, fontBig) - else - Drones[i].preview:draw(6, offset) - - Noble.Text.draw(Drones[i].name, 49, offset - 3, Noble.Text.ALIGN_LEFT, false, fontMed) - Noble.Text.draw("Price:", 49, offset + 15, Noble.Text.ALIGN_LEFT, false, fontSimple) - Noble.Text.draw("$" .. Drones[i].price, 103, offset + 15, Noble.Text.ALIGN_LEFT, false, fontSimple) - end - offset = offset + 46 - end - - if Drones[self.menuIndex].locked == false then - self.aKey:draw(330, 170 + dy) -- A key - Noble.Text.draw("Assemble", 348, 175, Noble.Text.ALIGN_LEFT, false, fontSimple) -- Assemble text - - Graphics.drawTextInRect(Drones[self.menuIndex].description, 135, 200, 255, 100, nil, nil, nil, fontSimple) -- Description - Drones[self.menuIndex].full:draw(160, 35) -- Drone preview (full size) - else - Graphics.drawTextInRect("Unavailable right now", 135, 200, 255, 100, nil, nil, nil, fontSimple) - scene.unknownDrone:draw(184, 35) - end -end - -function scene:exit() - scene.super.exit(self) - - Noble.showFPS = false -end - -function scene:finish() - scene.super.finish(self) - playdate.display.setScale(1) -end diff --git a/source/scenes/Game.lua b/source/scenes/Game.lua index 4627513..e79f8b0 100644 --- a/source/scenes/Game.lua +++ b/source/scenes/Game.lua @@ -42,6 +42,7 @@ function scene:setValues() scene.resultShowed = false scene.musicEnabled = Noble.Settings.get("music") + scene.difficulty = Noble.Settings.get("difficulty") scene.balebas = {} @@ -54,7 +55,7 @@ function scene:setValues() scene.tank = nil - scene.distance = 200 + scene.distance = DifficultySettings[scene.difficulty].distance end function scene:init() diff --git a/source/scripts/balebaSprite.lua b/source/scripts/balebaSprite.lua index 9faf00f..10b3b54 100644 --- a/source/scripts/balebaSprite.lua +++ b/source/scripts/balebaSprite.lua @@ -44,7 +44,7 @@ function Baleba:update() if self.player == nil or self.player.isMovingRight() == false then self.xVelocity = self.standrate else - self.xVelocity = 2 + self.standrate + self.xVelocity = 1.2 + self.standrate end self:moveTo(self.x - self.xVelocity, self.y)