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

alphabet

Browse Source
This commit is contained in:
Yoshman29
2022-10-31 14:48:35 +01:00
parent 64d7b0c34b
commit f0143f056f
5 changed files with 8 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/data/alphabet.xml
+2 -2
View File
@@ -1,6 +1,6 @@
<!DOCTYPE codename-engine-alphabet>
<letters fps="24">
<bold spritesheet="ui/alphabet-bold">
<bold spritesheet="menus/alphabet-bold">
<!-- Bold Letters !-->
<letter char="A" anim="A bold" />
<letter char="B" anim="B bold" />
@@ -29,7 +29,7 @@
<letter char="Y" anim="Y bold" />
<letter char="Z" anim="Z bold" />
</bold>
<normal spritesheet="ui/alphabet">
<normal spritesheet="menus/alphabet">
<!-- Symbols !-->
<letter char="$" anim="dollarsign" />
<letter char="#" anim="hashtag" />
buildnumber.txt
+1 -1
View File
@@ -1 +1 @@
849
853
source/funkin/game/PlayState.hx
+1 -1
View File
@@ -1154,7 +1154,7 @@ class PlayState extends MusicBeatState
var e = separatedScore.charAt(i);
var numScore:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/${prefix}num$e$suffix'));
var numScore:FlxSprite = new FlxSprite().loadGraphic(Paths.image('game/${prefix}score/num$e$suffix'));
numScore.screenCenter();
numScore.x = comboPos.x + (43 * i) - 90;
numScore.y += 80;
source/funkin/menus/MainMenuState.hx
+2 -2
View File
@@ -79,11 +79,11 @@ class MainMenuState extends MusicBeatState
menuItems = new FlxTypedGroup<FlxSprite>();
add(menuItems);
for (i in 0...optionShit.length)
{
var menuItem:FlxSprite = new FlxSprite(0, 60 + (i * 160));
menuItem.frames = Paths.getSparrowAtlas('menus/mainmenu/${optionShit[i]}');;
menuItem.frames = Paths.getSparrowAtlas('menus/mainmenu/${optionShit[i]}');
menuItem.animation.addByPrefix('idle', optionShit[i] + " basic", 24);
menuItem.animation.addByPrefix('selected', optionShit[i] + " white", 24);
menuItem.animation.play('idle');
source/funkin/ui/Alphabet.hx
+2 -76
View File
@@ -40,7 +40,6 @@ class Alphabet extends FlxSpriteGroup
// amp, backslash, question mark, apostrophy, comma, angry faic, period
var lastSprite:AlphaCharacter;
var xPosResetted:Bool = false;
var lastWasSpace:Bool = false;
var splitWords:Array<String> = [];
@@ -137,8 +136,6 @@ class Alphabet extends FlxSpriteGroup
var xPos:Float = 0;
for (character in splitWords)
{
lastWasSpace = character == " ";
if (lastSprite != null)
xPos = lastSprite.x + lastSprite.width - x;
@@ -188,79 +185,6 @@ class Alphabet extends FlxSpriteGroup
xPos = 0;
curRow += 1;
}
if (splitWords[loopNum] == " ")
{
lastWasSpace = true;
}
// #if (haxe >= "4.0.0")
// var isNumber:Bool = AlphaCharacter.numbers.contains(splitWords[loopNum]);
// var isSymbol:Bool = AlphaCharacter.symbols.contains(splitWords[loopNum]);
// #else
// var isNumber:Bool = AlphaCharacter.numbers.indexOf(splitWords[loopNum]) != -1;
// var isSymbol:Bool = AlphaCharacter.symbols.indexOf(splitWords[loopNum]) != -1;
// #end
// if (AlphaCharacter.alphabet.indexOf(splitWords[loopNum].toLowerCase()) != -1 || isNumber || isSymbol)
// // if (AlphaCharacter.alphabet.contains(splitWords[loopNum].toLowerCase()) || isNumber || isSymbol)
// {
// if (lastSprite != null && !xPosResetted)
// {
// lastSprite.updateHitbox();
// xPos += lastSprite.width + 3;
// // if (isBold)
// // xPos -= 80;
// }
// else
// {
// xPosResetted = false;
// }
// if (lastWasSpace)
// {
// xPos += 20;
// lastWasSpace = false;
// }
// // trace(_finalText.fastCodeAt(loopNum) + " " + _finalText.charAt(loopNum));
// // var letter:AlphaCharacter = new AlphaCharacter(30 * loopNum, 0);
// var letter:AlphaCharacter = new AlphaCharacter(xPos, 55 * yMulti);
// letter.row = curRow;
// if (isBold)
// {
// letter.createBold(splitWords[loopNum]);
// }
// else
// {
// if (isNumber)
// {
// letter.createNumber(splitWords[loopNum]);
// }
// else if (isSymbol)
// {
// letter.createSymbol(splitWords[loopNum]);
// }
// else
// {
// letter.createLetter(splitWords[loopNum]);
// }
// letter.x += 90;
// }
// if (FlxG.random.bool(40))
// {
// var daSound:String = "GF_";
// FlxG.sound.play(Paths.soundRandom(daSound, 1, 4));
// }
// add(letter);
// lastSprite = letter;
// }
loopNum += 1;
tmr.time = FlxG.random.float(0.04, 0.09);
@@ -327,6 +251,7 @@ class AlphaCharacter extends FlxSprite
letter = letter.toUpperCase();
if (boldAnims[letter] == null) {
visible = false;
width = 40;
return;
}
frames = Paths.getSparrowAtlas(boldAlphabetPath);
@@ -339,6 +264,7 @@ class AlphaCharacter extends FlxSprite
{
if (letterAnims[letter] == null) {
visible = false;
width = 40;
return;
}
frames = Paths.getSparrowAtlas(letterAlphabetPath);