1
0
Fork 0
mirror of https://github.com/ninjamuffin99/Funkin.git synced 2024-11-23 07:15:12 +00:00

jeff gameover censor

This commit is contained in:
Cameron Taylor 2021-04-09 11:38:09 -04:00
parent 80c6609ef9
commit 7fa9700664
3 changed files with 14 additions and 10 deletions

View file

@ -7,6 +7,7 @@ import flixel.math.FlxPoint;
import flixel.util.FlxColor;
import flixel.util.FlxTimer;
import haxe.display.Display.Package;
import ui.PreferencesMenu;
class GameOverSubstate extends MusicBeatSubstate
{
@ -60,7 +61,12 @@ class GameOverSubstate extends MusicBeatSubstate
bf.playAnim('firstDeath');
randomGameover = FlxG.random.int(1, 25);
var randomCensor:Array<Int> = [];
if (PreferencesMenu.getPref('censor-naughty'))
randomCensor = [1, 3, 8, 13, 17, 21];
randomGameover = FlxG.random.int(1, 25, randomCensor);
}
var playingDeathSound:Bool = false;

View file

@ -21,8 +21,6 @@ class LoadingState extends MusicBeatState
var stopMusic = false;
var callbacks:MultiCallback;
var logo:FlxSprite;
var gfDance:FlxSprite;
var danceLeft = false;
function new(target:FlxState, stopMusic:Bool)
@ -104,13 +102,13 @@ class LoadingState extends MusicBeatState
{
super.beatHit();
logo.animation.play('bump');
// logo.animation.play('bump');
danceLeft = !danceLeft;
if (danceLeft)
gfDance.animation.play('danceRight');
else
gfDance.animation.play('danceLeft');
/*
if (danceLeft)
gfDance.animation.play('danceRight');
else
gfDance.animation.play('danceLeft'); */
}
override function update(elapsed:Float)

View file

@ -23,7 +23,7 @@ class TankmenBG extends FlxSprite
frames = Paths.getSparrowAtlas('tankmanKilled1');
antialiasing = true;
animation.addByPrefix('run', 'tankman running', 24, true);
animation.addByPrefix('shot', 'John', 24, false);
animation.addByPrefix('shot', 'John Shot ' + FlxG.random.int(1, 2), 24, false);
animation.play('run');
animation.curAnim.curFrame = FlxG.random.int(0, animation.curAnim.numFrames - 1);