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

Cleanup

Browse Source
This commit is contained in:
NeeEoo
2024-03-05 17:54:34 +01:00
parent bf3b884efe
commit 4a34bb19d7
50 changed files with 49 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/backend/MusicBeatState.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.backend;
import flixel.addons.transition.FlxTransitionableState;
import funkin.backend.system.framerate.Framerate;
import funkin.backend.system.GraphicCacheSprite;
import funkin.backend.system.Controls;
source/funkin/backend/MusicBeatSubstate.hx
-1
View File
@@ -6,7 +6,6 @@ import funkin.backend.scripting.Script;
import funkin.backend.scripting.ScriptPack;
import funkin.backend.scripting.DummyScript;
import funkin.backend.system.interfaces.IBeatReceiver;
import funkin.backend.system.Conductor.BPMChangeEvent;
import funkin.backend.system.Conductor;
import funkin.backend.system.Controls;
import funkin.options.PlayerSettings;
source/funkin/backend/system/Conductor.hx
-2
View File
@@ -1,8 +1,6 @@
package funkin.backend.system;
import funkin.backend.chart.Chart;
import funkin.backend.chart.ChartData;
import openfl.Lib;
import flixel.FlxState;
import funkin.backend.system.interfaces.IBeatReceiver;
import flixel.util.FlxSignal.FlxTypedSignal;
source/funkin/backend/system/Main.hx
-1
View File
@@ -15,7 +15,6 @@ import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
import flixel.addons.transition.TransitionData;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import lime.app.Application;
import funkin.backend.system.modules.*;
#if ALLOW_MULTITHREADING
source/funkin/backend/utils/AudioAnalyzer.hx
+7 -7
View File
@@ -15,9 +15,9 @@ class AudioAnalyzer {
__peakByte = Math.pow(2, buffer.bitsPerSample-1)-1;
__timeMulti = 1 / (1 / buffer.sampleRate);
__timeMulti *= buffer.bitsPerSample;
__timeMulti -= __timeMulti % buffer.bitsPerSample;
__timeMulti = 1 / (1 / buffer.sampleRate);
__timeMulti *= buffer.bitsPerSample;
__timeMulti -= __timeMulti % buffer.bitsPerSample;
}
public function analyze(startPos:Float, endPos:Float):Float {
@@ -25,16 +25,16 @@ class AudioAnalyzer {
var bytesEndPos:Int = Math.floor(endPos * __timeMulti / 4000 / buffer.bitsPerSample) * buffer.bitsPerSample;
bytesStartPos -= bytesStartPos % buffer.bitsPerSample;
bytesEndPos -= bytesEndPos % buffer.bitsPerSample;
bytesEndPos -= bytesEndPos % buffer.bitsPerSample;
var maxByte:Int = 0;
for(i in 0...Math.floor((bytesEndPos - bytesStartPos) / buffer.bitsPerSample)) {
var byte:Int = buffer.data.buffer.get(bytesStartPos + (i * buffer.bitsPerSample))
var byte:Int = buffer.data.buffer.get(bytesStartPos + (i * buffer.bitsPerSample))
| (buffer.data.buffer.get(bytesStartPos + (i * buffer.bitsPerSample) + 1) << 8);
if (byte > 256 * 128) byte -= 256 * 256;
if (maxByte < byte) maxByte = byte;
}
return maxByte/__peakByte;
return maxByte/__peakByte;
}
}
source/funkin/backend/utils/CoolUtil.hx
-5
View File
@@ -1,7 +1,6 @@
package funkin.backend.utils;
import flixel.text.FlxText;
import openfl.text.TextFormatAlign;
import funkin.backend.utils.XMLUtil.TextFormat;
import flixel.tweens.FlxTween;
import flixel.system.frontEnds.SoundFrontEnd;
@@ -9,7 +8,6 @@ import flixel.sound.FlxSound;
import funkin.backend.system.Conductor;
import flixel.sound.FlxSoundGroup;
import haxe.Json;
import funkin.menus.StoryMenuState.WeekData;
import haxe.io.Path;
import haxe.xml.Access;
import flixel.input.keyboard.FlxKey;
@@ -17,10 +15,7 @@ import lime.utils.Assets;
import flixel.animation.FlxAnimation;
import flixel.util.FlxColor;
import flixel.util.FlxAxes;
import flixel.graphics.frames.FlxFrame;
import flixel.graphics.frames.FlxFramesCollection;
import openfl.geom.ColorTransform;
import funkin.backend.chart.Chart;
import haxe.CallStack;
using StringTools;
source/funkin/editors/EditorPicker.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.editors;
import flixel.addons.transition.FlxTransitionableState;
import flixel.math.FlxPoint;
import flixel.effects.FlxFlicker;
source/funkin/editors/SaveSubstate.hx
-3
View File
@@ -5,9 +5,6 @@ import sys.io.File;
#end
import haxe.io.Path;
import lime.ui.FileDialog;
import openfl.net.FileReference;
import openfl.events.Event;
import openfl.events.IOErrorEvent;
class SaveSubstate extends MusicBeatSubstate {
public var saveOptions:Map<String, Bool>;
source/funkin/editors/character/CharacterEditor.hx
-2
View File
@@ -5,9 +5,7 @@ import haxe.xml.Printer;
import haxe.xml.Access;
import funkin.backend.utils.XMLUtil.AnimData;
import flixel.math.FlxPoint;
import flixel.animation.FlxAnimation;
import funkin.editors.ui.UIContextMenu.UIContextMenuOption;
import flixel.input.keyboard.FlxKey;
import funkin.game.Character;
class CharacterEditor extends UIState {
source/funkin/editors/charter/ChartCreationScreen.hx
-1
View File
@@ -3,7 +3,6 @@ package funkin.editors.charter;
import flixel.text.FlxText.FlxTextFormat;
import flixel.text.FlxText.FlxTextFormatMarkerPair;
import funkin.backend.shaders.CustomShader;
import flixel.math.FlxRect;
import funkin.game.Character;
import funkin.game.Stage;
import funkin.game.HealthIcon;
source/funkin/editors/charter/Charter.hx
-8
View File
@@ -1,7 +1,5 @@
package funkin.editors.charter;
import openfl.geom.Rectangle;
import flixel.util.FlxSpriteUtil;
import funkin.editors.ui.UIContextMenu.UIContextMenuOptionSpr;
import funkin.editors.ui.UITopMenu.UITopMenuButton;
import funkin.editors.charter.CharterStrumline;
@@ -10,20 +8,14 @@ import funkin.backend.system.framerate.Framerate;
import haxe.Json;
import flixel.input.keyboard.FlxKey;
import flixel.sound.FlxSound;
import flixel.util.FlxSort;
import flixel.math.FlxPoint;
import funkin.editors.charter.CharterBackdropGroup.CharterBackdropDummy;
import funkin.backend.system.Conductor;
import funkin.backend.chart.*;
import funkin.backend.chart.ChartData;
import openfl.display.BitmapData;
import flixel.util.FlxColor;
import flixel.addons.display.FlxBackdrop;
import funkin.editors.ui.UIContextMenu.UIContextMenuOption;
import funkin.editors.ui.UIState;
import openfl.net.FileReference;
using flixel.util.FlxColor;
class Charter extends UIState {
public static var __song:String;
source/funkin/editors/charter/CharterBackdropGroup.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.editors.charter;
import flixel.util.FlxPool;
import flixel.graphics.FlxGraphic;
import funkin.backend.system.Conductor;
import openfl.geom.Rectangle;
source/funkin/editors/charter/CharterSelection.hx
-2
View File
@@ -3,11 +3,9 @@ package funkin.editors.charter;
import funkin.backend.chart.ChartData;
import funkin.backend.chart.ChartData.ChartMetaData;
import haxe.Json;
import funkin.backend.assets.ModsFolder;
import funkin.editors.charter.SongCreationScreen.SongCreationData;
import funkin.options.type.NewOption;
import funkin.backend.system.framerate.Framerate;
import flixel.util.FlxColor;
import funkin.menus.FreeplayState.FreeplaySonglist;
import funkin.editors.EditorTreeMenu;
import funkin.options.*;
source/funkin/editors/charter/CharterStrumLineGroup.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.editors.charter;
import funkin.backend.chart.ChartData.ChartStrumLine;
import funkin.backend.chart.EventsData;
import flixel.util.FlxSort;
source/funkin/editors/charter/CharterStrumline.hx
-2
View File
@@ -1,9 +1,7 @@
package funkin.editors.charter;
import flixel.group.FlxSpriteGroup;
import funkin.backend.chart.EventsData;
import funkin.game.Character;
import funkin.editors.ui.UIContextMenu.UIContextMenuOption;
import funkin.editors.ui.UITopMenu.UITopMenuButton;
import funkin.game.HealthIcon;
import funkin.backend.chart.ChartData.ChartStrumLine;
source/funkin/editors/charter/SongCreationScreen.hx
+1 -1
View File
@@ -3,7 +3,7 @@ package funkin.editors.charter;
import flixel.text.FlxText.FlxTextFormat;
import flixel.text.FlxText.FlxTextFormatMarkerPair;
import flixel.group.FlxGroup;
import funkin.backend.chart.ChartData;
import funkin.backend.chart.ChartData.ChartMetaData;
import haxe.io.Bytes;
typedef SongCreationData = {
source/funkin/editors/ui/UIAudioPlayer.hx
-1
View File
@@ -3,7 +3,6 @@ package funkin.editors.ui;
import flixel.math.FlxRect;
import flixel.util.FlxColor;
import flixel.ui.FlxBar;
import openfl.geom.Rectangle;
import flixel.sound.FlxSound;
import haxe.io.Bytes;
import lime.media.AudioBuffer;
source/funkin/editors/ui/UIAutoCompleteTextBox.hx
-3
View File
@@ -1,10 +1,7 @@
package funkin.editors.ui;
import flixel.math.FlxPoint;
import lime.ui.KeyModifier;
import lime.ui.KeyCode;
import openfl.desktop.Clipboard;
import openfl.geom.Rectangle;
class UIAutoCompleteTextBox extends UITextBox {
public var suggestionText:UIText;
source/funkin/editors/ui/UIButton.hx
-2
View File
@@ -1,7 +1,5 @@
package funkin.editors.ui;
import flixel.graphics.frames.FlxFrame;
class UIButton extends UISliceSprite {
public var callback:Void->Void = null;
public var field:UIText;
source/funkin/editors/ui/UIButtonList.hx
-3
View File
@@ -1,10 +1,7 @@
package funkin.editors.ui;
import flixel.FlxCamera;
import flixel.group.FlxGroup;
import flixel.util.FlxColor;
import flixel.math.FlxPoint;
import funkin.game.Character;
import flixel.util.FlxSort;
import flixel.math.FlxMath;
source/funkin/editors/ui/UICheckbox.hx
-2
View File
@@ -1,7 +1,5 @@
package funkin.editors.ui;
import funkin.backend.FunkinText;
class UICheckbox extends UISprite {
public var checked:Bool = false;
public var onChecked:Bool->Void = null;
source/funkin/editors/ui/UIState.hx
-1
View File
@@ -2,7 +2,6 @@ package funkin.editors.ui;
import lime.ui.KeyModifier;
import lime.ui.KeyCode;
import openfl.events.KeyboardEvent;
import funkin.backend.system.framerate.Framerate;
import funkin.editors.ui.UIContextMenu.UIContextMenuCallback;
import openfl.ui.Mouse;
source/funkin/game/GameOverSubstate.hx
-3
View File
@@ -4,10 +4,7 @@ import funkin.editors.charter.Charter;
import funkin.backend.scripting.events.GameOverCreationEvent;
import funkin.backend.scripting.events.CancellableEvent;
import funkin.backend.scripting.Script;
import flixel.addons.transition.FlxTransitionableState;
import flixel.sound.FlxSound;
import flixel.FlxSubState;
import flixel.math.FlxPoint;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import funkin.menus.StoryMenuState;
source/funkin/game/HudCamera.hx
-24
View File
@@ -1,31 +1,7 @@
package funkin.game;
import lime.app.Application;
import flixel.graphics.tile.FlxGraphicsShader;
import openfl.display.Bitmap;
import openfl.display.BitmapData;
import openfl.display.DisplayObject;
import openfl.display.Graphics;
import openfl.display.Sprite;
import openfl.geom.ColorTransform;
import openfl.geom.Point;
import openfl.geom.Rectangle;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxFrame;
import flixel.graphics.tile.FlxDrawBaseItem;
import flixel.graphics.tile.FlxDrawTrianglesItem;
import flixel.math.FlxMatrix;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import flixel.system.FlxAssets.FlxShader;
import flixel.util.FlxAxes;
import flixel.util.FlxColor;
import flixel.util.FlxSpriteUtil;
import openfl.display.BlendMode;
import openfl.filters.BitmapFilter;
import openfl.filters.ShaderFilter;
import openfl.Vector;
class HudCamera extends FlxCamera {
public var downscroll:Bool = false;
source/funkin/game/Note.hx
+1 -4
View File
@@ -1,11 +1,8 @@
package funkin.game;
import funkin.backend.chart.Chart;
import funkin.backend.chart.ChartData;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.util.FlxColor;
import flixel.math.FlxRect;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import funkin.backend.system.Conductor;
import funkin.backend.scripting.events.*;
source/funkin/game/PlayState.hx
-3
View File
@@ -2,7 +2,6 @@ package funkin.game;
import funkin.editors.charter.CharterSelection;
import flixel.FlxState;
import funkin.editors.EditorTreeMenu;
import funkin.editors.SaveWarning;
import funkin.backend.chart.EventsData;
import funkin.backend.system.RotatingSpriteGroup;
@@ -15,11 +14,9 @@ import funkin.game.SplashHandler;
import funkin.backend.scripting.DummyScript;
import funkin.menus.StoryMenuState.WeekData;
import funkin.backend.FunkinText;
import flixel.group.FlxSpriteGroup;
import funkin.backend.scripting.Script;
import funkin.backend.scripting.ScriptPack;
import flixel.FlxSubState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.math.FlxPoint;
import flixel.sound.FlxSound;
import flixel.text.FlxText;
source/funkin/game/Stage.hx
-1
View File
@@ -3,7 +3,6 @@ package funkin.game;
import funkin.backend.scripting.events.StageXMLEvent;
import funkin.backend.scripting.events.StageNodeEvent;
import flixel.math.FlxPoint;
import funkin.backend.MusicBeatGroup;
import flixel.FlxState;
import haxe.xml.Access;
import funkin.backend.system.interfaces.IBeatReceiver;
source/funkin/menus/BetaWarningState.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.menus;
import flixel.addons.transition.FlxTransitionableState;
import flixel.util.FlxColor;
import flixel.text.FlxText;
import funkin.backend.FunkinText;
source/funkin/menus/FreeplayState.hx
+1 -4
View File
@@ -1,17 +1,14 @@
package funkin.menus;
import funkin.backend.chart.Chart;
import funkin.backend.chart.ChartData;
import funkin.backend.chart.ChartData.ChartMetaData;
import haxe.io.Path;
import openfl.text.TextField;
import flixel.FlxState;
import flixel.addons.display.FlxGridOverlay;
import flixel.text.FlxText;
import flixel.util.FlxColor;
import lime.utils.Assets;
import funkin.game.HealthIcon;
import funkin.savedata.FunkinSave;
import haxe.Json;
import funkin.backend.scripting.events.*;
using StringTools;
source/funkin/menus/GitarooPause.hx
-1
View File
@@ -1,7 +1,6 @@
package funkin.menus;
import funkin.editors.charter.Charter;
import flixel.graphics.frames.FlxAtlasFrames;
class GitarooPause extends MusicBeatState
{
source/funkin/menus/MainMenuState.hx
-2
View File
@@ -4,9 +4,7 @@ import haxe.Json;
import funkin.backend.FunkinText;
import funkin.menus.credits.CreditsMain;
import flixel.FlxState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.effects.FlxFlicker;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
source/funkin/menus/PauseSubState.hx
-3
View File
@@ -6,9 +6,6 @@ import funkin.options.OptionsMenu;
import funkin.backend.scripting.events.PauseCreationEvent;
import funkin.backend.scripting.events.NameEvent;
import funkin.backend.scripting.Script;
import flixel.FlxSubState;
import flixel.addons.transition.FlxTransitionableState;
import flixel.input.keyboard.FlxKey;
import flixel.sound.FlxSound;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
source/funkin/menus/StoryMenuState.hx
+1 -2
View File
@@ -5,7 +5,6 @@ import haxe.io.Path;
import funkin.backend.scripting.events.*;
import flixel.util.FlxTimer;
import flixel.math.FlxPoint;
import flixel.graphics.frames.FlxFramesCollection;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
import funkin.backend.FunkinText;
@@ -37,7 +36,7 @@ class StoryMenuState extends MusicBeatState {
public var weekSprites:FlxTypedGroup<MenuItem>;
public var characterSprites:FlxTypedGroup<MenuCharacterSprite>;
public var charFrames:Map<String, FlxFramesCollection> = [];
//public var charFrames:Map<String, FlxFramesCollection> = [];
public override function create() {
super.create();
source/funkin/menus/TitleState.hx
-15
View File
@@ -1,27 +1,12 @@
package funkin.menus;
import funkin.backend.system.github.GitHub;
import funkin.backend.MusicBeatGroup;
import funkin.backend.utils.XMLUtil;
import flixel.util.typeLimit.OneOfThree;
import flixel.util.typeLimit.OneOfTwo;
import flixel.FlxState;
import flixel.addons.display.FlxGridOverlay;
import flixel.addons.transition.FlxTransitionSprite.GraphicTransTileDiamond;
import flixel.addons.transition.FlxTransitionableState;
import flixel.graphics.FlxGraphic;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxGroup;
import flixel.input.gamepad.FlxGamepad;
import flixel.math.FlxPoint;
import flixel.math.FlxRect;
import flixel.sound.FlxSound;
import flixel.system.ui.FlxSoundTray;
import flixel.text.FlxText;
import flixel.tweens.FlxTween;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import funkin.backend.system.Conductor;
import openfl.Assets;
import haxe.xml.Access;
source/funkin/menus/credits/CreditsMain.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.menus.credits;
import funkin.backend.system.github.GitHub;
import funkin.options.OptionsScreen;
import funkin.options.type.*;
import funkin.options.TreeMenu;
source/funkin/menus/ui/Alphabet.hx
-1
View File
@@ -4,7 +4,6 @@ import openfl.utils.AssetLibrary;
import haxe.xml.Access;
import funkin.backend.assets.LimeLibrarySymbol;
import funkin.backend.assets.IModsAssetLibrary;
import flixel.graphics.frames.FlxAtlasFrames;
import flixel.group.FlxSpriteGroup;
import flixel.util.FlxTimer;
import flixel.util.FlxColor;
source/funkin/options/Options.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.options;
import funkin.backend.system.Controls;
import openfl.Lib;
import flixel.util.FlxSave;
import flixel.input.keyboard.FlxKey;
source/funkin/options/OptionsMenu.hx
-3
View File
@@ -3,9 +3,6 @@ package funkin.options;
import funkin.backend.system.framerate.Framerate;
import funkin.options.type.Checkbox;
import haxe.xml.Access;
import flixel.tweens.FlxTween;
import funkin.menus.MainMenuState;
import flixel.util.typeLimit.OneOfTwo;
import funkin.options.type.*;
import funkin.options.categories.*;
import funkin.options.TreeMenu;
source/funkin/options/OptionsTree.hx
+3 -4
View File
@@ -3,10 +3,9 @@ package funkin.options;
class OptionsTree extends FlxTypedGroup<OptionsScreen> {
public var lastMenu:OptionsScreen;
public var treeParent:TreeMenu;
public override function new() {
super();
}
//public override function new() {
// super();
//}
public override function update(elapsed:Float) {
var last = members.last();
source/funkin/options/PlayerSettings.hx
+1 -4
View File
@@ -29,9 +29,6 @@ class PlayerSettings
public var controls:Controls;
#end
// public var avatar:Player;
// public var camera(get, never):PlayCamera;
function new(id, scheme)
{
this.id = id;
@@ -42,7 +39,7 @@ class PlayerSettings
{
controls.setKeyboardScheme(scheme);
}
static public function init():Void
{
if (solo == null)
source/funkin/options/TreeMenu.hx
-2
View File
@@ -5,10 +5,8 @@ import flixel.FlxState;
import funkin.backend.FunkinText;
import flixel.tweens.FlxTween;
import funkin.menus.MainMenuState;
import funkin.options.type.TextOption;
import flixel.util.typeLimit.OneOfTwo;
import funkin.options.type.OptionType;
import funkin.options.categories.*;
class TreeMenu extends UIState {
public var main:OptionsScreen;
source/funkin/options/categories/AppearanceOptions.hx
+2 -3
View File
@@ -48,9 +48,8 @@ class AppearanceOptions extends OptionsScreen {
"If checked, switching windows will pause the game.",
"autoPause"));
}
private function __changeFPS(change:Float)
{
private function __changeFPS(change:Float) {
// if statement cause of the flixel warning
if(FlxG.updateFramerate < Std.int(change))
FlxG.drawFramerate = FlxG.updateFramerate = Std.int(change);
source/funkin/options/categories/GameplayOptions.hx
+25 -5
View File
@@ -1,9 +1,13 @@
package funkin.options.categories;
import flixel.util.FlxTimer;
import funkin.backend.system.Conductor;
class GameplayOptions extends OptionsScreen {
var __metronome = FlxG.sound.load(Paths.sound('editors/charter/metronome'));
var offsetSetting:NumOption;
public override function new() {
super("Gameplay", 'Change Gameplay options such as Downscroll, Scroll Speed, Naughtyness...');
add(new Checkbox(
@@ -14,7 +18,7 @@ class GameplayOptions extends OptionsScreen {
"Ghost Tapping",
"If unchecked, trying to hit any strum that have no note that can be hit will cause a miss.",
"ghostTapping"));
add(new NumOption(
add(offsetSetting = new NumOption(
"Song Offset",
"Changes the offset that songs should start with.",
-999, // minimum
@@ -31,23 +35,39 @@ class GameplayOptions extends OptionsScreen {
"If unchecked, will stop the camera from zooming in every 4 beats",
"camZoomOnBeat"));
}
private function __changeOffset(offset) Conductor.songOffset = offset;
private function __changeOffset(offset)
Conductor.songOffset = offset;
var __lastBeat:Int = 0;
var __lastSongBeat:Int = 0;
override function update(elapsed) {
super.update(elapsed);
FlxG.camera.zoom = CoolUtil.fpsLerp(FlxG.camera.zoom, 1, 0.04);
if (members[2].selected) {
if (offsetSetting.selected) {
FlxG.sound.music.volume = 0.5;
if (__lastBeat != Conductor.curBeat) {
FlxG.camera.zoom += 0.03;
__lastBeat = Conductor.curBeat;
}
if (__lastSongBeat != Math.floor(Conductor.getStepForTime(FlxG.sound.music.time) / Conductor.stepsPerBeat)) {
var beat = Math.floor(Conductor.getStepForTime(FlxG.sound.music.time) / Conductor.stepsPerBeat);
if (__lastSongBeat != beat) {
__metronome.replay();
__lastSongBeat = Math.floor(Conductor.getStepForTime(FlxG.sound.music.time) / Conductor.stepsPerBeat);
__lastSongBeat = beat;
}
}
else FlxG.sound.music.volume = 1;
}
public override function close() {
// To remove this timer move super.update(elapsed); to the end, but im afraid it will cause stuff to break
new FlxTimer().start(0.0000001, (_) -> {
FlxG.camera.zoom = 1;
FlxG.sound.music.volume = 1;
});
super.close();
}
}
source/funkin/options/keybinds/ChangeKeybindSubState.hx
+1 -5
View File
@@ -1,9 +1,5 @@
package funkin.options.keybinds;
import flixel.effects.FlxFlicker;
import funkin.backend.system.Controls;
import flixel.addons.transition.FlxTransitionableState;
import flixel.util.FlxColor;
import flixel.input.keyboard.FlxKey;
class ChangeKeybindSubState extends MusicBeatSubstate {
@@ -27,7 +23,7 @@ class ChangeKeybindSubState extends MusicBeatSubstate {
if (cast(key, Int) <= 0) return;
if (key == ESCAPE && !FlxG.keys.pressed.SHIFT) {
close();
close();
cancelCallback();
return;
}
source/funkin/options/keybinds/KeybindSetting.hx
-3
View File
@@ -1,9 +1,6 @@
package funkin.options.keybinds;
import flixel.effects.FlxFlicker;
import funkin.backend.system.Controls;
import flixel.addons.transition.FlxTransitionableState;
import flixel.util.FlxColor;
import flixel.input.keyboard.FlxKey;
using StringTools;
source/funkin/options/keybinds/KeybindsOptions.hx
-3
View File
@@ -1,9 +1,6 @@
package funkin.options.keybinds;
import funkin.backend.system.Controls;
import flixel.addons.transition.FlxTransitionableState;
import flixel.util.FlxColor;
import flixel.input.keyboard.FlxKey;
using StringTools;
source/funkin/options/type/ArrayOption.hx
+6 -13
View File
@@ -1,7 +1,5 @@
package funkin.options.type;
import flixel.effects.FlxFlicker;
class ArrayOption extends OptionType {
public var selectCallback:String->Void;
@@ -31,17 +29,12 @@ class ArrayOption extends OptionType {
this.parent = parent;
if(Reflect.field(parent, optionName) != null)
{
if(options.indexOf(Reflect.field(parent, optionName)) != -1)
this.currentSelection = options.indexOf(Reflect.field(parent, optionName));
else
this.currentSelection = 0;
}
var fieldValue = Reflect.field(parent, optionName);
if(fieldValue != null)
this.currentSelection = Std.int(Math.max(0, options.indexOf(fieldValue)));
this.optionName = optionName;
add(__text = new Alphabet(100, 20, text, true));
add(__selectiontext = new Alphabet(__text.width + 120, -30, formatTextOption(), false));
}
@@ -52,7 +45,7 @@ class ArrayOption extends OptionType {
public override function onChangeSelection(change:Float):Void
{
if(currentSelection <= 0 && change == -1 || currentSelection >= options.length - 1 && change == 1 ) return;
if(currentSelection <= 0 && change == -1 || currentSelection >= options.length - 1 && change == 1) return;
currentSelection += Math.round(change);
__selectiontext.text = formatTextOption();
Reflect.setField(parent, optionName, options[currentSelection]);
source/funkin/options/type/Checkbox.hx
-1
View File
@@ -2,7 +2,6 @@ package funkin.options.type;
import flixel.math.FlxPoint;
@:allow()
class Checkbox extends TextOption {
public var checkbox:FlxSprite;
source/funkin/options/type/EditorIconOption.hx
-1
View File
@@ -1,6 +1,5 @@
package funkin.options.type;
import funkin.game.HealthIcon;
import flixel.util.FlxColor;
class EditorIconOption extends IconOption {
source/funkin/options/type/OptionType.hx
-1
View File
@@ -2,7 +2,6 @@ package funkin.options.type;
import funkin.backend.system.Controls;
import flixel.group.FlxSpriteGroup;
import funkin.options.OptionsScreen;
class OptionType extends FlxSpriteGroup {
public var controls(get, null):Controls;