From 8bbd7bc466159d49ab507b968b3bb5a8cb7ba088 Mon Sep 17 00:00:00 2001 From: kiry vajiravuth Date: Wed, 24 Jun 2026 20:54:20 +0700 Subject: [PATCH] even more typo fixes --- source/funkin/audio/FunkinSound.hx | 2 +- source/funkin/audio/visualize/PolygonSpectogram.hx | 2 +- source/funkin/audio/waveform/WaveformData.hx | 2 +- source/funkin/data/event/SongEventSchema.hx | 2 +- source/funkin/data/freeplay/player/PlayerData.hx | 2 +- source/funkin/data/song/importer/OsuManiaData.hx | 2 +- .../funkin/data/song/importer/StepManiaImporter.hx | 2 +- source/funkin/data/stage/StageData.hx | 2 +- source/funkin/effects/FunkTrail.hx | 2 +- source/funkin/external/apple/KeyboardUtil.hx | 2 +- source/funkin/input/Controls.hx | 2 +- source/funkin/mobile/ui/FunkinButton.hx | 4 ++-- source/funkin/mobile/ui/FunkinHitbox.hx | 2 +- source/funkin/play/GameOverSubState.hx | 2 +- source/funkin/play/PlayState.hx | 6 +++--- source/funkin/play/ResultState.hx | 2 +- source/funkin/play/notes/SustainTrail.hx | 2 +- source/funkin/save/Save.hx | 8 ++++---- source/funkin/ui/debug/charting/ChartEditorState.hx | 12 ++++++------ .../commands/SelectAllItemsBetweenTimeCommand.hx | 2 +- .../charting/components/ChartEditorMeasureTicks.hx | 2 +- source/funkin/ui/freeplay/LetterSort.hx | 6 +++--- source/funkin/ui/transition/LoadingState.hx | 2 +- .../funkin/ui/transition/preload/FunkinPreloader.hx | 2 +- 24 files changed, 37 insertions(+), 37 deletions(-) diff --git a/source/funkin/audio/FunkinSound.hx b/source/funkin/audio/FunkinSound.hx index 780e10de5..f05096a9b 100644 --- a/source/funkin/audio/FunkinSound.hx +++ b/source/funkin/audio/FunkinSound.hx @@ -420,7 +420,7 @@ class FunkinSound extends FlxSound implements ICloneable * @param autoPlay Whether to play the sound immediately or wait for a `play()` call. * @param persist Whether to keep this `FunkinSound` between states, or destroy it. * @param onComplete Called when the sound finished playing. - * @param onLoad Called when the sound finished loading. Called immediately for succesfully loaded embedded sounds. + * @param onLoad Called when the sound finished loading. Called immediately for successfully loaded embedded sounds. * @param important If `true`, the sound channel will forcefully be added onto the channel array, even if full. Use sparingly! * @return A `FunkinSound` object, or `null` if the sound could not be loaded. */ diff --git a/source/funkin/audio/visualize/PolygonSpectogram.hx b/source/funkin/audio/visualize/PolygonSpectogram.hx index aba12f96c..d07c967eb 100644 --- a/source/funkin/audio/visualize/PolygonSpectogram.hx +++ b/source/funkin/audio/visualize/PolygonSpectogram.hx @@ -88,7 +88,7 @@ class PolygonSpectogram extends MeshRender var funnyPixels:Int = Std.int(daHeight * detail); // sorta redundant but just need it for different var... - if (prevAudioData == audioData.subarray(startSample, startSample + samplesToGen)) return; // optimize / finish funciton here, no need to re-render + if (prevAudioData == audioData.subarray(startSample, startSample + samplesToGen)) return; // optimize / finish function here, no need to re-render prevAudioData = audioData.subarray(startSample, samplesToGen); diff --git a/source/funkin/audio/waveform/WaveformData.hx b/source/funkin/audio/waveform/WaveformData.hx index 056efe9ad..3af39171b 100644 --- a/source/funkin/audio/waveform/WaveformData.hx +++ b/source/funkin/audio/waveform/WaveformData.hx @@ -181,7 +181,7 @@ class WaveformData } /** - * Create a new WaveformData whose data represents the two waveforms overlayed. + * Create a new WaveformData whose data represents the two waveforms overlaid. */ public function merge(that:WaveformData):WaveformData { diff --git a/source/funkin/data/event/SongEventSchema.hx b/source/funkin/data/event/SongEventSchema.hx index bdbac4f84..dc5578f7e 100644 --- a/source/funkin/data/event/SongEventSchema.hx +++ b/source/funkin/data/event/SongEventSchema.hx @@ -17,7 +17,7 @@ abstract SongEventSchema(SongEventSchemaRaw) * Retrieve a SongEventSchemaField by name. This works even if the field is inside a Frame. * You can use array access to call this function; `schema["field_name"]` * - * @param name The name of the field to retreive. + * @param name The name of the field to retrieve. * @return The retrieved field, or null if not found. */ @:arrayAccess diff --git a/source/funkin/data/freeplay/player/PlayerData.hx b/source/funkin/data/freeplay/player/PlayerData.hx index ecb1db613..3e9894974 100644 --- a/source/funkin/data/freeplay/player/PlayerData.hx +++ b/source/funkin/data/freeplay/player/PlayerData.hx @@ -6,7 +6,7 @@ import funkin.data.animation.AnimationData; class PlayerData { /** - * The sematic version number of the player data JSON format. + * The semantic version number of the player data JSON format. * Supports fancy comparisons like NPM does it's neat. */ @:default(funkin.data.freeplay.player.PlayerRegistry.PLAYER_DATA_VERSION) diff --git a/source/funkin/data/song/importer/OsuManiaData.hx b/source/funkin/data/song/importer/OsuManiaData.hx index ee9a08497..4a501948d 100644 --- a/source/funkin/data/song/importer/OsuManiaData.hx +++ b/source/funkin/data/song/importer/OsuManiaData.hx @@ -2,7 +2,7 @@ package funkin.data.song.importer; /** * Structure of a parsed Osu!Mania .osu file - * Stuctured like a INI file format by CSV for HitObjects and more + * Structured like a INI file format by CSV for HitObjects and more */ typedef OsuManiaData = { diff --git a/source/funkin/data/song/importer/StepManiaImporter.hx b/source/funkin/data/song/importer/StepManiaImporter.hx index b6c953427..8913051cc 100644 --- a/source/funkin/data/song/importer/StepManiaImporter.hx +++ b/source/funkin/data/song/importer/StepManiaImporter.hx @@ -433,7 +433,7 @@ class StepManiaImporter result = pushWorking(workingDiff, result); } - // Syncronize timing points with StepStops + // Synchronize timing points with StepStops result.TimingPoints = synchronizeStepTimingPoints(result.Stops, result.TimingPoints); return result; diff --git a/source/funkin/data/stage/StageData.hx b/source/funkin/data/stage/StageData.hx index da93b048f..cfbbf4320 100644 --- a/source/funkin/data/stage/StageData.hx +++ b/source/funkin/data/stage/StageData.hx @@ -6,7 +6,7 @@ import funkin.data.animation.AnimationData; class StageData { /** - * The sematic version number of the stage data JSON format. + * The semantic version number of the stage data JSON format. * Supports fancy comparisons like NPM does it's neat. */ @:default(funkin.data.stage.StageRegistry.STAGE_DATA_VERSION) diff --git a/source/funkin/effects/FunkTrail.hx b/source/funkin/effects/FunkTrail.hx index b2ee31c84..809caf6a8 100644 --- a/source/funkin/effects/FunkTrail.hx +++ b/source/funkin/effects/FunkTrail.hx @@ -7,7 +7,7 @@ import flixel.system.FlxAssets.FlxGraphicAsset; import flixel.math.FlxPoint; /** - * An offshoot of FlxTrail, but accomodates the way Funkin + * An offshoot of FlxTrail, but accommodates the way Funkin * does offsets for characters. example, fixes Spirits trail */ @:nullSafety diff --git a/source/funkin/external/apple/KeyboardUtil.hx b/source/funkin/external/apple/KeyboardUtil.hx index 5ae2f03d8..145111e20 100644 --- a/source/funkin/external/apple/KeyboardUtil.hx +++ b/source/funkin/external/apple/KeyboardUtil.hx @@ -8,7 +8,7 @@ package funkin.external.apple; extern class KeyboardUtil { /** - * Retrieves wether a hardware keyboard is connected to the device. + * Retrieves whether a hardware keyboard is connected to the device. * * Works on iOS 16.4 and later. * diff --git a/source/funkin/input/Controls.hx b/source/funkin/input/Controls.hx index a72267e44..e01c312cd 100644 --- a/source/funkin/input/Controls.hx +++ b/source/funkin/input/Controls.hx @@ -1712,7 +1712,7 @@ class FunkinAction extends FlxActionDigital /** * Since, in many cases multiple actions should use similar keys, we don't want the - * rebinding UI to list every action. ActionBinders are what the user percieves as + * rebinding UI to list every action. ActionBinders are what the user perceives as * an input so, for instance, they can't set jump-press and jump-release to different keys. */ enum Control diff --git a/source/funkin/mobile/ui/FunkinButton.hx b/source/funkin/mobile/ui/FunkinButton.hx index adad1f173..6e76e7f71 100644 --- a/source/funkin/mobile/ui/FunkinButton.hx +++ b/source/funkin/mobile/ui/FunkinButton.hx @@ -87,13 +87,13 @@ class FunkinButton extends FunkinSprite implements IFlxInput public var deadZones:Array = []; /** - * Whether the button should be released if you swiped over somwhere else. + * Whether the button should be released if you swiped over somewhere else. */ public var limitToBounds:Bool = true; /** * A radius for circular buttons. - * If this radius is larger than 0 then the overlap check will look if the touch point is inside this raius. + * If this radius is larger than 0 then the overlap check will look if the touch point is inside this radius. */ public var radius:Float = 0; diff --git a/source/funkin/mobile/ui/FunkinHitbox.hx b/source/funkin/mobile/ui/FunkinHitbox.hx index 67bfce5d9..992321475 100644 --- a/source/funkin/mobile/ui/FunkinHitbox.hx +++ b/source/funkin/mobile/ui/FunkinHitbox.hx @@ -41,7 +41,7 @@ class FunkinHint extends FunkinButton * Each style is represented as a key with an associated array of two alpha values: * - The first value corresponds to the alpha when the hint is pressed. * - The second value corresponds to the alpha when the hint is not pressed. - * - The third value corresponds to the duratuon it'll take to tween between the two values. + * - The third value corresponds to the duration it'll take to tween between the two values. */ static final HINT_ALPHA_STYLE:Map> = [ INVISIBLE_TILL_PRESS => [0.3, 0.00001, 0.01], diff --git a/source/funkin/play/GameOverSubState.hx b/source/funkin/play/GameOverSubState.hx index c0e5cd0ea..5b1a85acc 100644 --- a/source/funkin/play/GameOverSubState.hx +++ b/source/funkin/play/GameOverSubState.hx @@ -36,7 +36,7 @@ class GameOverSubState extends MusicBeatSubState { /** * The currently active GameOverSubState. - * There should be only one GameOverSubState in existance at a time, we can use a singleton. + * There should be only one GameOverSubState in existence at a time, we can use a singleton. */ public static var instance:Null = null; diff --git a/source/funkin/play/PlayState.hx b/source/funkin/play/PlayState.hx index b58895002..225608c80 100644 --- a/source/funkin/play/PlayState.hx +++ b/source/funkin/play/PlayState.hx @@ -173,7 +173,7 @@ class PlayState extends MusicBeatSubState */ /** * The currently active PlayState. - * There should be only one PlayState in existance at a time, we can use a singleton. + * There should be only one PlayState in existence at a time, we can use a singleton. */ public static var instance:Null; @@ -1164,11 +1164,11 @@ class PlayState extends MusicBeatSubState } // Lime has some precision loss when getting the sound current position - // Since the notes scrolling is dependant on the sound time that caused it to appear "stuttery" for some people + // Since the notes scrolling is dependent on the sound time that caused it to appear "stuttery" for some people // As a workaround for that, we lerp the conductor position to the music time to fill the gap in this lost precision making the scrolling smoother // The previous method where it "guessed" the song position based on the elapsed time had some flaws // Sometimes the songPosition would exceed the music length causing issues in other places - // And it was frame dependant which we don't like!! + // And it was frame dependent which we don't like!! if (FlxG.sound.music.playing) { final audioDiff:Float = Math.round(Math.abs(FlxG.sound.music.time - (Conductor.instance.songPosition - Conductor.instance.combinedOffset))); diff --git a/source/funkin/play/ResultState.hx b/source/funkin/play/ResultState.hx index faa6b37ce..786f22604 100644 --- a/source/funkin/play/ResultState.hx +++ b/source/funkin/play/ResultState.hx @@ -1154,7 +1154,7 @@ typedef ResultsStateParams = var scoreData:SaveScoreData; /** - * The previous score data, used for rank comparision. + * The previous score data, used for rank comparison. */ var ?prevScoreData:SaveScoreData; diff --git a/source/funkin/play/notes/SustainTrail.hx b/source/funkin/play/notes/SustainTrail.hx index 78424e2fa..80a6217e1 100644 --- a/source/funkin/play/notes/SustainTrail.hx +++ b/source/funkin/play/notes/SustainTrail.hx @@ -112,7 +112,7 @@ class SustainTrail extends FlxSprite public var bottomClip:Float = 0.9; /** - * Whether the note will recieve custom vertex data + * Whether the note will receive custom vertex data */ public var customVertexData:Bool = false; diff --git a/source/funkin/save/Save.hx b/source/funkin/save/Save.hx index 9a3ab4003..8bfcf36bf 100644 --- a/source/funkin/save/Save.hx +++ b/source/funkin/save/Save.hx @@ -68,7 +68,7 @@ class Save implements ConsoleClass this.data = data ??= Save.getDefaultData(); // Build macro will inject SaveProperty initialization here automatically - // Make sure the verison number is up to date before we flush. + // Make sure the version number is up to date before we flush. updateVersionToLatest(); } @@ -80,7 +80,7 @@ class Save implements ConsoleClass #end return { // Version number is an abstract(Array) internally. - // This means it copies by reference, so merging save data overides the version number lol. + // This means it copies by reference, so merging save data overrides the version number lol. version: thx.Dynamics.clone(Save.SAVE_DATA_VERSION), volume: 1.0, mute: false, @@ -950,7 +950,7 @@ class Save implements ConsoleClass } /** - * An anonymous structure containingg all the user's save data. + * An anonymous structure containing all the user's save data. * Isn't stored with JSON, stored with some sort of Haxe built-in serialization? */ typedef RawSaveData = @@ -1030,7 +1030,7 @@ typedef SaveDataUnlocks = } /** - * An anoymous structure containing options about the user's high scores. + * An anonymous structure containing options about the user's high scores. */ typedef SaveHighScoresData = { diff --git a/source/funkin/ui/debug/charting/ChartEditorState.hx b/source/funkin/ui/debug/charting/ChartEditorState.hx index cb5f06a71..82ec990e9 100644 --- a/source/funkin/ui/debug/charting/ChartEditorState.hx +++ b/source/funkin/ui/debug/charting/ChartEditorState.hx @@ -316,7 +316,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * The length of the current instrumental, converted to steps. - * Dependant on BPM, because the size of a grid square does not change with BPM but the length of a beat does. + * Dependent on BPM, because the size of a grid square does not change with BPM but the length of a beat does. */ var songLengthInSteps(get, set):Float; @@ -334,7 +334,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * The length of the current instrumental, in PIXELS. - * Dependant on BPM, because the size of a grid square does not change with BPM but the length of a beat does. + * Dependent on BPM, because the size of a grid square does not change with BPM but the length of a beat does. */ var songLengthInPixels(get, set):Int; @@ -425,7 +425,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * The relative scroll position in the song, converted to steps. - * NOT dependant on BPM, because the size of a grid square does not change with BPM. + * NOT dependent on BPM, because the size of a grid square does not change with BPM. */ var scrollPositionInSteps(get, set):Float; @@ -442,7 +442,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * The relative scroll position in the song, converted to milliseconds. - * DEPENDANT on BPM, because the duration of a grid square changes with BPM. + * DEPENDENT on BPM, because the duration of a grid square changes with BPM. */ var scrollPositionInMs(get, set):Float; @@ -486,7 +486,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * playheadPosition, converted to steps. - * NOT dependant on BPM, because the size of a grid square does not change with BPM. + * NOT dependent on BPM, because the size of a grid square does not change with BPM. */ var playheadPositionInSteps(get, set):Float; @@ -503,7 +503,7 @@ class ChartEditorState extends UIState // UIState derives from MusicBeatState /** * playheadPosition, converted to milliseconds. - * DEPENDANT on BPM, because the duration of a grid square changes with BPM. + * DEPENDENT on BPM, because the duration of a grid square changes with BPM. */ var playheadPositionInMs(get, set):Float; diff --git a/source/funkin/ui/debug/charting/commands/SelectAllItemsBetweenTimeCommand.hx b/source/funkin/ui/debug/charting/commands/SelectAllItemsBetweenTimeCommand.hx index f01e81167..884027dda 100644 --- a/source/funkin/ui/debug/charting/commands/SelectAllItemsBetweenTimeCommand.hx +++ b/source/funkin/ui/debug/charting/commands/SelectAllItemsBetweenTimeCommand.hx @@ -98,7 +98,7 @@ class SelectAllItemsBetweenTimeCommand implements ChartEditorCommand state.currentEventSelection.push(event); } - // I don't think it's neccesary to copy this code in, but someone will make an issue out of this if I don't, I'm sure. + // I don't think it's necessary to copy this code in, but someone will make an issue out of this if I don't, I'm sure. // If we just selected one or more events (and no notes), then we should make the event data toolbox display the event data for the selected event. if (this.notes.length == 0 && this.events.length == 1) { diff --git a/source/funkin/ui/debug/charting/components/ChartEditorMeasureTicks.hx b/source/funkin/ui/debug/charting/components/ChartEditorMeasureTicks.hx index 188f48bb5..138e472fc 100644 --- a/source/funkin/ui/debug/charting/components/ChartEditorMeasureTicks.hx +++ b/source/funkin/ui/debug/charting/components/ChartEditorMeasureTicks.hx @@ -118,7 +118,7 @@ class ChartEditorMeasureTicks extends FlxTypedSpriteGroup measureTickBitmap.fillRect(new Rectangle(0, bottomTickY, ChartEditorState.GRID_SIZE, ChartEditorThemeHandler.MEASURE_TICKS_MEASURE_WIDTH / 2), dividerColor); - // Draw the beat ticks and dividers, and step ticks. No need for two seperate loops thankfully. + // Draw the beat ticks and dividers, and step ticks. No need for two separate loops thankfully. for (i in 1...stepsPerMeasure) { if ((i % Constants.STEPS_PER_BEAT) == 0) // If we're on a beat, draw a beat tick and divider. diff --git a/source/funkin/ui/freeplay/LetterSort.hx b/source/funkin/ui/freeplay/LetterSort.hx index b952d5da7..60e567a26 100644 --- a/source/funkin/ui/freeplay/LetterSort.hx +++ b/source/funkin/ui/freeplay/LetterSort.hx @@ -163,8 +163,8 @@ class LetterSort extends FlxSpriteGroup } /** - * Buncho timers and stuff to move the letters and seperators - * Seperated out so we can call it again on letters with songs within them + * Buncho timers and stuff to move the letters and separators + * Separated out so we can call it again on letters with songs within them * @param diff */ function doLetterChangeAnims(diff:Int):Void @@ -284,7 +284,7 @@ class FreeplayLetter extends FunkinSprite regexLetters.insert(0, '#'); // the symbols from flash don't have dashes, so we clean this up for use with animations - // (we don't need to re-export, rule of thumb is to accomodate files named in flash from dave + // (we don't need to re-export, rule of thumb is to accommodate files named in flash from dave // until we get him programming classes (and since i cant find the .fla file....)) animLetters = regexLetters.map(animLetter -> animLetter.replace('-', '')); diff --git a/source/funkin/ui/transition/LoadingState.hx b/source/funkin/ui/transition/LoadingState.hx index ef9bc497d..a00b843d1 100644 --- a/source/funkin/ui/transition/LoadingState.hx +++ b/source/funkin/ui/transition/LoadingState.hx @@ -260,7 +260,7 @@ class LoadingState extends MusicBeatSubState FlxG.switchState(loadStateCtor); } #else - // All assets preloaded, switch directly to play state (defualt on other targets). + // All assets preloaded, switch directly to play state (default on other targets). @:nullSafety(Off) if (shouldStopMusic && FlxG.sound.music != null) { diff --git a/source/funkin/ui/transition/preload/FunkinPreloader.hx b/source/funkin/ui/transition/preload/FunkinPreloader.hx index 67921d1c8..386fc7e7c 100644 --- a/source/funkin/ui/transition/preload/FunkinPreloader.hx +++ b/source/funkin/ui/transition/preload/FunkinPreloader.hx @@ -946,7 +946,7 @@ class FunkinPreloader extends FlxBasePreloader /** * Whether or not we are in flipped landscape device rotation, - * generally for mobile to accomodate the device notch! + * generally for mobile to accommodate the device notch! * @return Bool */ function isLandscapeFlipped():Bool