Skip to content

Commit

Permalink
Okay, we got covered some enough [skip ci]
Browse files Browse the repository at this point in the history
#38
We will cover more songs later

#44
We overveer the plan a bit but you should
get the idea
  • Loading branch information
JOELwindows7 committed Oct 5, 2023
1 parent d8d2987 commit ee28dcd
Show file tree
Hide file tree
Showing 15 changed files with 129 additions and 15 deletions.
7 changes: 6 additions & 1 deletion CREDIT.md
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ Hey, am I allowed to relicense? I was meant to just license part of my mods that
- https://api.haxeflixel.com/flixel/ui/FlxDPadMode.html dpad mode for the virtual pad
- https://snippets.haxeflixel.com/input/keyboard/ keyboard how to
- https://snippets.haxeflixel.com/input/ what input examples
- https://gamebanana.com/threads/219778 avoid reuploading sky mod for the time being. I think, that's indefinite. Oh, speaking of browsing Git commit history, that's what I did. I turn back to time, right before the removal of Sky mod, and take everything Sky as all as I can. Assets, Codes, Projects, everything I know it would have one. May come back later if I missed anything. ssssshh, don't tell bbpanzu! if he know this he'll turn back in time and force push this alternate timeline like if Sky never been existed. wait a minute. uh oh! peck!
- https://gamebanana.com/threads/219778 ~~avoid reuploading sky mod for the time being. I think, that's indefinite. Oh, speaking of browsing Git commit history, that's what I did. I turn back to time, right before the removal of Sky mod, and take everything Sky as all as I can. Assets, Codes, Projects, everything I know it would have one. May come back later if I missed anything. ssssshh, don't tell bbpanzu! if he know this he'll turn back in time and force push this alternate timeline like if Sky never been existed. wait a minute. uh oh! peck!~~ resolved
- https://youtu.be/7awd-y_DTQY PEAR & https://twitter.com/gothmei/status/1309307834677571585 gothmei. peck, the tweet is gone. there is no preservation in twitter after all. We lost the little pogchamp voice. oh wait, PEAR still has it!
- https://haxeflixel.com/documentation/flxtween/ how to tween
- https://youtu.be/u1DKR9cOxnM Funkin modder direct trailer
Expand Down Expand Up @@ -404,6 +404,11 @@ Hey, am I allowed to relicense? I was meant to just license part of my mods that
> WHO CARES..
> PUT IT ALL IN MY MOUT.
- tebarek
- Sky public domain but then cancel public domain 💀
- https://github.com/Perkedel/Kaded-fnf-mods/issues/44
- https://twitter.com/Alexander0110_/status/1597235683491733504?t=K7CL4zBMUGGzE7owQg8tRQ&s=19
- https://twitter.com/01Alexander10_/status/1594684037238558721?t=l9FA2gP8OK_tEomAoOFp4A&s=19
- the KPOP TV show has lyric!



Expand Down
5 changes: 4 additions & 1 deletion assets/preload/data/introText.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1749,4 +1749,7 @@ cookie--masterson
oh--re
what color is--your bugatti?
minyak--telon.
interior--kayu putih!
interior--kayu putih!
halo--im emu otori
emu is--meaning smile!!!
kpop lyric--is here boys n girls
4 changes: 2 additions & 2 deletions assets/preload/data/songs/rule-the-world/_meta.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "Rule the World",
"name": "Rule the World (알렉사)",
"offset": 0,
"artist": "TheFatRat"
"artist": "TheFatRat & AleXa"
}
79 changes: 79 additions & 0 deletions assets/preload/data/songs/rule-the-world/lyrics.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
(VERS 1) Rule the world, you know we::Rule the world
(VERS 1) Rule the world, you know we::Rule the world
Rule the world, you know we::Rule the world
Rule the world, you know we::Rule the world
Sky high punching::Yeah we're gonna have it all
Sky high punching::Yeah we're gonna have it all
Cloud nine jumping Happy::
I got you::you got me
Engines running::We'll be taking off at dawn
Engines running::We'll be taking off at dawn
Treasure hunting Glory::
I got you::you got me
(PRECHORUS) Dragons at the gate they won't stop us::getting to the top (Ohuhoh oh)
(PRECHORUS) Dragons at the gate they won't stop us::getting to the top (Ohuhoh oh)
Flying into space like a rocket::never giving up (No we never give up)
Flying into space like a rocket::never giving up (No we never give up)
I was all alone when I started::always ben the same (Oh uh oh oh)
I was all alone when I started::always ben the same (Oh uh oh oh)
Now you're here the journey's uncharted::everything'll change
Now you're here the journey's uncharted::everything'll change
(CHORUS) Oh you know rule the world::you know we rule the world
(CHORUS) Oh you know rule the world::you know we rule the world
Rule the world::you know we rule the world
Rule the world::you know we rule the world
(VERS 2) Thunder crashing::as we're breaking down the walls (Ouhuhuh)
(VERS 2) Thunder crashing::as we're breaking down the walls (Ouhuhuh)
Lightning flashing Lucky::
I got you::you got me
Rainbow crossing::as we're heading for the sun
Rainbow crossing::as we're heading for the sun
Ain't no stopping Ready::
I got you::you got me
(PRECHORUS) Dragons at the gate they won't stop us::getting to the top (Ohuhoh oh)
(PRECHORUS) Dragons at the gate they won't stop us::getting to the top (Ohuhoh oh)
Flying into space like a rocket::never giving up (No we never give up)
Flying into space like a rocket::never giving up (No we never give up)
I was all alone when I started::always ben the same (Oh uh oh oh)
I was all alone when I started::always ben the same (Oh uh oh oh)
Now you're here the journey's uncharted::everything'll change
Now you're here the journey's uncharted::everything'll change
(CHORUS) Oh you know rule the world::you know we rule the world
(CHORUS) Oh you know rule the world::you know we rule the world
Rule the world::you know we rule the world
Rule the world::you know we rule the world
(CHORUS REP) Rule the world::you know we rule the world
(CHORUS REP) Rule the world::you know we rule the world
Rule the world::you know we rule the world
Rule the world::you know we rule the world
(BRIDGE) Stars up high::will guide us home
(BRIDGE) Stars up high::will guide us home
(BRIDGE) Stars up high::will guide us home
(BRIDGE) Stars up high::will guide us home
You and I::It's time
You and I::It's time
to::
take the::
throne::
throne::
(PRECHORUS) Dragons at the gate they won't stop us::getting to the top (Ohuhoh oh)
(PRECHORUS) Dragons at the gate they won't stop us::getting to the top (Ohuhoh oh)
Flying into space like a rocket::never giving up (No we never give up)
Flying into space like a rocket::never giving up (No we never give up)
I was all alone when I started::always ben the same (Oh uh oh oh)
I was all alone when I started::always ben the same (Oh uh oh oh)
Now you're here the journey's uncharted::everything'll change
Now you're here the journey's uncharted::everything'll change
(CHORUS) Oh you know rule the world::you know we rule the world
(CHORUS) Oh you know rule the world::you know we rule the world
Rule the world::you know we rule the world
Rule the world::you know we rule the world
(CHORUS REP) Rule the world::you know we rule the world
(CHORUS REP) Rule the world::you know we rule the world
Rule the world::you know we rule the world
Rule the world::you know we rule the world
Rule the world you know we::
Rule the world...::(END)
Rule the world...::(END)
Rule the world...::(END)
Rule the world...::(END)
8 changes: 4 additions & 4 deletions assets/preload/data/songs/tutorial/lyrics.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Beep, Bop, Beep, Bop::That's how you do it!
Beep, Bop, Beep, Bop::That's how you do it!
Up, Down::Up, Down
Up, Down::Up, Down
Paa, Tuu::That's how you do it!
Paa, Tuu::That's how you do it!
Paa, Tuu, Paa, Tuuu::That's how you do it!
Paa, Tuu, Paa, Tuuu::That's how you do it!
Left, Up::Down, Right
Left, Up::Down, Right
Beep, Paa::Tuu, Bop
Expand All @@ -20,6 +20,6 @@ Tuu Tuu Paa::Tuu Tuu Bop
Tuu Tuu Paa::Tuu Tuu Bop
Down Up Right Up::Right
Tuu Paa Bop Paa::Bop
Bop Bop, Tuu Tuu::
Bop Bop, Tuu Tuu::
Paa, Paa, Paa, Paa::Paa,
Paa
Paa::
Binary file modified assets/shared/images/loading/loading_screen2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/loading/loading_screen5.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/loading/loading_screen7.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 18 additions & 3 deletions source/KadeEngineData.hx
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class KadeEngineData
FlxG.save.data.offset = 0;

if (FlxG.save.data.songPosition == null)
FlxG.save.data.songPosition = false;
FlxG.save.data.songPosition = true;

if (FlxG.save.data.fps == null)
FlxG.save.data.fps = false;
Expand All @@ -59,6 +59,14 @@ class KadeEngineData
if (FlxG.save.data.accidentVolumeKeys == null)
FlxG.save.data.accidentVolumeKeys = false;

// JOELwindows7: Master Volume
if (FlxG.save.data.masterVolume == null)
FlxG.save.data.masterVolumet = 1;

// JOELwindows7: MenuBG Volume
if (FlxG.save.data.menuBGVolume == null)
FlxG.save.data.menuBGVolume = 1;

// JOELwindows7: don't forget init save data of fullscreen mode
if (FlxG.save.data.fullscreen == null)
FlxG.save.data.fullscreen == FlxG.fullscreen;
Expand Down Expand Up @@ -121,7 +129,7 @@ class KadeEngineData
FlxG.save.data.colour = true;

if (FlxG.save.data.stepMania == null)
FlxG.save.data.stepMania = false;
FlxG.save.data.stepMania = true;

if (FlxG.save.data.flashing == null)
FlxG.save.data.flashing = true;
Expand All @@ -136,7 +144,7 @@ class KadeEngineData
FlxG.save.data.botplay = false;

if (FlxG.save.data.cpuStrums == null)
FlxG.save.data.cpuStrums = false;
FlxG.save.data.cpuStrums = true;

if (FlxG.save.data.strumline == null)
FlxG.save.data.strumline = false;
Expand Down Expand Up @@ -467,6 +475,10 @@ class KadeEngineData
if (FlxG.save.data.discordMode == null)
FlxG.save.data.discordMode = 1;

// Bottom left corner lyric like in KPop TV show
if (FlxG.save.data.kpopLyrics == null)
FlxG.save.data.kpopLyrics = true;

// JOELwindows7: workarounds!

// video cutscene crash on Linux
Expand Down Expand Up @@ -494,6 +506,9 @@ class KadeEngineData
(cast(Lib.current.getChildAt(0), Main)).setFPSCap(FlxG.save.data.fpsCap);
Debug.logInfo("successfully set FPS settings"); // JOELwindows7: see if Android version crash!
#end

// JOELwindows7: Oh, volume pls!
FlxG.sound.volume = FlxG.save.data.masterVolume;
}

// JOELwindows7: BOLO's reset modifier
Expand Down
4 changes: 4 additions & 0 deletions source/Options.hx
Original file line number Diff line number Diff line change
Expand Up @@ -2808,19 +2808,22 @@ class AdjustVolumeOption extends Option
public override function press():Bool
{
display = updateDisplay();
// FlxG.save.data.masterVolume = FlxG.sound.volume;
return true;
}

override function right():Bool
{
FlxG.sound.changeVolume(.1);
// FlxG.save.data.masterVolume = FlxG.sound.volume;
display = updateDisplay();
return true;
}

override function left():Bool
{
FlxG.sound.changeVolume(-.1);
// FlxG.save.data.masterVolume = FlxG.sound.volume;
display = updateDisplay();
return true;
}
Expand Down Expand Up @@ -2848,6 +2851,7 @@ class AdjustVolumeOption extends Option
{
shoomSays += ' '; // was `U` before. now space supported so yeah.
}
FlxG.save.data.masterVolume = FlxG.sound.volume;
return "Volume < " + shoomSays + " (" + Std.string(Std.int(FlxG.sound.volume * 100)) + "%)" + " >";
}

Expand Down
14 changes: 11 additions & 3 deletions source/PlayState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -1807,10 +1807,11 @@ class PlayState extends MusicBeatState implements IManipulateAudio
add(accText);

// DONE: JOELwindows7: This maybe can be the Korean pop tv show lyric bottom left corner?
lyricers = new FlxUIText(100, FlxG.height - 100, 0, " \n ", 20);
lyricers = new FlxUIText(100, FlxG.height - 150, 0, " \n ", 20);
lyricers.setFormat(Paths.font("UbuntuMono-R-NF.ttf"), 14, FlxColor.WHITE, FlxTextAlign.LEFT, FlxTextBorderStyle.OUTLINE, FlxColor.BLACK);
lyricers.scrollFactor.set();
add(lyricers);
lyricers.visible = FlxG.save.data.kpopLyrics;

scoreTxt = new FlxUIText(FlxG.width / 2 - 235, healthBarBG.y + 50, 0, "", 20);
// JOELwindows7: move this up a bit due to elongated texts.
Expand Down Expand Up @@ -9161,8 +9162,15 @@ class PlayState extends MusicBeatState implements IManipulateAudio
// JOELwindows7: daLyric boi
if (lyricExists)
{
// lyricers.text = lyricing[curSection][0] + "\n" + lyricing[curSection][1];
lyricers.text = lyricing[Std.int(Math.floor(curBeat / 4))][0] + "\n" + lyricing[Std.int(Math.floor(curBeat / 4))][1];
try
{
// lyricers.text = lyricing[curSection][0] + "\n" + lyricing[curSection][1];
lyricers.text = lyricing[Std.int(Math.floor(curBeat / 4))][0] + "\n" + lyricing[Std.int(Math.floor(curBeat / 4))][1];
}
catch (e)
{
lyricers.text = '\n';
}
lyricers.scrollFactor.set();
}

Expand Down
2 changes: 1 addition & 1 deletion source/const/Perkedel.hx
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class Perkedel
public static final STARTUP_TOAST_TITLE:String = "Cool and good";
public static final STARTUP_TOAST_DESCRIPTION:String = "Welcome to Last Funkin Moments\n Today's Kontraktua Majoris\n (2 of 3): Sky, Whitty";
public static final MAX_AVAILABLE_JUDGEMENT_RATING:Int = 3; // only up to sick we have.
public static final MAX_NUMBER_OF_LOADING_IMAGES:Int = 4; // how many loading backdrops do we have here?
public static final MAX_NUMBER_OF_LOADING_IMAGES:Int = 8; // how many loading backdrops do we have here?
public static final DISCLAIMER_SAY:String = "Disclaimer";
public static final LOADING_TOO_LONG_TIME_THRESHOLD:Float = 30; // if the loading took more than 30 second
public static final LOADING_TOO_LONG_SAY:String = 'Too long, didn\'t load? [OK]/[ENTER]/(START) Skip, [BACK]/[ESC]/(B) Cancel.\n\n====================\n|\tAT YOUR OWN RISK!!\t|\n====================\n\n';
Expand Down

0 comments on commit ee28dcd

Please sign in to comment.