gabry/CodenameEngine
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fixed healthicons in editors

Browse Source
This commit is contained in:
⍚~Nex
2025-04-21 03:41:08 +02:00
parent 8c252bba81
commit 895fb5c981
5 changed files with 8 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/funkin/editors/character/CharacterInfoScreen.hx
+2 -1
View File
@@ -153,7 +153,8 @@ class CharacterInfoScreen extends UISubstateWindow {
iconSprite.setIcon(icon);
iconSprite.scale.set(iconSprite.defaultScale * 0.5, iconSprite.defaultScale * 0.5);
iconSprite.updateHitbox();
iconSprite.setPosition(iconTextBox.x + 150 + 8, (iconTextBox.y + 16) - (iconSprite.height/2));
iconSprite.setPosition(iconTextBox.x + iconTextBox.bWidth + 8, iconTextBox.y + (iconTextBox.bHeight / 2) - (iconSprite.height / 2));
iconSprite.scrollFactor.set(1, 1);
}
function saveCharacterInfo() {
source/funkin/editors/charter/CharterMetaDataScreen.hx
+2 -1
View File
@@ -136,7 +136,8 @@ class CharterMetaDataScreen extends UISubstateWindow {
iconSprite.setIcon(icon);
iconSprite.scale.set(iconSprite.defaultScale * 0.5, iconSprite.defaultScale * 0.5);
iconSprite.updateHitbox();
iconSprite.setPosition(iconTextBox.x + 150 + 8, (iconTextBox.y + 16) - (iconSprite.height/2));
iconSprite.setPosition(iconTextBox.x + iconTextBox.bWidth + 8, iconTextBox.y + (iconTextBox.bHeight / 2) - (iconSprite.height / 2));
iconSprite.scrollFactor.set(1, 1);
}
public function saveMeta() {
source/funkin/editors/charter/CharterStrumline.hx
+1 -16
View File
@@ -43,21 +43,7 @@ class CharterStrumline extends UISprite {
if(strumLine.visible == null) strumLine.visible = true;
var icons = strumLine.characters != null ? strumLine.characters : [];
healthIcons = new FlxSpriteGroup(x, y);
for (i=>icon in icons) {
var healthIcon = new HealthIcon(Character.getIconFromCharName(icon));
var newScale = 0.6 - (icons.length / 20);
healthIcon.scale.x = healthIcon.scale.y = healthIcon.defaultScale * newScale;
healthIcon.updateHitbox();
healthIcon.x = FlxMath.lerp(0, icons.length * 20, (icons.length-1 != 0 ? i / (icons.length-1) : 0));
healthIcon.y = draggable ? 29 : 7;
healthIcon.alpha = strumLine.visible ? 1 : 0.4;
healthIcons.add(healthIcon);
}
members.push(healthIcons);
draggingSprite = new UISprite();
@@ -71,8 +57,7 @@ class CharterStrumline extends UISprite {
button = new CharterStrumlineOptions(this);
members.push(button);
vocals = strumLine.vocalsSuffix.length > 0 ? FlxG.sound.load(Paths.voices(PlayState.SONG.meta.name, PlayState.difficulty, strumLine.vocalsSuffix)) : new FlxSound();
vocals.group = FlxG.sound.defaultMusicGroup;
updateInfo();
selectedWaveform = -1;
}
source/funkin/editors/charter/SongCreationScreen.hx
+3 -2
View File
@@ -232,12 +232,13 @@ class SongCreationScreen extends UISubstateWindow {
}
function updateIcon(icon:String) {
if (iconSprite == null) add(iconSprite = new HealthIcon());
if (iconSprite == null) menuDataGroup.add(iconSprite = new HealthIcon());
iconSprite.setIcon(icon);
iconSprite.scale.set(iconSprite.defaultScale * 0.5, iconSprite.defaultScale * 0.5);
iconSprite.updateHitbox();
iconSprite.setPosition(iconTextBox.x + 150 + 8, (iconTextBox.y + 16) - (iconSprite.height/2));
iconSprite.setPosition(iconTextBox.x + iconTextBox.bWidth + 8, iconTextBox.y + (iconTextBox.bHeight / 2) - (iconSprite.height / 2));
iconSprite.scrollFactor.set(1, 1);
}
function saveSongInfo() {
source/funkin/options/type/NewOption.hx
-1
View File
@@ -1,7 +1,6 @@
package funkin.options.type;
import flixel.util.FlxColor;
import funkin.game.HealthIcon;
class NewOption extends TextOption {
public var iconSpr:FlxSprite;