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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Kade M 2021-04-25 22:59:14 -07:00 committed by GitHub
commit 5c449839b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 82 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Project.xml
View File

@ -117,7 +117,7 @@
<haxelib name="faxe" if='switch'/> <haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/> <haxelib name="polymod"/>
<haxelib name="discord_rpc" if="windows"/> <haxelib name="discord_rpc" if="windows"/>
<haxelib name="linc_luajit"/> <haxelib name="linc_luajit" if="windows"/>
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> --> <!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->

70
source/ChartingState.hx
View File

@ -90,9 +90,6 @@ class ChartingState extends MusicBeatState
private var lastNote:Note; private var lastNote:Note;
var player1Icon:String;
var player2Icon:String;
override function create() override function create()
{ {
@ -101,6 +98,20 @@ class ChartingState extends MusicBeatState
gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16); gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * 16);
add(gridBG); add(gridBG);
leftIcon = new HealthIcon('bf');
rightIcon = new HealthIcon('dad');
leftIcon.scrollFactor.set(1, 1);
rightIcon.scrollFactor.set(1, 1);
leftIcon.setGraphicSize(0, 45);
rightIcon.setGraphicSize(0, 45);
add(leftIcon);
add(rightIcon);
leftIcon.setPosition(0, -100);
rightIcon.setPosition(gridBG.width / 2, -100);
gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK);
add(gridBlackLine); add(gridBlackLine);
@ -123,23 +134,6 @@ class ChartingState extends MusicBeatState
}; };
} }
player1Icon = _song.player1;
player2Icon = _song.player2;
leftIcon = new HealthIcon(_song.player1);
rightIcon = new HealthIcon(_song.player2);
leftIcon.scrollFactor.set(1, 1);
rightIcon.scrollFactor.set(1, 1);
leftIcon.setGraphicSize(0, 45);
rightIcon.setGraphicSize(0, 45);
add(leftIcon);
add(rightIcon);
leftIcon.setPosition(0, -100);
rightIcon.setPosition(gridBG.width / 2, -100);
FlxG.mouse.visible = true; FlxG.mouse.visible = true;
FlxG.save.bind('funkin', 'ninjamuffin99'); FlxG.save.bind('funkin', 'ninjamuffin99');
@ -533,8 +527,6 @@ class ChartingState extends MusicBeatState
{ {
curStep = recalculateSteps(); curStep = recalculateSteps();
changeIcon();
if (FlxG.keys.justPressed.ALT && UI_box.selected_tab == 0) if (FlxG.keys.justPressed.ALT && UI_box.selected_tab == 0)
{ {
writingNotes = !writingNotes; writingNotes = !writingNotes;
@ -1019,7 +1011,7 @@ class ChartingState extends MusicBeatState
{ {
remove(gridBG); remove(gridBG);
gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * _song.notes[curSection].lengthInSteps); gridBG = FlxGridOverlay.create(GRID_SIZE, GRID_SIZE, GRID_SIZE * 8, GRID_SIZE * _song.notes[curSection].lengthInSteps);
add(gridBG); add(gridBG);
remove(gridBlackLine); remove(gridBlackLine);
gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK); gridBlackLine = new FlxSprite(gridBG.x + gridBG.width / 2).makeGraphic(2, Std.int(gridBG.height), FlxColor.BLACK);
@ -1127,38 +1119,6 @@ class ChartingState extends MusicBeatState
updateNoteUI(); updateNoteUI();
} }
function changeIcon():Void
{
if (_song.player1 != player1Icon)
{
remove(leftIcon);
player1Icon = _song.player1;
leftIcon = new HealthIcon(player1Icon);
leftIcon.scrollFactor.set(1, 1);
leftIcon.setGraphicSize(0, 45);
add(leftIcon);
leftIcon.setPosition(0, -100);
}
if (_song.player2 != player2Icon)
{
remove(rightIcon);
player2Icon = _song.player2;
rightIcon = new HealthIcon(player2Icon);
rightIcon.scrollFactor.set(1, 1);
rightIcon.setGraphicSize(0, 45);
add(rightIcon);
rightIcon.setPosition(gridBG.width / 2, -100);
}
}
function deleteNote(note:Note):Void function deleteNote(note:Note):Void
{ {

84
source/FreeplayState.hx
View File

@ -8,9 +8,6 @@ import flixel.group.FlxGroup.FlxTypedGroup;
import flixel.math.FlxMath; import flixel.math.FlxMath;
import flixel.text.FlxText; import flixel.text.FlxText;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import lime.utils.Assets; import lime.utils.Assets;
@ -38,8 +35,6 @@ class FreeplayState extends MusicBeatState
private var iconArray:Array<HealthIcon> = []; private var iconArray:Array<HealthIcon> = [];
var bg:FlxSprite;
override function create() override function create()
{ {
var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist')); var initSonglist = CoolUtil.coolTextFile(Paths.txt('freeplaySonglist'));
@ -73,7 +68,7 @@ class FreeplayState extends MusicBeatState
// LOAD CHARACTERS // LOAD CHARACTERS
bg = new FlxSprite().loadGraphic(Paths.image('menuDesat')); var bg:FlxSprite = new FlxSprite().loadGraphic(Paths.image('menuBGBlue'));
add(bg); add(bg);
grpSongs = new FlxTypedGroup<Alphabet>(); grpSongs = new FlxTypedGroup<Alphabet>();
@ -166,8 +161,6 @@ class FreeplayState extends MusicBeatState
} }
} }
var lockedIn:Bool = false;
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
super.update(elapsed); super.update(elapsed);
@ -213,8 +206,6 @@ class FreeplayState extends MusicBeatState
trace(poop); trace(poop);
lockedIn = true;
PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase()); PlayState.SONG = Song.loadFromJson(poop, songs[curSelected].songName.toLowerCase());
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = curDifficulty; PlayState.storyDifficulty = curDifficulty;
@ -259,7 +250,6 @@ class FreeplayState extends MusicBeatState
curSelected += change; curSelected += change;
if (curSelected < 0) if (curSelected < 0)
curSelected = songs.length - 1; curSelected = songs.length - 1;
if (curSelected >= songs.length) if (curSelected >= songs.length)
@ -267,57 +257,24 @@ class FreeplayState extends MusicBeatState
// selector.y = (70 * curSelected) + 30; // selector.y = (70 * curSelected) + 30;
#if !switch
intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
// lerpScore = 0;
#end
#if PRELOAD_ALL
FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0);
#end
var bullShit:Int = 0;
for (i in 0...iconArray.length) for (i in 0...iconArray.length)
{ {
iconArray[i].alpha = 0.6; iconArray[i].alpha = 0.6;
} }
var bullShit:Int = 0;
iconArray[curSelected].alpha = 1; iconArray[curSelected].alpha = 1;
if (curSelected >= 0)
{
if (curSelected >= 4)
{
if (curSelected >= 7)
{
if (curSelected >= 10)
{
if (curSelected >= 13)
{
if (curSelected >= 16)
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(219, 101, 217));
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(161, 212, 230));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(230, 129, 221));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(99, 12, 22));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(39, 46, 66));
}
}
else
{
FlxTween.color(bg, 0.5, bg.color, FlxColor.fromRGB(96, 66, 245));
}
}
for (item in grpSongs.members) for (item in grpSongs.members)
{ {
item.targetY = bullShit - curSelected; item.targetY = bullShit - curSelected;
@ -332,23 +289,6 @@ class FreeplayState extends MusicBeatState
// item.setGraphicSize(Std.int(item.width)); // item.setGraphicSize(Std.int(item.width));
} }
} }
var temp:Int = curSelected;
new FlxTimer().start(FlxG.random.float(0.7), function(tmr:FlxTimer)
{
if (curSelected == temp && !lockedIn)
{
#if !switch
intendedScore = Highscore.getScore(songs[curSelected].songName, curDifficulty);
// lerpScore = 0;
#end
#if PRELOAD_ALL
FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0);
#end
}
});
} }
} }

5
source/Note.hx
View File

@ -174,7 +174,10 @@ class Note extends FlxSprite
} }
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.8 * FlxG.save.data.scrollSpeed; if(FlxG.save.data.scrollSpeed != 1)
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * FlxG.save.data.scrollSpeed;
else
prevNote.scale.y *= Conductor.stepCrochet / 100 * 1.5 * PlayState.SONG.speed;
prevNote.updateHitbox(); prevNote.updateHitbox();
// prevNote.setGraphicSize(); // prevNote.setGraphicSize();
} }

108
source/PlayState.hx
View File

@ -12,7 +12,7 @@ import flixel.system.FlxAssets;
// Lua // Lua
#if cpp #if windows
import llua.Convert; import llua.Convert;
import llua.Lua; import llua.Lua;
import llua.State; import llua.State;
@ -65,7 +65,7 @@ import openfl.filters.ShaderFilter;
#if windows #if windows
import Discord.DiscordClient; import Discord.DiscordClient;
#end #end
#if cpp #if windows
import Sys; import Sys;
import sys.FileSystem; import sys.FileSystem;
#end #end
@ -74,7 +74,6 @@ using StringTools;
class PlayState extends MusicBeatState class PlayState extends MusicBeatState
{ {
public static var curStage:String = ''; public static var curStage:String = '';
public static var SONG:SwagSong; public static var SONG:SwagSong;
public static var isStoryMode:Bool = false; public static var isStoryMode:Bool = false;
@ -214,7 +213,7 @@ class PlayState extends MusicBeatState
// LUA SHIT // LUA SHIT
#if cpp #if windows
public static var lua:State = null; public static var lua:State = null;
@ -1028,29 +1027,28 @@ class PlayState extends MusicBeatState
FlxG.fixedTimestep = false; FlxG.fixedTimestep = false;
if (FlxG.save.data.songPosition) // I dont wanna talk about this code :( if (FlxG.save.data.songPosition) // I dont wanna talk about this code :(
{ {
songPosBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar')); songPosBG = new FlxSprite(0, 10).loadGraphic(Paths.image('healthBar'));
if (FlxG.save.data.downscroll) if (FlxG.save.data.downscroll)
songPosBG.y = FlxG.height * 0.9 + 45; songPosBG.y = FlxG.height * 0.9 + 45;
songPosBG.screenCenter(X); songPosBG.screenCenter(X);
songPosBG.scrollFactor.set(); songPosBG.scrollFactor.set();
add(songPosBG); add(songPosBG);
songPosBar = new FlxBar(songPosBG.x + 4, songPosBG.y + 4, LEFT_TO_RIGHT, Std.int(songPosBG.width - 8), Std.int(songPosBG.height - 8), this, songPosBar = new FlxBar(songPosBG.x + 4, songPosBG.y + 4, LEFT_TO_RIGHT, Std.int(songPosBG.width - 8), Std.int(songPosBG.height - 8), this,
'songPositionBar', 0, 90000); 'songPositionBar', 0, 90000);
songPosBar.scrollFactor.set(); songPosBar.scrollFactor.set();
songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME); songPosBar.createFilledBar(FlxColor.GRAY, FlxColor.LIME);
add(songPosBar); add(songPosBar);
var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16); var songName = new FlxText(songPosBG.x + (songPosBG.width / 2) - 20,songPosBG.y,0,SONG.song, 16);
if (FlxG.save.data.downscroll) if (FlxG.save.data.downscroll)
songName.y -= 3; songName.y -= 3;
songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); songName.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
songName.scrollFactor.set(); songName.scrollFactor.set();
add(songName); add(songName);
songName.cameras = [camHUD]; songName.cameras = [camHUD];
} }
healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('healthBar')); healthBarBG = new FlxSprite(0, FlxG.height * 0.9).loadGraphic(Paths.image('healthBar'));
if (FlxG.save.data.downscroll) if (FlxG.save.data.downscroll)
@ -1066,9 +1064,6 @@ class PlayState extends MusicBeatState
// healthBar // healthBar
add(healthBar); add(healthBar);
// Add Kade Engine watermark // Add Kade Engine watermark
kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16); kadeEngineWatermark = new FlxText(4,healthBarBG.y + 50,0,SONG.song + " " + (storyDifficulty == 2 ? "Hard" : storyDifficulty == 1 ? "Normal" : "Easy") + (Main.watermarks ? " - KE " + MainMenuState.kadeEngineVer : ""), 16);
kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); kadeEngineWatermark.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, RIGHT, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
@ -1282,7 +1277,7 @@ class PlayState extends MusicBeatState
generateStaticArrows(1); generateStaticArrows(1);
#if cpp #if windows
if (executeModchart) // dude I hate lua (jkjkjkjk) if (executeModchart) // dude I hate lua (jkjkjkjk)
{ {
trace('opening a lua state (because we are cool :))'); trace('opening a lua state (because we are cool :))');
@ -1483,7 +1478,7 @@ class PlayState extends MusicBeatState
getActorByName(id).x = x; getActorByName(id).x = x;
})); }));
trace(Lua_helper.add_callback(lua,"setActorAlpha", function(alpha:Int,id:String) { trace(Lua_helper.add_callback(lua,"setActorAlpha", function(alpha:Float,id:String) {
getActorByName(id).alpha = alpha; getActorByName(id).alpha = alpha;
})); }));
@ -1846,7 +1841,7 @@ class PlayState extends MusicBeatState
var playerCounter:Int = 0; var playerCounter:Int = 0;
// Per song offset check // Per song offset check
#if cpp #if windows
var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/'; var songPath = 'assets/data/' + PlayState.SONG.song.toLowerCase() + '/';
for(file in sys.FileSystem.readDirectory(songPath)) for(file in sys.FileSystem.readDirectory(songPath))
{ {
@ -2125,7 +2120,7 @@ class PlayState extends MusicBeatState
perfectMode = false; perfectMode = false;
#end #end
#if cpp #if windows
if (executeModchart && lua != null && songStarted) if (executeModchart && lua != null && songStarted)
{ {
setVar('songPos',Conductor.songPosition); setVar('songPos',Conductor.songPosition);
@ -2245,7 +2240,7 @@ class PlayState extends MusicBeatState
DiscordClient.changePresence("Chart Editor", null, null, true); DiscordClient.changePresence("Chart Editor", null, null, true);
#end #end
FlxG.switchState(new ChartingState()); FlxG.switchState(new ChartingState());
#if cpp #if windows
if (lua != null) if (lua != null)
{ {
Lua.close(lua); Lua.close(lua);
@ -2432,7 +2427,7 @@ class PlayState extends MusicBeatState
} }
} }
#if cpp #if windows
if (lua != null) if (lua != null)
setVar("mustHit",PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection); setVar("mustHit",PlayState.SONG.notes[Std.int(curStep / 16)].mustHitSection);
#end #end
@ -2441,7 +2436,7 @@ class PlayState extends MusicBeatState
{ {
var offsetX = 0; var offsetX = 0;
var offsetY = 0; var offsetY = 0;
#if cpp #if windows
if (lua != null) if (lua != null)
{ {
offsetX = getVar("followXOffset", "float"); offsetX = getVar("followXOffset", "float");
@ -2449,7 +2444,7 @@ class PlayState extends MusicBeatState
} }
#end #end
camFollow.setPosition(dad.getMidpoint().x + 150 + offsetX, dad.getMidpoint().y - 100 + offsetY); camFollow.setPosition(dad.getMidpoint().x + 150 + offsetX, dad.getMidpoint().y - 100 + offsetY);
#if cpp #if windows
if (lua != null) if (lua != null)
callLua('playerTwoTurn', []); callLua('playerTwoTurn', []);
#end #end
@ -2475,7 +2470,7 @@ class PlayState extends MusicBeatState
{ {
var offsetX = 0; var offsetX = 0;
var offsetY = 0; var offsetY = 0;
#if cpp #if windows
if (lua != null) if (lua != null)
{ {
offsetX = getVar("followXOffset", "float"); offsetX = getVar("followXOffset", "float");
@ -2484,7 +2479,7 @@ class PlayState extends MusicBeatState
#end #end
camFollow.setPosition(boyfriend.getMidpoint().x - 100 + offsetX, boyfriend.getMidpoint().y - 100 + offsetY); camFollow.setPosition(boyfriend.getMidpoint().x - 100 + offsetX, boyfriend.getMidpoint().y - 100 + offsetY);
#if cpp #if windows
if (lua != null) if (lua != null)
callLua('playerOneTurn', []); callLua('playerOneTurn', []);
#end #end
@ -2624,10 +2619,9 @@ class PlayState extends MusicBeatState
dad.playAnim('singDOWN' + altAnim, true); dad.playAnim('singDOWN' + altAnim, true);
case 0: case 0:
dad.playAnim('singLEFT' + altAnim, true); dad.playAnim('singLEFT' + altAnim, true);
} }
#if cpp #if windows
if (lua != null) if (lua != null)
callLua('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]); callLua('playerTwoSing', [Math.abs(daNote.noteData), Conductor.songPosition]);
#end #end
@ -2721,7 +2715,7 @@ class PlayState extends MusicBeatState
if (!loadRep) if (!loadRep)
rep.SaveReplay(); rep.SaveReplay();
#if cpp #if windows
if (executeModchart) if (executeModchart)
{ {
Lua.close(lua); Lua.close(lua);
@ -2763,7 +2757,7 @@ class PlayState extends MusicBeatState
FlxG.switchState(new StoryMenuState()); FlxG.switchState(new StoryMenuState());
#if cpp #if windows
if (lua != null) if (lua != null)
{ {
Lua.close(lua); Lua.close(lua);
@ -3557,7 +3551,7 @@ class PlayState extends MusicBeatState
boyfriend.playAnim('singRIGHTmiss', true); boyfriend.playAnim('singRIGHTmiss', true);
} }
#if cpp #if windows
if (lua != null) if (lua != null)
callLua('playerOneMiss', [direction, Conductor.songPosition]); callLua('playerOneMiss', [direction, Conductor.songPosition]);
#end #end
@ -3706,7 +3700,7 @@ class PlayState extends MusicBeatState
boyfriend.playAnim('singLEFT', true); boyfriend.playAnim('singLEFT', true);
} }
#if cpp #if windows
if (lua != null) if (lua != null)
callLua('playerOneSing', [note.noteData, Conductor.songPosition]); callLua('playerOneSing', [note.noteData, Conductor.songPosition]);
#end #end
@ -3829,7 +3823,7 @@ class PlayState extends MusicBeatState
resyncVocals(); resyncVocals();
} }
#if cpp #if windows
if (executeModchart && lua != null) if (executeModchart && lua != null)
{ {
setVar('curStep',curStep); setVar('curStep',curStep);
@ -3868,7 +3862,7 @@ class PlayState extends MusicBeatState
notes.sort(FlxSort.byY, FlxSort.DESCENDING); notes.sort(FlxSort.byY, FlxSort.DESCENDING);
} }
#if cpp #if windows
if (executeModchart && lua != null) if (executeModchart && lua != null)
{ {
setVar('curBeat',curBeat); setVar('curBeat',curBeat);
@ -3887,18 +3881,16 @@ class PlayState extends MusicBeatState
// Conductor.changeBPM(SONG.bpm); // Conductor.changeBPM(SONG.bpm);
// Dad doesnt interupt his own notes // Dad doesnt interupt his own notes
if (dad.animation.curAnim.name.startsWith('sing'))
{ // Commented out until a reason to bring this back arises in the future
if (dad.animation.finished) /* if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
{ dad.dance(); */
if(dad.animation.curAnim.name.startsWith('sing'))
if(dad.animation.finished)
dad.dance(); dad.dance();
}
}
else else
{
dad.dance(); dad.dance();
}
} }
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM); // FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
wiggleShit.update(Conductor.crochet); wiggleShit.update(Conductor.crochet);

4
source/StoryMenuState.hx
View File

@ -305,10 +305,6 @@ class StoryMenuState extends MusicBeatState
LoadingState.loadAndSwitchState(new PlayState(), true); LoadingState.loadAndSwitchState(new PlayState(), true);
}); });
} }
else
{
FlxG.camera.shake(0.02, 0.02);
}
} }
function changeDifficulty(change:Int = 0):Void function changeDifficulty(change:Int = 0):Void