You can now play as Pico.
Press "P" to swap to and from pico. Currently lackluster.
This commit is contained in:
parent
c4f376d61f
commit
fddc016e4f
@ -159,8 +159,8 @@
|
||||
85
|
||||
],
|
||||
"camera_position": [
|
||||
-300,
|
||||
0
|
||||
-400,
|
||||
125
|
||||
],
|
||||
"sing_duration": 4,
|
||||
"scale": 1,
|
||||
|
2376
charts/dad-battle/dad-battle-easy-pico.json
Normal file
2376
charts/dad-battle/dad-battle-easy-pico.json
Normal file
File diff suppressed because it is too large
Load Diff
3003
charts/dad-battle/dad-battle-hard-pico.json
Normal file
3003
charts/dad-battle/dad-battle-hard-pico.json
Normal file
File diff suppressed because it is too large
Load Diff
2886
charts/dad-battle/dad-battle-normal-pico.json
Normal file
2886
charts/dad-battle/dad-battle-normal-pico.json
Normal file
File diff suppressed because it is too large
Load Diff
10
charts/picoSongs.lua
Normal file
10
charts/picoSongs.lua
Normal file
@ -0,0 +1,10 @@
|
||||
return {
|
||||
{
|
||||
name = "dad-battle",
|
||||
difficulties = {
|
||||
"easy",
|
||||
"normal",
|
||||
"hard"
|
||||
}
|
||||
}
|
||||
}
|
43
main.lua
43
main.lua
@ -8,6 +8,8 @@ local logging = require("modules.logging")
|
||||
|
||||
local songs = require("charts.songs")
|
||||
|
||||
curChar = "bf" --this needs to be global
|
||||
|
||||
local curSong = songs[1]
|
||||
local curIndex = 1
|
||||
local evilCurIndex = 1
|
||||
@ -17,6 +19,8 @@ local curDiff = songs[1].difficulties[1]
|
||||
local curDiffInd = 1
|
||||
|
||||
local diffIMG
|
||||
local charIcon
|
||||
local iconNum = math.random(1,3)
|
||||
|
||||
local curState = nil
|
||||
local stateLoaded = false
|
||||
@ -27,6 +31,8 @@ local bg
|
||||
local logo
|
||||
local gf
|
||||
local freaky = love.audio.newSource("sounds/freakyMenu.ogg", "stream")
|
||||
local charSwapSND = love.audio.newSource("sounds/CS_select.ogg", "stream")
|
||||
charSwapSND:setVolume(0.25)
|
||||
|
||||
local left
|
||||
|
||||
@ -57,6 +63,12 @@ local function setup()
|
||||
diffIMG.position = myTypes.Vector2(200, 320)
|
||||
diffIMG.layer = 2
|
||||
|
||||
charIcon = myTypes.Sprite("sprites/menu/charIcons.png", "sprites/menu/charIcons.json")
|
||||
charIcon:PlayAnimation(curChar..iconNum, 24, false)
|
||||
charIcon.position = myTypes.Vector2(175, 100)
|
||||
charIcon.resize = myTypes.Vector2(0.25, 0.25) --this doesnt work and idk why
|
||||
charIcon.layer = 2 --since they won't overlap this is ok i think
|
||||
|
||||
freaky:play()
|
||||
end
|
||||
|
||||
@ -197,6 +209,37 @@ function love.keypressed(key, un, is)
|
||||
diffIMG:PlayAnimation(curDiff, 24, true)
|
||||
scroll:stop()
|
||||
scroll:play()
|
||||
elseif key == "p" then --changes character to/from pico hopefully
|
||||
if curChar == "bf" then
|
||||
songs = require("charts.picoSongs") --change which catalogue is available
|
||||
--reset the index's nd shit
|
||||
curSong = songs[1]
|
||||
curIndex = 1
|
||||
evilCurIndex = 1
|
||||
curDiffInd = 1
|
||||
curDiffList = songs[curIndex].difficulties
|
||||
curDiff = curDiffList[1]
|
||||
diffIMG:PlayAnimation(curDiff, 24, true)
|
||||
curChar = "pico"
|
||||
iconNum = math.random(1,3)
|
||||
charIcon:PlayAnimation(curChar..iconNum, 24, false)
|
||||
charSwapSND:stop()
|
||||
charSwapSND:play()
|
||||
else
|
||||
songs = require("charts.songs")
|
||||
curSong = songs[1]
|
||||
curIndex = 1
|
||||
evilCurIndex = 1
|
||||
curDiffInd = 1
|
||||
curDiffList = songs[curIndex].difficulties
|
||||
curDiff = curDiffList[1]
|
||||
diffIMG:PlayAnimation(curDiff, 24, true)
|
||||
curChar = "bf"
|
||||
iconNum = math.random(1,3)
|
||||
charIcon:PlayAnimation(curChar..iconNum, 24, false)
|
||||
charSwapSND:stop()
|
||||
charSwapSND:play()
|
||||
end
|
||||
elseif tonumber(key) and tonumber(key) < 5 then
|
||||
if key == "0" then
|
||||
settings.Downscroll = not settings.Downscroll
|
||||
|
@ -13,7 +13,12 @@ local function state(songName, songDifficulty)
|
||||
|
||||
local startTime = 0
|
||||
|
||||
local chartString = files.read_file(string.format("charts/%s/%s-%s.json", songName, songName, songDifficulty))
|
||||
local chartString
|
||||
if curChar == "bf" then
|
||||
chartString = files.read_file(string.format("charts/%s/%s-%s.json", songName, songName, songDifficulty))
|
||||
else
|
||||
chartString = files.read_file(string.format("charts/%s/%s-%s-%s.json", songName, songName, songDifficulty, curChar))
|
||||
end
|
||||
if not chartString then
|
||||
error("Chart couldn't be loaded!")
|
||||
end
|
||||
|
BIN
songs/Dad Battle Pico/Inst.ogg
Normal file
BIN
songs/Dad Battle Pico/Inst.ogg
Normal file
Binary file not shown.
BIN
songs/Dad Battle Pico/Voices.ogg
Normal file
BIN
songs/Dad Battle Pico/Voices.ogg
Normal file
Binary file not shown.
BIN
sounds/CS_select.ogg
Normal file
BIN
sounds/CS_select.ogg
Normal file
Binary file not shown.
73
sprites/menu/charIcons.json
Normal file
73
sprites/menu/charIcons.json
Normal file
@ -0,0 +1,73 @@
|
||||
{
|
||||
"TextureAtlas": {
|
||||
"SubTexture": [
|
||||
{
|
||||
"_name": "bf10000",
|
||||
"_x": "356",
|
||||
"_y": "0",
|
||||
"_width": "386",
|
||||
"_height": "258",
|
||||
"_frameX": "2",
|
||||
"_frameY": "2",
|
||||
"_frameWidth": "382",
|
||||
"_frameHeight": "254"
|
||||
},
|
||||
{
|
||||
"_name": "bf20000",
|
||||
"_x": "742",
|
||||
"_y": "0",
|
||||
"_width": "374",
|
||||
"_height": "258",
|
||||
"_frameX": "2",
|
||||
"_frameY": "2",
|
||||
"_frameWidth": "370",
|
||||
"_frameHeight": "254"
|
||||
},
|
||||
{
|
||||
"_name": "bf30000",
|
||||
"_x": "0",
|
||||
"_y": "321",
|
||||
"_width": "384",
|
||||
"_height": "258",
|
||||
"_frameX": "2",
|
||||
"_frameY": "2",
|
||||
"_frameWidth": "380",
|
||||
"_frameHeight": "254"
|
||||
},
|
||||
{
|
||||
"_name": "pico10000",
|
||||
"_x": "384",
|
||||
"_y": "321",
|
||||
"_width": "318",
|
||||
"_height": "258",
|
||||
"_frameX": "2",
|
||||
"_frameY": "2",
|
||||
"_frameWidth": "314",
|
||||
"_frameHeight": "254"
|
||||
},
|
||||
{
|
||||
"_name": "pico20000",
|
||||
"_x": "742",
|
||||
"_y": "258",
|
||||
"_width": "331",
|
||||
"_height": "258",
|
||||
"_frameX": "2",
|
||||
"_frameY": "2",
|
||||
"_frameWidth": "327",
|
||||
"_frameHeight": "254"
|
||||
},
|
||||
{
|
||||
"_name": "pico30000",
|
||||
"_x": "0",
|
||||
"_y": "0",
|
||||
"_width": "356",
|
||||
"_height": "321",
|
||||
"_frameX": "2",
|
||||
"_frameY": "2",
|
||||
"_frameWidth": "352",
|
||||
"_frameHeight": "317"
|
||||
}
|
||||
],
|
||||
"_imagePath": "sprites/menu/charIcons.png"
|
||||
}
|
||||
}
|
BIN
sprites/menu/charIcons.png
Normal file
BIN
sprites/menu/charIcons.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 164 KiB |
Loading…
x
Reference in New Issue
Block a user