diff --git a/Assets/Prefabs/newTile.prefab b/Assets/Prefabs/newTile.prefab index d785d8d..3559064 100644 --- a/Assets/Prefabs/newTile.prefab +++ b/Assets/Prefabs/newTile.prefab @@ -1,5 +1,111 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &853962700825142131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2302054554406120191} + - component: {fileID: 7930237308982353602} + m_Layer: 0 + m_Name: borderEast + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2302054554406120191 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853962700825142131} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7573435787306895636} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7930237308982353602 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853962700825142131} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 50, z: 10} + m_Center: {x: 4.5, y: 10, z: 0} +--- !u!1 &1105542063898681048 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8675574615724103168} + - component: {fileID: 5060182090080639643} + m_Layer: 0 + m_Name: borderWest + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8675574615724103168 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105542063898681048} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7573435787306895636} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &5060182090080639643 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105542063898681048} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 50, z: 10} + m_Center: {x: -4.5, y: 10, z: 0} --- !u!1 &1432760222041494230 GameObject: m_ObjectHideFlags: 0 @@ -27,13 +133,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432760222041494230} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: -1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7573435787306895636} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &592371478074520587 MeshFilter: @@ -93,9 +199,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432760222041494230} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} @@ -111,6 +225,59 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &6123336807212193309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6802392361063389519} + - component: {fileID: 7259734393543055140} + m_Layer: 0 + m_Name: borderNorth + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6802392361063389519 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6123336807212193309} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7573435787306895636} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &7259734393543055140 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6123336807212193309} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 10, y: 50, z: 1} + m_Center: {x: 0, y: 10, z: 4.5} --- !u!1 &7573435787306895624 GameObject: m_ObjectHideFlags: 0 @@ -124,6 +291,7 @@ GameObject: - component: {fileID: 7573435787306895626} - component: {fileID: 1119895836232734540} - component: {fileID: 7602326841346784209} + - component: {fileID: 6122092376269241101} m_Layer: 0 m_Name: newTile m_TagString: Tile @@ -138,14 +306,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7573435787306895624} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -109.4, y: 0, z: 0} m_LocalScale: {x: 10, y: 1, z: 10} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1418724594657166519} + - {fileID: 6802392361063389519} + - {fileID: 3477629701989741973} + - {fileID: 2302054554406120191} + - {fileID: 8675574615724103168} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7573435787306895637 MeshFilter: @@ -217,9 +389,91 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7573435787306895624} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 4 + serializedVersion: 5 m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!65 &6122092376269241101 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7573435787306895624} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 10, y: 50, z: 10} + m_Center: {x: 0, y: 10, z: 0} +--- !u!1 &7947202897621284699 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3477629701989741973} + - component: {fileID: 6619435022680525770} + m_Layer: 0 + m_Name: borderSouth + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3477629701989741973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7947202897621284699} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7573435787306895636} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &6619435022680525770 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7947202897621284699} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 10, y: 50, z: 1} + m_Center: {x: 0, y: 10, z: -4.5} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 2974cfd..774908f 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -22284,7 +22284,7 @@ MonoBehaviour: value: 0.93 - localeIdentifier: m_Code: de - value: 4 + value: 50 --- !u!1 &1031718408 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index afe88c1..44aaab3 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -19,6 +19,7 @@ namespace Assets.Scripts DateTime now; UIHandler uihandler; AudioHandler audioHandler; + WorldGenerator worldGenerator; int bobbingDirection = -1; string playername; @@ -47,7 +48,7 @@ namespace Assets.Scripts Dictionary equipment; bool finishedGame = false; - + private void OnEnable() { @@ -61,11 +62,15 @@ namespace Assets.Scripts { uihandler = GameObject.Find("UIHandler").GetComponent(); audioHandler = GameObject.Find("AudioHandler").GetComponent(); + if (GameObject.Find("Inventory") != null) { equipment = GameObject.Find("Inventory").GetComponent().getEquipmentBonus(); } - + if (GameObject.Find("WorldGenerator") != null) + { + worldGenerator = GameObject.Find("WorldGenerator").GetComponent(); + } } public void finishPlayerCreation() @@ -154,7 +159,7 @@ namespace Assets.Scripts switch (role.classname) { case "Warrior": - skills[0] = new BasicSkill(20,10,2,"Slash","Skills/Warrior/Slash",null); + skills[0] = new BasicSkill(20, 10, 2, "Slash", "Skills/Warrior/Slash", null); skills[0].setDescription(TextHandler.getText("slashDesc"));//""); skills[1] = new BasicSkill(0, 5, 1, "Block", "Skills/Warrior/Block", null); skills[1].setDescription(TextHandler.getText("blockDesc"));//""); @@ -199,7 +204,8 @@ namespace Assets.Scripts getRotation(); regeneratePlayer(); uihandler.adjustInformation(this); - if(!finishedGame){ + if (!finishedGame) + { gameFinished(); } } @@ -303,10 +309,11 @@ namespace Assets.Scripts { rotation += 360; } - if(rotation >= 360){ + if (rotation >= 360) + { rotation -= 360; } - needle.transform.eulerAngles = new Vector3(0,0,rotation); + needle.transform.eulerAngles = new Vector3(0, 0, rotation); } public int[] getStats() @@ -320,7 +327,7 @@ namespace Assets.Scripts { luck = this.luck; } - int[] result = { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points, luck}; + int[] result = { health, maxHealth, secondary, maxSecondary, strength, dexterity, intelligence, level, experience, maxExperience, points, luck }; return result; } @@ -446,7 +453,7 @@ namespace Assets.Scripts public void enemyKilled() { - uihandler.showMessage("SUCCESS;"+TextHandler.getText("enemyKilled")); + uihandler.showMessage("SUCCESS;" + TextHandler.getText("enemyKilled")); killcount++; SteamWorksHandler.getSlimeAchievement(killcount); gameFinished(); @@ -454,10 +461,10 @@ namespace Assets.Scripts public void gameFinished() { - if (GameObject.Find("WorldGenerator").GetComponent().gameWon()) + if (worldGenerator.gameWon()) { finishedGame = true; - uihandler.showMessage("SUCCESS;"+TextHandler.getText("gameWon")); + uihandler.showMessage("SUCCESS;" + TextHandler.getText("gameWon")); switch (difficulty) { case 0: @@ -481,7 +488,7 @@ namespace Assets.Scripts experience = experience - maxExperience; maxExperience = maxExperience * 2; level++; - uihandler.showMessage("SUCCESS;"+ TextHandler.getText("levelUp")); + uihandler.showMessage("SUCCESS;" + TextHandler.getText("levelUp")); points = points + 3; audioHandler.playLevelUp(); luck = luck + 2; @@ -507,7 +514,7 @@ namespace Assets.Scripts } else { - uihandler.showMessage("ERROR;"+TextHandler.getText("noPoints")); + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); } } @@ -520,7 +527,7 @@ namespace Assets.Scripts } else { - uihandler.showMessage("ERROR;"+TextHandler.getText("noPoints")); + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); } } @@ -533,7 +540,7 @@ namespace Assets.Scripts } else { - uihandler.showMessage("ERROR;"+TextHandler.getText("noPoints")); + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); } } @@ -547,7 +554,7 @@ namespace Assets.Scripts } else { - uihandler.showMessage("ERROR;"+TextHandler.getText("noPoints")); + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); } } @@ -561,7 +568,7 @@ namespace Assets.Scripts } else { - uihandler.showMessage("ERROR;"+TextHandler.getText("noPoints")); + uihandler.showMessage("ERROR;" + TextHandler.getText("noPoints")); } } @@ -570,7 +577,7 @@ namespace Assets.Scripts for (int i = 1; i <= 3; i++) { GameObject skill = pnlSkills.transform.Find("skill" + i).gameObject; - skills[i-1].displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject); + skills[i - 1].displaySkill(skill.transform.Find("imgAction").gameObject, skill.transform.Find("descAction").gameObject); } } @@ -687,5 +694,38 @@ namespace Assets.Scripts { return luck; } + + void OnTriggerEnter(Collider col) + { + if (col.gameObject.name.Contains("_")) + { + worldGenerator.changeCurrentTile(col.gameObject); + } + } + + void OnTriggerStay(Collider col) + { + if (col.gameObject.name.Contains("border")) + { + Vector3 newTile = new Vector3(); + if (col.gameObject.name.ToLower() == "bordernorth") + { + newTile = newTile + new Vector3(0, 0, 1); + } + if (col.gameObject.name.ToLower() == "bordersouth") + { + newTile = newTile + new Vector3(0, 0, -1); + } + if (col.gameObject.name.ToLower() == "bordereast") + { + newTile = newTile + new Vector3(1, 0, 0); + } + if (col.gameObject.name.ToLower() == "borderwest") + { + newTile = newTile + new Vector3(-1, 0, 0); + } + worldGenerator.createTile(newTile); + } + } } } diff --git a/Assets/Scripts/Testing/Tile.prefab b/Assets/Scripts/Testing/Tile.prefab deleted file mode 100644 index f8f949c..0000000 --- a/Assets/Scripts/Testing/Tile.prefab +++ /dev/null @@ -1,241 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1432760222041494230 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1418724594657166519} - - component: {fileID: 592371478074520587} - - component: {fileID: 1441453626542042980} - - component: {fileID: 7385324898674005301} - - component: {fileID: 7807969927081444678} - m_Layer: 0 - m_Name: pnlWater - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &1418724594657166519 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432760222041494230} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7573435787306895636} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &592371478074520587 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432760222041494230} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1441453626542042980 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432760222041494230} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 52b7d70b1de7c4ce09662b77c14d9fda, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7385324898674005301 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432760222041494230} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 1 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &7807969927081444678 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1432760222041494230} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0d2f50a8e0bb841a5aaa90ae55db8849, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1 &7573435787306895624 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7573435787306895636} - - component: {fileID: 7573435787306895637} - - component: {fileID: 7573435787306895626} - - component: {fileID: 7602326841346784209} - - component: {fileID: 6053739292490587254} - m_Layer: 0 - m_Name: Tile - m_TagString: Tile - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 4294967295 - m_IsActive: 1 ---- !u!4 &7573435787306895636 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7573435787306895624} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -109.4, y: 0, z: 0} - m_LocalScale: {x: 10, y: 1, z: 10} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1418724594657166519} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7573435787306895637 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7573435787306895624} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7573435787306895626 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7573435787306895624} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8e83d1b6a2b235d4bb5b64e3d386b16c, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &7602326841346784209 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7573435787306895624} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 5 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &6053739292490587254 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7573435787306895624} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 82f0b9ba1d91bf9148eb63b088e12979, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Scripts/Testing/Tile.prefab.meta b/Assets/Scripts/Testing/Tile.prefab.meta deleted file mode 100644 index edd7d9b..0000000 --- a/Assets/Scripts/Testing/Tile.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a3113b7ce76b2d5c1998c0dadca2acdd -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index 174579c..6f59c6e 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -9,10 +9,6 @@ using UnityEngine; public class Tile : MonoBehaviour { Vector3 position; - float borderNorth; - float borderEast; - float borderSouth; - float borderWest; System.Random rand = new System.Random(); TileType tiletype; GameObject contentGenerator; @@ -25,7 +21,6 @@ public class Tile : MonoBehaviour SteamWorksHandler.getForestAchievement(type.ToString()); contentGenerator = GameObject.Find("ContentGenerator"); setPosition(pos); - setBorders(); generateContent(); } @@ -34,14 +29,6 @@ public class Tile : MonoBehaviour } - public void setBorders() - { - borderNorth = position.z * 100 + 50; - borderEast = position.x * 100 + 50; - borderSouth = position.z * 100 - 50; - borderWest = position.x * 100 - 50; - } - public void generateContent() { foreach (Vector3 position in getSpawnLocations()) @@ -53,30 +40,7 @@ public class Tile : MonoBehaviour public List getSpawnLocations() { List list = new List(); - int xChange = 0; - int zChange = 0; - int sideLimiter = 0; - if(tiletype == TileType.CITY){ - sideLimiter = 20; - } - else{ - sideLimiter = 10; - } - for (float i = borderNorth - sideLimiter; i >= borderSouth + sideLimiter; i = i - sideLimiter) - { - for (float j = borderWest + sideLimiter; j <= borderEast - sideLimiter; j = j + sideLimiter) - { - xChange = rand.Next(-2, +2); - zChange = rand.Next(-2, +2); - if(tiletype == TileType.CITY){ - list.Add(new Vector3(j + xChange, 0, i + zChange)); - } - else{ - list.Add(new Vector3(j + xChange, 5, i + zChange)); - } - - } - } + //Change object spawning return list; } @@ -111,86 +75,6 @@ public class Tile : MonoBehaviour return position; } - public void setType(TileType tiletype) - { - this.tiletype = tiletype; - } - - public bool leftTile(float playerX, float playerZ) - { - bool result = false; - if (playerX >= borderEast + 10 || playerX <= borderWest - 10 || playerZ >= borderNorth + 10 || playerZ <= borderSouth - 10) - { - result = true; - } - return result; - } - - public void changeRenderer() - { - foreach (Rigidbody rigid in gameObject.GetComponentsInChildren()) - { - rigid.useGravity = !rigid.useGravity; - } - - foreach (Renderer rend in gameObject.GetComponentsInChildren()) - { - rend.enabled = !rend.enabled; - } - - foreach (Collider col in gameObject.GetComponentsInChildren()) - { - col.enabled = !col.enabled; - } - } - - public bool enteredTile(float playerX, float playerZ) - { - bool result = false; - if (playerX <= borderEast && playerX >= borderWest && playerZ <= borderNorth && playerZ >= borderSouth) - { - result = true; - } - return result; - } - - public Vector3 needConnectedTile(float playerX, float playerZ) - { - Vector3 result = new Vector3(position.x, 1, position.z); - if (playerX >= borderEast - 10) - { - result.x = result.x + 1; - result.y = 0; - } - else if(playerX <= borderWest + 10) - { - result.x = result.x - 1; - result.y = 0; - } - - if (playerZ >= borderNorth - 10) - { - result.z = result.z + 1; - result.y = 0; - } - else if(playerZ <= borderSouth + 10) - { - result.z = result.z - 1; - result.y = 0; - } - return result; - } - - public bool removeConnectedTiles(float playerX, float playerZ) - { - bool result = false; - if (playerX <= borderEast - 10 && playerX >= borderWest + 10 && playerZ <= borderNorth - 10 && playerZ >= borderSouth + 10) - { - result = true; - } - return result; - } - public void enemyKilled(GameObject enemy) { aliveEnemies.Remove(enemy); @@ -291,7 +175,6 @@ public class Tile : MonoBehaviour } tiletype = (TileType)Enum.Parse(typeof(TileType), json["tiletype"].ToString()); setPosition(pos); - setBorders(); } public List getPossibleNeighbours(){ diff --git a/Assets/Scripts/TileType.cs b/Assets/Scripts/TileType.cs index 6cb38a0..6b93d92 100644 --- a/Assets/Scripts/TileType.cs +++ b/Assets/Scripts/TileType.cs @@ -164,7 +164,7 @@ namespace Assets.Scripts case TileType.MOUNTAINS: lowModifier[0] = 0.2f; lowModifier[1] = 0.3f; - highModifier[0] = 1.25f; + highModifier[0] = 1.0f; highModifier[1] = 0.2f; break; case TileType.LAKE: diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index ccf6435..b832966 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -14,8 +14,6 @@ public class WorldGenerator : MonoBehaviour public GameObject tile; Dictionary tiles; GameObject currentTile; - List renderedTiles; - List toRemove; NoiseGenerator noise; int cityAmount = 0; int maxCityAmount = 0; @@ -30,7 +28,6 @@ public class WorldGenerator : MonoBehaviour private void OnEnable() { tiles = new Dictionary(); - renderedTiles = new List(); noise = new NoiseGenerator(); createSpawn(); cityAmount = 10; @@ -51,7 +48,7 @@ public class WorldGenerator : MonoBehaviour Destroy(tile); } } - player.transform.position = new Vector3(0, 4f, 0); + player.transform.position = new Vector3(0, 50f, 0); player.transform.rotation = Quaternion.identity; OnEnable(); this.cityAmount = cityAmount; @@ -61,8 +58,6 @@ public class WorldGenerator : MonoBehaviour // Update is called once per frame void Update() { - createTile(player.transform.position.x, player.transform.position.z); - changeCurrentTile(player.transform.position.x, player.transform.position.z); resetPlayer(); } @@ -70,7 +65,7 @@ public class WorldGenerator : MonoBehaviour { if (player.transform.position.y <= -10) { - Vector3 position = new Vector3(currentTile.transform.position.x, 5, currentTile.transform.position.z); + Vector3 position = new Vector3(currentTile.transform.position.x, 50, currentTile.transform.position.z); player.transform.SetPositionAndRotation(position, player.transform.rotation); } } @@ -86,13 +81,11 @@ public class WorldGenerator : MonoBehaviour currentTile = newTile; } - public void createTile(float playerX, float playerZ) + public void createTile(Vector3 requiredPosition) { - Vector3 pos = currentTile.GetComponent().needConnectedTile(playerX, playerZ); + Vector3 pos = currentTile.GetComponent().getPosition() + requiredPosition; if (!tiles.ContainsKey(pos) && pos.y == 0) { - string name = ""; - int chance = rand.Next(1, 11); Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100); GameObject newTile = Instantiate(tile, mapPos, Quaternion.identity); @@ -104,20 +97,9 @@ public class WorldGenerator : MonoBehaviour } } - public void changeCurrentTile(float playerX, float playerZ) + public void changeCurrentTile(GameObject newCurrent) { - if (currentTile.GetComponent().leftTile(playerX, playerZ)) - { - renderedTiles.Remove(currentTile); - foreach (GameObject tile in renderedTiles) - { - if (tile.GetComponent().enteredTile(playerX, playerZ)) - { - currentTile = tile; - break; - } - } - } + currentTile = newCurrent; } public GameObject getCurrentTile() @@ -184,7 +166,6 @@ public class WorldGenerator : MonoBehaviour noise.loadTile(loadedTile, jsonData["vertices"], jsonData["colors"]); } tiles.Add(pos, loadedTile); - renderedTiles.Add(loadedTile); } currentTile = tiles[current]; Vector3 position = new Vector3(currentTile.transform.position.x, 5, currentTile.transform.position.z); diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index d8d161b..a1bab96 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 1020 m_ShowMode: 4 - m_Title: Project + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 754 + controlID: 40 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 755 + controlID: 41 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 41 + controlID: 42 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -215,17 +215,17 @@ MonoBehaviour: y: 0 width: 1214 height: 685 - m_MinSize: {x: 202, y: 221} + m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 16} - {fileID: 17} - {fileID: 18} - {fileID: 19} - {fileID: 20} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -277,7 +277,7 @@ MonoBehaviour: m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 109 + controlID: 117 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -401,9 +401,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 625e0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: c684ffff20fbffff + m_ExpandedIDs: a6cffeffb8d4feff9ed6feffcaddfeffe6defeff12e0feff32e1feff90eafeff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -770,9 +770,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -611.9158, y: -195.30804, z: 1023.07135} + m_Target: {x: -226.4418, y: -253.85118, z: 861.5535} speed: 2 - m_Value: {x: -611.9158, y: -195.30804, z: 1023.07135} + m_Value: {x: -226.4418, y: -253.85118, z: 861.5535} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -818,9 +818,9 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.29342666, y: 0.046855267, z: -0.015906507, w: -0.9542193} + m_Target: {x: 0.14660643, y: -0.091043964, z: 0.015109609, w: 0.9844031} speed: 2 - m_Value: {x: -0.29499307, y: 0.046852905, z: -0.01598398, w: -0.95421606} + m_Value: {x: 0.14667538, y: -0.091086775, z: 0.015116714, w: 0.984866} m_Size: m_Target: 458.9204 speed: 2 @@ -916,7 +916,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -1654,7 +1654,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Scenes m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1662,16 +1662,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Scenes m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 188} - m_SelectedIDs: be5d0000 - m_LastClickedID: 23998 - m_ExpandedIDs: 000000007e5a0000805a0000be5d000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 24070000 + m_LastClickedID: 1828 + m_ExpandedIDs: 000000002406000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1699,7 +1699,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 000000007e5a0000805a0000 + m_ExpandedIDs: 000000002406000074060000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: