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

I have embraced modding

Browse Source
This commit is contained in:
KadeDev 2021-04-02 16:49:02 -07:00
parent 33e236fd45
commit aa054a828c
4 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/preload/data/freeplaySonglist.txt
View File

@ -1 +1,19 @@
Tutorial Tutorial:gf
Bopeebo:dad
Fresh:dad
Dadbattle:dad
Spookeez:spooky
South:spooky
Monster:monster
Pico:pico
Philly:pico
Blammed:pico
Satin-Panties:mom
High:mom
Milf:mom
Cocoa:parents-christmas
Eggnog:parents-christmas
Winter-Horrorland:monster-christmas
Senpai:senpai
Roses:senpai
Thorns:spirit

13
source/FreeplayState.hx
View File

@ -41,7 +41,8 @@ class FreeplayState extends MusicBeatState
for (i in 0...initSonglist.length) for (i in 0...initSonglist.length)
{ {
songs.push(new SongMetadata(initSonglist[i], 1, 'gf')); var data:Array<String> = initSonglist[i].split(':');
songs.push(new SongMetadata(data[0], 1, data[1]));
} }
/* /*
@ -63,15 +64,6 @@ class FreeplayState extends MusicBeatState
isDebug = true; isDebug = true;
#end #end
addWeek(['Bopeebo', 'Fresh', 'Dadbattle'], 1, ['dad']);
addWeek(['Spookeez', 'South', 'Monster'], 2, ['spooky', 'spooky', 'monster']);
addWeek(['Pico', 'Philly', 'Blammed'], 3, ['pico']);
addWeek(['Satin-Panties', 'High', 'Milf'], 4, ['mom']);
addWeek(['Cocoa', 'Eggnog', 'Winter-Horrorland'], 5, ['parents-christmas', 'parents-christmas', 'monster-christmas']);
addWeek(['Senpai', 'Roses', 'Thorns'], 6, ['senpai', 'senpai', 'spirit']);
// LOAD MUSIC // LOAD MUSIC
// LOAD CHARACTERS // LOAD CHARACTERS
@ -271,7 +263,6 @@ class FreeplayState extends MusicBeatState
#end #end
#if PRELOAD_ALL #if PRELOAD_ALL
Conductor.changeBPM(Song.loadFromJson(Highscore.formatSong(songs[curSelected].songName,0),songs[curSelected].songName.toLowerCase()).bpm);
FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0); FlxG.sound.playMusic(Paths.inst(songs[curSelected].songName), 0);
#end #end

4
source/Options.hx
View File

@ -329,9 +329,9 @@ class OffsetMenu extends Option
public override function press():Bool public override function press():Bool
{ {
trace("switch"); trace("switch");
var poop:String = Highscore.formatSong("offsetTest", 1); var poop:String = Highscore.formatSong("Tutorial", 1);
PlayState.SONG = Song.loadFromJson(poop, "offsetTest"); PlayState.SONG = Song.loadFromJson(poop, "Tutorial");
PlayState.isStoryMode = false; PlayState.isStoryMode = false;
PlayState.storyDifficulty = 0; PlayState.storyDifficulty = 0;
PlayState.storyWeek = 0; PlayState.storyWeek = 0;

10
source/PlayState.hx
View File

@ -124,6 +124,8 @@ class PlayState extends MusicBeatState
private var camHUD:FlxCamera; private var camHUD:FlxCamera;
private var camGame:FlxCamera; private var camGame:FlxCamera;
public static var offsetTesting:Bool = false;
var notesHitArray:Array<Date> = []; var notesHitArray:Array<Date> = [];
var currentFrames:Int = 0; var currentFrames:Int = 0;
@ -827,7 +829,7 @@ class PlayState extends MusicBeatState
scoreTxt.x = healthBarBG.x + healthBarBG.width / 2; scoreTxt.x = healthBarBG.x + healthBarBG.width / 2;
scoreTxt.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK); scoreTxt.setFormat(Paths.font("vcr.ttf"), 16, FlxColor.WHITE, CENTER, FlxTextBorderStyle.OUTLINE,FlxColor.BLACK);
scoreTxt.scrollFactor.set(); scoreTxt.scrollFactor.set();
if (SONG.song.contains('offsetTest')) if (offsetTesting)
scoreTxt.x += 300; scoreTxt.x += 300;
add(scoreTxt); add(scoreTxt);
@ -1609,7 +1611,7 @@ class PlayState extends MusicBeatState
super.update(elapsed); super.update(elapsed);
if (!SONG.song.contains('offsetTest')) if (!offsetTesting)
{ {
if (FlxG.save.data.accuracyDisplay) if (FlxG.save.data.accuracyDisplay)
{ {
@ -1967,7 +1969,7 @@ class PlayState extends MusicBeatState
#end #end
} }
if (SONG.song.contains('offsetTest')) if (offsetTesting)
{ {
FlxG.sound.playMusic(Paths.music('freakyMenu')); FlxG.sound.playMusic(Paths.music('freakyMenu'));
LoadingState.loadAndSwitchState(new OptionsMenu()); LoadingState.loadAndSwitchState(new OptionsMenu());
@ -2169,7 +2171,7 @@ class PlayState extends MusicBeatState
currentTimingShown.text = msTiming + "ms"; currentTimingShown.text = msTiming + "ms";
currentTimingShown.size = 20; currentTimingShown.size = 20;
if (msTiming >= 0.03 && SONG.song.contains('offsetTest')) if (msTiming >= 0.03 && offsetTesting)
{ {
//Remove Outliers //Remove Outliers
hits.shift(); hits.shift();