Skip to content
This repository has been archived by the owner on Dec 31, 2024. It is now read-only.

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
nebulazorua committed Dec 25, 2021
1 parent 5caf054 commit 0551301
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 37 deletions.
Binary file added art/flashFiles/AndroSplash.fla
Binary file not shown.
Binary file not shown.
29 changes: 0 additions & 29 deletions assets/preload/images/skins/default/base/splashes.xml

This file was deleted.

25 changes: 23 additions & 2 deletions source/states/ChartingState.hx
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ class ChartingState extends MusicBeatState

changeSection(curSection + 1, false);
}

updateSectionUI();


Expand Down Expand Up @@ -268,6 +268,18 @@ class ChartingState extends MusicBeatState
FlxG.sound.music.volume = vol;
};

var check_mute_vox = new FlxUICheckBox(10, 175, null, null, "Mute Vocals (in editor)", 100);
check_mute_vox.checked = false;
check_mute_vox.callback = function()
{
var vol:Float = 1;

if (check_mute_vox.checked)
vol = 0;

vocals.volume = vol;
};

var saveButton:FlxButton = new FlxButton(110, 8, "Save", function()
{
saveLevel();
Expand Down Expand Up @@ -337,6 +349,7 @@ class ChartingState extends MusicBeatState

tab_group_song.add(check_voices);
tab_group_song.add(check_mute_inst);
tab_group_song.add(check_mute_vox);
tab_group_song.add(check_use_hit);
tab_group_song.add(saveButton);
tab_group_song.add(reloadSong);
Expand Down Expand Up @@ -923,11 +936,19 @@ class ChartingState extends MusicBeatState
var shiftThing:Int = 1;
if (FlxG.keys.pressed.SHIFT)
shiftThing = 4;
if (FlxG.keys.justPressed.D)
if (FlxG.keys.justPressed.D){
for(i in 0...shiftThing){
if (_song.notes[curSection + i] == null)
{
addSection();
}
}
changeSection(curSection + shiftThing);
}
if (FlxG.keys.justPressed.A)
changeSection(curSection - shiftThing);


bpmTxt.text = bpmTxt.text = Std.string(FlxMath.roundDecimal(Conductor.songPosition / 1000, 2))
+ " / "
+ Std.string(FlxMath.roundDecimal(FlxG.sound.music.length / 1000, 2))
Expand Down
13 changes: 7 additions & 6 deletions source/ui/Note.hx
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ class Note extends NoteGraphic

public function new(strumTime:Float, noteData:Int, skin:String='default', modifier:String='base', type:String='default', ?prevNote:Note, ?sustainNote:Bool = false, ?initialPos:Float=0, ?beingCharted=false)
{
var graphicType:String = type;
var behaviour = type=='default'?Note.noteBehaviour:Note.behaviours.get(type);
if(behaviour==null){
behaviour = Json.parse(Paths.noteSkinText("behaviorData.json",'skins',skin,modifier,type));
Note.behaviours.set(type,behaviour);
}
this.noteType=type;
hitbox = Conductor.safeZoneOffset;
switch(noteType){
Expand All @@ -133,6 +127,13 @@ class Note extends NoteGraphic
canHold=false;
hitbox = Conductor.safeZoneOffset*0.38; // should probably not scale but idk man
}
var graphicType:String = type;
var behaviour = type=='default'?Note.noteBehaviour:Note.behaviours.get(type);
if(behaviour==null){
behaviour = Json.parse(Paths.noteSkinText("behaviorData.json",'skins',skin,modifier,type));
Note.behaviours.set(type,behaviour);
}

super(strumTime,modifier,skin,graphicType,behaviour);


Expand Down

0 comments on commit 0551301

Please sign in to comment.