ugh cutscene progress
This commit is contained in:
Yoshman29
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,66 @@
|
||||
{"ATLAS": {"SPRITES":[
|
||||
{"SPRITE" : {"name": "0000","x":2,"y":428,"w":211,"h":205,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0001","x":930,"y":239,"w":88,"h":116,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0002","x":478,"y":608,"w":133,"h":144,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0003","x":353,"y":485,"w":179,"h":121,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0004","x":2,"y":2,"w":375,"h":424,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0005","x":858,"y":476,"w":164,"h":163,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0006","x":930,"y":357,"w":88,"h":116,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0007","x":353,"y":608,"w":123,"h":176,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0008","x":648,"y":476,"w":208,"h":132,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0009","x":215,"y":428,"w":136,"h":200,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0010","x":944,"y":67,"w":68,"h":62,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0011","x":944,"y":191,"w":74,"h":44,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0012","x":655,"y":2,"w":287,"h":235,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0013","x":379,"y":2,"w":274,"h":249,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0014","x":379,"y":253,"w":267,"h":230,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0015","x":305,"y":786,"w":99,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0016","x":101,"y":745,"w":99,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0017","x":212,"y":694,"w":98,"h":52,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0018","x":944,"y":131,"w":65,"h":58,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0019","x":299,"y":833,"w":52,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0020","x":686,"y":791,"w":99,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0021","x":824,"y":750,"w":102,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0022","x":716,"y":744,"w":106,"h":45,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0023","x":878,"y":803,"w":109,"h":29,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0024","x":534,"y":485,"w":91,"h":63,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0025","x":112,"y":796,"w":94,"h":42,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0026","x":494,"y":799,"w":76,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0027","x":2,"y":635,"w":115,"h":57,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0028","x":478,"y":754,"w":106,"h":43,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0029","x":2,"y":694,"w":97,"h":56,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0030","x":208,"y":796,"w":89,"h":42,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0031","x":119,"y":635,"w":94,"h":46,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0032","x":894,"y":641,"w":101,"h":55,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0033","x":630,"y":808,"w":52,"h":52,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0034","x":353,"y":833,"w":45,"h":47,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0035","x":787,"y":797,"w":89,"h":42,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0036","x":883,"y":698,"w":100,"h":50,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0037","x":586,"y":760,"w":98,"h":46,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0038","x":878,"y":834,"w":95,"h":23,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0039","x":2,"y":752,"w":73,"h":41,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0040","x":613,"y":610,"w":158,"h":98,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0041","x":2,"y":834,"w":70,"h":32,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0042","x":406,"y":799,"w":86,"h":43,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0043","x":101,"y":694,"w":109,"h":49,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0044","x":773,"y":691,"w":108,"h":51,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0045","x":534,"y":550,"w":105,"h":53,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0046","x":944,"y":2,"w":70,"h":63,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0047","x":572,"y":808,"w":56,"h":53,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0048","x":613,"y":710,"w":101,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0049","x":773,"y":641,"w":119,"h":48,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0050","x":2,"y":795,"w":108,"h":37,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0051","x":202,"y":748,"w":101,"h":46,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0052","x":928,"y":750,"w":82,"h":51,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0053","x":215,"y":630,"w":124,"h":62,"rotated": false}},
|
||||
{"SPRITE" : {"name": "0054","x":655,"y":239,"w":273,"h":235,"rotated": false}}
|
||||
]},
|
||||
"meta": {
|
||||
"app": "Adobe Animate",
|
||||
"version": "21.0.1.37179",
|
||||
"image": "spritemap1.png",
|
||||
"format": "RGBA8888",
|
||||
"size": {"w":1024,"h":884},
|
||||
"resolution": "1"
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 138 KiB |
@@ -0,0 +1,26 @@
|
||||
import funkin.system.FunkinSprite;
|
||||
|
||||
var tankman:FunkinSprite;
|
||||
function create() {
|
||||
game.camHUD.visible = false;
|
||||
|
||||
tankman = new FunkinSprite(game.dad.x + game.dad.globalOffset.x + 520, game.dad.y + game.dad.globalOffset.y + 225);
|
||||
tankman.antialiasing = true;
|
||||
tankman.loadSprite(Paths.image('game/cutscenes/tank/ugh-tankman'));
|
||||
tankman.animateAtlas.anim.addBySymbol('1', 'TANK TALK 1 P1', 24, false);
|
||||
tankman.animateAtlas.anim.addBySymbol('2', 'TANK TALK 1 P2', 24, false);
|
||||
game.insert(game.members.indexOf(game.dad), tankman);
|
||||
|
||||
game.dad.visible = false;
|
||||
|
||||
tankman.playAnim('1');
|
||||
|
||||
game.camFollow.setPosition(tankman.x, tankman.y);
|
||||
|
||||
game.persistentUpdate = true;
|
||||
}
|
||||
|
||||
function update(elapsed:Float) {
|
||||
if (FlxG.keys.justPressed.F5)
|
||||
FlxG.resetState();
|
||||
}
|
||||
+1
-1
@@ -1 +1 @@
|
||||
2212
|
||||
2213
|
||||
@@ -697,24 +697,26 @@ class PlayState extends MusicBeatState
|
||||
var videoCutscene = Paths.video('${PlayState.SONG.song.toLowerCase()}-cutscene');
|
||||
var videoCutsceneAlt = Paths.file('songs/${PlayState.SONG.song.toLowerCase()}/cutscene.mp4');
|
||||
var dialogue = Paths.file('songs/${PlayState.SONG.song.toLowerCase()}/dialogue.xml');
|
||||
persistentUpdate = false;
|
||||
persistentUpdate = true;
|
||||
if (cutscene != null) {
|
||||
openSubState(new ScriptedCutscene(cutscene, function() {
|
||||
startCountdown();
|
||||
}));
|
||||
} else if (Assets.exists(dialogue)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
openSubState(new DialogueCutscene(dialogue, function() {
|
||||
startCountdown();
|
||||
}));
|
||||
} else if (Assets.exists(videoCutsceneAlt)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
persistentUpdate = false;
|
||||
openSubState(new VideoCutscene(videoCutsceneAlt, function() {
|
||||
startCountdown();
|
||||
}));
|
||||
persistentDraw = false;
|
||||
} else if (Assets.exists(videoCutscene)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
persistentUpdate = false;
|
||||
openSubState(new VideoCutscene(videoCutscene, function() {
|
||||
startCountdown();
|
||||
}));
|
||||
@@ -730,17 +732,27 @@ class PlayState extends MusicBeatState
|
||||
if (playCutscenes) {
|
||||
var videoCutscene = Paths.video('${PlayState.SONG.song.toLowerCase()}-end-cutscene');
|
||||
var videoCutsceneAlt = Paths.file('songs/${PlayState.SONG.song.toLowerCase()}/end-cutscene.mp4');
|
||||
persistentUpdate = false;
|
||||
var dialogue = Paths.file('songs/${PlayState.SONG.song.toLowerCase()}/end-dialogue.xml');
|
||||
persistentUpdate = true;
|
||||
if (endCutscene != null) {
|
||||
openSubState(new ScriptedCutscene(endCutscene, function() {
|
||||
nextSong();
|
||||
}));
|
||||
} else if (Assets.exists(dialogue)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
openSubState(new DialogueCutscene(dialogue, function() {
|
||||
startCountdown();
|
||||
}));
|
||||
} else if (Assets.exists(videoCutsceneAlt)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
persistentUpdate = false;
|
||||
openSubState(new VideoCutscene(videoCutsceneAlt, function() {
|
||||
nextSong();
|
||||
}));
|
||||
persistentDraw = false;
|
||||
} else if (Assets.exists(videoCutscene)) {
|
||||
FlxTransitionableState.skipNextTransIn = true;
|
||||
persistentUpdate = false;
|
||||
openSubState(new VideoCutscene(videoCutscene, function() {
|
||||
nextSong();
|
||||
}));
|
||||
|
||||
Reference in New Issue
Block a user