Merge branch 'master' of https://github.com/SweetTini/GlobalGameJam2020

Assets/Scenes/LevelOne.unity

@@ -168,8 +168,8 @@ MonoBehaviour:
   camera: {fileID: 1337282922}
   tile: {fileID: 11400000, guid: 7ece7857530facb42b843eed2526c86a, type: 2}
   framesPerControlTile: 15
-  nextControlYOffset: 1
-  nextControlXOffset: -2
+  nextControlYOffset: 4
+  nextControlXOffset: 1.5
 --- !u!483693784 &1491656
 TilemapRenderer:
   m_ObjectHideFlags: 0
@@ -388,7 +388,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   player: {fileID: 1671840916}
-  offsetY: 0
+  offsetY: 2
   interpolate: 0.1
 --- !u!4 &1146013793 stripped
 Transform:
@@ -521,7 +521,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1671840916}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -4.5, y: -4, z: 0}
+  m_LocalPosition: {x: -5, y: -4, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1008122163}

Assets/Scripts/CameraMovement.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 100
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Scripts/EventControlsDisplay.cs

@@ -8,10 +8,13 @@ public class EventControlsDisplay : MonoBehaviour
     [SerializeField] private Camera camera;
     [SerializeField] private Tile tile;
     [SerializeField] private float framesPerControlTile = 15;
-    [SerializeField] private int nextControlYOffset = 1;
-    [SerializeField] private int nextControlXOffset = -2;
+    [SerializeField] private float nextControlYOffset = 0;
+    [SerializeField] private float nextControlXOffset = 0;
 
     private Tilemap tilemap;
+    private int maxNumberOfControlTiles = 3;
+    private int numberOfControlTilesSet = 0;
+    private Vector3Int? initialCameraPosition;
     private int nextControlAccumalator = 0;
 
     private int framePerSecond => 60;
@@ -23,25 +26,46 @@ public class EventControlsDisplay : MonoBehaviour
 
     private void Update()
     {
-
-        if (nextControlAccumalator >= framesPerControlTile && nextControlXOffset < 1)
-        {
-            tilemap.SetTile(GetCameraPosition() + new Vector3Int(nextControlXOffset, nextControlYOffset, 0), tile);
-            nextControlAccumalator = 0;
-            nextControlXOffset++;
-        }
-        else
-        {
-            //transform.position = Vector2.Lerp(transform.position, player.transform.position + new Vector3(0, offsetY, 0), .1f);
-        }
-
+        SetTile();
+        SetTileMapPosition();
+        
         nextControlAccumalator++;
     }
 
+    private void SetTile()
+    {
+        if (nextControlAccumalator >= framesPerControlTile && numberOfControlTilesSet < maxNumberOfControlTiles)
+        {
+            if (initialCameraPosition == null)
+                initialCameraPosition = GetCameraPosition();
+
+            tilemap.SetTile(GetNextTilePosition(), tile);
+
+            nextControlAccumalator = 0;
+            numberOfControlTilesSet++;
+        }
+        else if (numberOfControlTilesSet == maxNumberOfControlTiles)
+        {
+            initialCameraPosition = null;
+        }
+    }
+
     private Vector3Int GetCameraPosition()
     {
         return new Vector3Int((int) camera.transform.position.x, 
                               (int) camera.transform.position.y, 
                               (int) camera.transform.position.z);
     }
+
+    private Vector3Int GetNextTilePosition()
+    {
+        return (initialCameraPosition + new Vector3Int(numberOfControlTilesSet, 0, 0))
+               .GetValueOrDefault();
+    }
+
+    private void SetTileMapPosition()
+    {
+        transform.position = camera.transform.position + 
+                             new Vector3(nextControlXOffset, nextControlYOffset, 0); // offset
+    }
 }

Assets/Scripts/EventControlsDisplay.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 200
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Scripts/Player.cs

@@ -40,7 +40,7 @@ public class Player : MonoBehaviour
     private void Jump()
     {
         // Jump
-        if (Input.GetKey(KeyCode.Space) && IsPlayerOnGround())
+        if (Input.GetKeyDown(KeyCode.Space) && IsPlayerOnGround())
         {
             rigidBody.velocity += new Vector2(0, jumpSpeed);
             rigidBody.velocity = new Vector2(rigidBody.velocity.x,

Assets/Scripts/Player.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 0
+  executionOrder: 50
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

Assets/Sprites/Hud.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a9931456aa6e9e840b3bd497e9b0803d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Hud/StaminaBar.png.meta

@@ -0,0 +1,115 @@
+fileFormatVersion: 2
+guid: 82c7c7c05d293dd46aa29dd621784808
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 10
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: -1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/Player/Player.controller

@@ -119,7 +119,7 @@ AnimatorController:
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
-    m_DefaultBool: 0
+    m_DefaultBool: 1
     m_Controller: {fileID: 0}
   - m_Name: IsGround
     m_Type: 4