week 3 rewrite

MaybeMaru · Feb 3, 2024 · 2738c39 · 2738c39
1 parent fe773d8
commit 2738c39
Show file tree

Hide file tree

Showing 17 changed files with 778 additions and 293 deletions.
diff --git a/assets/preload/data/stages/philly.hx b/assets/preload/data/stages/philly.hx
@@ -1,141 +1,105 @@
-//Lights
-var phillyLightsColors:Array<Int> = [0xFF31A2FD, 0xFF31FD8C, 0xFFFB33F5, 0xFFFD4531, 0xFFFBA633];
-var phillyCityLights:FunkinSprite;
-var phillyCityLightsBlur:FunkinSprite; // Was gonna use a shader but takes too much memory, so fuck it
-var phillyColor:Int = 0;
-
-//Train
-var phillyTrain:FunkinSprite;
-var trainSound:FlxSound;
-
-var startedMoving:Bool = false;
-var trainMoving:Bool = false;
-var trainFrameTiming:Float = 0;
-
-var trainCars:Int = 8;
-var trainFinishing:Bool = false;
-var trainCooldown:Int = 0;
-
-function create():Void {
-	var bg:FunkinSprite = new FunkinSprite('philly/sky', [-100, 0], [0.1,0.1]);
-	addSpr(bg, 'phillyBg');
-
-	var city:FunkinSprite = new FunkinSprite('philly/city', [-10, 0], [0.3,0.3]);
-	city.setScale(0.85);
-	addSpr(city, 'phillyCity');
-
-	phillyCityLights = new FunkinSprite('philly/phillyWindow', [city.x, 0], [0.3,0.3]);
-	phillyCityLights.visible = false;
-	phillyCityLights.setScale(0.85);
-	phillyCityLights.blend = getBlendMode('add');
-	addSpr(phillyCityLights, 'phillyWindow');
-
-	phillyCityLightsBlur = new FunkinSprite('philly/phillyWindow-blur', [city.x, 0], [0.3,0.3]);
-	phillyCityLightsBlur.visible = false;
-	phillyCityLightsBlur.setScale(0.85);
-	phillyCityLightsBlur.blend = getBlendMode('add');
-	addSpr(phillyCityLightsBlur, 'phillyWindowBlur');
-
-	var streetBehind:FunkinSprite = new FunkinSprite('philly/behindTrain', [-40, 50]);
-	addSpr(streetBehind, 'streetBehind');
-
-	phillyTrain = new FunkinSprite('philly/train', [2000, 360]);
-	addSpr(phillyTrain, 'phillyTrain');
-
-	var street:FunkinSprite = new FunkinSprite('philly/street', [-40, streetBehind.y]);
-	addSpr(street, 'phillyStreet');
-
-	trainSound = getSound('train_passes');
-	phillyColor += FlxG.random.int(0,3);
-}
+var colors = [0xFF31A2FD, 0xFF31FD8C, 0xFFFB33F5, 0xFFFD4531, 0xFFFBA633];
+var color = 0;
+var start;
+var sound;
 
-function beatHit(curBeat):Void {
-	var genTrain:Bool = (curBeat % 8 == 4 && FlxG.random.bool(30) && !trainMoving && trainCooldown > 8 && !trainSound.playing);
-	var inBlammed:Bool = (State.curSong == 'Blammed' && curBeat >= 100);
+function createPost() {
+	lights.blend = getBlendMode("add");
+	blur.blend = getBlendMode("add");
 
-	if (!trainMoving) {
-        trainCooldown++;
+	lights.alpha = 0;
+	blur.alpha = 0;
+
+	start = switch (State.curSong) {
+		case "Pico": 2;
+		default: 0;
 	}
 
-    if (genTrain && !inBlammed) {
-        trainStart();
-    }
+	sound = getSound('train_passes');
+	color += FlxG.random.int(0, colors.length);
 }
 
-function sectionHit(curSection):Void {
-	var stuffToColor:Array<Null<FunkinSprite>> = [phillyCityLights, phillyCityLightsBlur];
-	if (existsSpr('blammedOverlay')) { // Prevent getting a null sprite error
-		for (i in ['blammedOverlay', 'tunnelLights', 'tunnelLightsBlur'])
-			stuffToColor.push(getSpr(i));
-	}
-
-	var curColor:Int = phillyLightsColors[phillyColor];
-	for (obj in stuffToColor) {
-		if (obj != null) {	//	BLAMMED COLORS
-			obj.color = curColor;
-		}
-	}
+function sectionHit(section) {
+	if (section < start) return;
 
-	var showLights:Bool = true;
-	switch(State.curSong) {
-		case 'Pico': showLights = (curSection > 1);	//	PICO CUTSCENE
-	}
-	phillyCityLights.visible = showLights;
-	phillyCityLightsBlur.visible = showLights;
-	phillyCityLights.alpha = 1;
-	phillyCityLightsBlur.alpha = 1;
-	phillyColor = FlxMath.wrap(phillyColor + 1, 0, 4);
+	color = FlxMath.wrap(color + 1, 0, 4);
+
+	var lightsColor = colors[color];
+	lights.color = lightsColor;
+	blur.color = lightsColor;
+
+	lights.alpha = 1;
+	blur.alpha = 1;
 }
 
-function update(elapsed):Void {
-	var alphaLight:Float = Conductor.crochetMills * elapsed;
-	phillyCityLights.alpha = Math.max(phillyCityLights.alpha - alphaLight * 2, 0.001);
-	phillyCityLightsBlur.alpha = Math.max(phillyCityLightsBlur.alpha - alphaLight * 2.5, 0.001);
-
-    if (trainMoving) {
-        trainFrameTiming += elapsed;
-        if (trainFrameTiming >= 1 / 24) {
-            updateTrainPos();
-            trainFrameTiming = 0;
-        }
-    }
+function updatePost(elapsed) {
+	var speed = Conductor.crochetMills * elapsed * 2;
+	lights.alpha -= speed;
+	blur.alpha -= speed * 1.25;
+
+	trainMoving = sound.playing && sound.time > 4650;
+	if (trainMoving && !finishedMove)
+		updateTrain(elapsed);
 }
 
-function trainStart():Void {
+/*
+ * TRAIN CRAP
+**/
+
+var trainFrame = 0;
+var trainCars = 8;
+var trainMoving = false;
+var trainFinished = false;
+var trainCooldown = 0;
+var finishedMove = false;
+
+function beatHit(beat) {
+	if (!trainMoving)
+        trainCooldown++;
+
+	var moveTrain = (!trainMoving && trainCooldown > 8) && (beat % 8 == 4 && FlxG.random.bool(30));
+	if (moveTrain)
+		startTrain();
+}
+
+function startTrain() {
 	trainCooldown = FlxG.random.int(-4, 0);
-	trainMoving = true;
-	if (!trainSound.playing) {
-		trainSound.play(true);
-	}
+	finishedMove = false;
+	sound.play(true);
 }
 
-function updateTrainPos():Void {
-	if (trainSound.time >= 4700) {
-		startedMoving = true;
-		State.gf.playAnim('hairBlow');
-	}
+function updateTrain(elapsed) {
+	trainFrame += elapsed;
+    if (trainFrame >= 1 / 24) {
+        moveTrain();
+        trainFrame = 0;
+    }
+}
 
-	if (startedMoving) {
-		phillyTrain.x -= 400;
-		if (phillyTrain.x < -2000 && !trainFinishing) {
-			phillyTrain.x = -1150;
-			trainCars -= 1;
-		    if (trainCars <= 0) {
-				trainFinishing = true;
-			}
+function moveTrain() {
+	train.x -= 400;
+	if (!trainFinished) {
+		if (train.x < 800)
+			State.gf.playAnim('hairBlow');
+
+		if (train.x < -1900) {
+			train.x = -850; 
+			trainCars--;
+			if (trainCars < 1)
+				trainFinished = true;
 		}
+	}
 
-		if (phillyTrain.x < -4000 && trainFinishing) {
-			trainReset();
-		}
+	if (train.x < -4000 && trainFinished) {
+		resetTrain();
 	}
 }
 
-function trainReset():Void {
+function resetTrain() {
 	State.gf.playAnim('hairFall');
-	phillyTrain.x = FlxG.width + 200;
-	trainMoving = false;
+	train.x = 2000;
 	trainCars = 8;
-	trainFinishing = false;
-	startedMoving = false;
+	trainFinished = false;
+	trainMoving = false;
+	finishedMove = true;
 }
diff --git a/assets/preload/data/stages/philly.json b/assets/preload/data/stages/philly.json
@@ -5,5 +5,52 @@
 	"bfOffsets": [-75,0],
 	"startCamOffsets": [-800,-350],
 	"dadCamOffsets": [-100, 0],
-	"bfCamOffsets": [100, 0]
+	"bfCamOffsets": [100, 0],
+	"layers": {
+		"bg": [
+			{
+				"tag": "sky",
+				"imagePath": "sky",
+				"position": [-100, 0],
+				"scrolls": [0.1, 0.1]
+			},
+			{
+				"tag": "city",
+				"imagePath": "city",
+				"position": [-10, 0],
+				"scrolls":  [0.3,0.3],
+				"scale": 0.85
+			},
+			{
+				"tag": "lights",
+				"imagePath": "phillyWindow",
+				"position": [-10, 0],
+				"scrolls":  [0.3,0.3],
+				"scale": 0.85
+			},
+			{
+				"tag": "blur",
+				"imagePath": "phillyWindow-blur",
+				"position": [-10, 0],
+				"scrolls":  [0.3,0.3],
+				"scale": 0.85
+			},
+			{
+				"tag": "tracks",
+				"imagePath": "behindTrain",
+				"position": [-40, 50]
+			},
+			{
+				"tag": "train",
+				"imagePath": "train",
+				"position": [2000, 360]
+			},
+			{
+				"tag": "street",
+				"imagePath": "street",
+				"position": [-40, 50]
+			}
+		],
+		"fg": []
+	}
 }