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

a few more chars and alphabet errors

Browse Source
This commit is contained in:
SrtHero278
2024-12-24 10:48:24 -08:00
parent 80ef390095
commit c9e47516f3
3 changed files with 70 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/alphabet/bold.xml
+25 -3
View File
@@ -47,10 +47,32 @@
<anim char="8">character-eight</anim>
<anim char="9">character-nine</anim>
<component-data name="diacritic-tilde" anim="diacritic-tilde-fill" outline="diacritic-tilde-outline"/>
<composite char="ẽ">
<component anim="character-e0" x="0" y="0"/>
<component anim="diacritic-tilde-fill" x="3" y="63" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
<component anim="diacritic-tilde-fill" x="3" y="73" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
</composite>
<composite char="ñ">
<component anim="character-n0" x="0" y="0"/>
<component anim="diacritic-tilde-fill" x="3" y="73" outline="diacritic-tilde-outline" outlineX="-1" hasOutline="true"/>
</composite>
<composite char="á">
<component anim="character-a0" x="0" y="0"/>
<component anim="diacritic-acute-fill" x="23" y="70" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
</composite>
<composite char="é">
<component anim="character-e0" x="0" y="0"/>
<component anim="diacritic-acute-fill" x="15" y="70" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
</composite>
<composite char="í">
<component anim="character-i0" x="0" y="0"/>
<component anim="diacritic-acute-fill" x="15" y="68" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
</composite>
<composite char="ó">
<component anim="character-o0" x="0" y="0"/>
<component anim="diacritic-acute-fill" x="18" y="73" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
</composite>
<composite char="ú">
<component anim="character-u0" x="0" y="0"/>
<component anim="diacritic-acute-fill" x="15" y="60" outline="diacritic-acute-outline" outlineX="-1" hasOutline="true"/>
</composite>
</alphabetFont>
assets/data/alphabet/normal.xml
+39 -1
View File
@@ -11,19 +11,57 @@
<anim char="p" y="-15">p lowercase</anim>
<anim char="q" y="-15">q lowercase</anim>
<anim char="y" y="-15">y lowercase</anim>
<anim char="$">dollarsign</anim>
<anim char="&amp;">amp</anim>
<anim char="→" y="9">right arrow</anim>
<anim char="←" y="9">left arrow</anim>
<anim char="↓" y="5">down arrow</anim>
<anim char="↑" y="4">up arrow</anim>
<anim char="`" y="32" scaleY="0.5">comma</anim>
<anim char="," y="-9">comma</anim>
<anim char="'" y="28">comma</anim>
<anim char=".">period</anim>
<anim char="!">exclamation point</anim>
<anim char="?">question mark</anim>
<anim char="/">forward slash</anim>
<anim char="&#34;" y="22">start parentheses</anim>
<anim char="-" y="15">-</anim>
<anim char="^" y="28">^</anim>
<anim char="~" y="17">~</anim>
<anim char="=" y="13">=</anim>
<composite char="á">
<component anim="a lowercase0" x="0" y="0"/>
<component anim="comma" scaleY="0.5" x="7" y="35"/>
</composite>
<composite char="é">
<component anim="e lowercase0" x="0" y="0"/>
<component anim="comma" scaleY="0.5" x="7" y="35"/>
</composite>
<composite char="í">
<component anim="l lowercase0" x="0" y="-10" scaleY="0.5" angle="-2"/>
<component anim="comma" x="-7" y="25" scaleY="0.5" angle="-5"/>
</composite>
<composite char="ó">
<component anim="o lowercase0" x="0" y="0"/>
<component anim="comma" scaleY="0.5" x="7" y="28"/>
</composite>
<composite char="ú">
<component anim="u lowercase0" x="0" y="0"/>
<component anim="comma" scaleY="0.5" x="5" y="28"/>
</composite>
<composite char="å">
<component anim="a lowercase0" x="0" y="0"/>
<component anim="period" x="10" y="40"/>
</composite>
<composite char="ë">
<component anim="e lowercase0" x="0" y="0"/>
<component anim="period" x="0" y="40"/>
<component anim="period" x="20" y="40"/>
</composite>
<composite char="ö">
<component anim="o lowercase0" x="0" y="0"/>
<component anim="period" x="0" y="35"/>
<component anim="period" x="20" y="35"/>
</composite>
</alphabetFont>
source/funkin/menus/ui/Alphabet.hx
+6 -2
View File
@@ -113,6 +113,7 @@ enum abstract AlphabetRenderMode(ByteUInt) from ByteUInt to ByteUInt {
var MONOSPACE = 1;
}
@:allow(funkin.editors.alphabet.AlphabetEditor)
class Alphabet extends FlxSprite {
public var effects:Array<RegionEffect> = [];
var __renderData:AlphabetRenderData;
@@ -461,6 +462,7 @@ class Alphabet extends FlxSprite {
if (data == null) {
failedLetters.push(char);
Logs.error('Character $char: Data not found.');
return null;
} else if (data.isDefault)
loaded[defaultsIndexOf(data)].push(char);
@@ -497,6 +499,8 @@ class Alphabet extends FlxSprite {
animation.addByPrefix(name, anim, fps);
if (!animation.exists(name)) {
failedLetters.push(char);
var traceIndex = (component.refIndex != null) ? 'Outline For Component Index ${component.refIndex}' : 'Component Index ${index - data.startIndex}';
Logs.error('Character $char: $traceIndex: Animation "$anim" not found.');
return null;
}
return animation.getByName(name);
@@ -568,7 +572,7 @@ class Alphabet extends FlxSprite {
var components:Array<AlphabetComponent> = [];
for (component in node.elementsNamed("component")) {
if(!component.exists("anim")) {
Logs.error("<component> must have a anim attribute", "Alphabet");
Logs.error('Character $char: <component> must have a anim attribute", "Alphabet');
return;
}
@@ -729,7 +733,7 @@ class Alphabet extends FlxSprite {
v[2] = [];
v;
}
failedLetters = [];
failedLetters = [" "];
defaultAdvance = Std.parseFloat(xml.get("advance")).getDefaultFloat(40.0);
lineGap = Std.parseFloat(xml.get("lineGap")).getDefaultFloat(75.0);