Skip to content

Commit d7dbe50

Browse files
authored
flixel-animate fix for cutscenes (#907)
* fixed flixel-animate name changes * fixed guns * fixed stress still needs camera work
1 parent 6c25431 commit d7dbe50

3 files changed

Lines changed: 10 additions & 10 deletions

File tree

assets/songs/guns/cutscene.hx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ function create() {
1212
tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
1313
tankman.antialiasing = true;
1414
tankman.loadSprite(Paths.image('game/cutscenes/tank/guns-tankman'));
15-
tankman.animateAtlas.anim.addBySymbol('tank', 'TANK TALK 2', 0, false);
15+
tankman.addAnim('tank', 'TANK TALK 2', 0, false);
1616

1717
game.insert(game.members.indexOf(game.dad), tankman);
1818
game.dad.visible = false;
@@ -65,4 +65,4 @@ function destroy() {
6565
for(thing in [tankman, tankTalk]) thing.destroy();
6666
if(destroyDistorto) distorto.destroy();
6767
FlxTween.tween(FlxG.camera, {zoom: game.defaultCamZoom}, 0.7, {ease: FlxEase.quadInOut, startDelay: 0});
68-
}
68+
}

assets/songs/stress/cutscene.hx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ function create() {
3333
tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
3434
tankman.antialiasing = true;
3535
tankman.loadSprite(Paths.image('game/cutscenes/tank/stress-tankman'));
36-
tankman.animateAtlas.anim.addBySymbol('p1', 'TANK TALK 3 P1 UNCUT', 0, false);
37-
tankman.animateAtlas.anim.addBySymbol('p2', 'TANK TALK 3 P2 UNCUT', 0, false);
36+
tankman.addAnim('p1', 'TANK TALK 3 P1 UNCUT', 0, false);
37+
tankman.addAnim('p2', 'TANK TALK 3 P2 UNCUT', 0, false);
3838
tankman.playAnim('p1');
3939

4040
pico = new FunkinSprite(game.gf.x + game.gf.globalOffset.x + 150, game.gf.y + game.gf.globalOffset.y + 395);
4141
pico.antialiasing = true;
4242
pico.loadSprite(Paths.image('game/cutscenes/tank/stress-pico'));
43-
pico.animateAtlas.anim.addBySymbol('die', 'GF Time to Die sequence', 24, false);
44-
pico.animateAtlas.anim.addBySymbol('saves', 'Pico Saves them sequence', 24, false);
45-
pico.animateAtlas.anim.addBySymbol('idle', 'Pico Dual Wield on Speaker idle', 24, true);
43+
pico.addAnim('die', 'GF Time to Die sequence', 24, false);
44+
pico.addAnim('saves', 'Pico Saves them sequence', 24, false);
45+
pico.addAnim('idle', 'Pico Dual Wield on Speaker idle', 24, true);
4646
pico.scrollFactor.set(0.95, 0.95);
4747
pico.playAnim("idle");
4848
pico.visible = false;

assets/songs/ugh/cutscene.hx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ function create() {
1212
tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
1313
tankman.antialiasing = true;
1414
tankman.loadSprite(Paths.image('game/cutscenes/tank/ugh-tankman'));
15-
tankman.animateAtlas.anim.addBySymbol('1', 'TANK TALK 1 P1', 0, false);
16-
tankman.animateAtlas.anim.addBySymbol('2', 'TANK TALK 1 P2', 0, false);
15+
tankman.addAnim('1', 'TANK TALK 1 P1', 0, false);
16+
tankman.addAnim('2', 'TANK TALK 1 P2', 0, false);
1717

1818
game.insert(game.members.indexOf(game.dad), tankman);
1919
game.dad.visible = false;
@@ -77,4 +77,4 @@ function destroy() {
7777
for(timer in timers) timer.cancel();
7878
for(thing in [tankTalk1, tankTalk2, bfBeep, tankman]) thing.destroy();
7979
if(destroyDistorto) distorto.destroy();
80-
}
80+
}

0 commit comments

Comments
 (0)