Merge branch 'main' of https://github.com/CodenameCrew/CodenameEngine

Verwex · Verwex · commit 48624554cde0 · 2025-08-07T13:55:32.000+02:00
diff --git a/source/funkin/editors/charter/CharterStrumlineScreen.hx b/source/funkin/editors/charter/CharterStrumlineScreen.hx
@@ -171,7 +171,7 @@ class CharterStrumlineScreen extends UISubstateWindow {
 			}
 		}
 
-		vocalsSuffixDropDown = new UIDropDown(typeDropdown.x, hudScaleStepper.y + 128, 200, 32, suffixList, strumLine.vocalsSuffix != null && strumLine.vocalsSuffix != "" ? suffixList.indexOf(strumLine.vocalsSuffix) : 0);
+		vocalsSuffixDropDown = new UIDropDown(typeDropdown.x, hudScaleStepper.y + 128, 200, 32, suffixList, strumLine.vocalsSuffix != null && strumLine.vocalsSuffix != "" && Assets.exists(Paths.voices(Charter.__song.toLowerCase(), "", strumLine.vocalsSuffix)) ? suffixList.indexOf(strumLine.vocalsSuffix) : 0);
 		add(vocalsSuffixDropDown);
 		addLabelOn(vocalsSuffixDropDown, TU.translate("charterStrumLine.vocalSuffix"));
 

Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ class CharterStrumlineScreen extends UISubstateWindow {`
`171`	`171`	`}`
`172`	`172`	`}`
`173`	`173`
`174`		`- vocalsSuffixDropDown = new UIDropDown(typeDropdown.x, hudScaleStepper.y + 128, 200, 32, suffixList, strumLine.vocalsSuffix != null && strumLine.vocalsSuffix != "" ? suffixList.indexOf(strumLine.vocalsSuffix) : 0);`
	`174`	`+ vocalsSuffixDropDown = new UIDropDown(typeDropdown.x, hudScaleStepper.y + 128, 200, 32, suffixList, strumLine.vocalsSuffix != null && strumLine.vocalsSuffix != "" && Assets.exists(Paths.voices(Charter.__song.toLowerCase(), "", strumLine.vocalsSuffix)) ? suffixList.indexOf(strumLine.vocalsSuffix) : 0);`
`175`	`175`	`add(vocalsSuffixDropDown);`
`176`	`176`	`addLabelOn(vocalsSuffixDropDown, TU.translate("charterStrumLine.vocalSuffix"));`
`177`	`177`