Skip to content
This repository was archived by the owner on Apr 1, 2025. It is now read-only.

Commit 1818dea

Browse files
committed
backup ee
1 parent 88985e0 commit 1818dea

File tree

11 files changed

+335
-187
lines changed

11 files changed

+335
-187
lines changed
-2.33 MB
Binary file not shown.

assets/preload/images/campaign_menu_UI_characters.xml

Lines changed: 0 additions & 161 deletions
This file was deleted.

source/game/Conductor.hx

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,4 +103,18 @@ class Conductor
103103
crochet = ((60 / bpm) * 1000);
104104
stepCrochet = crochet / 4;
105105
}
106+
107+
public static function getStepByTime(time:Float) {
108+
var bpmChange:BPMChangeEvent = {
109+
stepTime: 0,
110+
songTime: 0,
111+
bpm: bpm
112+
};
113+
114+
for(change in bpmChangeMap)
115+
if (change.songTime < time && change.songTime >= bpmChange.songTime)
116+
bpmChange = change;
117+
118+
return bpmChange.stepTime + ((time - bpmChange.songTime) / ((60 / bpmChange.bpm) * (1000/4)));
119+
}
106120
}

source/game/objects/Note.hx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,16 @@ class Note extends FlxSprite
3131
public var strumTime:Float = 0;
3232

3333
public var mustPress:Bool = false;
34-
public var rawNoteData:Int = 0; //used in chart editor
3534
public var noteData:Int = 0;
3635
public var canBeHit:Bool = false;
3736
public var tooLate:Bool = false;
3837
public var wasGoodHit:Bool = false;
3938
public var prevNote:Note;
4039

40+
//chart editor stuffs
41+
public var rawNoteData:Int = 0;
42+
public var noteStep:Int = 0;
43+
4144
public var isPixelSkinNote:Bool = false;
4245

4346
public var sustainLength:Float = 0;

source/game/settings/keybinds/RebindControls.hx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,15 @@ class RebindControls extends meta.substates.MusicBeatSubstate
230230
}
231231
if (FlxG.keys.justPressed.ESCAPE)
232232
{
233+
if (camTween != null) camTween.cancel();
233234
var camHUD = FlxG.cameras.list[FlxG.cameras.list.length - 1];
234235
camHUD.scroll.y = 0;
235236
FlxG.sound.play(Paths.sound('cancelMenu'));
236-
close();
237+
tweenCam(false);
238+
new FlxTimer().start(1, (ea)->{
239+
close();
240+
});
241+
237242
}
238243
case 'input':
239244
canNext = false;

source/meta/modding/ModdingState.hx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
package meta.modding;
22

3+
import flixel.tweens.FlxEase;
4+
import flixel.tweens.FlxTween;
35
import meta.substates.WebviewSubstate;
46
import openfl.Lib;
57
import game.Controls.Control;

source/meta/modding/chart_editor/ChartEditor.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ import openfl.net.FileReference;
4848
using StringTools;
4949

5050
// my attempt of making my own chart editor :))
51+
// corecat from the future: i hate this.
5152
class ChartEditor extends MusicBeatState {
5253
// Editor stuffs
5354
var grid_size:Int = 40;

0 commit comments

Comments
 (0)