From b67bcde3fa0a012ae33203ded171460ae3ad616c Mon Sep 17 00:00:00 2001 From: "s3607057 (Angus Niven)" Date: Thu, 19 Sep 2019 14:51:44 +1000 Subject: [PATCH] Lowered difficulty mins on some of our level sections so they'll show up earlier. Made difficulty scale up faster with track length. Fixed a misalignment of the in-ground trap components. --- .../Map Sections/Map Section Template.prefab | 2 +- .../Map Sections/Width 5/Beltplex 5-1.prefab | 2 +- .../Width 5/Map Section Template 1.prefab | 60 ++++++++++--------- .../Width 5/Sidebelt Pits 5-1.prefab | 2 +- .../Width 5/Sidebelt Pits 5-2.prefab | 2 +- .../Map Sections/Width 5/Waterpit 5-1.prefab | 2 +- .../Width 7/Map Section Template 1.prefab | 60 ++++++++++--------- Assets/Prefabs/Traps/InGroundTrap.prefab | 18 +++--- Assets/Scripts/Map Generation/MapManager.cs | 2 +- 9 files changed, 77 insertions(+), 73 deletions(-) diff --git a/Assets/Prefabs/Map Sections/Map Section Template.prefab b/Assets/Prefabs/Map Sections/Map Section Template.prefab index 4e62741..27ae80e 100644 --- a/Assets/Prefabs/Map Sections/Map Section Template.prefab +++ b/Assets/Prefabs/Map Sections/Map Section Template.prefab @@ -594,7 +594,7 @@ PrefabInstance: - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524, type: 3} propertyPath: m_LocalPosition.y - value: -0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524, type: 3} diff --git a/Assets/Prefabs/Map Sections/Width 5/Beltplex 5-1.prefab b/Assets/Prefabs/Map Sections/Width 5/Beltplex 5-1.prefab index ba32b29..16301b1 100644 --- a/Assets/Prefabs/Map Sections/Width 5/Beltplex 5-1.prefab +++ b/Assets/Prefabs/Map Sections/Width 5/Beltplex 5-1.prefab @@ -48,7 +48,7 @@ MonoBehaviour: widthOut: 5 widthMax: 5 length: 6 - difficultyMin: 3 + difficultyMin: 1 difficultyMax: 5 weight: 3 spawns1: [] diff --git a/Assets/Prefabs/Map Sections/Width 5/Map Section Template 1.prefab b/Assets/Prefabs/Map Sections/Width 5/Map Section Template 1.prefab index 46b5781..4073ad5 100644 --- a/Assets/Prefabs/Map Sections/Width 5/Map Section Template 1.prefab +++ b/Assets/Prefabs/Map Sections/Width 5/Map Section Template 1.prefab @@ -135,7 +135,7 @@ GameObject: - component: {fileID: 3619681100419815630} - component: {fileID: 4348126259560571709} m_Layer: 0 - m_Name: Map Section Template + m_Name: Map Section Template 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -175,19 +175,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 36b3461547afb96459a4c4b059c764a7, type: 3} m_Name: m_EditorClassIdentifier: - width: 0 + widthIn: 0 + widthOut: 0 + widthMax: 0 length: 0 - sectionName: - boulders: [] - belts: [] - cannons: [] - pits: [] - spawns: [] - spikes: [] - track: [] - walls: [] - water: [] - blocks: [] + difficultyMin: 0 + difficultyMax: 0 + weight: 1 + spawns1: [] + spawns2: [] + spawns3: [] + spawns4: [] + spawns5: [] + spawns6: [] + spawns7: [] + spawns8: [] entrances: [] exits: [] --- !u!1 &5235963486073562068 @@ -462,7 +464,7 @@ PrefabInstance: - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524, type: 3} propertyPath: m_LocalPosition.y - value: -0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524, type: 3} @@ -663,11 +665,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3264658026752372929} m_Modifications: - - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b, - type: 3} - propertyPath: m_Name - value: ShootingCannon + Block - objectReference: {fileID: 0} - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3} propertyPath: m_LocalPosition.x @@ -723,6 +720,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b, + type: 3} + propertyPath: m_Name + value: ShootingCannon + Block + objectReference: {fileID: 0} - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3} propertyPath: m_Mesh @@ -753,11 +755,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7525176871745234139} m_Modifications: - - target: {fileID: 6745622317302131141, guid: 26e034cbe9690f14a87e8365ee7734f1, - type: 3} - propertyPath: m_Name - value: CrushingBoulder - objectReference: {fileID: 0} - target: {fileID: 6745622317302131140, guid: 26e034cbe9690f14a87e8365ee7734f1, type: 3} propertyPath: m_LocalPosition.x @@ -813,6 +810,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6745622317302131141, guid: 26e034cbe9690f14a87e8365ee7734f1, + type: 3} + propertyPath: m_Name + value: CrushingBoulder + objectReference: {fileID: 0} - target: {fileID: 6745622315908332753, guid: 26e034cbe9690f14a87e8365ee7734f1, type: 3} propertyPath: m_Mesh @@ -843,11 +845,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3733143707459234553} m_Modifications: - - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, - type: 3} - propertyPath: m_Name - value: CubeWithCrystals - objectReference: {fileID: 0} - target: {fileID: 9119206199061355250, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3} propertyPath: m_LocalPosition.x @@ -903,6 +900,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, + type: 3} + propertyPath: m_Name + value: CubeWithCrystals + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3} --- !u!4 &968667811583345056 stripped diff --git a/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-1.prefab b/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-1.prefab index 3dec878..ab3b3af 100644 --- a/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-1.prefab +++ b/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-1.prefab @@ -90,7 +90,7 @@ MonoBehaviour: widthOut: 5 widthMax: 5 length: 8 - difficultyMin: 3 + difficultyMin: 2 difficultyMax: 5 weight: 1 spawns1: [] diff --git a/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-2.prefab b/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-2.prefab index a319a05..ec46633 100644 --- a/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-2.prefab +++ b/Assets/Prefabs/Map Sections/Width 5/Sidebelt Pits 5-2.prefab @@ -82,7 +82,7 @@ MonoBehaviour: widthOut: 5 widthMax: 5 length: 5 - difficultyMin: 3 + difficultyMin: 2 difficultyMax: 5 weight: 3 spawns1: [] diff --git a/Assets/Prefabs/Map Sections/Width 5/Waterpit 5-1.prefab b/Assets/Prefabs/Map Sections/Width 5/Waterpit 5-1.prefab index 2d97669..49fe2c0 100644 --- a/Assets/Prefabs/Map Sections/Width 5/Waterpit 5-1.prefab +++ b/Assets/Prefabs/Map Sections/Width 5/Waterpit 5-1.prefab @@ -136,7 +136,7 @@ MonoBehaviour: widthOut: 5 widthMax: 5 length: 6 - difficultyMin: 2 + difficultyMin: 1 difficultyMax: 4 weight: 3 spawns1: [] diff --git a/Assets/Prefabs/Map Sections/Width 7/Map Section Template 1.prefab b/Assets/Prefabs/Map Sections/Width 7/Map Section Template 1.prefab index 46b5781..4073ad5 100644 --- a/Assets/Prefabs/Map Sections/Width 7/Map Section Template 1.prefab +++ b/Assets/Prefabs/Map Sections/Width 7/Map Section Template 1.prefab @@ -135,7 +135,7 @@ GameObject: - component: {fileID: 3619681100419815630} - component: {fileID: 4348126259560571709} m_Layer: 0 - m_Name: Map Section Template + m_Name: Map Section Template 1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -175,19 +175,21 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 36b3461547afb96459a4c4b059c764a7, type: 3} m_Name: m_EditorClassIdentifier: - width: 0 + widthIn: 0 + widthOut: 0 + widthMax: 0 length: 0 - sectionName: - boulders: [] - belts: [] - cannons: [] - pits: [] - spawns: [] - spikes: [] - track: [] - walls: [] - water: [] - blocks: [] + difficultyMin: 0 + difficultyMax: 0 + weight: 1 + spawns1: [] + spawns2: [] + spawns3: [] + spawns4: [] + spawns5: [] + spawns6: [] + spawns7: [] + spawns8: [] entrances: [] exits: [] --- !u!1 &5235963486073562068 @@ -462,7 +464,7 @@ PrefabInstance: - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524, type: 3} propertyPath: m_LocalPosition.y - value: -0.5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3281312547625224782, guid: 58f041c53dc10de43a80197af33f2524, type: 3} @@ -663,11 +665,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3264658026752372929} m_Modifications: - - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b, - type: 3} - propertyPath: m_Name - value: ShootingCannon + Block - objectReference: {fileID: 0} - target: {fileID: 6179448856766749153, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3} propertyPath: m_LocalPosition.x @@ -723,6 +720,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6179448856766749154, guid: 72b0336b2f8509045b92eadaecbc885b, + type: 3} + propertyPath: m_Name + value: ShootingCannon + Block + objectReference: {fileID: 0} - target: {fileID: 7559508468311915790, guid: 72b0336b2f8509045b92eadaecbc885b, type: 3} propertyPath: m_Mesh @@ -753,11 +755,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7525176871745234139} m_Modifications: - - target: {fileID: 6745622317302131141, guid: 26e034cbe9690f14a87e8365ee7734f1, - type: 3} - propertyPath: m_Name - value: CrushingBoulder - objectReference: {fileID: 0} - target: {fileID: 6745622317302131140, guid: 26e034cbe9690f14a87e8365ee7734f1, type: 3} propertyPath: m_LocalPosition.x @@ -813,6 +810,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6745622317302131141, guid: 26e034cbe9690f14a87e8365ee7734f1, + type: 3} + propertyPath: m_Name + value: CrushingBoulder + objectReference: {fileID: 0} - target: {fileID: 6745622315908332753, guid: 26e034cbe9690f14a87e8365ee7734f1, type: 3} propertyPath: m_Mesh @@ -843,11 +845,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3733143707459234553} m_Modifications: - - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, - type: 3} - propertyPath: m_Name - value: CubeWithCrystals - objectReference: {fileID: 0} - target: {fileID: 9119206199061355250, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3} propertyPath: m_LocalPosition.x @@ -903,6 +900,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9119206199061355249, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, + type: 3} + propertyPath: m_Name + value: CubeWithCrystals + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9c7fae64659c0ef42ad2fe9b386e8ef9, type: 3} --- !u!4 &968667811583345056 stripped diff --git a/Assets/Prefabs/Traps/InGroundTrap.prefab b/Assets/Prefabs/Traps/InGroundTrap.prefab index 89fa479..f43dd5b 100644 --- a/Assets/Prefabs/Traps/InGroundTrap.prefab +++ b/Assets/Prefabs/Traps/InGroundTrap.prefab @@ -61,17 +61,13 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3281312547625224782} m_Modifications: - - target: {fileID: 1745447707790088, guid: 94b25f84ad255eb45ac650f2140605f6, type: 3} - propertyPath: m_Name - value: Cube_Lava - objectReference: {fileID: 0} - target: {fileID: 4449718510517138, guid: 94b25f84ad255eb45ac650f2140605f6, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - target: {fileID: 4449718510517138, guid: 94b25f84ad255eb45ac650f2140605f6, type: 3} propertyPath: m_LocalPosition.y - value: -0.84 + value: -1.34 objectReference: {fileID: 0} - target: {fileID: 4449718510517138, guid: 94b25f84ad255eb45ac650f2140605f6, type: 3} propertyPath: m_LocalPosition.z @@ -109,6 +105,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1745447707790088, guid: 94b25f84ad255eb45ac650f2140605f6, type: 3} + propertyPath: m_Name + value: Cube_Lava + objectReference: {fileID: 0} - target: {fileID: 9117651094070773091, guid: 94b25f84ad255eb45ac650f2140605f6, type: 3} propertyPath: isPit @@ -192,7 +192,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.y - value: 0.6 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.z @@ -373,7 +373,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.y - value: 0.6 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.z @@ -497,7 +497,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.y - value: 0.6 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.z @@ -564,7 +564,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.y - value: 0.6 + value: 0.1 objectReference: {fileID: 0} - target: {fileID: 4004810153341632, guid: 0247930279caa4341ab23ddd2d4b69f8, type: 3} propertyPath: m_LocalPosition.z diff --git a/Assets/Scripts/Map Generation/MapManager.cs b/Assets/Scripts/Map Generation/MapManager.cs index 82ee776..615e89d 100644 --- a/Assets/Scripts/Map Generation/MapManager.cs +++ b/Assets/Scripts/Map Generation/MapManager.cs @@ -410,7 +410,7 @@ public class MapManager : ScriptableObject } //Ramp up the difficulty as the track extends - difficulty += ((int)endX - (int)startX) / 10; + difficulty += ((int)endX - (int)startX) / 7; /*diffMin += (totalSections - 2) / 2; diffMax += totalSections / 2;*/