Add more stuff from the OG game and more PART 1 (#228)
* senpai fucking dies * final flash fadeout * made cutscene not play on restart * winter horrorland + fixes * fix for pixel perfect shader * trail + fixes * better + shaking last update about it, i swear * never fucking mind + repacks + accuracy * more fixes + chromatic aberration * i hate how pixel shader fucks everything up * aberration in the cutscene & its cool twitch * camera beats when twitching * tank stuff pt1 now the cutscenes look 99% like og (still gotta freeze the stage animated sprites n stuff) PS: Deleting the lipSycn function in ugh and guns cutscenes cause its not needed + sometimes breaks the animations so lets just leave it in stress only like it was in og * week 5 completed + retrocompatibility with altanim now chrima parents work * philly train * gameplay shaders option better adding it now * tank stuff pt2 * blue balled text (death counter) * winter horrorland better rework WIP colored vignette usable by everyone (you can change its color, amount and strength) wip cuz i wanna edit the amount/strength based on the zoom, i'll do later, now i dont have time gotta do christmas irl stuff yay * winter horrorland better rework completed * seen cutscene variable finally * even better cutscenes * oops * tank stuff pt3 * tank stuff pt4 WIP running tanks Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com> * tankstuff pt4.5 imma check tmr why do some tankmen spawn too much up * tank stuff pt4.75 * dumb * tank stuff pt 4.9 * type on xml sprite type fix and more Co-Authored-By: Ne_Eo <NeeEoo@users.noreply.github.com> --------- Co-authored-by: Ne_Eo <NeeEoo@users.noreply.github.com> Co-authored-by: lunarcleint <88809950+lunarcleint@users.noreply.github.com>
This commit is contained in:
⍚~Nex
co-authored by
Ne_Eo
lunarcleint
Ne_Eo
lunarcleint
parent
a71a02ea94
commit
6e23da8e86
@@ -3,7 +3,7 @@ import funkin.system.FunkinSprite;
|
||||
import funkin.options.Options;
|
||||
|
||||
var tankman, pico:FunkinSprite;
|
||||
var gf:Character;
|
||||
var bf, gf:Character;
|
||||
var stressCutscene:FlxSound;
|
||||
var step:Int = 0;
|
||||
|
||||
@@ -13,10 +13,15 @@ function create() {
|
||||
game.persistentUpdate = true;
|
||||
|
||||
game.gf.visible = false;
|
||||
gf = new Character(game.gf.x, game.gf.y, "gf-tankmen");
|
||||
gf = new Character(game.gf.x + game.gf.globalOffset.x - 115, game.gf.y + game.gf.globalOffset.y + 85, "gf-tankmen");
|
||||
gf.scrollFactor.set(0.95, 0.95);
|
||||
gf.playAnim("dance-cutscene");
|
||||
game.insert(game.members.indexOf(game.gf), gf);
|
||||
game.insert(game.members.indexOf(game.gf) + 1, gf);
|
||||
|
||||
game.boyfriend.visible = false;
|
||||
bf = new Character(game.boyfriend.x + game.boyfriend.globalOffset.x, game.boyfriend.y + game.boyfriend.globalOffset.y - 350, "boyfriend", true);
|
||||
bf.scrollFactor.set(0.95, 0.95);
|
||||
game.insert(game.members.indexOf(game.boyfriend) + 1, bf);
|
||||
|
||||
stressCutscene = FlxG.sound.load(Paths.sound(Options.naughtyness ? 'cutscenes/tank/stress' : 'cutscenes/tank/stress-censor'));
|
||||
|
||||
@@ -46,14 +51,13 @@ function create() {
|
||||
pico.scrollFactor.set(0.95, 0.95);
|
||||
pico.playAnim("idle");
|
||||
pico.visible = false;
|
||||
game.insert(game.members.indexOf(game.gf), pico);
|
||||
|
||||
game.insert(game.members.indexOf(game.dad), tankman);
|
||||
game.insert(game.members.indexOf(game.gf) + 1, pico);
|
||||
|
||||
game.insert(game.members.indexOf(game.dad) + 1, tankman);
|
||||
game.dad.visible = false;
|
||||
|
||||
focusOn(game.dad);
|
||||
}
|
||||
|
||||
function update(elapsed) {
|
||||
if (FlxG.keys.justPressed.F5)
|
||||
FlxG.resetState();
|
||||
@@ -78,6 +82,14 @@ function update(elapsed) {
|
||||
FlxG.camera.zoom = 0.8;
|
||||
step = 2;
|
||||
pico.playAnim('saves', true);
|
||||
game.remove(bf);
|
||||
bf.destroy();
|
||||
game.boyfriend.visible = true;
|
||||
game.boyfriend.playAnim('bfCatch');
|
||||
game.boyfriend.animation.finishCallback = function(anim:String) {
|
||||
game.boyfriend.dance();
|
||||
game.boyfriend.animation.finishCallback = null;
|
||||
};
|
||||
}
|
||||
case 2:
|
||||
if (stressCutscene.time > 19600) {
|
||||
@@ -93,8 +105,22 @@ function update(elapsed) {
|
||||
}
|
||||
case 4:
|
||||
lipSync(tankman, 19500, stressCutscene.length);
|
||||
if (pico.isAnimFinished() && pico.getAnimName() == "saves")
|
||||
pico.playAnim("idle");
|
||||
pico.animation.finishCallback = pico.playAnim("idle");
|
||||
|
||||
if(stressCutscene.time > 31500) {
|
||||
focusOn(game.boyfriend, true);
|
||||
FlxG.camera.zoom = game.defaultCamZoom * 1.4;
|
||||
FlxTween.tween(FlxG.camera, {zoom: FlxG.camera.zoom + 0.1}, 0.5, {ease: FlxEase.elasticOut});
|
||||
game.boyfriend.playAnim('singUPmiss');
|
||||
game.boyfriend.animation.finishCallback = function(anim:String)
|
||||
{
|
||||
FlxG.camera.zoom /= 1.4;
|
||||
focusOn(game.dad, true);
|
||||
game.boyfriend.dance();
|
||||
game.boyfriend.animation.finishCallback = null;
|
||||
};
|
||||
step = 5;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -102,8 +128,9 @@ function lipSync(char:FunkinSprite, begin:Float, end:Float) {
|
||||
char.animateAtlas.anim.curFrame = Std.int(FlxMath.remapToRange(stressCutscene.time, begin, end, 0, char.animateAtlas.anim.length-1));
|
||||
}
|
||||
|
||||
function focusOn(char) {
|
||||
function focusOn(char, snap:Bool = false) {
|
||||
var camPos = char.getCameraPosition();
|
||||
game.camFollow.setPosition(camPos.x, camPos.y);
|
||||
if(snap) FlxG.camera.snapToTarget();
|
||||
camPos.put();
|
||||
}
|
||||
@@ -0,0 +1,157 @@
|
||||
import flixel.FlxSprite;
|
||||
|
||||
var tankmanRun:Array<TankmenBG> = [];
|
||||
var grpTankmanRun:FlxTypedGroup<FlxSprite> = [];
|
||||
|
||||
var spawnTimes = []; // [[time, direction]]
|
||||
var tankmanPool = [];
|
||||
|
||||
function recycleTankman() {
|
||||
if(tankmanPool.length == 0) {
|
||||
var a = new TankmenBG();
|
||||
a.self = a;
|
||||
a.fuckingnewfuckingnew();
|
||||
return a;
|
||||
} else {
|
||||
return tankmanPool.shift(); // can be pop but it causes it to be less random
|
||||
}
|
||||
}
|
||||
|
||||
function getTankman(data:Array<Float>) {
|
||||
var tankman:TankmenBG = recycleTankman();
|
||||
tankman.strumTime = data[0];
|
||||
tankman.resetShit(500, 200 + FlxG.random.int(50, 100), data[1] < 2);
|
||||
return tankman;
|
||||
}
|
||||
|
||||
function postCreate() {
|
||||
grpTankmanRun = new FlxTypedGroup();
|
||||
insert(members.indexOf(gf) - 1, grpTankmanRun);
|
||||
if(inCutscene) grpTankmanRun.visible = false;
|
||||
|
||||
/*var tempTankman:TankmenBG = recycleTankman();
|
||||
tempTankman.strumTime = 10;
|
||||
tempTankman.resetShit(20, 600, true);
|
||||
tankmanRun.push(tempTankman);
|
||||
grpTankmanRun.add(tempTankman.sprite);*/
|
||||
graphicCache.cache(Paths.image('stages/tank/tankmanKilled1'));
|
||||
|
||||
for (note in strumLines.members[2].notes.members) {
|
||||
if (FlxG.random.bool(16)) {
|
||||
spawnTimes.push([note.strumTime, note.noteData]);
|
||||
}
|
||||
}
|
||||
|
||||
//spawnTimes.reverse(); // no need to reverse it since the notes are already reversed
|
||||
}
|
||||
|
||||
function onStartCountdown() {
|
||||
if(PlayState.instance.seenCutscene) grpTankmanRun.visible = true;
|
||||
}
|
||||
|
||||
function spawnTankmen() {
|
||||
var time = Conductor.songPosition;
|
||||
//trace(spawnTimes);
|
||||
while(spawnTimes.length > 0 && spawnTimes[spawnTimes.length-1][0] - 1500 < time) {
|
||||
var tankmen = getTankman(spawnTimes.pop());
|
||||
|
||||
//trace("Spawning Tankman", tankmen.sprite.offset, tankmen.goingRight);
|
||||
|
||||
tankmanRun.push(tankmen);
|
||||
grpTankmanRun.add(tankmen.sprite);
|
||||
}
|
||||
}
|
||||
|
||||
function update(elapsed) {
|
||||
spawnTankmen();
|
||||
|
||||
var length = tankmanRun.length;
|
||||
for(i in 0...length) {
|
||||
var reverseIndex = length - i - 1;
|
||||
var tankmen = tankmanRun[reverseIndex];
|
||||
tankmen.update(elapsed);
|
||||
}
|
||||
}
|
||||
|
||||
class TankmenBG
|
||||
{
|
||||
var strumTime = 0;
|
||||
var goingRight = false;
|
||||
var tankSpeed = 0.7;
|
||||
|
||||
var endingOffset = null;
|
||||
var sprite = null;
|
||||
|
||||
var self = null;
|
||||
var killed = false;
|
||||
|
||||
var fuckingnewfuckingnew = function()
|
||||
{
|
||||
this.sprite = new FlxSprite();
|
||||
var sprite = this.sprite;
|
||||
|
||||
sprite.frames = Paths.getSparrowAtlas('stages/tank/tankmanKilled1');
|
||||
sprite.antialiasing = true;
|
||||
sprite.animation.addByPrefix('run', 'tankman running', 24, true);
|
||||
|
||||
sprite.animation.play('run');
|
||||
|
||||
sprite.updateHitbox();
|
||||
|
||||
sprite.setGraphicSize(Std.int(sprite.width * 0.8));
|
||||
sprite.updateHitbox();
|
||||
}
|
||||
|
||||
var resetShit = function(x, y, isGoingRight)
|
||||
{
|
||||
var sprite = this.sprite;
|
||||
sprite.revive();
|
||||
sprite.setPosition(x, y);
|
||||
sprite.offset.set(0, 0);
|
||||
goingRight = isGoingRight;
|
||||
endingOffset = FlxG.random.float(50, 200);
|
||||
tankSpeed = FlxG.random.float(0.6, 1);
|
||||
sprite.animation.remove("shot");
|
||||
sprite.animation.addByPrefix('shot', 'John Shot ' + FlxG.random.int(1, 2), 24, false);
|
||||
sprite.animation.play("run");
|
||||
sprite.animation.curAnim.curFrame = FlxG.random.int(0, sprite.animation.curAnim.numFrames - 1);
|
||||
|
||||
killed = false;
|
||||
sprite.flipX = goingRight;
|
||||
}
|
||||
|
||||
var update = function(elapsed)
|
||||
{
|
||||
var sprite = this.sprite;
|
||||
sprite.visible = !(sprite.x >= FlxG.width * 1.5 || sprite.x <= FlxG.width * -0.5);
|
||||
|
||||
if (sprite.animation.curAnim.name == 'run')
|
||||
{
|
||||
var endDirection:Float = (FlxG.width * 0.74) + endingOffset;
|
||||
|
||||
if (goingRight) {
|
||||
endDirection = (FlxG.width * 0.02) - endingOffset;
|
||||
sprite.x = (endDirection + (Conductor.songPosition - strumTime) * tankSpeed);
|
||||
}
|
||||
else sprite.x = (endDirection - (Conductor.songPosition - strumTime) * tankSpeed);
|
||||
}
|
||||
|
||||
if (Conductor.songPosition > strumTime)
|
||||
{
|
||||
sprite.animation.play('shot');
|
||||
sprite.animation.finishCallback = function(_) {
|
||||
killed = true;
|
||||
grpTankmanRun.remove(sprite, true);
|
||||
sprite.kill();
|
||||
tankmanPool.push(self);
|
||||
tankmanRun.remove(self);
|
||||
}
|
||||
|
||||
if (goingRight)
|
||||
{
|
||||
sprite.offset.y = 200;
|
||||
sprite.offset.x = 300;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user