AirDog46/Kade-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more fixes and other crap

Browse Source
This commit is contained in:
Kade M 2021-05-24 19:46:07 -07:00
parent e991a71ca9
commit b047eb7a72
5 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/Alphabet.hx
View File

@ -1,5 +1,7 @@
package; package;
import flixel.tweens.FlxEase;
import flixel.tweens.FlxTween;
import flixel.FlxG; import flixel.FlxG;
import flixel.FlxSprite; import flixel.FlxSprite;
import flixel.graphics.frames.FlxAtlasFrames; import flixel.graphics.frames.FlxAtlasFrames;
@ -36,11 +38,13 @@ class Alphabet extends FlxSpriteGroup
var xPosResetted:Bool = false; var xPosResetted:Bool = false;
var lastWasSpace:Bool = false; var lastWasSpace:Bool = false;
var listOAlphabets:List<AlphaCharacter> = new List<AlphaCharacter>();
var splitWords:Array<String> = []; var splitWords:Array<String> = [];
var isBold:Bool = false; var isBold:Bool = false;
public function new(x:Float, y:Float, text:String = "", ?bold:Bool = false, typed:Bool = false) public function new(x:Float, y:Float, text:String = "", ?bold:Bool = false, typed:Bool = false, shouldMove:Bool = false)
{ {
super(x, y); super(x, y);
@ -58,6 +62,7 @@ class Alphabet extends FlxSpriteGroup
{ {
addText(); addText();
} }
} }
} }
@ -93,6 +98,7 @@ class Alphabet extends FlxSpriteGroup
// var letter:AlphaCharacter = new AlphaCharacter(30 * loopNum, 0); // var letter:AlphaCharacter = new AlphaCharacter(30 * loopNum, 0);
var letter:AlphaCharacter = new AlphaCharacter(xPos, 0); var letter:AlphaCharacter = new AlphaCharacter(xPos, 0);
listOAlphabets.add(letter);
if (isBold) if (isBold)
letter.createBold(character); letter.createBold(character);
@ -178,6 +184,7 @@ class Alphabet extends FlxSpriteGroup
// var letter:AlphaCharacter = new AlphaCharacter(30 * loopNum, 0); // var letter:AlphaCharacter = new AlphaCharacter(30 * loopNum, 0);
var letter:AlphaCharacter = new AlphaCharacter(xPos, 55 * yMulti); var letter:AlphaCharacter = new AlphaCharacter(xPos, 55 * yMulti);
listOAlphabets.add(letter);
letter.row = curRow; letter.row = curRow;
if (isBold) if (isBold)
{ {

2
source/FreeplayState.hx
View File

@ -76,7 +76,7 @@ class FreeplayState extends MusicBeatState
for (i in 0...songs.length) for (i in 0...songs.length)
{ {
var songText:Alphabet = new Alphabet(0, (70 * i) + 30, songs[i].songName, true, false); var songText:Alphabet = new Alphabet(0, (70 * i) + 30, songs[i].songName, true, false, true);
songText.isMenuItem = true; songText.isMenuItem = true;
songText.targetY = i; songText.targetY = i;
grpSongs.add(songText); grpSongs.add(songText);

2
source/Options.hx
View File

@ -302,7 +302,7 @@ class Judgement extends Option
} }
override function getValue():String { override function getValue():String {
return Conductor.safeFrames + " - " + return "Safe Frames: " + Conductor.safeFrames +
" - SIK: " + HelperFunctions.truncateFloat(45 * Conductor.timeScale, 0) + " - SIK: " + HelperFunctions.truncateFloat(45 * Conductor.timeScale, 0) +
"ms GD: " + HelperFunctions.truncateFloat(90 * Conductor.timeScale, 0) + "ms GD: " + HelperFunctions.truncateFloat(90 * Conductor.timeScale, 0) +
"ms BD: " + HelperFunctions.truncateFloat(135 * Conductor.timeScale, 0) + "ms BD: " + HelperFunctions.truncateFloat(135 * Conductor.timeScale, 0) +

2
source/OptionsMenu.hx
View File

@ -83,7 +83,7 @@ class OptionsMenu extends MusicBeatState
for (i in 0...options.length) for (i in 0...options.length)
{ {
var controlLabel:Alphabet = new Alphabet(0, (70 * i) + 30, options[i].getName(), true, false); var controlLabel:Alphabet = new Alphabet(0, (70 * i) + 30, options[i].getName(), true, false, true);
controlLabel.isMenuItem = true; controlLabel.isMenuItem = true;
controlLabel.targetY = i; controlLabel.targetY = i;
grpControls.add(controlLabel); grpControls.add(controlLabel);

3
source/PlayState.hx
View File

@ -2288,6 +2288,8 @@ class PlayState extends MusicBeatState
dad.playAnim('singLEFT' + altAnim, true); dad.playAnim('singLEFT' + altAnim, true);
} }
if (FlxG.save.data.cpuStrums)
{
cpuStrums.forEach(function(spr:FlxSprite) cpuStrums.forEach(function(spr:FlxSprite)
{ {
if (Math.abs(daNote.noteData) == spr.ID) if (Math.abs(daNote.noteData) == spr.ID)
@ -2303,6 +2305,7 @@ class PlayState extends MusicBeatState
else else
spr.centerOffsets(); spr.centerOffsets();
}); });
}
#if windows #if windows
if (luaModchart != null) if (luaModchart != null)