cowarin
/
Funkin
mirror of https://github.com/ninjamuffin99/Funkin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

tank assets placements

This commit is contained in:
Cameron Taylor 2021-04-01 16:39:03 -07:00
parent f1b65fa92d
commit 916d6437db
3 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/MusicBeatState.hx
View File

@ -2,6 +2,7 @@ package;
import Conductor.BPMChangeEvent; import Conductor.BPMChangeEvent;
import flixel.FlxG; import flixel.FlxG;
import flixel.FlxGame;
import flixel.addons.transition.FlxTransitionableState; import flixel.addons.transition.FlxTransitionableState;
import flixel.addons.ui.FlxUIState; import flixel.addons.ui.FlxUIState;
import flixel.math.FlxRect; import flixel.math.FlxRect;
@ -26,7 +27,7 @@ class MusicBeatState extends FlxUIState
override function update(elapsed:Float) override function update(elapsed:Float)
{ {
//everyStep(); // everyStep();
var oldStep:Int = curStep; var oldStep:Int = curStep;
updateCurStep(); updateCurStep();
@ -67,6 +68,6 @@ class MusicBeatState extends FlxUIState
public function beatHit():Void public function beatHit():Void
{ {
//do literally nothing dumbass // do literally nothing dumbass
} }
} }

35
source/PlayState.hx
View File

@ -35,6 +35,7 @@ import flixel.util.FlxStringUtil;
import flixel.util.FlxTimer; import flixel.util.FlxTimer;
import haxe.Json; import haxe.Json;
import lime.utils.Assets; import lime.utils.Assets;
import openfl.Lib;
import openfl.display.BlendMode; import openfl.display.BlendMode;
import openfl.display.StageQuality; import openfl.display.StageQuality;
import openfl.filters.ShaderFilter; import openfl.filters.ShaderFilter;
@ -503,13 +504,15 @@ class PlayState extends MusicBeatState
var tankSky:BGSprite = new BGSprite('tankClouds', 0, 10, 0.1, 0.1); var tankSky:BGSprite = new BGSprite('tankClouds', 0, 10, 0.1, 0.1);
add(tankSky); add(tankSky);
var tankMountains:BGSprite = new BGSprite('tankMountains', -100, 150, 0.2, 0.2); var tankMountains:BGSprite = new BGSprite('tankMountains', -200, 90, 0.2, 0.2);
tankMountains.setGraphicSize(Std.int(tankMountains.width * 1.1));
tankMountains.updateHitbox();
add(tankMountains); add(tankMountains);
var tankBuildings:BGSprite = new BGSprite('tankBuildings', -200, 370, 0.25, 0.25); var tankBuildings:BGSprite = new BGSprite('tankBuildings', -200, 200, 0.25, 0.25);
add(tankBuildings); add(tankBuildings);
var tankRuins:BGSprite = new BGSprite('tankRuins', -200, 170, 0.35, 0.35); var tankRuins:BGSprite = new BGSprite('tankRuins', -200, 0, 0.35, 0.35);
add(tankRuins); add(tankRuins);
var smokeLeft:BGSprite = new BGSprite('smokeLeft', -200, -100, 0.4, 0.4, ['SmokeBlurLeft'], true); var smokeLeft:BGSprite = new BGSprite('smokeLeft', -200, -100, 0.4, 0.4, ['SmokeBlurLeft'], true);
@ -518,10 +521,12 @@ class PlayState extends MusicBeatState
var smokeRight:BGSprite = new BGSprite('smokeRight', 1100, -100, 0.4, 0.4, ['SmokeRight'], true); var smokeRight:BGSprite = new BGSprite('smokeRight', 1100, -100, 0.4, 0.4, ['SmokeRight'], true);
add(smokeRight); add(smokeRight);
var tankWatchtower:BGSprite = new BGSprite('tankWatchtower', 300, 50, 0.5, 0.5); var tankWatchtower:BGSprite = new BGSprite('tankWatchtower', 100, 50, 0.5, 0.5);
add(tankWatchtower); add(tankWatchtower);
var tankGround:BGSprite = new BGSprite('tankGround', -200, -20); var tankGround:BGSprite = new BGSprite('tankGround', -300, -300);
tankGround.setGraphicSize(Std.int(tankGround.width * 1.3));
tankGround.updateHitbox();
add(tankGround); add(tankGround);
tankmanRun = new FlxTypedGroup<TankmenBG>(); tankmanRun = new FlxTypedGroup<TankmenBG>();
@ -529,23 +534,23 @@ class PlayState extends MusicBeatState
// smokeLeft.screenCenter(); // smokeLeft.screenCenter();
var fgTank0:BGSprite = new BGSprite('tank0', -290, 400, 1.7, 1.5, ['fg']); var fgTank0:BGSprite = new BGSprite('tank0', -500, 650, 1.7, 1.5, ['fg']);
foregroundSprites.add(fgTank0); foregroundSprites.add(fgTank0);
var fgTank1:BGSprite = new BGSprite('tank1', -100, 680, 2, 0.2, ['fg']); var fgTank1:BGSprite = new BGSprite('tank1', -300, 700, 2, 0.2, ['fg']);
foregroundSprites.add(fgTank1); foregroundSprites.add(fgTank1);
// just called 'foreground' just cuz small inconsistency no bbiggei // just called 'foreground' just cuz small inconsistency no bbiggei
var fgTank2:BGSprite = new BGSprite('tank2', 450, 840, 1.5, 1.5, ['foreground']); var fgTank2:BGSprite = new BGSprite('tank2', 450, 940, 1.5, 1.5, ['foreground']);
foregroundSprites.add(fgTank2); foregroundSprites.add(fgTank2);
var fgTank4:BGSprite = new BGSprite('tank4', 1000, 880, 1.5, 1.5, ['fg']); var fgTank4:BGSprite = new BGSprite('tank4', 1200, 1080, 1.5, 1.5, ['fg']);
foregroundSprites.add(fgTank4); foregroundSprites.add(fgTank4);
var fgTank5:BGSprite = new BGSprite('tank5', 1400, 600, 1.5, 1.5, ['fg']); var fgTank5:BGSprite = new BGSprite('tank5', 1800, 900, 1.5, 1.5, ['fg']);
foregroundSprites.add(fgTank5); foregroundSprites.add(fgTank5);
var fgTank3:BGSprite = new BGSprite('tank3', 1300, 1130, 3.5, 2.5, ['fg']); var fgTank3:BGSprite = new BGSprite('tank3', 1300, 1430, 3.5, 2.5, ['fg']);
foregroundSprites.add(fgTank3); foregroundSprites.add(fgTank3);
default: default:
@ -659,7 +664,7 @@ class PlayState extends MusicBeatState
switch (SONG.player1) switch (SONG.player1)
{ {
case "bf-holding-gf": case "bf-holding-gf":
boyfriend.y -= 140; // boyfriend.y -= 140;
} }
// REPOSITIONING PER STAGE // REPOSITIONING PER STAGE
@ -696,6 +701,12 @@ class PlayState extends MusicBeatState
boyfriend.y += 220; boyfriend.y += 220;
gf.x += 180; gf.x += 180;
gf.y += 300; gf.y += 300;
case "tank":
gf.y -= 10;
boyfriend.x += 70;
boyfriend.y += 60;
dad.y += 90;
dad.x -= 80;
} }
add(gf); add(gf);

1
source/TankmenBG.hx
View File

@ -26,6 +26,7 @@ class TankmenBG extends FlxSprite
animation.addByPrefix('shot', 'John', 24, false); animation.addByPrefix('shot', 'John', 24, false);
animation.play('run'); animation.play('run');
animation.curAnim.curFrame = FlxG.random.int(0, animation.curAnim.numFrames - 1);
goingRight = isGoingRight; goingRight = isGoingRight;
endingOffset = FlxG.random.float(50, 200); endingOffset = FlxG.random.float(50, 200);