Merge branch 'main' into worldbuilding

# Conflicts:
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/BardHare.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/FryKing.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_1.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_2.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_3.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/InGameNPCs/Townsfolk_4.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Ayud.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare-Maqam.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/BardHare.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Cerise.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/ChefComb.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/ChefComb.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/DessertChef-Cerise.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/DessertChef-Cerise.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/FarmerAssaultM-Ayud.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/FarmerAssaultM-Ayud.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/FarmerCaveF-Terra.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/FarmerCaveF-Terra.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Felfel.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/LegendaryChef-Comb.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/LegendaryChef-Comb.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/MountainRockCritter.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/MountainRockCritter.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Terra.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/TownfolkPepper-Felfel.prefab
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/TownfolkPepper-Felfel.prefab.meta
#	UOP1_Project/Assets/Prefabs/Characters/NPCs_Unique/Townsfolk_HillCave.prefab
#	UOP1_Project/Assets/Scenes/Menus/MainMenu.unity

Author: ciro-unity

UOP1_Project/Assets/Art/Props/Food/CritterEggs/GoldenEgg.mat

@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: GoldenEgg
+  m_Shader: {fileID: -6465566751694194690, guid: 6308ea4821d1aeb4cbe77aa991079282,
+    type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - Texture2D_300EB541:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTexture:
+        m_Texture: {fileID: 2800000, guid: ae898a3f2fcb4cc4799b161672460846, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecularMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - PixelSnap: 0
+    - Vector1_398E6F7F: 0.5
+    - Vector1_8606F96E: 0
+    - _AlphaClip: 0
+    - _Blend: 0
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DstBlend: 0
+    - _EnableExternalAlpha: 0
+    - _EnvironmentReflections: 1
+    - _FresnelOpacity: 0.5
+    - _Fresnel_Power: 3
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _OutlineDepthSensitivity: 1
+    - _OutlineNormalsSensitivity: 1
+    - _OutlineThickness: 1
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - Color_9BF846A1: {r: 0.8962264, g: 0.80365604, b: 0, a: 0.2705882}
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
+    - _Offset: {r: 0, g: 0, b: 0, a: 0}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _SpecularColor: {r: 0, g: 0, b: 0, a: 0}
+    - _Tiling: {r: 1, g: 1, b: 0, a: 0}
+  m_BuildTextureStacks: []
+--- !u!114 &1993555791081402199
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 2

UOP1_Project/Assets/ScriptableObjects/Dialogue/No-Default-Bard.asset.meta renamed to UOP1_Project/Assets/Art/Props/Food/CritterEggs/GoldenEgg.mat.meta

@@ -15,36 +15,64 @@ MonoBehaviour:
   m_TableCollectionName: Actors
   m_TableCollectionNameGuidString: 9c592d2d4c7fc459f94a645873569195
   m_Entries:
-  - m_Id: 60141068288
-    m_Key: Townsfolk2
+  - m_Id: 87619184212434944
+    m_Key: PigChef
     m_Metadata:
       m_Items: []
-  - m_Id: 1740769320960
+  - m_Id: 87619184212434945
     m_Key: BardHare
     m_Metadata:
       m_Items: []
-  - m_Id: 2003462774784
-    m_Key: PigChef
+  - m_Id: 87619184212434946
+    m_Key: LegendaryChef
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434947
+    m_Key: FarmerAssaultM
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434948
+    m_Key: FarmerCaveF
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434949
+    m_Key: TownfolkPepper
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434950
+    m_Key: DessertChef
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434951
+    m_Key: PhoenixChick
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434952
+    m_Key: TownsfolkM1
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434953
+    m_Key: TownsfolkF1
     m_Metadata:
       m_Items: []
-  - m_Id: 27198154021396480
-    m_Key: New Entry
+  - m_Id: 87619184212434954
+    m_Key: Town
     m_Metadata:
       m_Items: []
-  - m_Id: 27198158756765696
-    m_Key: Townsfolk1
+  - m_Id: 87619184212434955
+    m_Key: Island
     m_Metadata:
       m_Items: []
-  - m_Id: 73168485301583872
-    m_Key: FryKing
+  - m_Id: 87619184212434956
+    m_Key: SlimeCritter
     m_Metadata:
       m_Items: []
-  - m_Id: 77529628448514048
-    m_Key: Townsfolk3
+  - m_Id: 87619184212434957
+    m_Key: RockCritter
     m_Metadata:
       m_Items: []
-  - m_Id: 77534566687825920
-    m_Key: Townsfolk4
+  - m_Id: 87619184212434958
+    m_Key: PlantCritter
     m_Metadata:
       m_Items: []
   m_Metadata:

UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors Shared Data.asset

@@ -17,7 +17,34 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 212da3a67744e4280b67fa323838acc8, type: 2}
   - {fileID: 11400000, guid: 5a99fcc266fdb48608555d31b49c084b, type: 2}
   - {fileID: 11400000, guid: 8d64c2a9fccc2614baa07c24841aca37, type: 2}
-  m_Extensions: []
+  m_Extensions:
+  - id: 0
   m_Group: String Table
   references:
     version: 1
+    00000000:
+      type: {class: GoogleSheetsExtension, ns: UnityEditor.Localization.Plugins.Google,
+        asm: Unity.Localization.Editor}
+      data:
+        m_Collection: {fileID: 11400000}
+        m_SheetsServiceProvider: {fileID: 11400000, guid: 048784966300e0f418f4fb2c6af7efb3,
+          type: 2}
+        m_SpreadsheetId: 1luF1JYM54a-2ijKBRV8cuqDki0C7qENoCGYJurP2YcY
+        m_SheetId: 684528833
+        m_Columns:
+        - id: 1
+        - id: 2
+        m_RemoveMissingPulledKeys: 0
+    00000001:
+      type: {class: KeyColumn, ns: UnityEditor.Localization.Plugins.Google.Columns,
+        asm: Unity.Localization.Editor}
+      data:
+        m_Column: A
+    00000002:
+      type: {class: LocaleColumn, ns: UnityEditor.Localization.Plugins.Google.Columns,
+        asm: Unity.Localization.Editor}
+      data:
+        m_Column: B
+        m_LocaleIdentifier:
+          m_Code: en
+        m_IncludeComments: 0

UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors.asset

@@ -18,32 +18,64 @@ MonoBehaviour:
   m_Metadata:
     m_Items: []
   m_TableData:
-  - m_Id: 60141068288
-    m_Localized: Earl
+  - m_Id: 87619184212434947
+    m_Localized: Ayud
     m_Metadata:
       m_Items: []
-  - m_Id: 1740769320960
-    m_Localized: The bard hare
+  - m_Id: 87619184212434946
+    m_Localized: Chef Comb
     m_Metadata:
       m_Items: []
-  - m_Id: 2003462774784
+  - m_Id: 87619184212434945
+    m_Localized: Maqam
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434944
     m_Localized: Hamlet
     m_Metadata:
       m_Items: []
-  - m_Id: 27198158756765696
-    m_Localized: Maria
+  - m_Id: 87619184212434958
+    m_Localized: Groen
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434957
+    m_Localized: Klipper
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434956
+    m_Localized: Gluecose
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434955
+    m_Localized: Isle of Yolk
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434954
+    m_Localized: Truffleton
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434953
+    m_Localized: Carmela
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434952
+    m_Localized: Gourmando
+    m_Metadata:
+      m_Items: []
+  - m_Id: 87619184212434951
+    m_Localized: Nar
     m_Metadata:
       m_Items: []
-  - m_Id: 73168485301583872
-    m_Localized: Fry King
+  - m_Id: 87619184212434950
+    m_Localized: Cerise
     m_Metadata:
       m_Items: []
-  - m_Id: 77529628448514048
-    m_Localized: Jim
+  - m_Id: 87619184212434949
+    m_Localized: Felfel
     m_Metadata:
       m_Items: []
-  - m_Id: 77534566687825920
-    m_Localized: Sally
+  - m_Id: 87619184212434948
+    m_Localized: Terra
     m_Metadata:
       m_Items: []
   references:

UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors_en.asset

@@ -17,26 +17,6 @@ MonoBehaviour:
   m_SharedData: {fileID: 11400000, guid: 9c592d2d4c7fc459f94a645873569195, type: 2}
   m_Metadata:
     m_Items: []
-  m_TableData:
-  - m_Id: 60141068288
-    m_Localized: Earl
-    m_Metadata:
-      m_Items: []
-  - m_Id: 1740769320960
-    m_Localized: "Le li\xE8vre Barde"
-    m_Metadata:
-      m_Items: []
-  - m_Id: 2003462774784
-    m_Localized: Hamlet
-    m_Metadata:
-      m_Items: []
-  - m_Id: 27198158756765696
-    m_Localized: Marie
-    m_Metadata:
-      m_Items: []
-  - m_Id: 73168485301583872
-    m_Localized: Fry King
-    m_Metadata:
-      m_Items: []
+  m_TableData: []
   references:
     version: 1

UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors_fr.asset

@@ -17,14 +17,6 @@ MonoBehaviour:
   m_SharedData: {fileID: 11400000, guid: 9c592d2d4c7fc459f94a645873569195, type: 2}
   m_Metadata:
     m_Items: []
-  m_TableData:
-  - m_Id: 27198158756765696
-    m_Localized: Maria
-    m_Metadata:
-      m_Items: []
-  - m_Id: 60141068288
-    m_Localized: Earl
-    m_Metadata:
-      m_Items: []
+  m_TableData: []
   references:
     version: 1

UOP1_Project/Assets/LocalizationFiles/AssetTables/Dialogue System/Actors/Actors_it.asset

@@ -131,6 +131,10 @@ MonoBehaviour:
     m_Key: Onion
     m_Metadata:
       m_Items: []
+  - m_Id: 85948406991544320
+    m_Key: SavoryCakeWithPepper_Dish
+    m_Metadata:
+      m_Items: []
   m_Metadata:
     m_Items: []
   m_KeyGenerator: