better speedrun timer, small update to map transitions. better UX around completion

Author: MondayHopscotch

assets/world.ldtk

@@ -10,7 +10,7 @@ newgrounds 2.0.0
 flixel git https://github.com/MondayHopscotch/flixel.git lowres2023
 flixelutils git https://github.com/bitDecayGames/flixel-utils.git lowrez2023
 bitlytics git https://github.com/bitDecayGames/Bitlytics.git
-echo 4.2.2
+echo git https://github.com/MondayHopscotch/echo.git
 echo-flixel 0.0.1
 ldtk-haxe-api 1.3.3-rc.1
 

haxelib.deps

@@ -1,5 +1,6 @@
 package;
 
+import progress.PlayTimePlugin;
 import io.newgrounds.NG;
 import newgrounds.Newgrounds;
 import collision.Color;
@@ -96,6 +97,8 @@ class Main extends Sprite {
 			shaderUpdater.setShader(pixelShader);
 		};
 
+		FlxG.plugins.add(new PlayTimePlugin());
+
 		// call it once on startup
 		setCameraShader();
 		// then every time we switch states

source/Main.hx

@@ -1,5 +1,6 @@
 package entities;
 
+import progress.PlayTimePlugin;
 import entities.particles.UpgradeParticle;
 import states.CreditsState;
 import flixel.util.FlxTimer;
@@ -141,6 +142,7 @@ class ColorUpgrade extends ColorCollideSprite {
 							});
 						});
 					} else {
+						PlayTimePlugin.ME.timerRunning = false;
 						FlxG.switchState(new CreditsState());
 					}
 				}));

source/entities/ColorUpgrade.hx

@@ -343,6 +343,9 @@ class Player extends ColorCollideSprite {
 		#end
 	}
 
+	var lineA = Line.get(0, 0);
+	var lineB = Line.get(0, 0);
+
 	function handleInput(delta:Float) {
 		var inputDir = InputCalcuator.getInputCardinal(playerNum);
 		if (inputDir != NONE) {
@@ -495,6 +498,27 @@ class Player extends ColorCollideSprite {
 				addColorIfUnlocked(YELLOW);
 			}
 		} else {
+			if (!topShape.solid) {
+				var world = FlxEcho.instance.world;
+				var bodies = PlayState.ME.terrainGroup.get_group_bodies();
+
+				lineA.start.set(bottomShape.left, bottomShape.top);
+				lineA.end.set(topShape.left, topShape.top);
+				lineB.start.set(bottomShape.right, bottomShape.top);
+				lineB.end.set(topShape.right, topShape.top);
+
+				// For some reason doing the linecast like this causes bodies to disappear...
+				// var resultA = lineA.linecast(bodies, world, false);
+				// var resultB = lineB.linecast(bodies, world, false);
+				// So instead, we'll do linecast_all as we were already doing it for lasers and it doesn't break things.
+				var resultA = lineA.linecast_all(FlxEcho.get_group_bodies(PlayState.ME.terrainGroup));
+				var resultB = lineB.linecast_all(FlxEcho.get_group_bodies(PlayState.ME.terrainGroup));
+				if (resultA.length > 0) {
+					body.y += lineA.length - resultA[0].closest.distance;
+				} else if (resultB.length > 0) {
+					body.y += lineB.length - resultB[0].closest.distance;
+				}
+			}
 			topShape.solid = true;
 			body.drag.x = decel;
 			if (mixColors) {

source/entities/Player.hx

@@ -95,6 +95,9 @@ class Collected {
 		return FlxG.save.data.game.checkpoint.safeReturn;
 	}
 
+	public static function isGameComplete():Bool {
+		return FlxG.save.data.game.gameCompleted;
+	}
 
 	public static function gameComplete() {
 		clearCheckpoint();
@@ -146,6 +149,11 @@ class Collected {
 		return FlxG.save.data.game.checkpoint.deaths;
 	}
 
+	public static function setTime(t:Float) {
+		FlxG.save.data.game.checkpoint.time = t;
+		FlxG.save.flush();
+	}
+
 	public static function addTime(t:Float) {
 		FlxG.save.data.game.checkpoint.time += t;
 		FlxG.save.flush();

source/progress/Collected.hx

@@ -0,0 +1,32 @@
+package progress;
+
+import flixel.FlxG;
+import flixel.system.FlxAssets.FlxShader;
+import flixel.FlxBasic;
+
+/*
+ * This is here to help time our gameplay consistently
+*/
+class PlayTimePlugin extends FlxBasic {
+	public static var ME:PlayTimePlugin;
+
+	public var accumulated:Float = 0.0;
+	public var timerRunning:Bool = false;
+
+	public function new() {
+		super();
+		ME = this;
+
+		FlxG.signals.preStateSwitch.add(() -> {
+			FlxG.watch.add(this, "accumulated", "Timer: ");
+		});
+	}
+
+	override function update(elapsed:Float) {
+		super.update(elapsed);
+
+		if (timerRunning) {
+			accumulated += elapsed;
+		}
+	}
+}

source/progress/PlayTimePlugin.hx

@@ -1,5 +1,6 @@
 package states;
 
+import progress.Collected;
 import io.newgrounds.NG;
 import config.Newgrounds;
 import com.bitdecay.analytics.Bitlytics;
@@ -148,7 +149,11 @@ var clickHere:FlxSprite = null;
 					state = "go_to_splash";
 				}
 			case "go_to_splash":
-				FlxG.switchState(new SplashScreenState());
+				if (Collected.getCheckpointLevel() != null) {
+					FlxG.switchState(new MainMenuState());
+				} else {
+					FlxG.switchState(new SplashScreenState());
+				}
 		}
 	}
 }

source/states/ClickToFocusState.hx

@@ -1,5 +1,6 @@
 package states;
 
+import progress.PlayTimePlugin;
 import input.SimpleController;
 import config.Newgrounds;
 import flixel.util.FlxStringUtil;
@@ -50,10 +51,14 @@ class CreditsState extends FlxUIState {
 		bgColor = backgroundColor;
 		camera.pixelPerfectRender = true;
 
-		Collected.addTime(PlayState.ME.levelTime);
+		// Collected.addTime(PlayState.ME.levelTime);
+
+		var finalTime = PlayTimePlugin.ME.accumulated;
+		Collected.setTime(finalTime);
 
 		// Report for the leaderboard
-		Newgrounds.reportScore(Collected.getTime());
+		Newgrounds.reportScore(finalTime);
+		Collected.setTime(0);
 
 		// Credits
 		_allCreditElements = new Array<FlxSprite>();
@@ -113,7 +118,7 @@ class CreditsState extends FlxUIState {
 		add(_txtThankYou);
 		_allCreditElements.push(_txtThankYou);
 
-		var _txtTime = FlxTextFactory.make('Time: ${getFormattedTime()}', FlxG.width / 2, creditsVerticalOffset + FlxG.height * .75, 36, FlxTextAlign.CENTER);
+		var _txtTime = FlxTextFactory.make('Time: ${getFormattedTime(finalTime)}', FlxG.width / 2, creditsVerticalOffset + FlxG.height * .75, 36, FlxTextAlign.CENTER);
 		_txtTime.color = FlxColor.GRAY;
 		center(_txtTime);
 		_txtTime.x -= _txtTime.x % 4;
@@ -130,9 +135,8 @@ class CreditsState extends FlxUIState {
 		Collected.gameComplete();
 	}
 
-	private function getFormattedTime():String {
-		var rawTime = Collected.getTime();
-		var ngConsistentTime = Math.round(rawTime * 1000);
+	private function getFormattedTime(t:Float):String {
+		var ngConsistentTime = Math.round(t * 1000);
 		return formatTime(ngConsistentTime, true);
 	}
 

source/states/CreditsState.hx

@@ -1,5 +1,7 @@
 package states;
 
+import progress.PlayTimePlugin;
+import ui.font.BitmapText;
 import flixel.FlxSprite;
 import ldtk.Level;
 import states.substate.UpgradeCutscene;
@@ -52,6 +54,9 @@ class PlayState extends FlxTransitionableState {
 
 	public var player:Player;
 
+	public var timerCam = new FlxCamera();
+	public var timerTxt = new BitmapText("0:00");
+
 	public var baseTerrainCam:FlxCamera;
 	public var colorCams:Map<Color, FlxCamera> = [];
 	public var objectCam:FlxCamera;
@@ -75,6 +80,9 @@ class PlayState extends FlxTransitionableState {
 	var deltaMod = 1.0;
 	var deathDeltaMod = 0.1;
 
+	// This is our cumulative time in-game
+	var baseTime = 0.0;
+	// This is our time on this specific level
 	public var levelTime = 0.0;
 
 	var resetQueued = false;
@@ -109,6 +117,22 @@ class PlayState extends FlxTransitionableState {
 		objectCam = makeShaderCamera(EMPTY);
 		FlxG.cameras.add(objectCam, false);
 
+		timerCam.bgColor = FlxColor.TRANSPARENT;
+		FlxG.cameras.add(timerCam, false);
+		timerTxt.scrollFactor.set();
+		timerTxt.camera = timerCam;
+		timerTxt.autoSize = false;
+		timerTxt.width = FlxG.width;
+		timerTxt.alignment = CENTER;
+		timerTxt.updateHitbox();
+		timerTxt.screenCenter(X);
+		timerTxt.setBorderStyle(OUTLINE, FlxColor.BLACK);
+
+		if (Collected.isGameComplete()) {
+			// Only show timer once they've completed the game
+			add(timerTxt);
+		}
+
 		// XXX: need the substate to use the right cameras... but it's not set yet, so we go to this
 		// variable to get it
 		if (_requestedSubState != null) {
@@ -150,6 +174,7 @@ class PlayState extends FlxTransitionableState {
 		var checkpointRoom = Collected.getCheckpointLevel();
 		var checkpointEntity = Collected.getCheckpointEntity();
 		if (checkpointRoom != null && checkpointEntity != null) {
+			PlayTimePlugin.ME.accumulated = Collected.getTime();
 			loadLevel(checkpointRoom, checkpointEntity);
 		} else {
 			var spawnLevel = levels.ldtk.Level.project.all_worlds.Default.levels.filter((l) -> return l.l_Objects.all_Spawn.length > 0);
@@ -162,7 +187,7 @@ class PlayState extends FlxTransitionableState {
 		}
 		#end
 
-		FlxG.watch.add(this, "levelTime", "Timer: ");
+		PlayTimePlugin.ME.timerRunning = true;
 	}
 
 	override function draw() {
@@ -220,8 +245,8 @@ class PlayState extends FlxTransitionableState {
 		lastLevel = levelID;
 		lastSpawnEntity = entityID;
 
-		Collected.addTime(levelTime);
-		levelTime = 0;
+		// Collected.addTime(levelTime);
+		Collected.setTime(PlayTimePlugin.ME.accumulated);
 
 		Collected.setLastCheckpoint(levelID, entityID);
 
@@ -541,9 +566,10 @@ class PlayState extends FlxTransitionableState {
 
 		super.update(elapsed);
 
-		// if (player.inControl) {
-		levelTime += originalDelta;
-		// }
+		// Time travels at normal speed as far as timing goes
+		// levelTime += originalDelta;
+
+		updateTimer();
 
 		for (o in pendingObjects) {
 			o.add_to_group(objects);
@@ -570,6 +596,12 @@ class PlayState extends FlxTransitionableState {
 		#end
 	}
 
+	public function updateTimer() {
+		var rawTime = PlayTimePlugin.ME.accumulated;
+		var ngConsistentTime = Math.round(rawTime * 1000);
+		timerTxt.text = CreditsState.formatTime(ngConsistentTime, false);
+	}
+
 	var tmpScreenPoint = FlxPoint.get();
 	function camSeesWorldPoint(cam:FlxCamera, x:Float, y:Float):Bool {
 		tmpScreenPoint = objectCam.project(FlxPoint.weak(x, y));