Merge pull request #8 from deanblackborough/player-activated-paltforms

Player activated paltforms

README.md

@@ -30,6 +30,7 @@ Check the `player/scripts/playerInput` script file, the controls should be what
 - Max jumps setting
 - Jump through platforms
 - Moving jump through platforms, move in x and/or y, set speed a target
+- Player activated jump through platforms
 - Player collision with ground 
 - Player collision with jump through platforms
 - Player collision with moving jump through platforms

objects/oPlayer/Create_0.gml

@@ -47,6 +47,10 @@ activeJumpThroughPlatformInstance = noone;
 movingJumpThroughPlatformInstance = noone;
 activeMovingJumpThroughPlatformInstance = noone;
 
+// Player activated jump through platform
+playerActivatedJumpThroughPlatformInstance = noone;
+activePlayerActivatedJumpThroughPlatformInstance = noone;
+
 // Quality options
 snapToColliders = true;
 

objects/oPlayer/Step_0.gml

@@ -146,12 +146,14 @@ if (
 	inputJumpKeyPressed && inputDownKey && 
 	( 
 		jumpThroughPlatformInstance != noone ||
-		movingJumpThroughPlatformInstance != noone
+		movingJumpThroughPlatformInstance != noone || 
+		playerActivatedJumpThroughPlatformInstance != noone
 	)
 )
 {
 	activeJumpThroughPlatformInstance = jumpThroughPlatformInstance;
 	activeMovingJumpThroughPlatformInstance = movingJumpThroughPlatformInstance;
+	activePlayerActivatedJumpThroughPlatformInstance = playerActivatedJumpThroughPlatformInstance;
 
 	setPlayerOnGround(false);
 }
@@ -215,6 +217,61 @@ if (jumpThroughPlatformInstance != noone)
 	setPlayerOnGround(true);
 }
 
+/*****************************************
+*
+* Collision with player activated jump through platforms
+*
+*****************************************/
+
+if (instance_exists(playerActivatedJumpThroughPlatformInstance)) 
+{
+	playerActivatedJumpThroughPlatformInstance.sprite_index = playerActivatedJumpThroughPlatformInstance.initialSprite;	
+}
+
+
+var resetNumberOfPlayerActivatedJumpThroughPlatforms = instance_number(oPlayerActivatedJumpThroughPlatform);
+
+for (var i = 0; i < resetNumberOfPlayerActivatedJumpThroughPlatforms; i++) 
+{
+	var localPlayerActivatedJumpThroughPlatformInstance = instance_find(oPlayerActivatedJumpThroughPlatform, i);
+	localPlayerActivatedJumpThroughPlatformInstance.sprite_index = localPlayerActivatedJumpThroughPlatformInstance.initialSprite;	
+}
+
+playerActivatedJumpThroughPlatformInstance = noone;
+
+var numberOfPlayerActivatedJumpThroughPlatforms = instance_number(oPlayerActivatedJumpThroughPlatform);
+
+for (var i = 0; i < numberOfPlayerActivatedJumpThroughPlatforms; i++) 
+{
+	var localPlayerActivatedJumpThroughPlatformInstance = instance_find(oPlayerActivatedJumpThroughPlatform, i);
+
+	if (
+		place_meeting(x, y + playerSpeedY, localPlayerActivatedJumpThroughPlatformInstance) && 
+		floor(y) <= localPlayerActivatedJumpThroughPlatformInstance.bbox_top && 
+		activePlayerActivatedJumpThroughPlatformInstance != localPlayerActivatedJumpThroughPlatformInstance
+	)
+	{	
+		playerActivatedJumpThroughPlatformInstance = localPlayerActivatedJumpThroughPlatformInstance;
+
+		if (instance_exists(localPlayerActivatedJumpThroughPlatformInstance)) 
+		{
+			localPlayerActivatedJumpThroughPlatformInstance.sprite_index = localPlayerActivatedJumpThroughPlatformInstance.activeSprite;
+		}
+	}	
+}
+
+if (playerActivatedJumpThroughPlatformInstance != noone) 
+{
+	if (snapToColliders) 
+	{
+		snapToColliderOnY(playerSpeedY, playerActivatedJumpThroughPlatformInstance);
+	}
+
+	playerSpeedY = 0;
+
+	setPlayerOnGround(true);
+} 
+
 /*****************************************
 *
 * Collision with moving jump through platforms

objects/oPlayerActivatedJumpThroughPlatform/Create_0.gml

@@ -0,0 +1,3 @@
+
+initialSprite = sPlayerActivatedJumpThroughPlatform;
+activeSprite = sPlayerActivatedJumpThroughPlatformActive;