AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'KadeDev:master' into master

Browse Source
This commit is contained in:
CyndaquilDAC 2021-07-02 16:17:47 -05:00 committed by GitHub
commit 07ceac5502
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 139 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
assets/preload/music/freakyMenu.mp3
View File

Binary file not shown.

BIN
assets/preload/music/freakyMenu.ogg
View File

Binary file not shown.

BIN
assets/shared/images/NOTE_assets.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 692 KiB

After

Width:  |  Height:  |  Size: 654 KiB

94
assets/shared/images/NOTE_assets.xml
View File

@ -1,49 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="NOTE_assets.png">
<!-- Created with Adobe Animate version 21.0.7.42652 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="Blue Active0000" x="5" y="5" width="157" height="154"/>
<SubTexture name="Green Active0000" x="172" y="5" width="157" height="154"/>
<SubTexture name="Purple Active0000" x="339" y="5" width="154" height="157"/>
<SubTexture name="Red Active0000" x="503" y="5" width="154" height="157"/>
<SubTexture name="arrowDOWN0000" x="1809" y="5" width="157" height="154"/>
<SubTexture name="arrowLEFT0000" x="5" y="172" width="155" height="156"/>
<SubTexture name="arrowRIGHT0000" x="170" y="172" width="154" height="157"/>
<SubTexture name="arrowUP0000" x="334" y="172" width="157" height="154"/>
<SubTexture name="blue0000" x="667" y="5" width="157" height="154"/>
<SubTexture name="blue hold end0000" x="834" y="5" width="50" height="64"/>
<SubTexture name="blue hold piece0000" x="894" y="5" width="50" height="44"/>
<SubTexture name="down confirm0000" x="501" y="172" width="244" height="240"/>
<SubTexture name="down confirm0001" x="755" y="172" width="244" height="240"/>
<SubTexture name="down confirm0002" x="1009" y="172" width="214" height="210" frameX="-15" frameY="-15" frameWidth="244" frameHeight="240"/>
<SubTexture name="down press0000" x="1233" y="172" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0001" x="1233" y="172" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0002" x="1385" y="172" width="149" height="146"/>
<SubTexture name="green0000" x="954" y="5" width="157" height="154"/>
<SubTexture name="green hold end0000" x="1121" y="5" width="50" height="64"/>
<SubTexture name="green hold piece0000" x="1181" y="5" width="50" height="44"/>
<SubTexture name="left confirm0000" x="1544" y="172" width="231" height="235"/>
<SubTexture name="left confirm0001" x="1785" y="172" width="231" height="235"/>
<SubTexture name="left confirm0002" x="5" y="422" width="210" height="214" frameX="-11" frameY="-12" frameWidth="231" frameHeight="235"/>
<SubTexture name="left press0000" x="225" y="422" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0001" x="225" y="422" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0002" x="375" y="422" width="146" height="149"/>
<SubTexture name="pruple end hold0000" x="1241" y="5" width="50" height="64"/>
<SubTexture name="purple0000" x="1301" y="5" width="154" height="157"/>
<SubTexture name="purple hold piece0000" x="1465" y="5" width="50" height="44"/>
<SubTexture name="red0000" x="1525" y="5" width="154" height="157"/>
<SubTexture name="red hold end0000" x="1689" y="5" width="50" height="64"/>
<SubTexture name="red hold piece0000" x="1749" y="5" width="50" height="44"/>
<SubTexture name="right confirm0000" x="531" y="422" width="237" height="241"/>
<SubTexture name="right confirm0001" x="778" y="422" width="237" height="241"/>
<SubTexture name="right confirm0002" x="1025" y="422" width="210" height="214" frameX="-13" frameY="-14" frameWidth="237" frameHeight="241"/>
<SubTexture name="right press0000" x="1245" y="422" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0001" x="1245" y="422" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0002" x="1393" y="422" width="148" height="151"/>
<SubTexture name="up confirm0000" x="1551" y="422" width="238" height="234"/>
<SubTexture name="up confirm0001" x="1799" y="422" width="238" height="234"/>
<SubTexture name="up confirm0002" x="5" y="673" width="212" height="209" frameX="-13" frameY="-12" frameWidth="238" frameHeight="234"/>
<SubTexture name="up press0000" x="227" y="673" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="227" y="673" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="381" y="673" width="153" height="150"/>
</TextureAtlas>
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="NOTE_assets.png">
<!-- Created with Adobe Animate version 21.0.7.42652 -->
<!-- http://www.adobe.com/products/animate.html -->
<SubTexture name="arrowDOWN0000" x="1147" y="5" width="157" height="154"/>
<SubTexture name="arrowLEFT0000" x="1314" y="5" width="155" height="156"/>
<SubTexture name="arrowRIGHT0000" x="1479" y="5" width="154" height="157"/>
<SubTexture name="arrowUP0000" x="1643" y="5" width="157" height="154"/>
<SubTexture name="blue0000" x="5" y="5" width="157" height="154"/>
<SubTexture name="blue hold end0000" x="172" y="5" width="50" height="64"/>
<SubTexture name="blue hold piece0000" x="232" y="5" width="50" height="44"/>
<SubTexture name="down confirm0000" x="5" y="172" width="244" height="240"/>
<SubTexture name="down confirm0001" x="259" y="172" width="244" height="240"/>
<SubTexture name="down confirm0002" x="513" y="172" width="214" height="210" frameX="-15" frameY="-15" frameWidth="244" frameHeight="240"/>
<SubTexture name="down press0000" x="737" y="172" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0001" x="737" y="172" width="142" height="140" frameX="-4" frameY="-2" frameWidth="149" frameHeight="146"/>
<SubTexture name="down press0002" x="889" y="172" width="149" height="146"/>
<SubTexture name="green0000" x="292" y="5" width="157" height="154"/>
<SubTexture name="green hold end0000" x="459" y="5" width="50" height="64"/>
<SubTexture name="green hold piece0000" x="519" y="5" width="50" height="44"/>
<SubTexture name="left confirm0000" x="1048" y="172" width="231" height="235"/>
<SubTexture name="left confirm0001" x="1289" y="172" width="231" height="235"/>
<SubTexture name="left confirm0002" x="1530" y="172" width="210" height="214" frameX="-11" frameY="-12" frameWidth="231" frameHeight="235"/>
<SubTexture name="left press0000" x="1750" y="172" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0001" x="1750" y="172" width="140" height="142" frameX="-3" frameY="-3" frameWidth="146" frameHeight="149"/>
<SubTexture name="left press0002" x="5" y="422" width="146" height="149"/>
<SubTexture name="pruple end hold0000" x="579" y="5" width="50" height="64"/>
<SubTexture name="purple0000" x="639" y="5" width="154" height="157"/>
<SubTexture name="purple hold piece0000" x="803" y="5" width="50" height="44"/>
<SubTexture name="red0000" x="863" y="5" width="154" height="157"/>
<SubTexture name="red hold end0000" x="1027" y="5" width="50" height="64"/>
<SubTexture name="red hold piece0000" x="1087" y="5" width="50" height="44"/>
<SubTexture name="right confirm0000" x="161" y="422" width="237" height="241"/>
<SubTexture name="right confirm0001" x="408" y="422" width="237" height="241"/>
<SubTexture name="right confirm0002" x="655" y="422" width="210" height="214" frameX="-13" frameY="-14" frameWidth="237" frameHeight="241"/>
<SubTexture name="right press0000" x="875" y="422" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0001" x="875" y="422" width="138" height="141" frameX="-3" frameY="-7" frameWidth="148" frameHeight="151"/>
<SubTexture name="right press0002" x="1023" y="422" width="148" height="151"/>
<SubTexture name="up confirm0000" x="1181" y="422" width="238" height="234"/>
<SubTexture name="up confirm0001" x="1429" y="422" width="238" height="234"/>
<SubTexture name="up confirm0002" x="1677" y="422" width="212" height="209" frameX="-13" frameY="-12" frameWidth="238" frameHeight="234"/>
<SubTexture name="up press0000" x="1899" y="422" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0001" x="1899" y="422" width="144" height="141" frameX="-5" frameY="-4" frameWidth="153" frameHeight="150"/>
<SubTexture name="up press0002" x="5" y="673" width="153" height="150"/>
</TextureAtlas>

16
source/FreeplayState.hx
View File

@ -64,6 +64,21 @@ class FreeplayState extends MusicBeatState
{
var data:Array<String> = initSonglist[i].split(':');
var meta = new SongMetadata(data[0], Std.parseInt(data[2]), data[1]);
#if debug
songs.push(meta);
var format = StringTools.replace(meta.songName, " ", "-");
switch (format) {
case 'Dad-Battle': format = 'Dadbattle';
case 'Philly-Nice': format = 'Philly';
}
var diffs = [];
FreeplayState.loadDiff(0,format,meta.songName,diffs);
FreeplayState.loadDiff(1,format,meta.songName,diffs);
FreeplayState.loadDiff(2,format,meta.songName,diffs);
FreeplayState.songData.set(meta.songName,diffs);
trace('loaded diffs for ' + meta.songName);
#else
if(Std.parseInt(data[2]) <= FlxG.save.data.weekUnlocked - 1)
{
songs.push(meta);
@ -80,6 +95,7 @@ class FreeplayState extends MusicBeatState
FreeplayState.songData.set(meta.songName,diffs);
trace('loaded diffs for ' + meta.songName);
}
#end
}
//trace("\n" + diffList);

2
source/KeyBindMenu.hx
View File

@ -320,7 +320,7 @@ class KeyBindMenu extends FlxSubState
var shouldReturn:Bool = true;
var notAllowed:Array<String> = ["START", "RIGHT_TRIGGER", "LEFT_TRIGGER"];
var notAllowed:Array<String> = ["START"];
for(x in 0...gpKeys.length)
{

24
source/Note.hx
View File

@ -99,20 +99,20 @@ class Note extends FlxSprite
default:
frames = Paths.getSparrowAtlas('NOTE_assets');
animation.addByPrefix('greenScroll', 'green instance 1');
animation.addByPrefix('redScroll', 'red instance 1');
animation.addByPrefix('blueScroll', 'blue instance 1');
animation.addByPrefix('purpleScroll', 'purple instance 1');
animation.addByPrefix('greenScroll', 'green0');
animation.addByPrefix('redScroll', 'red0');
animation.addByPrefix('blueScroll', 'blue0');
animation.addByPrefix('purpleScroll', 'purple0');
animation.addByPrefix('purpleholdend', 'pruple end hold instance 1');
animation.addByPrefix('greenholdend', 'green hold end instance 1');
animation.addByPrefix('redholdend', 'red hold end instance 1');
animation.addByPrefix('blueholdend', 'blue hold end instance 1');
animation.addByPrefix('purpleholdend', 'pruple end hold');
animation.addByPrefix('greenholdend', 'green hold end');
animation.addByPrefix('redholdend', 'red hold end');
animation.addByPrefix('blueholdend', 'blue hold end');
animation.addByPrefix('purplehold', 'purple hold piece instance 1');
animation.addByPrefix('greenhold', 'green hold piece instance 1');
animation.addByPrefix('redhold', 'red hold piece instance 1');
animation.addByPrefix('bluehold', 'blue hold piece instance 1');
animation.addByPrefix('purplehold', 'purple hold piece');
animation.addByPrefix('greenhold', 'green hold piece');
animation.addByPrefix('redhold', 'red hold piece');
animation.addByPrefix('bluehold', 'blue hold piece');
setGraphicSize(Std.int(width * 0.7));
updateHitbox();

88
source/PlayState.hx
View File

@ -1735,70 +1735,70 @@ class PlayState extends MusicBeatState
case 'normal':
babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
babyArrow.animation.addByPrefix('green', 'arrow static instance 1');
babyArrow.animation.addByPrefix('blue', 'arrow static instance 2');
babyArrow.animation.addByPrefix('purple', 'arrow static instance 3');
babyArrow.animation.addByPrefix('red', 'arrow static instance 4');
babyArrow.animation.addByPrefix('green', 'arrowUP');
babyArrow.animation.addByPrefix('blue', 'arrowDOWN');
babyArrow.animation.addByPrefix('purple', 'arrowLEFT');
babyArrow.animation.addByPrefix('red', 'arrowRIGHT');
babyArrow.antialiasing = true;
babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7));
switch (Math.abs(i))
{
case 0:
babyArrow.x += Note.swagWidth * 0;
babyArrow.animation.addByPrefix('static', 'arrow static instance 1');
babyArrow.animation.addByPrefix('pressed', 'left press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'left confirm instance 1', 24, false);
case 1:
babyArrow.x += Note.swagWidth * 1;
babyArrow.animation.addByPrefix('static', 'arrow static instance 2');
babyArrow.animation.addByPrefix('pressed', 'down press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'down confirm instance 1', 24, false);
case 2:
babyArrow.x += Note.swagWidth * 2;
babyArrow.animation.addByPrefix('static', 'arrow static instance 4');
babyArrow.animation.addByPrefix('pressed', 'up press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'up confirm instance 1', 24, false);
babyArrow.animation.addByPrefix('static', 'arrowUP');
babyArrow.animation.addByPrefix('pressed', 'up press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'up confirm', 24, false);
case 3:
babyArrow.x += Note.swagWidth * 3;
babyArrow.animation.addByPrefix('static', 'arrow static instance 3');
babyArrow.animation.addByPrefix('pressed', 'right press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'right confirm instance 1', 24, false);
}
babyArrow.animation.addByPrefix('static', 'arrowRIGHT');
babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
case 1:
babyArrow.x += Note.swagWidth * 1;
babyArrow.animation.addByPrefix('static', 'arrowDOWN');
babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
case 0:
babyArrow.x += Note.swagWidth * 0;
babyArrow.animation.addByPrefix('static', 'arrowLEFT');
babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
}
default:
babyArrow.frames = Paths.getSparrowAtlas('NOTE_assets');
babyArrow.animation.addByPrefix('green', 'arrow static instance 1');
babyArrow.animation.addByPrefix('blue', 'arrow static instance 2');
babyArrow.animation.addByPrefix('purple', 'arrow static instance 3');
babyArrow.animation.addByPrefix('red', 'arrow static instance 4');
babyArrow.animation.addByPrefix('green', 'arrowUP');
babyArrow.animation.addByPrefix('blue', 'arrowDOWN');
babyArrow.animation.addByPrefix('purple', 'arrowLEFT');
babyArrow.animation.addByPrefix('red', 'arrowRIGHT');
babyArrow.antialiasing = true;
babyArrow.setGraphicSize(Std.int(babyArrow.width * 0.7));
switch (Math.abs(i))
{
case 0:
babyArrow.x += Note.swagWidth * 0;
babyArrow.animation.addByPrefix('static', 'arrow static instance 1');
babyArrow.animation.addByPrefix('pressed', 'left press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'left confirm instance 1', 24, false);
case 1:
babyArrow.x += Note.swagWidth * 1;
babyArrow.animation.addByPrefix('static', 'arrow static instance 2');
babyArrow.animation.addByPrefix('pressed', 'down press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'down confirm instance 1', 24, false);
case 2:
babyArrow.x += Note.swagWidth * 2;
babyArrow.animation.addByPrefix('static', 'arrow static instance 4');
babyArrow.animation.addByPrefix('pressed', 'up press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'up confirm instance 1', 24, false);
babyArrow.animation.addByPrefix('static', 'arrowUP');
babyArrow.animation.addByPrefix('pressed', 'up press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'up confirm', 24, false);
case 3:
babyArrow.x += Note.swagWidth * 3;
babyArrow.animation.addByPrefix('static', 'arrow static instance 3');
babyArrow.animation.addByPrefix('pressed', 'right press instance 1', 24, false);
babyArrow.animation.addByPrefix('confirm', 'right confirm instance 1', 24, false);
babyArrow.animation.addByPrefix('static', 'arrowRIGHT');
babyArrow.animation.addByPrefix('pressed', 'right press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'right confirm', 24, false);
case 1:
babyArrow.x += Note.swagWidth * 1;
babyArrow.animation.addByPrefix('static', 'arrowDOWN');
babyArrow.animation.addByPrefix('pressed', 'down press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'down confirm', 24, false);
case 0:
babyArrow.x += Note.swagWidth * 0;
babyArrow.animation.addByPrefix('static', 'arrowLEFT');
babyArrow.animation.addByPrefix('pressed', 'left press', 24, false);
babyArrow.animation.addByPrefix('confirm', 'left confirm', 24, false);
}
}
@ -2682,7 +2682,7 @@ class PlayState extends MusicBeatState
});
}
if (!inCutscene)
if (!inCutscene && songStarted)
keyShit();

22
source/StoryMenuState.hx
View File

@ -78,7 +78,14 @@ class StoryMenuState extends MusicBeatState
function unlockWeeks():Array<Bool>
{
var weeks:Array<Bool> = [true];
var weeks:Array<Bool> = [];
#if debug
for(i in 0...weekNames.length)
weeks.push(true);
return weeks;
#end
weeks.push(true);
for(i in 0...FlxG.save.data.weekUnlocked)
{
@ -212,6 +219,19 @@ class StoryMenuState extends MusicBeatState
updateText();
var bullShit:Int = 0;
for (item in grpWeekText.members)
{
item.targetY = bullShit - curWeek;
if (item.targetY == Std.int(0) && weekUnlocked[curWeek])
item.alpha = 1;
else
item.alpha = 0.6;
bullShit++;
}
trace("Line 165");
super.create();