Nicola/TalesOfNovariel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleaned up a bit of code, need to work on camera handlign (Isn't as smooth as I want it to be) #1

Merged
Nicola merged 1 commits from feature_CleanupProjekt into dev 2025-06-07 09:24:47 +02:00
Conversation 0 Commits 1 Files Changed 14 +101 -155
14 changed files with 101 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/AddressableAssetsData/AssetGroups/Built In Data.asset
View File

@ -13,20 +13,9 @@ MonoBehaviour:
m_Name: Built In Data
m_EditorClassIdentifier:
m_GroupName: Built In Data
m_Data:
m_SerializedData: []
m_GUID: 70e308d3a06ec4bf6b2e90b0f2bcd3f4
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_SerializeEntries: []
m_ReadOnly: 1
m_Settings: {fileID: 11400000, guid: 32ad8ebbbed827b67a2ab07fb07a244f, type: 2}
m_SchemaSet:
m_Schemas:
- {fileID: 11400000, guid: 726997210445350c0814ddb1507cedc4, type: 2}
m_Schemas: []

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

@ -13,8 +13,6 @@ 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

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

@ -13,8 +13,6 @@ 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

10
Assets/AddressableAssetsData/AssetGroups/Localization-Assets-Shared.asset
View File

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

10
Assets/AddressableAssetsData/AssetGroups/Localization-Locales.asset
View File

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

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

@ -13,8 +13,6 @@ 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

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

@ -13,8 +13,6 @@ 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

37
Assets/Scenes/GameScene.unity
View File

@ -13,7 +13,7 @@ OcclusionCullingSettings:
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
serializedVersion: 10
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: 12
m_GIWorkflowMode: 1
serializedVersion: 13
m_BakeOnSceneLoad: 0
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
@ -66,9 +66,6 @@ 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
@ -1246,6 +1243,7 @@ MonoBehaviour:
m_DeselectOnBackgroundClick: 1
m_PointerBehavior: 0
m_CursorLockBehavior: 0
m_ScrollDeltaPerTick: 6
--- !u!1 &72236516
GameObject:
m_ObjectHideFlags: 0
@ -3090,6 +3088,7 @@ AudioSource:
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_Resource: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 0.5
m_Pitch: 1
@ -6339,6 +6338,9 @@ 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:
@ -18987,6 +18989,9 @@ 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:
@ -19745,9 +19750,8 @@ Light:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 993077594}
m_Enabled: 1
serializedVersion: 10
serializedVersion: 11
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 10
@ -19797,8 +19801,12 @@ 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
@ -21711,6 +21719,7 @@ 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
@ -23948,7 +23957,7 @@ RectTransform:
m_Pivot: {x: 0.5, y: 0.5}
--- !u!95 &1186792636
Animator:
serializedVersion: 5
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -23962,6 +23971,7 @@ Animator:
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
@ -28159,6 +28169,9 @@ 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:
@ -42405,7 +42418,7 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &5866666021777289726
Animator:
serializedVersion: 5
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
@ -42419,6 +42432,7 @@ Animator:
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
@ -42488,6 +42502,9 @@ 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:

17
Assets/Scripts/ContentGenerator.cs
View File

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

16
Assets/Scripts/Player/PlayerGameObject.cs
View File

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

36
Assets/Scripts/Player/PlayerObject.cs
View File

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

8
Assets/Scripts/Player/PlayerStat.cs
View File

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

2
Assets/Scripts/Tile.cs
View File

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

97
ProjectSettings/SceneTemplateSettings.json
View File

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