diff --git a/.gitignore b/.gitignore index 1906c29..0f741a3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ settings.json log.log -*.log \ No newline at end of file +*.log +*.log diff --git a/charts/blazin/cutscene.lua b/charts/blazin/cutscene.lua deleted file mode 100644 index 0cf46dd..0000000 --- a/charts/blazin/cutscene.lua +++ /dev/null @@ -1,20 +0,0 @@ - - -function onStartCountdown() - if not allowCountdown and isStoryMode and not seenCutscene then --Block the first countdown - startVideo('2hotCutscene'); - seenCutscene = true - allowCountdown = true; - return Function_Stop; - end - return Function_Continue; -end - -function onEndSong() - if isStoryMode and not seenCutscene1 then - startVideo('blazinCutscene') - seenCutscene1 = true - return Function_Stop - end - return Function_Continue -end diff --git a/charts/blazin/script.lua b/charts/blazin/script.lua index 09e620a..b6e6bf9 100644 --- a/charts/blazin/script.lua +++ b/charts/blazin/script.lua @@ -1,26 +1,48 @@ -function onCreate() - setPropertyFromClass('GameOverSubstate', 'characterName', 'pico-dead') - setPropertyFromClass('GameOverSubstate', 'deathSoundName', 'gameplay/gameover/fnf_loss_sfx-pico-gutpunch') - setPropertyFromClass('GameOverSubstate', 'loopSoundName', 'gameplay/gameover/gameOver-pico') - setPropertyFromClass('GameOverSubstate', 'endSoundName', 'gameplay/gameover/gameOverEnd-pico') - setPropertyFromClass('PauseSubState', 'songName', 'breakfast-pico/breakfast-pico') +local videoPath = "videos/blazinCutscene.ogv" - for i = 0,3 do - setPropertyFromGroup('strumLineNotes',i,'x', -830) - end +local song +local videoStream +local video - triggerEvent('Camera Follow Pos', 320, 300) +local module = {} + +function module.onCreate(songName) + if songName == "Blazin" then + module.shared.canStart = false + song = songName + videoStream = love.video.newVideoStream(love.filesystem.newFile(videoPath)) + videoStream:play() + video = love.graphics.newVideo(videoStream) + video:play() + end end -function onUpdate() - noteTweenX("NoteMove1", 0, -150, 0.01, cubeInOut) - noteTweenX("NoteMove2", 1, -150, 0.01, cubeInOut) - noteTweenX("NoteMove3", 2, -150, 0.01, cubeInOut) - noteTweenX("NoteMove4", 3, -150, 0.01, cubeInOut) - - noteTweenX("NoteMove5", 4, 412, 0.01, cubeInOut) - noteTweenX("NoteMove6", 5, 524, 0.01, cubeInOut) - noteTweenX("NoteMove7", 6, 636, 0.01, cubeInOut) - noteTweenX("NoteMove8", 7, 748, 0.01, cubeInOut) - +function module.onUpdate() + if videoStream then + if not videoStream:isPlaying() then + module.shared.canStart = true + video = nil + videoStream = nil + end + end end + +function module.onDraw() + if video then + love.graphics.draw(video, 0,0,0,1.5,1.5) + end +end + +function module.onClose() + if video then + video:stop() + video:release() + video = nil + + videoStream:stop() + videoStream:release() + videoStream = nil + end +end + +return module \ No newline at end of file diff --git a/charts/darnell/cutscene.lua b/charts/darnell/cutscene.lua deleted file mode 100644 index 93d64d1..0000000 --- a/charts/darnell/cutscene.lua +++ /dev/null @@ -1,188 +0,0 @@ -local cutscene = true -local neneIdle = true -local video = true -local cutscene1 = true - -function onCreate() - setPropertyFromClass('GameOverSubstate', 'characterName', 'pico-dead') - setPropertyFromClass('GameOverSubstate', 'deathSoundName', 'fnf_loss_sfx-pico') - setPropertyFromClass('GameOverSubstate', 'loopSoundName', 'gameplay/gameover/gameOver-pico') - setPropertyFromClass('GameOverSubstate', 'endSoundName', 'gameplay/gameover/gameOverEnd-pico') - setPropertyFromClass('PauseSubState', 'songName', 'breakfast-pico/breakfast-pico') - - makeAnimatedLuaSprite('PicoBullet', 'PicoBullet', 2100, 850); - addAnimationByPrefix('PicoBullet', 'Pop', 'Pop', 24, false); - setProperty('PicoBullet.flipX', false); - scaleObject('PicoBullet', 1, 1); - setScrollFactor('PicoBullet', 1, 1); - setProperty('PicoBullet.alpha', 1); - - makeAnimatedLuaSprite('spraypaintExplosionEZ', 'spraypaintExplosionEZ', 1000, 150); - addAnimationByPrefix('spraypaintExplosionEZ', 'explosion', 'explosion round 1 short', 24, false); - setProperty('spraypaintExplosionEZ.flipX', false); - scaleObject('spraypaintExplosionEZ', 1, 1); - setScrollFactor('spraypaintExplosionEZ', 1, 1); - setProperty('spraypaintExplosionEZ.alpha', 0); - addLuaSprite('spraypaintExplosionEZ', true); - - makeLuaSprite('cutsceneShootBlack', 'empty', 0, 0); - makeGraphic('cutsceneShootBlack', 3000, 2000, '000000'); - setProperty('cutsceneShootBlack.alpha', 0); - addLuaSprite('cutsceneShootBlack', false); - - makeLuaSprite('cutsceneOpenBlack', 'empty', 0, 0); - makeGraphic('cutsceneOpenBlack', 1280, 720, '000000'); - setObjectCamera('cutsceneOpenBlack', 'other'); - setProperty('cutsceneOpenBlack.alpha', 1); - - makeLuaText('cutText', '[SPACE] to Start', 300, 500, 700) - setTextSize('cutText', 17); - setTextFont('cutText', 'vcr2.ttf') - addLuaText('cutText') - - if isStoryMode then - setProperty('skipText.visible', false) - end - - if not isStoryMode then - setProperty('cutText.visible', false) - end - - if cutscene and isStoryMode and not seenCutscene then - addLuaSprite('cutsceneOpenBlack', true); - else - triggerEvent("Change Character", 'bf', 'pico-playable') - end -end - -function onUpdate() -if getPropertyFromClass('flixel.FlxG', 'keys.justPressed.SPACE') and isStoryMode and cutscene1 or getPropertyFromClass('flixel.FlxG', 'keys.justPressed.ENTER') and cutscene1 and isStoryMode then -runTimer('videoWait', 2); -setProperty('cutText.visible', false) -cutscene1 = false -return Function_Continue; -end -end - -function onStartCountdown() -if isStoryMode then - if cutscene and not seenCutscene then - doTweenAlpha('GUItween', 'camHUD', 0, 0.1, 'linear'); - triggerEvent('Camera Follow Pos', 1500, 900) - if video then - startVideo('darnellCutscene'); - runTimer('video', 87); --86 - video = false - end - return Function_Stop; - end - if not cutscene then - doTweenAlpha('GUItween', 'camHUD', 1, 0.5, 'linear'); - playAnim('boyfriend', 'return', false); - runHaxeCode([[ - var cameraTwn:FlxTween; - cameraTwn = FlxTween.tween(FlxG.camera, {zoom: 0.77}, 2, {ease: FlxEase.sineInOut, onComplete: - function (twn:FlxTween) { - cameraTwn = null; - } - }); - ]]) - return Function_Continue; - end -end -end - -function onTimerCompleted(tag, loops, loopsLeft) - if tag == 'video' and cutscene then - triggerEvent('Camera Follow Pos', 1500, 900) - runTimer('videoWait', 2); - end - if tag == 'videoWait' and cutscene then - playMusic('darnellCanCutscene/darnellCanCutscene', 1, false) - doTweenAlpha('GUItween', 'camHUD', 0, 0.1, 'linear'); - triggerEvent('Camera Follow Pos', 1500, 900) - runTimer('startSong', 9.2); - runTimer('darnellAnim1', 4.2); - runTimer('cameraTween', 1); - runTimer('neneIdle1', 0.6); - playAnim('gf', 'danceRight', false); - playAnim('boyfriend', 'pissed', false); - doTweenAlpha('cutsceneOpenBlack', 'cutsceneOpenBlack', 0, 1, 'linear') - runHaxeCode([[ - FlxG.camera.zoom = 0.7 - ]]) - end - if tag == 'cameraTween' and cutscene and isStoryMode then - triggerEvent('Camera Follow Pos', 1500, 900) - runHaxeCode([[ - var cameraTwn:FlxTween; - cameraTwn = FlxTween.tween(FlxG.camera, {zoom: 0.7}, 3, {ease: FlxEase.sineInOut, onComplete: - function (twn:FlxTween) { - cameraTwn = null; - } - }); - ]]) - end - if tag == 'neneIdle1' and cutscene and neneIdle == true then - playAnim('gf', 'danceLeft', false); - runTimer('neneIdle2', 0.6); - end - if tag == 'neneIdle2' and cutscene and neneIdle == true then - playAnim('gf', 'danceRight', false); - runTimer('neneIdle1', 0.6); - end - if tag == 'darnellAnim1' and cutscene then - playAnim('dad', 'lightCan', false); - playSound('Darnell_Lighter', 1) - runTimer('picoAnim1', 1); - end - if tag == 'picoAnim1' and cutscene then - triggerEvent('Camera Follow Pos', 1700, 900) - setProperty('cutText.visible', false) - playAnim('boyfriend', 'cock', false); - playSound('Gun_Prep', 1) - addLuaSprite('PicoBullet', true); - runTimer('darnellAnim2', 0.3); - end - if tag == 'darnellAnim2' and cutscene then - playAnim('dad', 'kickCan', false); - playSound('Kick_Can_UP', 1) - playAnim('cutsceneSpraycan', 'i', false); - setProperty('cutsceneSpraycan.alpha', 1); - runTimer('darnellAnim3', 0.3); - end - if tag == 'darnellAnim3' and cutscene then - playAnim('dad', 'kneeCan', false); - playSound('Kick_Can_FORWARD', 1) - runTimer('picoAnim2', 0.3); - end - if tag == 'picoAnim2' and cutscene then - triggerEvent('Camera Follow Pos', 1500, 900) - setProperty('spraypaintExplosionEZ.alpha', 1); - playAnim('spraypaintExplosionEZ', 'explosion', true); - playAnim('boyfriend', 'shoot'); - setProperty('cutsceneShootBlack.alpha', 1); - doTweenAlpha('cutsceneShootBlack', 'cutsceneShootBlack', 0, 1, 'linear') - playAnim('boyfriend', 'return', false); - playSound('shot'..getRandomInt(1, 3), 1) - runTimer('cutsceneLaugh', 0.5); - runTimer('picoReturn', (1/24)*139); - end - if tag == 'cutsceneLaugh' and cutscene then - neneIdle = false - playAnim('dad', 'laughCutscene', false); - playAnim('gf', 'laughCutscene', false); - playSound('cutscene/darnell_laugh', 1) - playSound('cutscene/nene_laugh', 1) - end - if tag == 'startSong' and cutscene then - cutscene = false - doTweenAlpha('GUItween', 'camHUD', 1, 0.5, 'linear'); - setProperty('skipText.visible', true) - startCountdown() - end - if tag == 'picoReturn' then - triggerEvent("Change Character", 'bf', 'pico-playable') - doTweenAlpha('GUItween', 'camHUD', 1, 0.5, 'linear'); - end -end diff --git a/charts/darnell/script.lua b/charts/darnell/script.lua index e8b3c5e..da5eb25 100644 --- a/charts/darnell/script.lua +++ b/charts/darnell/script.lua @@ -1,9 +1,48 @@ -function onCreate() - setPropertyFromClass('GameOverSubstate', 'characterName', 'pico-dead') - setPropertyFromClass('GameOverSubstate', 'deathSoundName', 'fnf_loss_sfx-pico') - setPropertyFromClass('GameOverSubstate', 'loopSoundName', 'gameplay/gameover/gameOver-pico') - setPropertyFromClass('GameOverSubstate', 'endSoundName', 'gameplay/gameover/gameOverEnd-pico') - setPropertyFromClass('PauseSubState', 'songName', 'breakfast-pico/breakfast-pico') - characterPlayAnim('boyfriend', 'pissed', true); - setProperty('boyfriend.specialAnim', true); +local videoPath = "videos/darnellCutscene.ogv" + +local song +local videoStream +local video + +local module = {} + +function module.onCreate(songName) + if songName == "Darnell" then + module.shared.canStart = false + song = songName + videoStream = love.video.newVideoStream(love.filesystem.newFile(videoPath)) + videoStream:play() + video = love.graphics.newVideo(videoStream) + video:play() + end end + +function module.onUpdate() + if videoStream then + if not videoStream:isPlaying() then + module.shared.canStart = true + video = nil + videoStream = nil + end + end +end + +function module.onDraw() + if video then + love.graphics.draw(video, 0,0,0,1.5,1.5) + end +end + +function module.onClose() + if video then + video:stop() + video:release() + video = nil + + videoStream:stop() + videoStream:release() + videoStream = nil + end +end + +return module \ No newline at end of file diff --git a/charts/guns/script.lua b/charts/guns/script.lua index da1ff6c..5cdb289 100644 --- a/charts/guns/script.lua +++ b/charts/guns/script.lua @@ -1,59 +1,48 @@ -function onCreatePost() - dadnorm = getCharacterY('dad') + 250 - bfnorm = getCharacterY('boyfriend') + 350 - dady = getCharacterY('dad') + 0 - bfy = getCharacterY('boyfriend') + 0 +local videoPath = "videos/gunsCutscene.ogv" + +local song +local videoStream +local video + +local module = {} + +function module.onCreate(songName) + if songName == "Guns" then + module.shared.canStart = false + song = songName + videoStream = love.video.newVideoStream(love.filesystem.newFile(videoPath)) + videoStream:play() + video = love.graphics.newVideo(videoStream) + video:play() + end end -function opponentNoteHit(id, direction, noteType, isSustainNote) - if curBeat >= 224 then - if curBeat <= 352 then - dady = dady - 10 - doTweenY('funny fly', 'dad', dady, 0.25, linear) - end - end +function module.onUpdate() + if videoStream then + if not videoStream:isPlaying() then + module.shared.canStart = true + video = nil + videoStream = nil + end + end end -function goodNoteHit(id, direction, noteType, isSustainNote) - if curBeat >= 250 then - if curBeat <= 352 then - bfy = bfy - 10 - doTweenY('funny fly2', 'boyfriend', bfy, 0.25, linear) - end - end +function module.onDraw() + if video then + love.graphics.draw(video, 0,0,0,1.5,1.5) + end end -function noteMiss(id, direction, noteType, isSustainNote) - if curBeat >= 224 then - if curBeat <= 352 then - bfynow = bfy - if bfynow < bfnorm then - bfl = bfynow + 10 - doTweenY('funny fall', 'boyfriend', bfl, 0.25, linear) - else - doTweenY('funny non', 'boyfriend', bfnorm, 0.25, linear) - end - end - end +function module.onClose() + if video then + video:stop() + video:release() + video = nil + + videoStream:stop() + videoStream:release() + videoStream = nil + end end -function noteMissPress(direction) - if curBeat >= 224 then - if curBeat <= 352 then - bfynow = bfy - if bfynow < bfnorm then - bfl = bfynow + 10 - doTweenY('funny fall2', 'boyfriend', bfl, 0.25, linear) - else - doTweenY('funny non2', 'boyfriend', bfnorm, 0.25, linear) - end - end - end -end - -function onBeatHit() - if curBeat == 352 then - doTweenY('return', 'boyfriend', bfnorm, 10, linear) - doTweenY('returndad', 'dad', dadnorm, 10, linear) - end -end \ No newline at end of file +return module \ No newline at end of file diff --git a/charts/stress/script.lua b/charts/stress/script.lua new file mode 100644 index 0000000..1a6337a --- /dev/null +++ b/charts/stress/script.lua @@ -0,0 +1,48 @@ +local videoPath = "videos/stressCutscene.ogv" + +local song +local videoStream +local video + +local module = {} + +function module.onCreate(songName) + if songName == "Stress" then + module.shared.canStart = false + song = songName + videoStream = love.video.newVideoStream(love.filesystem.newFile(videoPath)) + videoStream:play() + video = love.graphics.newVideo(videoStream) + video:play() + end +end + +function module.onUpdate() + if videoStream then + if not videoStream:isPlaying() then + module.shared.canStart = true + video = nil + videoStream = nil + end + end +end + +function module.onDraw() + if video then + love.graphics.draw(video, 0,0,0,1.5,1.5) + end +end + +function module.onClose() + if video then + video:stop() + video:release() + video = nil + + videoStream:stop() + videoStream:release() + videoStream = nil + end +end + +return module \ No newline at end of file diff --git a/images/tank/erect/placeholder.png b/images/tank/erect/placeholder.png new file mode 100644 index 0000000..9bb1c07 Binary files /dev/null and b/images/tank/erect/placeholder.png differ diff --git a/images/tank/tankBuildings.png b/images/tank/tankBuildings.png new file mode 100644 index 0000000..7ebdcc1 Binary files /dev/null and b/images/tank/tankBuildings.png differ diff --git a/images/tank/tankClouds.png b/images/tank/tankClouds.png new file mode 100644 index 0000000..7f5769a Binary files /dev/null and b/images/tank/tankClouds.png differ diff --git a/images/tank/tankGround.png b/images/tank/tankGround.png new file mode 100644 index 0000000..956b9e9 Binary files /dev/null and b/images/tank/tankGround.png differ diff --git a/images/tank/tankMountains.png b/images/tank/tankMountains.png new file mode 100644 index 0000000..ca3ed8e Binary files /dev/null and b/images/tank/tankMountains.png differ diff --git a/images/tank/tankRuins.png b/images/tank/tankRuins.png new file mode 100644 index 0000000..1169d7f Binary files /dev/null and b/images/tank/tankRuins.png differ diff --git a/images/tank/tankSky.png b/images/tank/tankSky.png new file mode 100644 index 0000000..9a0a620 Binary files /dev/null and b/images/tank/tankSky.png differ diff --git a/sprites/tank/erect/placeholdersowecanhavethefolder.mov b/sprites/tank/erect/placeholdersowecanhavethefolder.mov new file mode 100644 index 0000000..d1775be Binary files /dev/null and b/sprites/tank/erect/placeholdersowecanhavethefolder.mov differ diff --git a/sprites/tank/smokeLeft.json b/sprites/tank/smokeLeft.json new file mode 100644 index 0000000..1237733 --- /dev/null +++ b/sprites/tank/smokeLeft.json @@ -0,0 +1,535 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "SmokeBlurLeft instance 10000", + "_x": "1005", + "_y": "812", + "_width": "446", + "_height": "617", + "_frameX": "-43", + "_frameY": "-204", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10001", + "_x": "1005", + "_y": "812", + "_width": "446", + "_height": "617", + "_frameX": "-43", + "_frameY": "-204", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10002", + "_x": "1005", + "_y": "812", + "_width": "446", + "_height": "617", + "_frameX": "-43", + "_frameY": "-204", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10003", + "_x": "0", + "_y": "801", + "_width": "467", + "_height": "655", + "_frameX": "-28", + "_frameY": "-177", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10004", + "_x": "0", + "_y": "801", + "_width": "467", + "_height": "655", + "_frameX": "-28", + "_frameY": "-177", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10005", + "_x": "0", + "_y": "801", + "_width": "467", + "_height": "655", + "_frameX": "-28", + "_frameY": "-177", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10006", + "_x": "1505", + "_y": "786", + "_width": "481", + "_height": "673", + "_frameX": "-15", + "_frameY": "-151", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10007", + "_x": "1505", + "_y": "786", + "_width": "481", + "_height": "673", + "_frameX": "-15", + "_frameY": "-151", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10008", + "_x": "1505", + "_y": "786", + "_width": "481", + "_height": "673", + "_frameX": "-15", + "_frameY": "-151", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10009", + "_x": "2981", + "_y": "752", + "_width": "487", + "_height": "724", + "_frameX": "0", + "_frameY": "-119", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10010", + "_x": "2981", + "_y": "752", + "_width": "487", + "_height": "724", + "_frameX": "0", + "_frameY": "-119", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10011", + "_x": "2981", + "_y": "752", + "_width": "487", + "_height": "724", + "_frameX": "0", + "_frameY": "-119", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10012", + "_x": "2011", + "_y": "779", + "_width": "472", + "_height": "736", + "_frameX": "-11", + "_frameY": "-83", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10013", + "_x": "2011", + "_y": "779", + "_width": "472", + "_height": "736", + "_frameX": "-11", + "_frameY": "-83", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10014", + "_x": "2011", + "_y": "779", + "_width": "472", + "_height": "736", + "_frameX": "-11", + "_frameY": "-83", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10015", + "_x": "2981", + "_y": "0", + "_width": "477", + "_height": "741", + "_frameX": "-7", + "_frameY": "-68", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10016", + "_x": "2981", + "_y": "0", + "_width": "477", + "_height": "741", + "_frameX": "-7", + "_frameY": "-68", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10017", + "_x": "2981", + "_y": "0", + "_width": "477", + "_height": "741", + "_frameX": "-7", + "_frameY": "-68", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10018", + "_x": "3478", + "_y": "752", + "_width": "472", + "_height": "741", + "_frameX": "-19", + "_frameY": "-56", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10019", + "_x": "3478", + "_y": "752", + "_width": "472", + "_height": "741", + "_frameX": "-19", + "_frameY": "-56", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10020", + "_x": "3478", + "_y": "752", + "_width": "472", + "_height": "741", + "_frameX": "-19", + "_frameY": "-56", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10021", + "_x": "3468", + "_y": "0", + "_width": "476", + "_height": "742", + "_frameX": "-22", + "_frameY": "-58", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10022", + "_x": "3468", + "_y": "0", + "_width": "476", + "_height": "742", + "_frameX": "-22", + "_frameY": "-58", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10023", + "_x": "3468", + "_y": "0", + "_width": "476", + "_height": "742", + "_frameX": "-22", + "_frameY": "-58", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10024", + "_x": "2011", + "_y": "0", + "_width": "479", + "_height": "769", + "_frameX": "-21", + "_frameY": "-33", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10025", + "_x": "2011", + "_y": "0", + "_width": "479", + "_height": "769", + "_frameX": "-21", + "_frameY": "-33", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10026", + "_x": "2011", + "_y": "0", + "_width": "479", + "_height": "769", + "_frameX": "-21", + "_frameY": "-33", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10027", + "_x": "1505", + "_y": "0", + "_width": "496", + "_height": "776", + "_frameX": "-9", + "_frameY": "-23", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10028", + "_x": "1505", + "_y": "0", + "_width": "496", + "_height": "776", + "_frameX": "-9", + "_frameY": "-23", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10029", + "_x": "1505", + "_y": "0", + "_width": "496", + "_height": "776", + "_frameX": "-9", + "_frameY": "-23", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10030", + "_x": "0", + "_y": "0", + "_width": "498", + "_height": "791", + "_frameX": "-13", + "_frameY": "-11", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10031", + "_x": "0", + "_y": "0", + "_width": "498", + "_height": "791", + "_frameX": "-13", + "_frameY": "-11", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10032", + "_x": "0", + "_y": "0", + "_width": "498", + "_height": "791", + "_frameX": "-13", + "_frameY": "-11", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10033", + "_x": "1005", + "_y": "0", + "_width": "490", + "_height": "802", + "_frameX": "-17", + "_frameY": "-5", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10034", + "_x": "1005", + "_y": "0", + "_width": "490", + "_height": "802", + "_frameX": "-17", + "_frameY": "-5", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10035", + "_x": "1005", + "_y": "0", + "_width": "490", + "_height": "802", + "_frameX": "-17", + "_frameY": "-5", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10036", + "_x": "508", + "_y": "0", + "_width": "487", + "_height": "808", + "_frameX": "-21", + "_frameY": "0", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10037", + "_x": "508", + "_y": "0", + "_width": "487", + "_height": "808", + "_frameX": "-21", + "_frameY": "0", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10038", + "_x": "508", + "_y": "0", + "_width": "487", + "_height": "808", + "_frameX": "-21", + "_frameY": "0", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10039", + "_x": "2500", + "_y": "0", + "_width": "471", + "_height": "770", + "_frameX": "-25", + "_frameY": "-39", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10040", + "_x": "2500", + "_y": "0", + "_width": "471", + "_height": "770", + "_frameX": "-25", + "_frameY": "-39", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10041", + "_x": "2500", + "_y": "0", + "_width": "471", + "_height": "770", + "_frameX": "-25", + "_frameY": "-39", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10042", + "_x": "2493", + "_y": "780", + "_width": "447", + "_height": "775", + "_frameX": "-30", + "_frameY": "-37", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10043", + "_x": "2493", + "_y": "780", + "_width": "447", + "_height": "775", + "_frameX": "-30", + "_frameY": "-37", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10044", + "_x": "2493", + "_y": "780", + "_width": "447", + "_height": "775", + "_frameX": "-30", + "_frameY": "-37", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10045", + "_x": "477", + "_y": "818", + "_width": "452", + "_height": "602", + "_frameX": "-29", + "_frameY": "-217", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10046", + "_x": "477", + "_y": "818", + "_width": "452", + "_height": "602", + "_frameX": "-29", + "_frameY": "-217", + "_frameWidth": "511", + "_frameHeight": "843" + }, + { + "_name": "SmokeBlurLeft instance 10047", + "_x": "477", + "_y": "818", + "_width": "452", + "_height": "602", + "_frameX": "-29", + "_frameY": "-217", + "_frameWidth": "511", + "_frameHeight": "843" + } + ], + "_imagePath": "smokeLeft.png" + } +} \ No newline at end of file diff --git a/sprites/tank/smokeLeft.png b/sprites/tank/smokeLeft.png new file mode 100644 index 0000000..f8c9dc4 Binary files /dev/null and b/sprites/tank/smokeLeft.png differ diff --git a/sprites/tank/smokeRight.json b/sprites/tank/smokeRight.json new file mode 100644 index 0000000..e30945d --- /dev/null +++ b/sprites/tank/smokeRight.json @@ -0,0 +1,535 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "SmokeRight instance 10000", + "_x": "0", + "_y": "897", + "_width": "533", + "_height": "885", + "_frameX": "-35", + "_frameY": "-47", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10001", + "_x": "1619", + "_y": "0", + "_width": "510", + "_height": "871", + "_frameX": "-38", + "_frameY": "-40", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10002", + "_x": "1619", + "_y": "0", + "_width": "510", + "_height": "871", + "_frameX": "-38", + "_frameY": "-40", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10003", + "_x": "1619", + "_y": "0", + "_width": "510", + "_height": "871", + "_frameX": "-38", + "_frameY": "-40", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10004", + "_x": "0", + "_y": "1792", + "_width": "501", + "_height": "871", + "_frameX": "-35", + "_frameY": "-32", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10005", + "_x": "0", + "_y": "1792", + "_width": "501", + "_height": "871", + "_frameX": "-35", + "_frameY": "-32", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10006", + "_x": "0", + "_y": "1792", + "_width": "501", + "_height": "871", + "_frameX": "-35", + "_frameY": "-32", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10007", + "_x": "1087", + "_y": "899", + "_width": "524", + "_height": "876", + "_frameX": "-24", + "_frameY": "-22", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10008", + "_x": "1087", + "_y": "899", + "_width": "524", + "_height": "876", + "_frameX": "-24", + "_frameY": "-22", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10009", + "_x": "1087", + "_y": "899", + "_width": "524", + "_height": "876", + "_frameX": "-24", + "_frameY": "-22", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10010", + "_x": "543", + "_y": "899", + "_width": "534", + "_height": "882", + "_frameX": "-16", + "_frameY": "-12", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10011", + "_x": "543", + "_y": "899", + "_width": "534", + "_height": "882", + "_frameX": "-16", + "_frameY": "-12", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10012", + "_x": "543", + "_y": "899", + "_width": "534", + "_height": "882", + "_frameX": "-16", + "_frameY": "-12", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10013", + "_x": "0", + "_y": "0", + "_width": "542", + "_height": "887", + "_frameX": "-2", + "_frameY": "-6", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10014", + "_x": "0", + "_y": "0", + "_width": "542", + "_height": "887", + "_frameX": "-2", + "_frameY": "-6", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10015", + "_x": "0", + "_y": "0", + "_width": "542", + "_height": "887", + "_frameX": "-2", + "_frameY": "-6", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10016", + "_x": "552", + "_y": "0", + "_width": "538", + "_height": "889", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10017", + "_x": "552", + "_y": "0", + "_width": "538", + "_height": "889", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10018", + "_x": "552", + "_y": "0", + "_width": "538", + "_height": "889", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10019", + "_x": "1621", + "_y": "881", + "_width": "535", + "_height": "830", + "_frameX": "0", + "_frameY": "-57", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10020", + "_x": "1621", + "_y": "881", + "_width": "535", + "_height": "830", + "_frameX": "0", + "_frameY": "-57", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10021", + "_x": "1621", + "_y": "881", + "_width": "535", + "_height": "830", + "_frameX": "0", + "_frameY": "-57", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10022", + "_x": "1621", + "_y": "1721", + "_width": "526", + "_height": "834", + "_frameX": "-5", + "_frameY": "-52", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10023", + "_x": "1621", + "_y": "1721", + "_width": "526", + "_height": "834", + "_frameX": "-5", + "_frameY": "-52", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10024", + "_x": "1621", + "_y": "1721", + "_width": "526", + "_height": "834", + "_frameX": "-5", + "_frameY": "-52", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10025", + "_x": "511", + "_y": "1792", + "_width": "525", + "_height": "815", + "_frameX": "-14", + "_frameY": "-68", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10026", + "_x": "511", + "_y": "1792", + "_width": "525", + "_height": "815", + "_frameX": "-14", + "_frameY": "-68", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10027", + "_x": "511", + "_y": "1792", + "_width": "525", + "_height": "815", + "_frameX": "-14", + "_frameY": "-68", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10028", + "_x": "2157", + "_y": "1721", + "_width": "515", + "_height": "738", + "_frameX": "-17", + "_frameY": "-146", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10029", + "_x": "2157", + "_y": "1721", + "_width": "515", + "_height": "738", + "_frameX": "-17", + "_frameY": "-146", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10030", + "_x": "2157", + "_y": "1721", + "_width": "515", + "_height": "738", + "_frameX": "-17", + "_frameY": "-146", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10031", + "_x": "2668", + "_y": "765", + "_width": "443", + "_height": "676", + "_frameX": "-32", + "_frameY": "-196", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10032", + "_x": "2668", + "_y": "765", + "_width": "443", + "_height": "676", + "_frameX": "-32", + "_frameY": "-196", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10033", + "_x": "2668", + "_y": "765", + "_width": "443", + "_height": "676", + "_frameX": "-32", + "_frameY": "-196", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10034", + "_x": "2668", + "_y": "0", + "_width": "481", + "_height": "755", + "_frameX": "-47", + "_frameY": "-149", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10035", + "_x": "2668", + "_y": "0", + "_width": "481", + "_height": "755", + "_frameX": "-47", + "_frameY": "-149", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10036", + "_x": "2668", + "_y": "0", + "_width": "481", + "_height": "755", + "_frameX": "-47", + "_frameY": "-149", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10037", + "_x": "1046", + "_y": "1791", + "_width": "508", + "_height": "802", + "_frameX": "-50", + "_frameY": "-121", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10038", + "_x": "1046", + "_y": "1791", + "_width": "508", + "_height": "802", + "_frameX": "-50", + "_frameY": "-121", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10039", + "_x": "1046", + "_y": "1791", + "_width": "508", + "_height": "802", + "_frameX": "-50", + "_frameY": "-121", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10040", + "_x": "2139", + "_y": "0", + "_width": "519", + "_height": "851", + "_frameX": "-37", + "_frameY": "-80", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10041", + "_x": "2139", + "_y": "0", + "_width": "519", + "_height": "851", + "_frameX": "-37", + "_frameY": "-80", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10042", + "_x": "2139", + "_y": "0", + "_width": "519", + "_height": "851", + "_frameX": "-37", + "_frameY": "-80", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10043", + "_x": "1100", + "_y": "0", + "_width": "509", + "_height": "878", + "_frameX": "-36", + "_frameY": "-60", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10044", + "_x": "1100", + "_y": "0", + "_width": "509", + "_height": "878", + "_frameX": "-36", + "_frameY": "-60", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10045", + "_x": "1100", + "_y": "0", + "_width": "509", + "_height": "878", + "_frameX": "-36", + "_frameY": "-60", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10046", + "_x": "0", + "_y": "897", + "_width": "533", + "_height": "885", + "_frameX": "-35", + "_frameY": "-47", + "_frameWidth": "568", + "_frameHeight": "938" + }, + { + "_name": "SmokeRight instance 10047", + "_x": "0", + "_y": "897", + "_width": "533", + "_height": "885", + "_frameX": "-35", + "_frameY": "-47", + "_frameWidth": "568", + "_frameHeight": "938" + } + ], + "_imagePath": "smokeRight.png" + } +} \ No newline at end of file diff --git a/sprites/tank/smokeRight.png b/sprites/tank/smokeRight.png new file mode 100644 index 0000000..8f93375 Binary files /dev/null and b/sprites/tank/smokeRight.png differ diff --git a/sprites/tank/tank0.json b/sprites/tank/tank0.json new file mode 100644 index 0000000..47bde96 --- /dev/null +++ b/sprites/tank/tank0.json @@ -0,0 +1,161 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "fg tankhead far right instance 10000", + "_x": "631", + "_y": "457", + "_width": "311", + "_height": "437", + "_frameX": "-3", + "_frameY": "-13", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10001", + "_x": "631", + "_y": "457", + "_width": "311", + "_height": "437", + "_frameX": "-3", + "_frameY": "-13", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10002", + "_x": "0", + "_y": "460", + "_width": "306", + "_height": "440", + "_frameX": "-3", + "_frameY": "-10", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10003", + "_x": "0", + "_y": "460", + "_width": "306", + "_height": "440", + "_frameX": "-3", + "_frameY": "-10", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10004", + "_x": "631", + "_y": "0", + "_width": "305", + "_height": "447", + "_frameX": "-2", + "_frameY": "-3", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10005", + "_x": "631", + "_y": "0", + "_width": "305", + "_height": "447", + "_frameX": "-2", + "_frameY": "-3", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10006", + "_x": "0", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10007", + "_x": "0", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-1", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10008", + "_x": "316", + "_y": "0", + "_width": "305", + "_height": "450", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10009", + "_x": "316", + "_y": "0", + "_width": "305", + "_height": "450", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10010", + "_x": "316", + "_y": "0", + "_width": "305", + "_height": "450", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10011", + "_x": "316", + "_y": "0", + "_width": "305", + "_height": "450", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10012", + "_x": "316", + "_y": "0", + "_width": "305", + "_height": "450", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10013", + "_x": "316", + "_y": "0", + "_width": "305", + "_height": "450", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "314", + "_frameHeight": "450" + } + ], + "_imagePath": "tank0.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tank0.png b/sprites/tank/tank0.png new file mode 100644 index 0000000..d3387f6 Binary files /dev/null and b/sprites/tank/tank0.png differ diff --git a/sprites/tank/tank1.json b/sprites/tank/tank1.json new file mode 100644 index 0000000..0d3426e --- /dev/null +++ b/sprites/tank/tank1.json @@ -0,0 +1,172 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "fg tankhead 5 instance 10000", + "_x": "0", + "_y": "388", + "_width": "472", + "_height": "113", + "_frameX": "0", + "_frameY": "-9", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10001", + "_x": "0", + "_y": "388", + "_width": "472", + "_height": "113", + "_frameX": "0", + "_frameY": "-9", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10002", + "_x": "0", + "_y": "262", + "_width": "468", + "_height": "116", + "_frameX": "-2", + "_frameY": "-6", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10003", + "_x": "0", + "_y": "262", + "_width": "468", + "_height": "116", + "_frameX": "-2", + "_frameY": "-6", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10004", + "_x": "0", + "_y": "132", + "_width": "460", + "_height": "120", + "_frameX": "-6", + "_frameY": "-2", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10005", + "_x": "0", + "_y": "132", + "_width": "460", + "_height": "120", + "_frameX": "-6", + "_frameY": "-2", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10006", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10007", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10008", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10009", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10010", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10011", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10012", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10013", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + }, + { + "_name": "fg tankhead 5 instance 10014", + "_x": "0", + "_y": "0", + "_width": "459", + "_height": "122", + "_frameX": "-6", + "_frameY": "0", + "_frameWidth": "472", + "_frameHeight": "122" + } + ], + "_imagePath": "tank1.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tank1.png b/sprites/tank/tank1.png new file mode 100644 index 0000000..ad82dec Binary files /dev/null and b/sprites/tank/tank1.png differ diff --git a/sprites/tank/tank2.json b/sprites/tank/tank2.json new file mode 100644 index 0000000..5b7dde2 --- /dev/null +++ b/sprites/tank/tank2.json @@ -0,0 +1,161 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "foreground man 3 instance 10000", + "_x": "595", + "_y": "327", + "_width": "293", + "_height": "305", + "_frameX": "-2", + "_frameY": "-17", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10001", + "_x": "595", + "_y": "327", + "_width": "293", + "_height": "305", + "_frameX": "-2", + "_frameY": "-17", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10002", + "_x": "0", + "_y": "331", + "_width": "288", + "_height": "310", + "_frameX": "-4", + "_frameY": "-12", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10003", + "_x": "0", + "_y": "331", + "_width": "288", + "_height": "310", + "_frameX": "-4", + "_frameY": "-12", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10004", + "_x": "595", + "_y": "0", + "_width": "288", + "_height": "317", + "_frameX": "-1", + "_frameY": "-5", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10005", + "_x": "595", + "_y": "0", + "_width": "288", + "_height": "317", + "_frameX": "-1", + "_frameY": "-5", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10006", + "_x": "0", + "_y": "0", + "_width": "288", + "_height": "321", + "_frameX": "0", + "_frameY": "-1", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10007", + "_x": "0", + "_y": "0", + "_width": "288", + "_height": "321", + "_frameX": "0", + "_frameY": "-1", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10008", + "_x": "298", + "_y": "0", + "_width": "287", + "_height": "322", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10009", + "_x": "298", + "_y": "0", + "_width": "287", + "_height": "322", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10010", + "_x": "298", + "_y": "0", + "_width": "287", + "_height": "322", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10011", + "_x": "298", + "_y": "0", + "_width": "287", + "_height": "322", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10012", + "_x": "298", + "_y": "0", + "_width": "287", + "_height": "322", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "295", + "_frameHeight": "322" + }, + { + "_name": "foreground man 3 instance 10013", + "_x": "298", + "_y": "0", + "_width": "287", + "_height": "322", + "_frameX": "0", + "_frameY": "0", + "_frameWidth": "295", + "_frameHeight": "322" + } + ], + "_imagePath": "tank2.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tank2.png b/sprites/tank/tank2.png new file mode 100644 index 0000000..15f280e Binary files /dev/null and b/sprites/tank/tank2.png differ diff --git a/sprites/tank/tank3.json b/sprites/tank/tank3.json new file mode 100644 index 0000000..3d3a134 --- /dev/null +++ b/sprites/tank/tank3.json @@ -0,0 +1,172 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "fg tankhead 4 instance 10000", + "_x": "0", + "_y": "422", + "_width": "590", + "_height": "124", + "_frameX": "0", + "_frameY": "-11", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10001", + "_x": "0", + "_y": "422", + "_width": "590", + "_height": "124", + "_frameX": "0", + "_frameY": "-11", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10002", + "_x": "0", + "_y": "286", + "_width": "585", + "_height": "126", + "_frameX": "-2", + "_frameY": "-9", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10003", + "_x": "0", + "_y": "286", + "_width": "585", + "_height": "126", + "_frameX": "-2", + "_frameY": "-9", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10004", + "_x": "0", + "_y": "145", + "_width": "580", + "_height": "131", + "_frameX": "-5", + "_frameY": "-4", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10005", + "_x": "0", + "_y": "145", + "_width": "580", + "_height": "131", + "_frameX": "-5", + "_frameY": "-4", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10006", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10007", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10008", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10009", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10010", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10011", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10012", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10013", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + }, + { + "_name": "fg tankhead 4 instance 10014", + "_x": "0", + "_y": "0", + "_width": "574", + "_height": "135", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "590", + "_frameHeight": "135" + } + ], + "_imagePath": "tank3.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tank3.png b/sprites/tank/tank3.png new file mode 100644 index 0000000..d3281b8 Binary files /dev/null and b/sprites/tank/tank3.png differ diff --git a/sprites/tank/tank4.json b/sprites/tank/tank4.json new file mode 100644 index 0000000..af7c006 --- /dev/null +++ b/sprites/tank/tank4.json @@ -0,0 +1,161 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "fg tankman bobbin 3 instance 10000", + "_x": "0", + "_y": "0", + "_width": "399", + "_height": "319", + "_frameX": "0", + "_frameY": "-11", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10001", + "_x": "0", + "_y": "0", + "_width": "399", + "_height": "319", + "_frameX": "0", + "_frameY": "-11", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10002", + "_x": "0", + "_y": "329", + "_width": "393", + "_height": "322", + "_frameX": "-4", + "_frameY": "-8", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10003", + "_x": "0", + "_y": "329", + "_width": "393", + "_height": "322", + "_frameX": "-4", + "_frameY": "-8", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10004", + "_x": "403", + "_y": "329", + "_width": "391", + "_height": "320", + "_frameX": "-8", + "_frameY": "-4", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10005", + "_x": "403", + "_y": "329", + "_width": "391", + "_height": "320", + "_frameX": "-8", + "_frameY": "-4", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10006", + "_x": "403", + "_y": "659", + "_width": "390", + "_height": "320", + "_frameX": "-10", + "_frameY": "-1", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10007", + "_x": "403", + "_y": "659", + "_width": "390", + "_height": "320", + "_frameX": "-10", + "_frameY": "-1", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10008", + "_x": "0", + "_y": "661", + "_width": "390", + "_height": "319", + "_frameX": "-11", + "_frameY": "0", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10009", + "_x": "0", + "_y": "661", + "_width": "390", + "_height": "319", + "_frameX": "-11", + "_frameY": "0", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10010", + "_x": "0", + "_y": "661", + "_width": "390", + "_height": "319", + "_frameX": "-11", + "_frameY": "0", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10011", + "_x": "0", + "_y": "661", + "_width": "390", + "_height": "319", + "_frameX": "-11", + "_frameY": "0", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10012", + "_x": "0", + "_y": "661", + "_width": "390", + "_height": "319", + "_frameX": "-11", + "_frameY": "0", + "_frameWidth": "401", + "_frameHeight": "330" + }, + { + "_name": "fg tankman bobbin 3 instance 10013", + "_x": "0", + "_y": "661", + "_width": "390", + "_height": "319", + "_frameX": "-11", + "_frameY": "0", + "_frameWidth": "401", + "_frameHeight": "330" + } + ], + "_imagePath": "tank4.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tank4.png b/sprites/tank/tank4.png new file mode 100644 index 0000000..a111eef Binary files /dev/null and b/sprites/tank/tank4.png differ diff --git a/sprites/tank/tank5.json b/sprites/tank/tank5.json new file mode 100644 index 0000000..f451fec --- /dev/null +++ b/sprites/tank/tank5.json @@ -0,0 +1,161 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "fg tankhead far right instance 10000", + "_x": "633", + "_y": "457", + "_width": "312", + "_height": "437", + "_frameX": "0", + "_frameY": "-13", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10001", + "_x": "633", + "_y": "457", + "_width": "312", + "_height": "437", + "_frameX": "0", + "_frameY": "-13", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10002", + "_x": "0", + "_y": "460", + "_width": "307", + "_height": "440", + "_frameX": "-5", + "_frameY": "-10", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10003", + "_x": "0", + "_y": "460", + "_width": "307", + "_height": "440", + "_frameX": "-5", + "_frameY": "-10", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10004", + "_x": "633", + "_y": "0", + "_width": "306", + "_height": "447", + "_frameX": "-7", + "_frameY": "-3", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10005", + "_x": "633", + "_y": "0", + "_width": "306", + "_height": "447", + "_frameX": "-7", + "_frameY": "-3", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10006", + "_x": "0", + "_y": "0", + "_width": "307", + "_height": "450", + "_frameX": "-7", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10007", + "_x": "0", + "_y": "0", + "_width": "307", + "_height": "450", + "_frameX": "-7", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10008", + "_x": "317", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10009", + "_x": "317", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10010", + "_x": "317", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10011", + "_x": "317", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10012", + "_x": "317", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + }, + { + "_name": "fg tankhead far right instance 10013", + "_x": "317", + "_y": "0", + "_width": "306", + "_height": "450", + "_frameX": "-9", + "_frameY": "0", + "_frameWidth": "315", + "_frameHeight": "450" + } + ], + "_imagePath": "tank5.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tank5.png b/sprites/tank/tank5.png new file mode 100644 index 0000000..b955747 Binary files /dev/null and b/sprites/tank/tank5.png differ diff --git a/sprites/tank/tankRolling.json b/sprites/tank/tankRolling.json new file mode 100644 index 0000000..07e4f40 --- /dev/null +++ b/sprites/tank/tankRolling.json @@ -0,0 +1,36 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "BG tank w lighting instance 10000", + "_x": "0", + "_y": "0", + "_width": "319", + "_height": "328" + }, + { + "_name": "BG tank w lighting instance 10001", + "_x": "0", + "_y": "332", + "_width": "318", + "_height": "325", + "_frameX": "-1", + "_frameY": "-3", + "_frameWidth": "319", + "_frameHeight": "328" + }, + { + "_name": "BG tank w lighting instance 10002", + "_x": "0", + "_y": "661", + "_width": "318", + "_height": "325", + "_frameX": "-1", + "_frameY": "-3", + "_frameWidth": "319", + "_frameHeight": "328" + } + ], + "_imagePath": "tankRolling.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tankRolling.png b/sprites/tank/tankRolling.png new file mode 100644 index 0000000..3575f6c Binary files /dev/null and b/sprites/tank/tankRolling.png differ diff --git a/sprites/tank/tankWatchtower.json b/sprites/tank/tankWatchtower.json new file mode 100644 index 0000000..1fe123a --- /dev/null +++ b/sprites/tank/tankWatchtower.json @@ -0,0 +1,161 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "watchtower gradient color instance 10000", + "_x": "0", + "_y": "0", + "_width": "369", + "_height": "679", + "_frameX": "0", + "_frameY": "-3", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10001", + "_x": "0", + "_y": "0", + "_width": "369", + "_height": "679", + "_frameX": "0", + "_frameY": "-3", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10002", + "_x": "373", + "_y": "0", + "_width": "367", + "_height": "680", + "_frameX": "-1", + "_frameY": "-2", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10003", + "_x": "373", + "_y": "0", + "_width": "367", + "_height": "680", + "_frameX": "-1", + "_frameY": "-2", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10004", + "_x": "744", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10005", + "_x": "744", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10006", + "_x": "744", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10007", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10008", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10009", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10010", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10011", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10012", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + }, + { + "_name": "watchtower gradient color instance 10013", + "_x": "1113", + "_y": "0", + "_width": "365", + "_height": "682", + "_frameX": "-2", + "_frameY": "0", + "_frameWidth": "369", + "_frameHeight": "682" + } + ], + "_imagePath": "tankWatchtower.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tankWatchtower.png b/sprites/tank/tankWatchtower.png new file mode 100644 index 0000000..30a72b4 Binary files /dev/null and b/sprites/tank/tankWatchtower.png differ diff --git a/sprites/tank/tankmanKilled1.json b/sprites/tank/tankmanKilled1.json new file mode 100644 index 0000000..6834e08 --- /dev/null +++ b/sprites/tank/tankmanKilled1.json @@ -0,0 +1,425 @@ +{ + "TextureAtlas": { + "SubTexture": [ + { + "_name": "John Shot 10000", + "_x": "0", + "_y": "2148", + "_width": "750", + "_height": "512", + "_frameX": "0", + "_frameY": "-67", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10001", + "_x": "2708", + "_y": "2101", + "_width": "807", + "_height": "615", + "_frameX": "-105", + "_frameY": "0", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10002", + "_x": "1808", + "_y": "2139", + "_width": "814", + "_height": "601", + "_frameX": "-98", + "_frameY": "-14", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10003", + "_x": "3227", + "_y": "624", + "_width": "840", + "_height": "605", + "_frameX": "-152", + "_frameY": "-13", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10004", + "_x": "1808", + "_y": "1556", + "_width": "896", + "_height": "579", + "_frameX": "-96", + "_frameY": "-39", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10005", + "_x": "3141", + "_y": "0", + "_width": "914", + "_height": "620", + "_frameX": "-130", + "_frameY": "0", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10006", + "_x": "2708", + "_y": "1556", + "_width": "935", + "_height": "541", + "_frameX": "-109", + "_frameY": "-79", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10007", + "_x": "3647", + "_y": "1233", + "_width": "426", + "_height": "608", + "_frameX": "-220", + "_frameY": "-14", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10008", + "_x": "3519", + "_y": "2101", + "_width": "534", + "_height": "466", + "_frameX": "-112", + "_frameY": "-156", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10009", + "_x": "3519", + "_y": "2571", + "_width": "521", + "_height": "466", + "_frameX": "-125", + "_frameY": "-156", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10010", + "_x": "3519", + "_y": "2571", + "_width": "521", + "_height": "466", + "_frameX": "-125", + "_frameY": "-156", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 10011", + "_x": "2626", + "_y": "2720", + "_width": "459", + "_height": "490", + "_frameX": "-187", + "_frameY": "-132", + "_frameWidth": "1044", + "_frameHeight": "622" + }, + { + "_name": "John Shot 20000", + "_x": "0", + "_y": "2664", + "_width": "597", + "_height": "429", + "_frameX": "-243", + "_frameY": "-212", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20001", + "_x": "0", + "_y": "1518", + "_width": "885", + "_height": "626", + "_frameX": "-215", + "_frameY": "-48", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20002", + "_x": "889", + "_y": "1556", + "_width": "915", + "_height": "592", + "_frameX": "-185", + "_frameY": "-82", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20003", + "_x": "1109", + "_y": "832", + "_width": "1055", + "_height": "720", + "_frameX": "-148", + "_frameY": "-66", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20004", + "_x": "2168", + "_y": "832", + "_width": "1055", + "_height": "720", + "_frameX": "-148", + "_frameY": "-66", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20005", + "_x": "2130", + "_y": "0", + "_width": "1007", + "_height": "828", + "_frameX": "-201", + "_frameY": "0", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20006", + "_x": "1117", + "_y": "0", + "_width": "1009", + "_height": "828", + "_frameX": "-199", + "_frameY": "0", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20007", + "_x": "0", + "_y": "768", + "_width": "1105", + "_height": "746", + "_frameX": "-108", + "_frameY": "-44", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20008", + "_x": "0", + "_y": "0", + "_width": "1113", + "_height": "764", + "_frameX": "-108", + "_frameY": "-44", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20009", + "_x": "754", + "_y": "2152", + "_width": "768", + "_height": "491", + "_frameX": "-13", + "_frameY": "-179", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20010", + "_x": "754", + "_y": "2152", + "_width": "768", + "_height": "491", + "_frameX": "-13", + "_frameY": "-179", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "John Shot 20011", + "_x": "754", + "_y": "2647", + "_width": "781", + "_height": "461", + "_frameX": "0", + "_frameY": "-209", + "_frameWidth": "1221", + "_frameHeight": "828" + }, + { + "_name": "tankman running0000", + "_x": "2045", + "_y": "2744", + "_width": "503", + "_height": "412", + "_frameX": "0", + "_frameY": "-10", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0001", + "_x": "2045", + "_y": "2744", + "_width": "503", + "_height": "412", + "_frameX": "0", + "_frameY": "-10", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0002", + "_x": "2045", + "_y": "2744", + "_width": "503", + "_height": "412", + "_frameX": "0", + "_frameY": "-10", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0003", + "_x": "1539", + "_y": "2744", + "_width": "502", + "_height": "417", + "_frameX": "-3", + "_frameY": "-11", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0004", + "_x": "1539", + "_y": "2744", + "_width": "502", + "_height": "417", + "_frameX": "-3", + "_frameY": "-11", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0005", + "_x": "3089", + "_y": "3041", + "_width": "434", + "_height": "426", + "_frameX": "-8", + "_frameY": "-50", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0006", + "_x": "3089", + "_y": "3041", + "_width": "434", + "_height": "426", + "_frameX": "-8", + "_frameY": "-50", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0007", + "_x": "0", + "_y": "3097", + "_width": "358", + "_height": "428", + "_frameX": "-116", + "_frameY": "0", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0008", + "_x": "0", + "_y": "3097", + "_width": "358", + "_height": "428", + "_frameX": "-116", + "_frameY": "0", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0009", + "_x": "0", + "_y": "3097", + "_width": "358", + "_height": "428", + "_frameX": "-116", + "_frameY": "0", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0010", + "_x": "3527", + "_y": "3041", + "_width": "366", + "_height": "426", + "_frameX": "-105", + "_frameY": "-7", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0011", + "_x": "3527", + "_y": "3041", + "_width": "366", + "_height": "426", + "_frameX": "-105", + "_frameY": "-7", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0012", + "_x": "1526", + "_y": "2152", + "_width": "262", + "_height": "415", + "_frameX": "-144", + "_frameY": "-63", + "_frameWidth": "505", + "_frameHeight": "478" + }, + { + "_name": "tankman running0013", + "_x": "1526", + "_y": "2152", + "_width": "262", + "_height": "415", + "_frameX": "-144", + "_frameY": "-63", + "_frameWidth": "505", + "_frameHeight": "478" + } + ], + "_imagePath": "tankmanKilled1.png" + } +} \ No newline at end of file diff --git a/sprites/tank/tankmanKilled1.png b/sprites/tank/tankmanKilled1.png new file mode 100644 index 0000000..b74d81e Binary files /dev/null and b/sprites/tank/tankmanKilled1.png differ diff --git a/stages/tank.json b/stages/tank.json new file mode 100644 index 0000000..47b5771 --- /dev/null +++ b/stages/tank.json @@ -0,0 +1,16 @@ +{ + "directory": "", + "defaultZoom": 0.9, + "isPixelStage": false, + + "boyfriend": [800, -250], + "girlfriend": [200, 100], + "opponent": [500, -200], + "hide_girlfriend": false, + + "camera_boyfriend": [100, -300], + "camera_opponent": [-500, 200], + "camera_girlfriend": [0, 0], + "camera_speed": 1, + "default": true +} diff --git a/stages/tank.lua b/stages/tank.lua new file mode 100644 index 0000000..1343627 --- /dev/null +++ b/stages/tank.lua @@ -0,0 +1,123 @@ +local myTypes = require("modules.types") +local rollingBGTank +local bgTankX = 300 +local bgTankY = 300 +local bgTankRotate = 0 +local watchtower, audience1, audience2, audience3, audience4, audience5, audience6 + +return { + onCreate = function(song) + local tankSky = myTypes.Image("images/tank/tankSky.png") + tankSky.layer = -10 + tankSky.position = myTypes.Vector2(-400, -400) + tankSky.modifer = 0 + + local tankMountains = myTypes.Image("images/tank/tankMountains.png") + tankMountains.layer = -9 + tankMountains.position = myTypes.Vector2(-280, -20) + tankMountains.modifier = 0.2 + tankMountains.resize = myTypes.Vector2(1.2, 1.2) + + local tankBuildings = myTypes.Image("images/tank/tankBuildings.png") + tankBuildings.position = myTypes.Vector2(-180, 0) + tankBuildings.modifier = 0.3 + tankBuildings.layer = -7 + tankBuildings.resize = myTypes.Vector2(1.1, 1.1) + + local tankRuins = myTypes.Image("images/tank/tankRuins.png") + tankRuins.position = myTypes.Vector2(-180, 0) + tankRuins.modifier = 0.35 + tankRuins.layer = -6 + tankRuins.resize = myTypes.Vector2(1.1, 1.1) + + local clouds = myTypes.Image("images/tank/tankClouds.png") + clouds.position = myTypes.Vector2(0, 0) + clouds.modifier = 0.4 + clouds.layer = -8 + + local smokeLeft = myTypes.Sprite("sprites/tank/smokeLeft.png", "sprites/tank/smokeLeft.json") + smokeLeft:PlayAnimation("SmokeBlurLeft", 24, true) + smokeLeft.position = myTypes.Vector2(-200, 0) + smokeLeft.modifier = 0.4 + smokeLeft.layer = -5 + + local smokeRight = myTypes.Sprite("sprites/tank/smokeRight.png", "sprites/tank/smokeRight.json") + smokeRight:PlayAnimation("SmokeRight", 24, true) + smokeRight.position = myTypes.Vector2(1100, -100) + smokeRight.modifier = 0.4 + smokeRight.layer = -5 + + watchtower = myTypes.Sprite("sprites/tank/tankWatchtower.png", "sprites/tank/tankWatchtower.json") + watchtower:PlayAnimation("watchtower gradient color", 24, false) + watchtower.position = myTypes.Vector2(100, 50) + watchtower.modifier = 0.5 + watchtower.layer = -4 + + rollingBGTank = myTypes.Sprite("sprites/tank/tankRolling.png", "sprites/tank/tankRolling.json") + rollingBGTank:PlayAnimation("BG tank w lighting", 24, true) + rollingBGTank.position = myTypes.Vector2(bgTankX, bgTankY) + rollingBGTank.modifier = 0.5 + rollingBGTank.layer = -3 + rollingBGTank.rotation = bgTankRotate + + local tankGround = myTypes.Image("images/tank/tankGround.png") + tankGround.position = myTypes.Vector2(-420, -150) + tankGround.layer = -2 + tankGround.resize = myTypes.Vector2(1.15, 1.15) + + audience1 = myTypes.Sprite("sprites/tank/tank0.png", "sprites/tank/tank0.json") + audience1:PlayAnimation("fg tankhead far right instance 1", 24, false) + audience1.position = myTypes.Vector2(-500, 650) + audience1.modifier = 1.5 + audience1.layer = 2 + + audience2 = myTypes.Sprite("sprites/tank/tank2.png", "sprites/tank/tank2.json") + audience2:PlayAnimation("foreground man 3 instance 1", 24, false) + audience2.position = myTypes.Vector2(360, 980) + audience2.modifier = 1.5 + audience2.layer = 3 + + audience3 = myTypes.Sprite("sprites/tank/tank3.png", "sprites/tank/tank3.json") + audience3:PlayAnimation("fg tankhead 4 instance 1", 24, false) + audience3.position = myTypes.Vector2(1050, 1240) + audience3.modifier = 2.5 + audience3.layer = 5 + + audience4 = myTypes.Sprite("sprites/tank/tank4.png", "sprites/tank/tank4.json") + audience4:PlayAnimation("fg tankman bobbin 3 instance 1", 24, false) + audience4.position = myTypes.Vector2(1200, 900) + audience4.modifier = 1.5 + audience4.layer = 4 + + audience5 = myTypes.Sprite("sprites/tank/tank5.png", "sprites/tank/tank5.json") + audience5:PlayAnimation("fg tankhead far right instance 1", 24, false) + audience5.position = myTypes.Vector2(1550, 700) + audience5.modifier = 1.5 + audience5.layer = 3 + + audience6 = myTypes.Sprite("sprites/tank/tank1.png", "sprites/tank/tank1.json") + audience6:PlayAnimation("fg tankhead 5 instance 1", 24, false) + audience6.position = myTypes.Vector2(-300, 750) + audience6.modifier = 1.5 + audience6.layer = 2 + end, + + onBeat = function(beat) + if beat % 2 == 0 then + watchtower:PlayAnimation("watchtower gradient color", 24, false) + audience1:PlayAnimation("fg tankhead far right instance 1", 24, false) + audience2:PlayAnimation("foreground man 3 instance 1", 24, false) + audience3:PlayAnimation("fg tankhead 4 instance 1", 24, false) + audience4:PlayAnimation("fg tankman bobbin 3 instance 1", 24, false) + audience5:PlayAnimation("fg tankhead far right instance 1", 24, false) + audience6:PlayAnimation("fg tankhead 5 instance 1", 24, false) + end + end, + + --zero fucking idea what im doing + onUpdate = function(dt) + bgTankX = math.sin(math.rad(0.1)) * 50 + bgTankY = math.cos(math.rad(0.1)) * 50 + bgTankRotate = bgTankRotate + 1 + end +} \ No newline at end of file diff --git a/videos/2hotCutscene.mp4 b/videos/2hotCutscene.mp4 deleted file mode 100644 index f0e62ed..0000000 Binary files a/videos/2hotCutscene.mp4 and /dev/null differ diff --git a/videos/blazinCutscene.ogv b/videos/blazinCutscene.ogv new file mode 100644 index 0000000..8c41cc2 Binary files /dev/null and b/videos/blazinCutscene.ogv differ diff --git a/videos/blazinCutscene.mp4 b/videos/blazinEndCutscene.mp4 similarity index 100% rename from videos/blazinCutscene.mp4 rename to videos/blazinEndCutscene.mp4 diff --git a/videos/toyCommercial.mp4 b/videos/darnellCutscene.ogv similarity index 68% rename from videos/toyCommercial.mp4 rename to videos/darnellCutscene.ogv index 98fa726..6540245 100644 Binary files a/videos/toyCommercial.mp4 and b/videos/darnellCutscene.ogv differ diff --git a/videos/encoding_info.txt b/videos/encoding_info.txt deleted file mode 100644 index d116c97..0000000 --- a/videos/encoding_info.txt +++ /dev/null @@ -1,45 +0,0 @@ -Hello there, -If you are reading this, I've likely already been captured, tortured, and murdered. -I'm sharing with you the secrets I know about The Funkin' Crew's secret formula for video encoding. - -This letter is meant for those of you who hate compression artifacts, -those who wince at h264 blocks, Those who share in my anguish of -blurring anytime static or confetti appear. - -These settings may not work for each and every application, -but I've found them to be a good tradeoff between quality, and filesize. - -Using Handbrake 1.8.2 (can likely use an earlier or later version) -This is a bit of an offshoot of the "Fast 720p30" preset, so you can start there. - -Filters -- Interlace Detection: Off -- Deinterlate: Off - -Video -- Video Encoder: H.265 (x265) - - Uses H.265 on the CPU encoder, since GPU/Hardware encoding has more artifacts. -- Framerate: Same as source - Constant Framerate -- Quality: Constant Quality RF21 - - The number can be tweaked as desired a lil bit - -- Preset: veryslow - - differences between slow and veryslow might be marginal -- Tune: Animation - - Different tuning could yield better results, I simply went with this one since it said animation! -- Profile: Auto -- Level: Auto - - 3.1 might be good for 720p @ 24fps - - -Audio -- Codec: AAC -- Biterate: close to whatever source bitrate is, max should be 192kbps prob - - -To whoever reads this, best wishes and good luck. -In my dying breaths, I will be thinking about a world with good -video compression. -Godspeed, and thank you for reading. - -- The Funkin' Crew Inc. diff --git a/videos/gunsCutscene.mp4 b/videos/gunsCutscene.mp4 deleted file mode 100644 index 807d88b..0000000 Binary files a/videos/gunsCutscene.mp4 and /dev/null differ diff --git a/videos/gunsCutscene.ogv b/videos/gunsCutscene.ogv new file mode 100644 index 0000000..5e53729 Binary files /dev/null and b/videos/gunsCutscene.ogv differ diff --git a/videos/stressCutscene.mp4 b/videos/stressCutscene.mp4 deleted file mode 100644 index 74a3619..0000000 Binary files a/videos/stressCutscene.mp4 and /dev/null differ diff --git a/videos/darnellCutscene.mp4 b/videos/stressCutscene.ogv similarity index 54% rename from videos/darnellCutscene.mp4 rename to videos/stressCutscene.ogv index 8f7f4f2..a225f0a 100644 Binary files a/videos/darnellCutscene.mp4 and b/videos/stressCutscene.ogv differ diff --git a/videos/ughCutscene.mp4 b/videos/ughCutscene.mp4 deleted file mode 100644 index 1526b89..0000000 Binary files a/videos/ughCutscene.mp4 and /dev/null differ