Parker2991/Funkin
1
0
Fork 0
mirror of https://github.com/FunkinCrew/Funkin.git synced 2024-11-27 10:05:41 -05:00
Code Issues Projects Releases Packages Wiki Activity

Minor tweaks and fixes

Browse source
This commit is contained in:
Eric Myllyoja 2022-09-07 22:57:40 -04:00
parent e3857d789f
commit d84be39a5e
6 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
source/funkin/LatencyState.hx
View file

@ -139,17 +139,17 @@ class LatencyState extends MusicBeatSubstate
super.create(); super.create();
} }
override function stepHit() override function stepHit():Bool
{ {
if (curStep % 4 == 2) if (curStep % 4 == 2)
{ {
blocks.members[((curBeat % 8) + 1) % 8].alpha = 0.5; blocks.members[((curBeat % 8) + 1) % 8].alpha = 0.5;
} }
super.stepHit(); return super.stepHit();
} }
override function beatHit() override function beatHit():Bool
{ {
if (curBeat % 8 == 0) if (curBeat % 8 == 0)
blocks.forEach(blok -> blocks.forEach(blok ->
@ -160,7 +160,7 @@ class LatencyState extends MusicBeatSubstate
blocks.members[curBeat % 8].alpha = 1; blocks.members[curBeat % 8].alpha = 1;
// block.visible = !block.visible; // block.visible = !block.visible;
super.beatHit(); return super.beatHit();
} }
override function update(elapsed:Float) override function update(elapsed:Float)

2
source/funkin/StoryMenuState.hx
View file

@ -34,7 +34,7 @@ class StoryMenuState extends MusicBeatState
['Cocoa', 'Eggnog', 'Winter-Horrorland'], ['Cocoa', 'Eggnog', 'Winter-Horrorland'],
['Senpai', 'Roses', 'Thorns'], ['Senpai', 'Roses', 'Thorns'],
['Ugh', 'Guns', 'Stress'], ['Ugh', 'Guns', 'Stress'],
['Darnell', "lit-up", "2hot"] ['Darnell', "lit-up", "2hot", "blazin"]
]; ];
var curDifficulty:Int = 1; var curDifficulty:Int = 1;

3
source/funkin/audiovis/SpectogramSprite.hx
View file

@ -9,12 +9,9 @@ import flixel.system.FlxSound;
import flixel.util.FlxColor; import flixel.util.FlxColor;
import funkin.audiovis.PolygonSpectogram.VISTYPE; import funkin.audiovis.PolygonSpectogram.VISTYPE;
import funkin.audiovis.VisShit.CurAudioInfo; import funkin.audiovis.VisShit.CurAudioInfo;
<<<<<<< HEAD
=======
import funkin.audiovis.dsp.FFT; import funkin.audiovis.dsp.FFT;
import haxe.Timer; import haxe.Timer;
import lime.system.ThreadPool; import lime.system.ThreadPool;
>>>>>>> master
import lime.utils.Int16Array; import lime.utils.Int16Array;
using Lambda; using Lambda;

7
source/funkin/play/PlayState.hx
View file

@ -938,7 +938,7 @@ class PlayState extends MusicBeatState
} }
else else
{ {
swagNote.x += FlxG.width / 2; // general offset // swagNote.x += FlxG.width / 2; // general offset
} }
} }
} }
@ -1406,7 +1406,10 @@ class PlayState extends MusicBeatState
var daPos:Float = 0; var daPos:Float = 0;
for (i in 0...(Std.int(curStep / 16 + sec))) for (i in 0...(Std.int(curStep / 16 + sec)))
{ {
if (SongLoad.getSong()[i].changeBPM) var section = SongLoad.getSong()[i];
if (section == null)
continue;
if (section.changeBPM)
{ {
daBPM = SongLoad.getSong()[i].bpm; daBPM = SongLoad.getSong()[i].bpm;
} }

4
source/funkin/play/character/BaseCharacter.hx
View file

@ -460,13 +460,13 @@ class BaseCharacter extends Bopper
if (event.note.mustPress && characterType == BF) if (event.note.mustPress && characterType == BF)
{ {
// If the note is from the same strumline, play the sing animation. // If the note is from the same strumline, play the sing animation.
this.playSingAnimation(event.note.data.dir, false, event.note.data.altNote); this.playSingAnimation(event.note.data.dir, false);
holdTimer = 0; holdTimer = 0;
} }
else if (!event.note.mustPress && characterType == DAD) else if (!event.note.mustPress && characterType == DAD)
{ {
// If the note is from the same strumline, play the sing animation. // If the note is from the same strumline, play the sing animation.
this.playSingAnimation(event.note.data.dir, false, event.note.data.altNote); this.playSingAnimation(event.note.data.dir, false);
holdTimer = 0; holdTimer = 0;
} }
} }

14
source/funkin/ui/stageBuildShit/StageOffsetSubstate.hx
View file

@ -1,21 +1,13 @@
package funkin.ui.stageBuildShit; package funkin.ui.stageBuildShit;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.input.mouse.FlxMouseEventManager; import flixel.input.mouse.FlxMouseEvent;
import flixel.math.FlxPoint; import flixel.math.FlxPoint;
import flixel.ui.FlxButton;
import funkin.play.PlayState; import funkin.play.PlayState;
import funkin.play.character.BaseCharacter; import funkin.play.character.BaseCharacter;
import funkin.play.stage.StageData; import funkin.play.stage.StageData;
import haxe.Json;
import haxe.ui.ComponentBuilder;
import haxe.ui.RuntimeComponentBuilder; import haxe.ui.RuntimeComponentBuilder;
import haxe.ui.Toolkit;
import haxe.ui.components.Button;
import haxe.ui.containers.HBox;
import haxe.ui.containers.VBox;
import haxe.ui.core.Component; import haxe.ui.core.Component;
import openfl.Assets;
import openfl.events.Event; import openfl.events.Event;
import openfl.events.IOErrorEvent; import openfl.events.IOErrorEvent;
import openfl.net.FileReference; import openfl.net.FileReference;
@ -46,7 +38,7 @@ class StageOffsetSubstate extends MusicBeatSubstate
for (thing in PlayState.instance.currentStage) for (thing in PlayState.instance.currentStage)
{ {
FlxMouseEventManager.add(thing, spr -> FlxMouseEvent.add(thing, spr ->
{ {
char = cast thing; char = cast thing;
trace("JUST PRESSED!"); trace("JUST PRESSED!");
@ -94,7 +86,7 @@ class StageOffsetSubstate extends MusicBeatSubstate
{ {
for (thing in PlayState.instance.currentStage) for (thing in PlayState.instance.currentStage)
{ {
FlxMouseEventManager.remove(thing); FlxMouseEvent.remove(thing);
thing.alpha = 1; thing.alpha = 1;
} }