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

Merge branch 'master' of https://github.com/KadeDev/Kade-Engine

Browse Source
This commit is contained in:
Kade M 2021-06-05 11:49:17 -07:00
commit d52d450ce0
9 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Project.xml
View File

@ -2,7 +2,7 @@
<project>
<!-- _________________________ Application Settings _________________________ -->
<app title="Friday Night Funkin' Kade Engine" file="Kade Engine" packageName="com.ninjamuffin99.funkin" package="com.ninjamuffin99.funkin" main="Main" version="0.2.7.1" company="ninjamuffin99" />
<app title="Friday Night Funkin' Kade Engine" file="Kade Engine" packageName="com.kadedev.kadeengine" package="com.kadedev.kadeengine" main="Main" version="0.2.7.1" company="kadedev" />
<!--Switch Export with Unique ApplicationID and Icon-->
<set name="APP_ID" value="0x0100f6c013bbc000" />

4
assets/preload/images/alphabet.xml
View File

@ -14,10 +14,6 @@
<SubTexture name="%0001" x="673" y="202" width="46" height="52"/>
<SubTexture name="%0002" x="850" y="243" width="45" height="52" frameX="0" frameY="0" frameWidth="46" frameHeight="52"/>
<SubTexture name="%0003" x="850" y="243" width="45" height="52" frameX="0" frameY="0" frameWidth="46" frameHeight="52"/>
<SubTexture name="&0000" x="410" y="307" width="36" height="58" pivotX="0" pivotY="0"/>
<SubTexture name="&0001" x="410" y="307" width="36" height="58"/>
<SubTexture name="&0002" x="563" y="307" width="36" height="58"/>
<SubTexture name="&0003" x="563" y="307" width="36" height="58"/>
<SubTexture name="(0000" x="554" y="196" width="26" height="57" pivotX="0" pivotY="0.15"/>
<SubTexture name="(0001" x="554" y="196" width="26" height="57"/>
<SubTexture name="(0002" x="254" y="202" width="26" height="56" frameX="0" frameY="0" frameWidth="26" frameHeight="57"/>

2
source/BackgroundDancer.hx
View File

@ -9,7 +9,7 @@ class BackgroundDancer extends FlxSprite
{
super(x, y);
frames = Paths.getSparrowAtlas("limo/limoDancer");
frames = Paths.getSparrowAtlas("limo/limoDancer",'week4');
animation.addByIndices('danceLeft', 'bg dancer sketch PINK', [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14], "", 24, false);
animation.addByIndices('danceRight', 'bg dancer sketch PINK', [15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29], "", 24, false);
animation.play('danceLeft');

2
source/BackgroundGirls.hx
View File

@ -10,7 +10,7 @@ class BackgroundGirls extends FlxSprite
super(x, y);
// BG fangirls dissuaded
frames = Paths.getSparrowAtlas('weeb/bgFreaks');
frames = Paths.getSparrowAtlas('weeb/bgFreaks','week6');
animation.addByIndices('danceLeft', 'BG girls group', CoolUtil.numberArray(14), "", 24, false);
animation.addByIndices('danceRight', 'BG girls group', CoolUtil.numberArray(30, 15), "", 24, false);

1
source/Character.hx
View File

@ -537,6 +537,7 @@ class Character extends FlxSprite
dadVar = 6.1;
if (holdTimer >= Conductor.stepCrochet * dadVar * 0.001)
{
trace('dance');
dance();
holdTimer = 0;
}

2
source/GameplayCustomizeState.hx
View File

@ -58,6 +58,8 @@ class GameplayCustomizeState extends MusicBeatState
var camFollow = new FlxObject(0, 0, 1, 1);
dad = new Character(100, 100, 'dad');
bf = new Boyfriend(770, 450, 'bf');
bf = new Boyfriend(770, 450, 'bf');
var camPos:FlxPoint = new FlxPoint(dad.getGraphicMidpoint().x + 400, dad.getGraphicMidpoint().y);

17
source/KeyBindMenu.hx
View File

@ -223,21 +223,8 @@ class KeyBindMenu extends FlxSubState
var notAllowed:Array<String> = [];
for(x in keys){
if(x != tempKey){notAllowed.push(x);}
}
for(x in blacklist){notAllowed.push(x);}
if(curSelected != 4){
for(x in keyText){
if(x != keyText[curSelected]){notAllowed.push(x);}
}
}
else {for(x in keyText){notAllowed.push(x);}}
trace(notAllowed);
for(x in 0...keys.length)
@ -245,6 +232,8 @@ class KeyBindMenu extends FlxSubState
var oK = keys[x];
if(oK == r)
keys[x] = null;
if (notAllowed.contains(oK))
return;
}
if(shouldReturn){
@ -253,7 +242,7 @@ class KeyBindMenu extends FlxSubState
}
else{
keys[curSelected] = tempKey;
FlxG.sound.play(Paths.sound('confirmMenu'));
FlxG.sound.play(Paths.sound('scrollMenu'));
keyWarning.alpha = 1;
warningTween.cancel();
warningTween = FlxTween.tween(keyWarning, {alpha: 0}, 0.5, {ease: FlxEase.circOut, startDelay: 2});

2
source/MainMenuState.hx
View File

@ -37,7 +37,7 @@ class MainMenuState extends MusicBeatState
var newGaming2:FlxText;
public static var firstStart:Bool = true;
public static var nightly:String = "";
public static var nightly:String = "-nightly-development";
public static var kadeEngineVer:String = "1.5" + nightly;
public static var gameVer:String = "0.2.7.1";

19
source/PlayState.hx
View File

@ -1786,6 +1786,9 @@ class PlayState extends MusicBeatState
super.update(elapsed);
scoreTxt.text = Ratings.CalculateRanking(songScore,songScoreDef,nps,maxNPS,accuracy);
if (!FlxG.save.data.accuracyDisplay)
scoreTxt.text = "Score: " + songScore;
if (FlxG.keys.justPressed.ENTER && startedCountdown && canPause)
{
persistentUpdate = false;
@ -3252,9 +3255,9 @@ class PlayState extends MusicBeatState
function trainStart():Void
{
if(FlxG.save.data.distractions){
trainMoving = true;
if (!trainSound.playing)
trainSound.play(true);
trainMoving = true;
if (!trainSound.playing)
trainSound.play(true);
}
}
@ -3315,6 +3318,8 @@ class PlayState extends MusicBeatState
gf.playAnim('scared', true);
}
var danced:Bool = false;
override function stepHit()
{
super.stepHit();
@ -3331,10 +3336,6 @@ class PlayState extends MusicBeatState
}
#end
if (dad.curCharacter == 'spooky' && curStep % 4 == 2)
{
// dad.dance();
}
// yes this updates every step.
@ -3423,10 +3424,6 @@ class PlayState extends MusicBeatState
boyfriend.playAnim('idle');
}
if (!dad.animation.curAnim.name.startsWith("sing"))
{
dad.dance();
}
if (curBeat % 8 == 7 && curSong == 'Bopeebo')
{