Skip to content

Commit d8a5da7

Browse files
committed
Merge branch 'Archipelago' of https://github.com/Z11Coding/Mixtape-Engine-Rework into Archipelago
2 parents a420f83 + 4065506 commit d8a5da7

File tree

8 files changed

+1168
-5
lines changed

8 files changed

+1168
-5
lines changed

source/Main.hx

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,14 @@ class Main extends Sprite
149149
trace(commandPrompt.metadata());
150150
trace(game.metadata());
151151

152+
trace("gamedddifsdsf".realSizeOf());
153+
154+
var testArray = new yutautil.CollectionUtils.KeyIndexedArray();
155+
testArray.set("test", 1);
156+
trace(testArray.get("test"));
157+
trace(testArray.get("test2"));
158+
trace(testArray["test"]);
159+
152160
yutautil.Threader.runInThread(commandPrompt.start());
153161
#if HSCRIPT_ALLOWED
154162
Iris.warn = function(x, ?pos:haxe.PosInfos) {

source/objects/Character.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ class Character extends FlxSprite
449449
playAnim('danceLeft' + idleSuffix);
450450
}
451451
else if(hasAnimation('idle' + idleSuffix))
452-
playAnim('idle' + idleSuffix);
452+
playAnim((hasAnimation('blink') && FlxG.random.float(0, 1) < 0.025) ? 'blink' : 'idle' + idleSuffix);
453453
}
454454
}
455455

source/states/PlayState.hx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,6 +1243,8 @@ class PlayState extends MusicBeatState
12431243
raveLightsColors = [0xFF31A2FD, 0xFF31FD8C, 0xFFFB33F5, 0xFFFD4531, 0xFFFBA633];
12441244
if (!inArchipelagoMode) MaxHP = 2 + (ClientPrefs.data.healthMode == "Tabi" ? 2 : 0);
12451245
initY = healthBar.y;
1246+
1247+
// trace(this.realSizeOf());
12461248
}
12471249

12481250
function doStaticSign(lestatic:Int = 0)

0 commit comments

Comments
 (0)