Assets/AddressableAssetsData/AssetGroups/Built In Data.asset

@@ -13,9 +13,20 @@ MonoBehaviour:
   m_Name: Built In Data
   m_EditorClassIdentifier: 
   m_GroupName: Built In Data
+  m_Data:
+    m_SerializedData: []
   m_GUID: 70e308d3a06ec4bf6b2e90b0f2bcd3f4
-  m_SerializeEntries: []
+  m_SerializeEntries:
+  - m_GUID: Resources
+    m_Address: Resources
+    m_ReadOnly: 1
+    m_SerializedLabels: []
+  - m_GUID: EditorSceneList
+    m_Address: EditorSceneList
+    m_ReadOnly: 1
+    m_SerializedLabels: []
   m_ReadOnly: 1
   m_Settings: {fileID: 11400000, guid: 32ad8ebbbed827b67a2ab07fb07a244f, type: 2}
   m_SchemaSet:
-    m_Schemas: []
+    m_Schemas:
+    - {fileID: 11400000, guid: 726997210445350c0814ddb1507cedc4, type: 2}

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-English (en).asset

@@ -13,6 +13,8 @@ MonoBehaviour:
   m_Name: Localization-Asset-Tables-English (en)
   m_EditorClassIdentifier: 
   m_GroupName: Localization-Asset-Tables-English (en)
+  m_Data:
+    m_SerializedData: []
   m_GUID: bc491a18712d1ab6cbe938e8d857fe9d
   m_SerializeEntries:
   - m_GUID: 3f4a2212e0f31106c95287f1d21aac5f

Assets/AddressableAssetsData/AssetGroups/Localization-Asset-Tables-German (de).asset

@@ -13,6 +13,8 @@ MonoBehaviour:
   m_Name: Localization-Asset-Tables-German (de)
   m_EditorClassIdentifier: 
   m_GroupName: Localization-Asset-Tables-German (de)
+  m_Data:
+    m_SerializedData: []
   m_GUID: 15b932c3937087c31b29b528ae416d45
   m_SerializeEntries:
   - m_GUID: bfc09a585addcc2d2a52f11ddf43d841

Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset

@@ -13,15 +13,17 @@ MonoBehaviour:
   m_Name: Localization-Assets-Shared
   m_EditorClassIdentifier: 
   m_GroupName: Localization-Assets-Shared
+  m_Data:
+    m_SerializedData: []
   m_GUID: 8710454e326edd0848f9ffd2e32d518e
   m_SerializeEntries:
-  - m_GUID: 493a625c00a76ca27985d7f7e8d2cb79
+  - m_GUID: be998aea26820a30aa2217983d31b9c7
-    m_Address: Assets/Locals/StringTable/MyTexts Shared Data.asset
+    m_Address: Assets/Locals/AssetTable/MyAssets Shared Data.asset
     m_ReadOnly: 1
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: be998aea26820a30aa2217983d31b9c7
+  - m_GUID: 493a625c00a76ca27985d7f7e8d2cb79
-    m_Address: Assets/Locals/AssetTable/MyAssets Shared Data.asset
+    m_Address: Assets/Locals/StringTable/MyTexts Shared Data.asset
     m_ReadOnly: 1
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0

Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset

@@ -13,16 +13,18 @@ MonoBehaviour:
   m_Name: Localization-Locales
   m_EditorClassIdentifier: 
   m_GroupName: Localization-Locales
+  m_Data:
+    m_SerializedData: []
   m_GUID: d61fee6dc4bc9a39a9096f6169f1cd9b
   m_SerializeEntries:
-  - m_GUID: 0aac76c5240b89aeebbf4ec7cdffc00d
+  - m_GUID: f88accf5b8ddaf1fb8fd65217f8f3c2b
-    m_Address: English (en)
+    m_Address: German (de)
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: f88accf5b8ddaf1fb8fd65217f8f3c2b
+  - m_GUID: 0aac76c5240b89aeebbf4ec7cdffc00d
-    m_Address: German (de)
+    m_Address: English (en)
     m_ReadOnly: 1
     m_SerializedLabels:
     - Locale

Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-English (en).asset

@@ -13,6 +13,8 @@ MonoBehaviour:
   m_Name: Localization-String-Tables-English (en)
   m_EditorClassIdentifier: 
   m_GroupName: Localization-String-Tables-English (en)
+  m_Data:
+    m_SerializedData: []
   m_GUID: 89dd789e0f3293d228323c14be3e9873
   m_SerializeEntries:
   - m_GUID: 05ef8b507bd2e405a8ec691463ac192c

Assets/AddressableAssetsData/AssetGroups/Localization-String-Tables-German (de).asset

@@ -13,6 +13,8 @@ MonoBehaviour:
   m_Name: Localization-String-Tables-German (de)
   m_EditorClassIdentifier: 
   m_GroupName: Localization-String-Tables-German (de)
+  m_Data:
+    m_SerializedData: []
   m_GUID: 6a77fe84ba83c9d3fb58ef8d7fdc8caf
   m_SerializeEntries:
   - m_GUID: 24c6e805c27d5528ca5172fc619ce3d3

Assets/Scenes/GameScene.unity

@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 9
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -42,8 +42,8 @@ RenderSettings:
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 13
+  serializedVersion: 12
-  m_BakeOnSceneLoad: 0
+  m_GIWorkflowMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -66,6 +66,9 @@ LightmapSettings:
     m_LightmapParameters: {fileID: 0}
     m_LightmapsBakeMode: 1
     m_TextureCompression: 1
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 256
     m_ReflectionCompression: 2
     m_MixedBakeMode: 2
     m_BakeBackend: 1
@@ -1243,7 +1246,6 @@ MonoBehaviour:
   m_DeselectOnBackgroundClick: 1
   m_PointerBehavior: 0
   m_CursorLockBehavior: 0
-  m_ScrollDeltaPerTick: 6
 --- !u!1 &72236516
 GameObject:
   m_ObjectHideFlags: 0
@@ -3088,7 +3090,6 @@ AudioSource:
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 0}
-  m_Resource: {fileID: 0}
   m_PlayOnAwake: 0
   m_Volume: 0.5
   m_Pitch: 1
@@ -6338,9 +6339,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -18989,9 +18987,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -19750,8 +19745,9 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 993077594}
   m_Enabled: 1
-  serializedVersion: 11
+  serializedVersion: 10
   m_Type: 1
+  m_Shape: 0
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_Intensity: 1
   m_Range: 10
@@ -19801,12 +19797,8 @@ Light:
   m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
   m_UseBoundingSphereOverride: 0
   m_UseViewFrustumForShadowCasterCull: 1
-  m_ForceVisible: 0
   m_ShadowRadius: 0
   m_ShadowAngle: 0
-  m_LightUnit: 1
-  m_LuxAtDistance: 1
-  m_EnableSpotReflector: 1
 --- !u!114 &993077597
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -21719,7 +21711,6 @@ AudioSource:
   serializedVersion: 4
   OutputAudioMixerGroup: {fileID: 0}
   m_audioClip: {fileID: 8300000, guid: a643b25dcc17f2f458d98e5a494862a7, type: 3}
-  m_Resource: {fileID: 8300000, guid: a643b25dcc17f2f458d98e5a494862a7, type: 3}
   m_PlayOnAwake: 1
   m_Volume: 0.5
   m_Pitch: 1
@@ -23957,7 +23948,7 @@ RectTransform:
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &1186792636
 Animator:
-  serializedVersion: 7
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -23971,7 +23962,6 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -28169,9 +28159,6 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -42418,7 +42405,7 @@ Transform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5866666021777289726
 Animator:
-  serializedVersion: 7
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -42432,7 +42419,6 @@ Animator:
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
   m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
@@ -42502,9 +42488,6 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

Assets/Scripts/ContentGenerator.cs

@@ -1,4 +1,3 @@
-using Assets.Scripts;
 using Assets.Scripts.InteractableObjects;
 using Newtonsoft.Json.Linq;
 using System.Collections;
@@ -22,21 +21,21 @@ public class ContentGenerator : MonoBehaviour
         return enemies[index];
     }
 
-    public GameObject generateContent(TileType tiletype)
+    public GameObject generateContent(string tiletype)
     {
-        switch (tiletype)
+        switch (tiletype.ToLower())
         {
-            case TileType.PLAIN:
+            case "plain":
                 return generateTileContent();
-            case TileType.MOUNTAINS:
+            case "mountains":
                 return generateStoneTileContent();
-            case TileType.FOREST:
+            case "forest":
                 return generateTreeTileContent();
-            case TileType.HILLS:
+            case "hills":
                 return generateHillTileContent();
-            case TileType.DESERT:
+            case "desert":
                 return generateDesertTileContent();
-            case TileType.CITY:
+            case "city":
                 return generateCityTileContent();
         }
         return null;

Assets/Scripts/Player/PlayerGameObject.cs

@@ -61,9 +61,19 @@ namespace Assets.Scripts.Player
         // Update is called once per frame
         void Update()
         {
-            if (player == null) return;
+            if (player == null)
-            if (player.getStat("Killcount").getAmount() == -1) return;
+            {
-            if (uihandler.state == UIState.DEATH) return;
+                return;
+            }
+            if (player.getStat("Killcount").getAmount() == -1)
+            {
+                return;
+            }
+
+            if (uihandler.state == UIState.DEATH)
+            {
+                return;
+            }
 
             getRotation();
             regeneratePlayer();

Assets/Scripts/Player/PlayerObject.cs

@@ -35,25 +35,23 @@ namespace Assets.Scripts.Player
 
         private void generateStats(bool isLoad)
         {
-            stats = new Dictionary<string, PlayerStat>
+            stats = new Dictionary<string, PlayerStat>();
-            {
+            stats.Add("Health", new PlayerStat("Health", 100, "The current health of the player"));
-                { "Health", new PlayerStat("Health", 100, "The current health of the player") },
+            stats.Add("MaxHealth", new PlayerStat("MaxHealth", 100, "The current max health of the player"));
-                { "MaxHealth", new PlayerStat("MaxHealth", 100, "The current max health of the player") },
+            stats.Add("Secondary", new PlayerStat("Secondary", 20, "The current secondary of the player"));
-                { "Secondary", new PlayerStat("Secondary", 20, "The current secondary of the player") },
+            stats.Add("MaxSecondary", new PlayerStat("MaxSecondary", 20, "The current max secondary of the player"));
-                { "MaxSecondary", new PlayerStat("MaxSecondary", 20, "The current max secondary of the player") },
+            stats.Add("Strength", new PlayerStat("Strength", 5, "The current strength of the player"));
-                { "Strength", new PlayerStat("Strength", 5, "The current strength of the player") },
+            stats.Add("Dexterity", new PlayerStat("Dexterity", 5, "The current dexterity of the player"));
-                { "Dexterity", new PlayerStat("Dexterity", 5, "The current dexterity of the player") },
+            stats.Add("Intelligence", new PlayerStat("Intelligence", 5, "The current intelligence of the player"));
-                { "Intelligence", new PlayerStat("Intelligence", 5, "The current intelligence of the player") },
+            stats.Add("Experience", new PlayerStat("Experience", 0, "The current experience of the player"));
-                { "Experience", new PlayerStat("Experience", 0, "The current experience of the player") },
+            stats.Add("MaxExperience", new PlayerStat("MaxExperience", 10, "The current max experience of the player"));
-                { "MaxExperience", new PlayerStat("MaxExperience", 10, "The current max experience of the player") },
+            stats.Add("SecondaryRegen", new PlayerStat("SecondaryRegen", 5, "The current secondary regen of the player"));
-                { "SecondaryRegen", new PlayerStat("SecondaryRegen", 5, "The current secondary regen of the player") },
+            stats.Add("Level", new PlayerStat("Level", 0, "The current level of the player"));
-                { "Level", new PlayerStat("Level", 0, "The current level of the player") },
+            stats.Add("Luck", new PlayerStat("Luck", 20 - (difficulty * 5), "The current luck of the player"));
-                { "Luck", new PlayerStat("Luck", 20 - (difficulty * 5), "The current luck of the player") },
+            stats.Add("Killcount", new PlayerStat("Killcount", -1, "The current killcount of the player"));
-                { "Killcount", new PlayerStat("Killcount", -1, "The current killcount of the player") },
+            stats.Add("Points", new PlayerStat("Points", 0, "The current skillpoints of the player"));
-                { "Points", new PlayerStat("Points", 0, "The current skillpoints of the player") },
+            stats.Add("TreeCount", new PlayerStat("TreeCount",0,"The amount of trees the player chopped"));
-                { "TreeCount", new PlayerStat("TreeCount", 0, "The amount of trees the player chopped") },
+            stats.Add("OreCount", new PlayerStat("OreCount",0,"The amount of ores the player mined"));
-                { "OreCount", new PlayerStat("OreCount", 0, "The amount of ores the player mined") }
-            };
 
             if (!isLoad)
             {

Assets/Scripts/Player/PlayerStat.cs

@@ -25,19 +25,19 @@ namespace Assets.Scripts.Player
         }
 
         public string getTooltip(){
-            return tooltip;
+            return this.tooltip;
         }
 
         public string getText(){
-            return text;
+            return this.text;
         }
 
         public int getAmount(){
-            return amount;
+            return this.amount;
         }
 
         public void changeAmount(int change){
-            amount += change;
+            this.amount = this.amount + change;
         }
 
         public void setAmount(int amount){

Assets/Scripts/Tile.cs

@@ -77,7 +77,7 @@ public class Tile : MonoBehaviour
 
         if (chance >= 25)
         {
-            GameObject content = contentGenerator.GetComponent<ContentGenerator>().generateContent(tiletype);
+            GameObject content = contentGenerator.GetComponent<ContentGenerator>().generateContent(tiletype.ToString());
             if (content != null)
             {
                 GameObject obj = Instantiate(content, position, Quaternion.identity, gameObject.transform);

ProjectSettings/SceneTemplateSettings.json

@@ -4,123 +4,164 @@
         {
             "userAdded": false,
             "type": "UnityEngine.AnimationClip",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEditor.Animations.AnimatorController",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.AnimatorOverrideController",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEditor.Audio.AudioMixerController",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.ComputeShader",
-            "defaultInstantiationMode": 1
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Cubemap",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.GameObject",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEditor.LightingDataAsset",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": false
         },
         {
             "userAdded": false,
             "type": "UnityEngine.LightingSettings",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Material",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEditor.MonoScript",
-            "defaultInstantiationMode": 1
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.PhysicMaterial",
-            "defaultInstantiationMode": 0
+            "ignore": false,
-        },
+            "defaultInstantiationMode": 0,
-        {
+            "supportsModification": true
-            "userAdded": false,
-            "type": "UnityEngine.PhysicsMaterial",
-            "defaultInstantiationMode": 0
         },
         {
             "userAdded": false,
             "type": "UnityEngine.PhysicsMaterial2D",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Rendering.VolumeProfile",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEditor.SceneAsset",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": false
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Shader",
-            "defaultInstantiationMode": 1
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.ShaderVariantCollection",
-            "defaultInstantiationMode": 1
+            "ignore": true,
+            "defaultInstantiationMode": 1,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Texture",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Texture2D",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         },
         {
             "userAdded": false,
             "type": "UnityEngine.Timeline.TimelineAsset",
-            "defaultInstantiationMode": 0
+            "ignore": false,
+            "defaultInstantiationMode": 0,
+            "supportsModification": true
         }
     ],
     "defaultDependencyTypeInfo": {
         "userAdded": false,
         "type": "<default_scene_template_dependencies>",
-        "defaultInstantiationMode": 1
+        "ignore": false,
+        "defaultInstantiationMode": 1,
+        "supportsModification": true
     },
     "newSceneOverride": 0
 }