diff --git a/source/funkin/editors/character/CharacterAnimsWindow.hx b/source/funkin/editors/character/CharacterAnimsWindow.hx index 0aaacce1..0360f31c 100644 --- a/source/funkin/editors/character/CharacterAnimsWindow.hx +++ b/source/funkin/editors/character/CharacterAnimsWindow.hx @@ -31,10 +31,12 @@ class CharacterAnimsWindow extends UIButtonList { displayWindowSprite.antialiasing = character.antialiasing; displayWindowSprite.flipX = character.flipX; + alpha = 0.7; + @:privateAccess - for (name => anim in displayWindowSprite.animation._animations) + for (name => anim in displayWindowSprite.animation._animations) buildAnimDisplay(name, anim); - + for (anim in character.getAnimOrder()) add(new CharacterAnimButton(0,0, character.animDatas.get(anim), this)); diff --git a/source/funkin/editors/character/CharacterEditor.hx b/source/funkin/editors/character/CharacterEditor.hx index bdf0dc27..5f0663ab 100644 --- a/source/funkin/editors/character/CharacterEditor.hx +++ b/source/funkin/editors/character/CharacterEditor.hx @@ -418,10 +418,10 @@ class CharacterEditor extends UIState { function updateStagePositions(stagePositions:Array) @:privateAccess { if (stage != null && stagePositions.length > 0) { - characterPropertiesWindow.testAsDropDown.items = + characterPropertiesWindow.testAsDropDown.items = UIDropDown.getItems(characterPropertiesWindow.testAsDropDown.options = stagePositions); - } else - characterPropertiesWindow.testAsDropDown.items = + } else + characterPropertiesWindow.testAsDropDown.items = UIDropDown.getItems(characterPropertiesWindow.testAsDropDown.options = ["NONE"]); } @@ -450,7 +450,7 @@ class CharacterEditor extends UIState { if (character.__swappedLeftRightAnims) character.swapLeftRightAnimations(); - if (character.isPlayer) + if (character.isPlayer) character.flipX = !character.__baseFlipped; remove(character); diff --git a/source/funkin/editors/character/CharacterIconDisplay.hx b/source/funkin/editors/character/CharacterIconDisplay.hx index a9d43a76..1a4a90f0 100644 --- a/source/funkin/editors/character/CharacterIconDisplay.hx +++ b/source/funkin/editors/character/CharacterIconDisplay.hx @@ -35,7 +35,7 @@ class CharacterIconDisplay extends UISprite { healthBarBG = new FlxSprite(x+(width/2), y+(height*(2.25/4))+2).makeSolid(barWidth-Std.int(width), 10, 0xFF000000); healthBar = new FlxSprite(healthBarBG.x+2, healthBarBG.y+2).makeSolid( - Std.int(healthBarBG.width-4), Std.int(healthBarBG.height-4), + Std.int(healthBarBG.width-4), Std.int(healthBarBG.height-4), color != null ? color : 0xFFFFFFFF ); diff --git a/source/funkin/editors/character/CharacterPropertiesWindow.hx b/source/funkin/editors/character/CharacterPropertiesWindow.hx index 54cc5220..4b2607fe 100644 --- a/source/funkin/editors/character/CharacterPropertiesWindow.hx +++ b/source/funkin/editors/character/CharacterPropertiesWindow.hx @@ -15,7 +15,7 @@ class CharacterPropertiesWindow extends UISliceSprite { public var antialiasingCheckbox:UICheckbox; public var testAsDropDown:UIDropDown; public var designedAsDropDown:UIDropDown; - + public function new(x:Float, y:Float, character:Character) @:privateAccess { super(x, y, Std.int(500-16), 204+20, "editors/ui/inputbox"); @@ -88,6 +88,8 @@ class CharacterPropertiesWindow extends UISliceSprite { members.push(designedAsDropDown); addLabelOn(designedAsDropDown, "Char Desgined As..."); + alpha = 0.7; + antialiasingCheckbox.x+=14; for (checkbox in [flipXCheckbox, antialiasingCheckbox]) {checkbox.y += 3; checkbox.x += 12;} @@ -96,7 +98,7 @@ class CharacterPropertiesWindow extends UISliceSprite { } public function changePosition(newPosX:Null, newPosY:Null) { - if (newPosX != null && newPosY != null && newPosX == character.globalOffset.x && newPosY == character.globalOffset.y) + if (newPosX != null && newPosY != null && newPosX == character.globalOffset.x && newPosY == character.globalOffset.y) return; else { if (newPosX != null && newPosX == character.globalOffset.x) return; @@ -128,7 +130,7 @@ class CharacterPropertiesWindow extends UISliceSprite { } public function changeCamPosition(newPosX:Null, newPosY:Null) { - if (newPosX != null && newPosY != null && newPosX == character.cameraOffset.x && newPosY == character.cameraOffset.y) + if (newPosX != null && newPosY != null && newPosX == character.cameraOffset.x && newPosY == character.cameraOffset.y) return; else { if (newPosX != null && newPosX == character.cameraOffset.x) return;