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

more conductor stuff + settings now works

Browse Source
This commit is contained in:
Yoshman29
2022-11-02 03:30:38 +01:00
parent f36e50c1c7
commit 56c14b6b51
6 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
969
970
source/funkin/game/PlayState.hx
+1 -4
View File
@@ -1357,12 +1357,9 @@ class PlayState extends MusicBeatState
{
super.beatHit(curBeat);
scripts.call("beatHit", [curBeat]);
if (SONG.notes[Math.floor(curStep / 16)] != null && SONG.notes[Math.floor(curStep / 16)].changeBPM)
Conductor.changeBPM(SONG.notes[Math.floor(curStep / 16)].bpm);
if (camZoomingInterval < 1) camZoomingInterval = 1;
if (camZooming && FlxG.camera.zoom < 1.35 && curBeat % camZoomingInterval == 0)
if (Options.camZoomOnBeat && camZooming && FlxG.camera.zoom < 1.35 && curBeat % camZoomingInterval == 0)
{
FlxG.camera.zoom += 0.015;
camHUD.zoom += 0.03;
source/funkin/menus/MainMenuState.hx
+3 -2
View File
@@ -1,5 +1,6 @@
package funkin.menus;
import funkin.options.Options;
#if desktop
import funkin.system.Discord.DiscordClient;
#end
@@ -155,12 +156,12 @@ class MainMenuState extends MusicBeatState
selectedSomethin = true;
CoolUtil.playMenuSFX(1);
FlxFlicker.flicker(magenta, 1.1, 0.15, false);
if (Options.flashingMenu) FlxFlicker.flicker(magenta, 1.1, 0.15, false);
menuItems.forEach(function(spr:FlxSprite)
{
if (spr.ID != curSelected) return;
FlxFlicker.flicker(spr, 1, 0.06, false, false, function(flick:FlxFlicker)
FlxFlicker.flicker(spr, 1, Options.flashingMenu ? 0.06 : 0.15, false, false, function(flick:FlxFlicker)
{
var daChoice:String = optionShit[curSelected];
source/funkin/options/OptionsMenu.hx
+1 -1
View File
@@ -77,7 +77,7 @@ class OptionsMenu extends MusicBeatState {
if (controls.ACCEPT && alphabets.members[curSelected] != null) {
CoolUtil.playMenuSFX(1);
canSelect = false;
FlxFlicker.flicker(alphabets.members[curSelected], 1, 0.06, false, false, function(flick:FlxFlicker)
FlxFlicker.flicker(alphabets.members[curSelected], 1, Options.flashingMenu ? 0.06 : 0.15, false, false, function(flick:FlxFlicker)
{
FlxTransitionableState.skipNextTransOut = true;
FlxG.switchState(Type.createInstance(options[curSelected].state, []));
source/funkin/options/keybinds/KeybindsOptions.hx
+1 -1
View File
@@ -217,7 +217,7 @@ class KeybindsOptions extends MusicBeatSubstate {
if (alphabets.members[curSelected] != null) {
canSelect = false;
CoolUtil.playMenuSFX(1);
FlxFlicker.flicker(alphabets.members[curSelected], 0.4, 0.1, true, false, function(t) {
FlxFlicker.flicker(alphabets.members[curSelected], 0.4, Options.flashingMenu ? 0.06 : 0.15, true, false, function(t) {
alphabets.members[curSelected].changeKeybind(function() {
canSelect = true;
}, function() {
source/funkin/system/Conductor.hx
+8 -1
View File
@@ -1,5 +1,6 @@
package funkin.system;
import flixel.FlxState;
import funkin.interfaces.IBeatReceiver;
import flixel.FlxG;
import funkin.system.Song.SwagSong;
@@ -107,14 +108,18 @@ class Conductor
totalSteps += deltaSteps;
totalPos += ((60 / curBPM) * 1000 / 4) * deltaSteps;
}
trace("new BPM map BUDDY " + bpmChangeMap);
}
public static function init() {
FlxG.signals.preUpdate.add(update);
FlxG.signals.preStateCreate.add(onStateSwitch);
reset();
}
private static function onStateSwitch(newState:FlxState) {
if (FlxG.sound.music == null)
reset();
}
private static function update() {
var elapsed = FlxG.elapsed;
@@ -140,6 +145,8 @@ class Conductor
lastChange = change;
}
if (lastChange.bpm > 0 && bpm != lastChange.bpm) changeBPM(lastChange.bpm);
curStepFloat = lastChange.stepTime + ((Conductor.songPosition - lastChange.songTime) / Conductor.stepCrochet);
curBeatFloat = curStepFloat / 4;