gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Changes to Freeplay Moddability

Browse Source
This commit is contained in:
NeeEoo
2023-06-26 14:11:41 +02:00
parent df2f28f433
commit fd100a6b21
2 changed files with 38 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/scripting/events/FreeplayAlphaUpdateEvent.hx
+24
View File
@@ -0,0 +1,24 @@
package funkin.backend.scripting.events;
final class FreeplayAlphaUpdateEvent extends CancellableEvent {
/**
* The alpha when nothing is playing and isnt selected
*/
public var idleAlpha:Float;
/**
* The alpha when something is playing and isnt selected
*/
public var idlePlayingAlpha:Float;
/**
* The alpha when nothing is playing and selected
*/
public var selectedAlpha:Float;
/**
* The alpha when something is playing and selected
*/
public var selectedPlayingAlpha:Float;
/**
* The lerp of the alpha
*/
public var lerp:Float;
}
source/funkin/menus/FreeplayState.hx
+14 -7
View File
@@ -22,7 +22,11 @@ class FreeplayState extends MusicBeatState
/**
* How much time a song stays selected until it autoplays.
*/
public inline static var timeUntilAutoplay:Float = 1;
public var timeUntilAutoplay:Float = 1;
/**
* Whenever the song autoplays when hovered over.
*/
public var disableAutoPlay:Bool = false;
/**
* Array containing all of the songs metadatas
@@ -202,7 +206,7 @@ class FreeplayState extends MusicBeatState
if (FlxG.sound.music != null && FlxG.sound.music.volume < 0.7)
{
FlxG.sound.music.volume += 0.5 * FlxG.elapsed;
FlxG.sound.music.volume += 0.5 * elapsed;
}
lerpScore = Math.floor(lerp(lerpScore, intendedScore, 0.4));
@@ -233,7 +237,7 @@ class FreeplayState extends MusicBeatState
var dontPlaySongThisFrame = false;
#if PRELOAD_ALL
autoplayElapsed += elapsed;
if (!songInstPlaying && (autoplayElapsed > timeUntilAutoplay || FlxG.keys.justPressed.SPACE)) {
if (!disableAutoPlay && !songInstPlaying && (autoplayElapsed > timeUntilAutoplay || FlxG.keys.justPressed.SPACE)) {
if (curPlayingInst != (curPlayingInst = Paths.inst(songs[curSelected].name, songs[curSelected].difficulties[curDifficulty])))
FlxG.sound.playMusic(curPlayingInst, 0);
songInstPlaying = true;
@@ -398,22 +402,25 @@ class FreeplayState extends MusicBeatState
}
function updateOptionsAlpha() {
var event = event("onUpdateOptionsAlpha", EventManager.get(FreeplayAlphaUpdateEvent).recycle(0.6, 0.45, 1, 1, 0.25));
if (event.cancelled) return;
var bullShit:Int = 0;
for (i in 0...iconArray.length)
iconArray[i].alpha = lerp(iconArray[i].alpha, #if PRELOAD_ALL songInstPlaying ? 0.45 : #end 0.6, 0.25);
iconArray[i].alpha = lerp(iconArray[i].alpha, #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha, event.lerp);
iconArray[curSelected].alpha = 1;
iconArray[curSelected].alpha = #if PRELOAD_ALL songInstPlaying ? event.selectedPlayingAlpha : #end event.selectedAlpha;
for (item in grpSongs.members)
{
item.targetY = bullShit - curSelected;
bullShit++;
item.alpha = lerp(item.alpha, #if PRELOAD_ALL songInstPlaying ? 0.45 : #end 0.6, 0.25);
item.alpha = lerp(item.alpha, #if PRELOAD_ALL songInstPlaying ? event.idlePlayingAlpha : #end event.idleAlpha, event.lerp);
if (item.targetY == 0)
item.alpha = 1;
item.alpha = #if PRELOAD_ALL songInstPlaying ? event.selectedPlayingAlpha : #end event.selectedAlpha;
}
}
}