Merge branch 'main' of https://git.steelants.cz/GJP/GGJ2022

Assets/Prefabs/Background Objects/bg_compas.prefab

@@ -95,7 +95,7 @@ GameObject:
   - component: {fileID: 6816399794078047248}
   - component: {fileID: 304331928327035788}
   m_Layer: 0
-  m_Name: compass
+  m_Name: bg_compas
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Background Objects/bg_magnet.prefab

@@ -178,7 +178,7 @@ GameObject:
   - component: {fileID: 7299430167591065022}
   - component: {fileID: 8979301594789080325}
   m_Layer: 0
-  m_Name: Gaint Freaking Magnet
+  m_Name: bg_magnet
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Level Chunks/level_chunk_1.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 2957714535164430066}
   - component: {fileID: -6971605353857731775}
   m_Layer: 0
-  m_Name: level chunk 1
+  m_Name: level_chunk_1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Level Chunks/level_chunk_2.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 2957714535164430066}
   - component: {fileID: -4978173286257615179}
   m_Layer: 0
-  m_Name: level chunk 2
+  m_Name: level_chunk_2
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Level Chunks/level_chunk_3.prefab

@@ -11,7 +11,7 @@ GameObject:
   - component: {fileID: 2957714535164430066}
   - component: {fileID: 4501625178067468098}
   m_Layer: 0
-  m_Name: level chunk 3
+  m_Name: level_chunk_3
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Platforms/platform_neutral.prefab

@@ -179,7 +179,7 @@ GameObject:
   - component: {fileID: 991026633550732616}
   - component: {fileID: -3679359786245750542}
   m_Layer: 0
-  m_Name: platform 3 neutral
+  m_Name: platform_neutral
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Platforms/platform_neutral_sharp.prefab

@@ -97,7 +97,7 @@ GameObject:
   - component: {fileID: 8372693939530454457}
   - component: {fileID: 458963570543655786}
   m_Layer: 0
-  m_Name: platform 4 neutral
+  m_Name: platform_neutral_sharp
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Platforms/platform_power.prefab

@@ -99,7 +99,7 @@ GameObject:
   - component: {fileID: -731181381576803345}
   - component: {fileID: 3389900204265069980}
   m_Layer: 0
-  m_Name: platform 2 power
+  m_Name: platform_power
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Platforms/platform_rrange.prefab

@@ -117,7 +117,7 @@ GameObject:
   - component: {fileID: 7973800414101489524}
   - component: {fileID: 6165408165884203318}
   m_Layer: 0
-  m_Name: Platform_Orange
+  m_Name: platform_rrange
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Platforms/platform_speed.prefab

@@ -96,7 +96,7 @@ GameObject:
   - component: {fileID: 5794058540197003412}
   - component: {fileID: 8763404315579740833}
   m_Layer: 0
-  m_Name: platform 3 speed
+  m_Name: platform_speed
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/Platforms/platform_start.prefab

@@ -181,7 +181,7 @@ GameObject:
   - component: {fileID: 2187729912207573111}
   - component: {fileID: -6601052459336252156}
   m_Layer: 0
-  m_Name: Platform Start
+  m_Name: platform_start
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/platforms/Platform_Blue.prefab

@@ -101,7 +101,7 @@ GameObject:
   - component: {fileID: 2527761051471871889}
   - component: {fileID: 4240483973579556787}
   m_Layer: 0
-  m_Name: Platform_Blue
+  m_Name: platform_blue
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/platforms/Platform_Green.prefab

@@ -116,7 +116,7 @@ GameObject:
   - component: {fileID: -7597049073915248875}
   - component: {fileID: 3278078638141404736}
   m_Layer: 0
-  m_Name: Platform_Green
+  m_Name: platform_green
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/platforms/Platform_Red.prefab

@@ -117,7 +117,7 @@ GameObject:
   - component: {fileID: 5862113707430629064}
   - component: {fileID: -6889792310482815023}
   m_Layer: 0
-  m_Name: Platform_Red
+  m_Name: platform_red
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/platforms/Platform_empty.prefab

@@ -87,7 +87,7 @@ GameObject:
   - component: {fileID: 5458493816772439993}
   - component: {fileID: 6374445660222366211}
   m_Layer: 0
-  m_Name: Platform_empty
+  m_Name: platform_empty
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Prefabs/platforms/Platform_yellow.prefab

@@ -117,7 +117,7 @@ GameObject:
   - component: {fileID: 8383421295717427161}
   - component: {fileID: 3996111038030861644}
   m_Layer: 0
-  m_Name: Platform_yellow
+  m_Name: platform_yellow
   m_TagString: platform
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scenes/Vasek.unity

@@ -5132,6 +5132,11 @@ MonoBehaviour:
   - {fileID: 1316835597118596560, guid: edd9e993fa2520f4095e33c7552ecd54, type: 3}
   - {fileID: 1316835597118596560, guid: b140cd85c7d7ba64cbc9ab71d92e349e, type: 3}
   spawnedLevelBlocks: []
+  backgroundBlocks:
+  - {fileID: 5287741263160770601, guid: 7a596fa177a8fd34face58d8f58e0e41, type: 3}
+  - {fileID: 2394897577413455488, guid: 1348a4eeda762ae4db83cd873efb4c44, type: 3}
+  backgroundLevelBlocks: []
+  bgParrent: {fileID: 1253020012}
   player: {fileID: 250075900}
   lastBlock: {fileID: 126480931}
 --- !u!1 &705507993
@@ -5228,6 +5233,37 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &1253020012
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1253020013}
+  m_Layer: 0
+  m_Name: Background
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1253020013
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253020012}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -3.7466898, y: 11.656877, z: 19.668505}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1287430439
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -5428,7 +5464,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
       propertyPath: m_RootOrder
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2628890434173161083, guid: aa81b1bce294ebf42a0a5fff43100935, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Scripts/BGRotation.cs

@@ -8,7 +8,7 @@ public class BGRotation : MonoBehaviour
 
     private void Start()
     {
-        rotation = new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360));
+        rotation = new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360)) * 0.009f;
     }
 
     void FixedUpdate()

Assets/Scripts/ProceduralGeneration.cs

@@ -9,27 +9,28 @@ public class ProceduralGeneration : MonoBehaviour
     private int maximumNumberOfPlatformsAtScene = 100;
     public List<GameObject> spawnedLevelBlocks = new List<GameObject>();
     private float maximumDistanceOfPlatformFromPlayer = 20.0f;
+    private GameObject levelParrent = null;
 
     [Header("Background")]
     public List<GameObject> backgroundBlocks = new List<GameObject>();
     public List<GameObject> backgroundLevelBlocks = new List<GameObject>();
     private float maximumDistanceOfPlatformFromPlayerBg = 600.0f;
+    public GameObject bgParrent = null;
 
     public GameObject player = null;
     public GameObject lastBlock;
     private GameObject lastBlockPrefab;
-    private GameObject levelParrent = null;
 
     List<GameObject> spawnBackgroundObjects(Vector3 playerPosition, List<GameObject> backgroundBlocks, GameObject parentLevelObject)
     {
         List<GameObject> bgBlocksSpawnTemp = new List<GameObject>();
         for (var i = 0; i < 200; i++)
         {
-            int bgElement = Random.Range(0, backgroundBlocks.Count);
+            int bgElement = Random.Range(0, backgroundBlocks.Count - 1);
 
             GameObject newBgObject = Instantiate(backgroundBlocks[bgElement], (Random.insideUnitSphere * Random.Range(300, maximumDistanceOfPlatformFromPlayerBg) + playerPosition + new Vector3(0, 0, 50)), (Quaternion.identity));
             newBgObject.transform.Rotate(new Vector3(Random.Range(0, 360), Random.Range(0, 360), Random.Range(0, 360)));
-            newBgObject.transform.parent = parentLevelObject.transform;
+            newBgObject.transform.parent = bgParrent.transform;
 
             bgBlocksSpawnTemp.Add(newBgObject);
         }
@@ -73,7 +74,7 @@ public class ProceduralGeneration : MonoBehaviour
         // Debug.Log("Building LOOP");
 
         int pieceCount = 10;
-        float radius = (pieceCount / 2) * 2;
+        float radius = (pieceCount / 2) + 1.9f;
         float angle = 360f / (float)pieceCount;
 
         Bounds bounds = this.getPrefabBounds(lastObject);