cowarin/Funkin
1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2025-11-26 06:09:02 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bugfix/multifix' into develop-0.4.0

Browse source
This commit is contained in:
Cameron Taylor 2024-05-30 20:53:18 -04:00
parent 174c595837 8d7591a796
commit d015e73066
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assets

@ -1 +1 @@
Subproject commit 8a8239cb50b5277fb0cfce041b3d8a9dfc780c35 Subproject commit 371cce1fdc44914ddc3a5327e996cece4e676715

9
source/funkin/ui/story/LevelProp.hx
View file

@ -11,12 +11,15 @@ class LevelProp extends Bopper
function set_propData(value:LevelPropData):LevelPropData function set_propData(value:LevelPropData):LevelPropData
{ {
// Only reset the prop if the asset path has changed. // Only reset the prop if the asset path has changed.
if (propData == null || value?.assetPath != propData?.assetPath) if (propData == null || !(thx.Dynamics.equals(value, propData)))
{ {
this.propData = value;
this.visible = this.propData != null;
danceEvery = this.propData?.danceEvery ?? 0;
applyData(); applyData();
} }
this.visible = (value != null);
danceEvery = this.propData?.danceEvery ?? 0;
return this.propData; return this.propData;
} }

14
source/funkin/ui/transition/LoadingState.hx
View file

@ -57,8 +57,7 @@ class LoadingState extends MusicBeatSubState
funkay.scrollFactor.set(); funkay.scrollFactor.set();
funkay.screenCenter(); funkay.screenCenter();
loadBar = new FunkinSprite(0, FlxG.height - 20).makeSolidColor(FlxG.width, 10, 0xFFff16d2); loadBar = new FunkinSprite(0, FlxG.height - 20).makeSolidColor(0, 10, 0xFFff16d2);
loadBar.screenCenter(X);
add(loadBar); add(loadBar);
initSongsManifest().onComplete(function(lib) { initSongsManifest().onComplete(function(lib) {
@ -163,8 +162,15 @@ class LoadingState extends MusicBeatSubState
targetShit = FlxMath.remapToRange(callbacks.numRemaining / callbacks.length, 1, 0, 0, 1); targetShit = FlxMath.remapToRange(callbacks.numRemaining / callbacks.length, 1, 0, 0, 1);
var lerpWidth:Int = Std.int(FlxMath.lerp(loadBar.width, FlxG.width * targetShit, 0.2)); var lerpWidth:Int = Std.int(FlxMath.lerp(loadBar.width, FlxG.width * targetShit, 0.2));
loadBar.setGraphicSize(lerpWidth, loadBar.height); // this if-check prevents the setGraphicSize function
loadBar.updateHitbox(); // from setting the width of the loadBar to the height of the loadBar
// this is a behaviour that is implemented in the setGraphicSize function
// if the width parameter is equal to 0
if (lerpWidth > 0)
{
loadBar.setGraphicSize(lerpWidth, loadBar.height);
loadBar.updateHitbox();
}
FlxG.watch.addQuick('percentage?', callbacks.numRemaining / callbacks.length); FlxG.watch.addQuick('percentage?', callbacks.numRemaining / callbacks.length);
} }