From 742d88cb89d39dc6f0ce77109168a7efcba6d4ba Mon Sep 17 00:00:00 2001 From: Joshua Reason Date: Thu, 12 Sep 2019 12:22:35 +1000 Subject: [PATCH] Started working on push --- .../Plugins/IngameDebugConsole/Android.meta | 8 - .../Plugins/IngameDebugConsole/Prefabs.meta | 8 - .../Plugins/IngameDebugConsole/Scripts.meta | 8 - .../IngameDebugConsole/Sprites/Unused.meta | 8 - Assets/Scripts/Character.cs | 463 ++++++++++-------- .../{Models.meta => Scripts/Components.meta} | 2 +- Assets/Scripts/LevelBlocks/ActiveBlock.cs | 26 - Assets/Scripts/LevelBlocks/Block.cs | 39 +- Assets/Scripts/LogicBlocks.meta | 8 - 9 files changed, 296 insertions(+), 274 deletions(-) delete mode 100644 Assets/Plugins/IngameDebugConsole/Android.meta delete mode 100644 Assets/Plugins/IngameDebugConsole/Prefabs.meta delete mode 100644 Assets/Plugins/IngameDebugConsole/Scripts.meta delete mode 100644 Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta rename Assets/{Models.meta => Scripts/Components.meta} (77%) delete mode 100644 Assets/Scripts/LogicBlocks.meta diff --git a/Assets/Plugins/IngameDebugConsole/Android.meta b/Assets/Plugins/IngameDebugConsole/Android.meta deleted file mode 100644 index 12049b6..0000000 --- a/Assets/Plugins/IngameDebugConsole/Android.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3d7d7a61a5341904eb3c65af025b1d86 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Prefabs.meta b/Assets/Plugins/IngameDebugConsole/Prefabs.meta deleted file mode 100644 index 6aa8bf2..0000000 --- a/Assets/Plugins/IngameDebugConsole/Prefabs.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 7dbc36665bc0d684db9a4447e27a7a4b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Scripts.meta b/Assets/Plugins/IngameDebugConsole/Scripts.meta deleted file mode 100644 index 72dcaac..0000000 --- a/Assets/Plugins/IngameDebugConsole/Scripts.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 860c08388401a6d4e858fe4910ea9337 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta b/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta deleted file mode 100644 index f3769b1..0000000 --- a/Assets/Plugins/IngameDebugConsole/Sprites/Unused.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f6caae32d463529478f2186f47c2e3fe -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 899ebd6..8943cee 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -103,6 +103,9 @@ public class Character : MonoBehaviour public IEnumerator MoveToBlock(Block target, Animation animation, float time) { + Block oldBlock = _currentBlock; + + _currentBlock.OnLeftByPlayer(this); System.Func yFunction = null; if (animation == Animation.Jump) @@ -113,6 +116,9 @@ public class Character : MonoBehaviour yield return StartCoroutine(LerpToBlock(target.VisualPosition, time, yFunction)); _currentBlock= target; + _currentBlock.OnWalkedOnByPlayer(this); + + yield return StartCoroutine(DoPush(oldBlock,_currentBlock, time)); StopAnimation(animation); } @@ -191,6 +197,49 @@ public class Character : MonoBehaviour transform.position = _startPos + Vector3.up * heightOffset(1); } + public IEnumerator DoPush(Block lastBlock, Block currentBlock, float animationTime) + { + //Direction player moved in ignoring Y value + Vector3 pushDirection = Vector3.ProjectOnPlane(currentBlock.position - lastBlock.position, Vector3.up).normalized; + + foreach(Character character in _currentBlock.GetPushablePlayers()) + { + if (character == this) + continue; + + yield return StartCoroutine(character.GetPushed(pushDirection)); + } + } + + public IEnumerator GetPushed(Vector3 direction) + { + yield return null; + } + + private Block getPushLocation(Vector3 pushDirection) + { + //setting up variables + Vector3 position = _currentBlock.position + pushDirection; // position wanted + Block hit; //output of block detection + + //if move is obstucted no where to move + if (Block.isBlockAtPosition(position + Vector3.up, 1, ~Ignore)) + return _currentBlock; + + + //If block at Position is walkable set it to moveTo + if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) + { + return hit; + } + //else if block down one is walkable + else if (Block.isBlockAtPosition(position + Vector3.down, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) + { + return hit; + } + return _currentBlock; + } + public void StartAnimation(Animation animation,float speed = 1) { characterAnimator.SetFloat("AnimationSpeed", (1 / speed)); @@ -237,6 +286,214 @@ public class Character : MonoBehaviour } } + + public void respawnCharacter() + { + /* Will introduce more complex criteria for choosing where to respawn the player in future + * For now: if the square one back (x =- 1) from the pit is walkable and unoccupied, then put them there + * Otherwise, try the next square back, etc, until we find an available one + */ + + Block currentBlock = null; + //We start from the position of our pit, at ground level + Vector3 currentPos = new Vector3(this.transform.position.x, this.transform.position.y, this.transform.position.z); + + Debug.Log("Commencing respawn"); + + //Hardcoding the number of iterations for now for simplicity, should change this later + for (int i = 0; i < 100; i++) + { + //First we check one back + currentPos.x -= 1; + Debug.Log("currentPos = " + currentPos.x + ", " + currentPos.y + ", " + currentPos.z); + if (Block.isBlockAtPosition(currentPos, 1, ~Ignore, out currentBlock)) //Does a block exist here? + { + Debug.Log("Block exists"); + if (currentBlock.isWalkable(~Ignore)) //If so, can we walk on it? + { + Debug.Log("Block is walkable"); + //Don't yet have a check for whether it's occupied + break; //If it is, we stop here + } + } + + //If the block one back isn't an option, we check to the left and right + currentPos.z += 1; + Debug.Log("currentPos = " + currentPos.x + ", " + currentPos.y + ", " + currentPos.z); + if (Block.isBlockAtPosition(currentPos, 1, ~Ignore, out currentBlock)) //Does a block exist here? + { + Debug.Log("Block exists"); + if (currentBlock.isWalkable(~Ignore)) //If so, can we walk on it? + { + Debug.Log("Block is walkable"); + //Don't yet have a check for whether it's occupied + break; //If it is, we stop here + } + } + currentPos.z -= 2; + Debug.Log("currentPos = " + currentPos.x + ", " + currentPos.y + ", " + currentPos.z); + if (Block.isBlockAtPosition(currentPos, 1, ~Ignore, out currentBlock)) //Does a block exist here? + { + Debug.Log("Block exists"); + if (currentBlock.isWalkable(~Ignore)) //If so, can we walk on it? + { + Debug.Log("Block is walkable"); + //Don't yet have a check for whether it's occupied + break; //If it is, we stop here + } + } + + //If we've gotten this far and haven't found an available spot, we move back a row and try again + currentPos.z += 1; + } + + //Having found our target block, we move the character there + if (currentBlock != null) + { + this.transform.position = currentBlock.VisualPosition; + this.inPit = false; + this._currentBlock = currentBlock; + Debug.Log("Moved " + this.name + " to " + + this.transform.position.x + ", " + + this.transform.position.y + ", " + + this.transform.position.z + ", " + + " inPit = " + inPit); + } + else + { + Debug.Log("Failed to find anywhere to put " + this.name); + } + + } + + /// + /// Upon collision with a floating block, collect its + /// Upon collision with the end portal, end of level + /// + /// name of collided object + void OnTriggerEnter(Collider other) + { + Collectable collectable = other.GetComponentInChildren(); + + if (collectable != null) + { + collectable.OnCollect(this); + } + if (other.gameObject.name == "collect_sphere") + { + other.gameObject.SetActive(false); + //player.collected +=1; + + } + if (other.gameObject.name == "End Portal") + { + other.GetComponent().enabled = false; + SceneManager.LoadScene(nextScene); + } + } + + /// + /// Rotates to point in specific direction based on current direction + /// + /// Local direction to point + public void Rotate(Direction direction, float speed) + { + StartCoroutine(rotateCoroutine(direction, transform, speed, 0.15f)); + //transform.forward = direction.ToVector(transform); + } + public void RotateHalf(Direction direction, float speed) + { + StartCoroutine(rotateHalfCoroutine(direction, transform, speed, 0.15f)); + //transform.forward = direction.ToVector(transform); + } + + /// + /// Jumps in specefied direction, picks between Long Jump and Jumping up + /// + /// Direction to Jump + public void Jump(Direction direction, float speed) + { + //if there is a block infront JumpUp else LongJump + if (Block.isBlockAtPosition(_currentBlock.position + direction.ToVector(transform) + Vector3.up, 1, ~Ignore)) + JumpUp(direction, speed); + else + JumpLong(direction, speed); + } + + #endregion Class Implementation + + #region Private Functions + + /// + /// Jumps up obstacle of specific height. Jumps as high as possible + /// + /// Direction of obstacle + /// max height + private void JumpUp(Direction direction, float speed, int height = 1) + { + //setting up variables + Vector3 position; // position wanted + Block hit; //output of block detection + Block moveTo = _currentBlock; //block we'll actually move to + + //Check blocks in going up then move to the heighest walkable one + for (int i = 0; i <= height; i++) + { + //next position up the tower + position = _currentBlock.position + direction.ToVector(transform) + (Vector3.up * i); + + //if block is walkable set it to last known position + if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) + moveTo = hit; + } + + //set current block && move + _currentBlock = moveTo; + StartCoroutine(JumpCoroutine(_currentBlock, transform, speed, 0.5f)); + //transform.position = CurrentBlock.VisualPosition; + } + + /// + /// Long jumps forward a specified distance. Can Jump gaps. Stops at obstruction + /// + /// Direction to Jump + /// Max distance + private void JumpLong(Direction direction, float speed, int Distance = 2) + { + //setting up variables + Vector3 position; // position wanted + Block hit; //output of block detection + Block moveTo = _currentBlock; //block we'll actually move to + + //Check blocks in front until we hit an obstruction or went the distance + for (int i = 1; i <= Distance; i++) + { + //Next position to MoveTo + position = _currentBlock.position + (direction.ToVector(transform) * i); + + //if jump is obstructed, stop and go to last known block + if (Block.isBlockAtPosition(position + Vector3.up, 1, ~Ignore)) + break; + + + //If block at Position is walkable set it to last known position + if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) + moveTo = hit; + //else if block down one is walkable + else if (Block.isBlockAtPosition(position + Vector3.down, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) + moveTo = hit; + + }//end for + + //Set Current Block and move + _currentBlock = moveTo; + StartCoroutine(JumpCoroutine(_currentBlock, transform, speed, 0.5f)); + //transform.position = CurrentBlock.VisualPosition; + } + + #endregion Private Functions + + #region Depricated IEnumerator JumpCoroutine(Block Target, Transform Current, float time, float heightMax) { float elapsedTime = 0; @@ -515,210 +772,6 @@ public class Character : MonoBehaviour } } - public void respawnCharacter() - { - /* Will introduce more complex criteria for choosing where to respawn the player in future - * For now: if the square one back (x =- 1) from the pit is walkable and unoccupied, then put them there - * Otherwise, try the next square back, etc, until we find an available one - */ - - Block currentBlock = null; - //We start from the position of our pit, at ground level - Vector3 currentPos = new Vector3(this.transform.position.x, this.transform.position.y, this.transform.position.z); - - Debug.Log("Commencing respawn"); - - //Hardcoding the number of iterations for now for simplicity, should change this later - for (int i = 0; i < 100; i++) - { - //First we check one back - currentPos.x -= 1; - Debug.Log("currentPos = " + currentPos.x + ", " + currentPos.y + ", " + currentPos.z); - if (Block.isBlockAtPosition(currentPos, 1, ~Ignore, out currentBlock)) //Does a block exist here? - { - Debug.Log("Block exists"); - if (currentBlock.isWalkable(~Ignore)) //If so, can we walk on it? - { - Debug.Log("Block is walkable"); - //Don't yet have a check for whether it's occupied - break; //If it is, we stop here - } - } - - //If the block one back isn't an option, we check to the left and right - currentPos.z += 1; - Debug.Log("currentPos = " + currentPos.x + ", " + currentPos.y + ", " + currentPos.z); - if (Block.isBlockAtPosition(currentPos, 1, ~Ignore, out currentBlock)) //Does a block exist here? - { - Debug.Log("Block exists"); - if (currentBlock.isWalkable(~Ignore)) //If so, can we walk on it? - { - Debug.Log("Block is walkable"); - //Don't yet have a check for whether it's occupied - break; //If it is, we stop here - } - } - currentPos.z -= 2; - Debug.Log("currentPos = " + currentPos.x + ", " + currentPos.y + ", " + currentPos.z); - if (Block.isBlockAtPosition(currentPos, 1, ~Ignore, out currentBlock)) //Does a block exist here? - { - Debug.Log("Block exists"); - if (currentBlock.isWalkable(~Ignore)) //If so, can we walk on it? - { - Debug.Log("Block is walkable"); - //Don't yet have a check for whether it's occupied - break; //If it is, we stop here - } - } - - //If we've gotten this far and haven't found an available spot, we move back a row and try again - currentPos.z += 1; - } - - //Having found our target block, we move the character there - if (currentBlock != null) - { - this.transform.position = currentBlock.VisualPosition; - this.inPit = false; - this._currentBlock = currentBlock; - Debug.Log("Moved " + this.name + " to " - + this.transform.position.x + ", " - + this.transform.position.y + ", " - + this.transform.position.z + ", " - + " inPit = " + inPit); - } - else - { - Debug.Log("Failed to find anywhere to put " + this.name); - } - - } - - /// - /// Upon collision with a floating block, collect its - /// Upon collision with the end portal, end of level - /// - /// name of collided object - void OnTriggerEnter(Collider other) - { - Collectable collectable = other.GetComponentInChildren(); - - if (collectable != null) - { - collectable.OnCollect(this); - } - if (other.gameObject.name == "collect_sphere") - { - other.gameObject.SetActive(false); - //player.collected +=1; - - } - if (other.gameObject.name == "End Portal") - { - other.GetComponent().enabled = false; - SceneManager.LoadScene(nextScene); - } - } - - /// - /// Rotates to point in specific direction based on current direction - /// - /// Local direction to point - public void Rotate(Direction direction, float speed) - { - StartCoroutine(rotateCoroutine(direction, transform, speed, 0.15f)); - //transform.forward = direction.ToVector(transform); - } - public void RotateHalf(Direction direction, float speed) - { - StartCoroutine(rotateHalfCoroutine(direction, transform, speed, 0.15f)); - //transform.forward = direction.ToVector(transform); - } - - /// - /// Jumps in specefied direction, picks between Long Jump and Jumping up - /// - /// Direction to Jump - public void Jump(Direction direction, float speed) - { - //if there is a block infront JumpUp else LongJump - if (Block.isBlockAtPosition(_currentBlock.position + direction.ToVector(transform) + Vector3.up, 1, ~Ignore)) - JumpUp(direction, speed); - else - JumpLong(direction, speed); - } - - #endregion Class Implementation - - #region Private Functions - - /// - /// Jumps up obstacle of specific height. Jumps as high as possible - /// - /// Direction of obstacle - /// max height - private void JumpUp(Direction direction, float speed, int height = 1) - { - //setting up variables - Vector3 position; // position wanted - Block hit; //output of block detection - Block moveTo = _currentBlock; //block we'll actually move to - - //Check blocks in going up then move to the heighest walkable one - for (int i = 0; i <= height; i++) - { - //next position up the tower - position = _currentBlock.position + direction.ToVector(transform) + (Vector3.up * i); - - //if block is walkable set it to last known position - if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) - moveTo = hit; - } - - //set current block && move - _currentBlock = moveTo; - StartCoroutine(JumpCoroutine(_currentBlock, transform, speed, 0.5f)); - //transform.position = CurrentBlock.VisualPosition; - } - - /// - /// Long jumps forward a specified distance. Can Jump gaps. Stops at obstruction - /// - /// Direction to Jump - /// Max distance - private void JumpLong(Direction direction, float speed, int Distance = 2) - { - //setting up variables - Vector3 position; // position wanted - Block hit; //output of block detection - Block moveTo = _currentBlock; //block we'll actually move to - - //Check blocks in front until we hit an obstruction or went the distance - for (int i = 1; i <= Distance; i++) - { - //Next position to MoveTo - position = _currentBlock.position + (direction.ToVector(transform) * i); - - //if jump is obstructed, stop and go to last known block - if (Block.isBlockAtPosition(position + Vector3.up, 1, ~Ignore)) - break; - - - //If block at Position is walkable set it to last known position - if (Block.isBlockAtPosition(position, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) - moveTo = hit; - //else if block down one is walkable - else if (Block.isBlockAtPosition(position + Vector3.down, 1, ~Ignore, out hit) && hit.isWalkable(~Ignore)) - moveTo = hit; - - }//end for - - //Set Current Block and move - _currentBlock = moveTo; - StartCoroutine(JumpCoroutine(_currentBlock, transform, speed, 0.5f)); - //transform.position = CurrentBlock.VisualPosition; - } - - #endregion Private Functions + #endregion Depricated } \ No newline at end of file diff --git a/Assets/Models.meta b/Assets/Scripts/Components.meta similarity index 77% rename from Assets/Models.meta rename to Assets/Scripts/Components.meta index 5346456..5a95b09 100644 --- a/Assets/Models.meta +++ b/Assets/Scripts/Components.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 296bd90e667df1f4697823a0aa45acf0 +guid: 8d7394d70ec233849a60a26da5f23b75 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/LevelBlocks/ActiveBlock.cs b/Assets/Scripts/LevelBlocks/ActiveBlock.cs index dc10796..c0bff6e 100644 --- a/Assets/Scripts/LevelBlocks/ActiveBlock.cs +++ b/Assets/Scripts/LevelBlocks/ActiveBlock.cs @@ -4,10 +4,6 @@ using UnityEngine; public class ActiveBlock : Block { - - protected List currentPlayers = new List(); - - #region Class Functions /// @@ -20,28 +16,6 @@ public class ActiveBlock : Block } - /// - /// Is called when a player moves onto this block - /// - /// Should be implemented by a derived class - /// - /// Player which moved on to block - public virtual void OnWalkedOnByPlayer(PlayerData player) - { - currentPlayers.Add(player); - } - - /// - /// Is called when a player moves off of block - /// - /// Should be implemented by a derived class - /// - /// Player which moved on to block - public virtual void OnLeftByPlayer(PlayerData player) - { - currentPlayers.Remove(player); - } - /// /// Called after all players have finished all their moves /// diff --git a/Assets/Scripts/LevelBlocks/Block.cs b/Assets/Scripts/LevelBlocks/Block.cs index 946b254..1d1c834 100644 --- a/Assets/Scripts/LevelBlocks/Block.cs +++ b/Assets/Scripts/LevelBlocks/Block.cs @@ -33,6 +33,13 @@ public class Block : MonoBehaviour #endregion InspectorFields + #region Private Functions + /// + /// List of current players on this block + /// + protected List currentPlayers = new List(); + #endregion Private Functions + #region ReadOnly Properties /// /// Blocks position in global space @@ -58,10 +65,38 @@ public class Block : MonoBehaviour return (is_Walkable && !isBlockAtPosition(position + Vector3.up, 1, layerMask)); } + /// + /// Is called when a player moves onto this block + /// + /// Should be implemented by a derived class + /// + /// Player which moved on to block + public virtual void OnWalkedOnByPlayer(Character player) + { + currentPlayers.Add(player); + } + + /// + /// Is called when a player moves off of block + /// + /// Should be implemented by a derived class + /// + /// Player which moved on to block + public virtual void OnLeftByPlayer(Character player) + { + currentPlayers.Remove(player); + } + + /// + /// Returns an array of players who can be pushed off this block + /// + /// array of players who can be pushed off this block + public virtual Character[] GetPushablePlayers() + { + return currentPlayers.ToArray(); + } - - #endregion Public Functions diff --git a/Assets/Scripts/LogicBlocks.meta b/Assets/Scripts/LogicBlocks.meta deleted file mode 100644 index 98af9d1..0000000 --- a/Assets/Scripts/LogicBlocks.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8936b441d7647f74884c94f97bfb8931 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: