more fixes + update song charts and events
MF gotta wait for monster cuz bpm changes are broken as FUCK i'll prob merge the bpm pr soon at this point
This commit is contained in:
@@ -291,6 +291,7 @@ class Chart {
|
||||
if (data.meta != null && Reflect.hasField(data.meta, "parsedColor")) Reflect.deleteField(data.meta, "parsedColor");
|
||||
}
|
||||
|
||||
// in this part abt the events, i gotta account that these booleans can be null - Nex
|
||||
if (saveLocalEvents != true && saveGlobalEvents != true) data.events = null;
|
||||
else {
|
||||
data.events = [];
|
||||
|
||||
@@ -436,7 +436,7 @@ class Charter extends UIState {
|
||||
gridBackdrops = new CharterBackdropGroup(strumLines);
|
||||
gridBackdrops.notesGroup = this.notesGroup;
|
||||
|
||||
leftEventRowText = new UIText(0, -40, 0, "Global Events\n(All Difficulties)", 12);
|
||||
leftEventRowText = new UIText(0, -40, 0, "Local Events\n(Only This Difficulty)", 12);
|
||||
leftEventRowText.alignment = "center"; leftEventRowText.alpha = 0.75;
|
||||
|
||||
leftEventsBackdrop = new EventBackdrop(false);
|
||||
@@ -446,13 +446,13 @@ class Charter extends UIState {
|
||||
leftEventsGroup.eventsBackdrop = leftEventsBackdrop;
|
||||
leftEventsGroup.eventsRowText = leftEventRowText;
|
||||
|
||||
rightEventRowText = new UIText(0, -40, 0, "Local Events\n(Only This Difficulty)", 12);
|
||||
rightEventRowText = new UIText(0, -40, 0, "Global Events\n(All Difficulties)", 12);
|
||||
rightEventRowText.alignment = "center"; rightEventRowText.alpha = 0.75;
|
||||
|
||||
rightEventsBackdrop = new EventBackdrop(true);
|
||||
rightEventsBackdrop.x = 0;
|
||||
|
||||
rightEventsBackdrop.cameras = rightEventsGroup.cameras = [charterCamera];
|
||||
rightEventRowText.cameras = rightEventsBackdrop.cameras = rightEventsGroup.cameras = [charterCamera];
|
||||
rightEventsGroup.eventsBackdrop = rightEventsBackdrop;
|
||||
rightEventsGroup.eventsRowText = rightEventRowText;
|
||||
|
||||
|
||||
@@ -70,7 +70,7 @@ class CharterEvent extends UISliceSprite implements ICharterSelectable {
|
||||
transform.redMultiplier *= selected ? 0.75 : 1;
|
||||
transform.greenMultiplier *= selected ? 0.75 : 1;
|
||||
transform.blueMultiplier *= selected ? 0.75 : 1;
|
||||
|
||||
|
||||
transform.redOffset += selected ? 96 : 0;
|
||||
transform.greenOffset += selected ? 96 : 0;
|
||||
transform.blueOffset += selected ? 168 : 0;
|
||||
|
||||
@@ -75,14 +75,12 @@ class CharterEventScreen extends UISubstateWindow {
|
||||
Charter.instance.deleteSelection([chartEvent]);
|
||||
else if (events.length > 0) {
|
||||
var oldEvents:Array<ChartEvent> = chartEvent.events.copy();
|
||||
chartEvent.events = [
|
||||
for (i in eventsList.buttons.members) i.event
|
||||
];
|
||||
chartEvent.events = [for (i in eventsList.buttons.members) i.event];
|
||||
chartEvent.global = global;
|
||||
|
||||
if (creatingEvent && events.length > 0)
|
||||
Charter.instance.createSelection([chartEvent]);
|
||||
else {
|
||||
chartEvent.events = [for (i in eventsList.buttons.members) i.event];
|
||||
chartEvent.refreshEventIcons();
|
||||
Charter.instance.updateBPMEvents();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user