From a82fa992f94081306ff36911afad220fad6bc0b6 Mon Sep 17 00:00:00 2001 From: Finnchen123 Date: Sat, 5 Oct 2024 11:53:34 +0200 Subject: [PATCH] improved save/load mechanic. --- ...alization-String-Tables-English (en).asset | 1 - ...calization-String-Tables-German (de).asset | 1 - Assets/Prefabs/LakeTile.prefab | 125 ++++++++++++++++++ Assets/Prefabs/LakeTile.prefab.meta | 7 + Assets/Prefabs/MountainTile.prefab | 125 ++++++++++++++++++ Assets/Prefabs/MountainTile.prefab.meta | 7 + Assets/Prefabs/RiverTile.prefab | 125 ++++++++++++++++++ Assets/Prefabs/RiverTile.prefab.meta | 7 + Assets/Scripts/ContentGenerator.cs | 58 +++----- Assets/Scripts/InteractableObjects/Door.cs | 2 +- Assets/Scripts/Player/PlayerCamera.cs | 2 +- Assets/Scripts/Tile.cs | 1 + Assets/Scripts/WorldGenerator.cs | 1 - save.json | 8 +- 14 files changed, 420 insertions(+), 50 deletions(-) create mode 100644 Assets/Prefabs/LakeTile.prefab create mode 100644 Assets/Prefabs/LakeTile.prefab.meta create mode 100644 Assets/Prefabs/MountainTile.prefab create mode 100644 Assets/Prefabs/MountainTile.prefab.meta create mode 100644 Assets/Prefabs/RiverTile.prefab create mode 100644 Assets/Prefabs/RiverTile.prefab.meta diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset index 46a619c..2dd6ead 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset @@ -22,7 +22,6 @@ MonoBehaviour: m_ReadOnly: 1 m_SerializedLabels: - Locale-en - - Preload FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 32ad8ebbbed827b67a2ab07fb07a244f, type: 2} diff --git a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset index e1ec9f2..fe08086 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset +++ b/Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset @@ -22,7 +22,6 @@ MonoBehaviour: m_ReadOnly: 1 m_SerializedLabels: - Locale-de - - Preload FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 1 m_Settings: {fileID: 11400000, guid: 32ad8ebbbed827b67a2ab07fb07a244f, type: 2} diff --git a/Assets/Prefabs/LakeTile.prefab b/Assets/Prefabs/LakeTile.prefab new file mode 100644 index 0000000..f04e60a --- /dev/null +++ b/Assets/Prefabs/LakeTile.prefab @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3202911257754518413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320959129255199420} + - component: {fileID: 1323245986789467739} + - component: {fileID: 8641065854321209087} + - component: {fileID: 5610536905663998088} + - component: {fileID: -9044467048652882874} + m_Layer: 0 + m_Name: LakeTile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320959129255199420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 1, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1323245986789467739 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8641065854321209087 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 &5610536905663998088 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + 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: 1 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &-9044467048652882874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4ad100ae18006c438490a7509944332, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + HIGHEST_POINT: 2 + LOWEST_POINT: -7 + MODIFIER: 2 diff --git a/Assets/Prefabs/LakeTile.prefab.meta b/Assets/Prefabs/LakeTile.prefab.meta new file mode 100644 index 0000000..94e38c0 --- /dev/null +++ b/Assets/Prefabs/LakeTile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1efa04901bce38519a6cead12f5bce4e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MountainTile.prefab b/Assets/Prefabs/MountainTile.prefab new file mode 100644 index 0000000..df3c5f7 --- /dev/null +++ b/Assets/Prefabs/MountainTile.prefab @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3202911257754518413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320959129255199420} + - component: {fileID: 1323245986789467739} + - component: {fileID: 8641065854321209087} + - component: {fileID: 5610536905663998088} + - component: {fileID: -9044467048652882874} + m_Layer: 0 + m_Name: MountainTile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320959129255199420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 1, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1323245986789467739 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8641065854321209087 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 &5610536905663998088 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + 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: 1 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &-9044467048652882874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4ad100ae18006c438490a7509944332, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + HIGHEST_POINT: 7 + LOWEST_POINT: -2 + MODIFIER: 1 diff --git a/Assets/Prefabs/MountainTile.prefab.meta b/Assets/Prefabs/MountainTile.prefab.meta new file mode 100644 index 0000000..3bf9d6e --- /dev/null +++ b/Assets/Prefabs/MountainTile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d7f8c55b8cc6c744e9185e3bacfb8538 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/RiverTile.prefab b/Assets/Prefabs/RiverTile.prefab new file mode 100644 index 0000000..c63160a --- /dev/null +++ b/Assets/Prefabs/RiverTile.prefab @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3202911257754518413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320959129255199420} + - component: {fileID: 1323245986789467739} + - component: {fileID: 8641065854321209087} + - component: {fileID: 5610536905663998088} + - component: {fileID: -9044467048652882874} + m_Layer: 0 + m_Name: RiverTile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &320959129255199420 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 10, y: 1, z: 10} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &1323245986789467739 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &8641065854321209087 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + 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: 10303, guid: 0000000000000000f000000000000000, type: 0} + 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 &5610536905663998088 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + 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: 1 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &-9044467048652882874 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3202911257754518413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4ad100ae18006c438490a7509944332, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 0} + HIGHEST_POINT: 2 + LOWEST_POINT: -7 + MODIFIER: 4 diff --git a/Assets/Prefabs/RiverTile.prefab.meta b/Assets/Prefabs/RiverTile.prefab.meta new file mode 100644 index 0000000..ec28228 --- /dev/null +++ b/Assets/Prefabs/RiverTile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bc586d48df85fcb9683c3f4be62d7cb3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContentGenerator.cs b/Assets/Scripts/ContentGenerator.cs index 9df1859..8ffef3d 100644 --- a/Assets/Scripts/ContentGenerator.cs +++ b/Assets/Scripts/ContentGenerator.cs @@ -1,3 +1,4 @@ +using Assets.Scripts.InteractableObjects; using Newtonsoft.Json.Linq; using System.Collections; using System.Collections.Generic; @@ -49,7 +50,7 @@ public class ContentGenerator : MonoBehaviour } else if (chance >= 50 && chance < 90) { - if (rand.Next(0,2) == 0) + if (rand.Next(0, 2) == 0) { return trees[rand.Next(0, trees.Length)]; } @@ -62,7 +63,7 @@ public class ContentGenerator : MonoBehaviour { return generateEnemy(); } - else if(chance >= 95 && chance < 99) + else if (chance >= 95 && chance < 99) { return boss; } @@ -187,7 +188,7 @@ public class ContentGenerator : MonoBehaviour } } } - else if(name.ToLower().Contains("tree")) + else if (name.ToLower().Contains("tree")) { foreach (GameObject tree in trees) { @@ -198,10 +199,12 @@ public class ContentGenerator : MonoBehaviour } } } - else if(name.ToLower().Contains("npc")){ + else if (name.ToLower().Contains("npc")) + { result = npc; } - else if(name.ToLower().Contains("house")){ + else if (name.ToLower().Contains("house")) + { result = house; } return result; @@ -210,51 +213,20 @@ public class ContentGenerator : MonoBehaviour public GameObject loadEnemy(JToken json) { GameObject result = gameObject; - string name = json["enemyname"].ToString().Replace("(Clone)", ""); - if (name.Split(' ').Length > 1) + SlimeType slimeType = (SlimeType)System.Enum.Parse(typeof(SlimeType), json["enemytype"].ToString().ToUpper()); + foreach (GameObject enemy in enemies) { - name = name.Split(' ')[1]; - } - if (name == "(Boss)") - { - result = boss; - } - else - { - switch (name) + if (enemy.GetComponent().slimeType == slimeType) { - case "Metal": - name = "SlimeMetalIdle"; - break; - case "MiniBoss": - name = "SlimeMiniBossIdle"; - break; - case "Forest": - name = "SlimeForestIdle"; - break; - case "Mage": - name = "SlimeMageIdle"; - break; - case "Warrior": - name = "SlimeWarriorIdle"; - break; - default: - name = "SlimeBaseIdle"; - break; - } - foreach (GameObject enemy in enemies) - { - if (enemy.name == name) - { - result = enemy; - break; - } + result = enemy; + break; } } return result; } - public GameObject generateCityTileContent(){ + public GameObject generateCityTileContent() + { int chance = rand.Next(1, 101); if (chance < 10) { diff --git a/Assets/Scripts/InteractableObjects/Door.cs b/Assets/Scripts/InteractableObjects/Door.cs index 75bd7da..947c663 100644 --- a/Assets/Scripts/InteractableObjects/Door.cs +++ b/Assets/Scripts/InteractableObjects/Door.cs @@ -38,7 +38,7 @@ namespace Assets.Scripts.InteractableObjects result = result + FileHandler.generateJSON("objectname", "\"" + transform.parent.name + "\",\r\n"); result = result + FileHandler.generateJSON("hasInteracted", "\"" + hasInteracted + "\",\r\n"); result = result + FileHandler.generateJSON("isOpen", "\"" + isOpen + "\",\r\n"); - result = result + FileHandler.generateJSON("gotItem", "\"" + transform.parent.Find("chest").Find("Body").GetComponent().saveChest() + "\""); + result = result + FileHandler.generateJSON("gotItem", "\"" + transform.parent.Find("chest").GetComponent().saveChest() + "\""); return result; } diff --git a/Assets/Scripts/Player/PlayerCamera.cs b/Assets/Scripts/Player/PlayerCamera.cs index 82ff5a0..c8c864b 100644 --- a/Assets/Scripts/Player/PlayerCamera.cs +++ b/Assets/Scripts/Player/PlayerCamera.cs @@ -64,7 +64,7 @@ namespace Assets.Scripts.Player if (hit.collider.gameObject.tag.ToLower().Contains("object")) { string obj = hit.collider.gameObject.tag.Split(':')[1]; - if (hit.distance <= 10 && !obj.ToLower().Equals("house")) + if (hit.distance <= 3 && !obj.ToLower().Equals("house")) { if (!uihandler.isPlayerInFight()) { diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index d2218e3..04f64bf 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -184,6 +184,7 @@ public class Tile : MonoBehaviour position = new Vector3(float.Parse(obj["position"].ToString().Split('/')[0]), float.Parse(obj["position"].ToString().Split('/')[1]), float.Parse(obj["position"].ToString().Split('/')[2])); spawnedObject = Instantiate(spawnedObject, position, Quaternion.identity); spawnedObject.transform.parent = gameObject.transform; + spawnedObject.transform.localScale *= 10; if (spawnedObject.tag.Contains("Enemy")) { aliveEnemies.Add(spawnedObject); diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index c3222b9..2becb17 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -95,7 +95,6 @@ public class WorldGenerator : MonoBehaviour noise.applyNoise(newTile, tiles, pos); newTile.GetComponent().generateTile(pos, (TileType)Enum.Parse(typeof(TileType), newTile.name.Split("_")[0])); tiles.Add(pos, newTile); - GameObject.Find("QuestLog").GetComponent().updateQuests("find", newTile, 1); } } diff --git a/save.json b/save.json index 101b5b3..72d94b1 100644 --- a/save.json +++ b/save.json @@ -18,7 +18,7 @@ "isDodging": "False", "killcount": 0, "treecount": 0, -"orecount": 0, +"orecount": 1, "luck": 20, "difficulty": 0 }, @@ -50,7 +50,11 @@ }, "bags": { "slot0": { -"bag1": "empty", +"bag1": { +"rarity": "COMMON", +"itemName": "Tin ore", + +}, "bag2": "empty", "bag3": "empty" },