Merge remote-tracking branch 'origin/main'

blueberryPeak/Assets/Materials/Terrain/Water.mat

@@ -121,7 +121,7 @@ Material:
     - _EnvironmentReflections: 1
     - _FlowSpeed: 0.1
     - _FlowStrength: 0.0075
-    - _FoamDistance: 4.84
+    - _FoamDistance: 0.8
     - _GlossMapScale: 0
     - _Glossiness: 0
     - _GlossyReflections: 0
@@ -132,7 +132,7 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
-    - _Size: 1.12
+    - _Size: 30.53
     - _Smoothness: 0.5
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
@@ -144,7 +144,7 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _DarkFoamColor: {r: 0.20784314, g: 0.6431373, b: 1, a: 1}
+    - _DarkFoamColor: {r: 0.12348701, g: 0.24743868, b: 0.3490566, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _LightFoamColor: {r: 1, g: 1, b: 1, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}

blueberryPeak/Assets/Scenes/xaver.unity

@@ -119,6 +119,142 @@ NavMeshSettings:
     debug:
       m_Flags: 0
   m_NavMeshData: {fileID: 0}
+--- !u!1 &283682412
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 283682413}
+  m_Layer: 0
+  m_Name: Terrain
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &283682413
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 283682412}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 100, y: 0, z: -100}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 721346634}
+  - {fileID: 2135365762}
+  - {fileID: 920841147}
+  - {fileID: 1792442180}
+  - {fileID: 1744196446}
+  - {fileID: 1831115029}
+  - {fileID: 1810293205}
+  - {fileID: 520242668}
+  - {fileID: 1696518997}
+  - {fileID: 1210642101}
+  - {fileID: 468305384}
+  - {fileID: 646582186}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &468305381
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 468305384}
+  - component: {fileID: 468305383}
+  - component: {fileID: 468305382}
+  m_Layer: 0
+  m_Name: Terrain_(0.00, 0.00, -200.00)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!154 &468305382
+TerrainCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 468305381}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_TerrainData: {fileID: 15600000, guid: 1cf854006fbd948468cc29b7f01c9b4d, type: 2}
+  m_EnableTreeColliders: 1
+--- !u!218 &468305383
+Terrain:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 468305381}
+  m_Enabled: 1
+  serializedVersion: 6
+  m_TerrainData: {fileID: 15600000, guid: 1cf854006fbd948468cc29b7f01c9b4d, type: 2}
+  m_TreeDistance: 5000
+  m_TreeBillboardDistance: 50
+  m_TreeCrossFadeLength: 5
+  m_TreeMaximumFullLODCount: 50
+  m_DetailObjectDistance: 80
+  m_DetailObjectDensity: 1
+  m_HeightmapPixelError: 5
+  m_SplatMapDistance: 1000
+  m_HeightmapMinimumLODSimplification: 0
+  m_HeightmapMaximumLOD: 0
+  m_ShadowCastingMode: 2
+  m_DrawHeightmap: 1
+  m_DrawInstanced: 0
+  m_DrawTreesAndFoliage: 1
+  m_StaticShadowCaster: 0
+  m_IgnoreQualitySettings: 0
+  m_ReflectionProbeUsage: 1
+  m_MaterialTemplate: {fileID: 2100000, guid: a563fe890ec251a40831c7ad252593ce, type: 2}
+  m_BakeLightProbesForTrees: 1
+  m_PreserveTreePrototypeLayers: 0
+  m_DeringLightProbesForTrees: 1
+  m_ReceiveGI: 1
+  m_ScaleInLightmap: 0.256
+  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
+  m_GroupingID: 0
+  m_RenderingLayerMask: 1
+  m_AllowAutoConnect: 1
+  m_EnableHeightmapRayTracing: 1
+  m_EnableTreesAndDetailsRayTracing: 0
+  m_TreeMotionVectorModeOverride: 3
+--- !u!4 &468305384
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 468305381}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -100, y: 0, z: -100}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 283682413}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &520242665
 GameObject:
   m_ObjectHideFlags: 0
@@ -205,12 +341,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 520242665}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 100, y: 0, z: -100}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &588039976
 GameObject:
@@ -393,6 +529,208 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &646582183
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 646582186}
+  - component: {fileID: 646582185}
+  - component: {fileID: 646582184}
+  m_Layer: 0
+  m_Name: Terrain_(100.00, 0.00, -200.00)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!154 &646582184
+TerrainCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 646582183}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_TerrainData: {fileID: 15600000, guid: 278cc5e50e5ee4467b06416d0b819065, type: 2}
+  m_EnableTreeColliders: 1
+--- !u!218 &646582185
+Terrain:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 646582183}
+  m_Enabled: 1
+  serializedVersion: 6
+  m_TerrainData: {fileID: 15600000, guid: 278cc5e50e5ee4467b06416d0b819065, type: 2}
+  m_TreeDistance: 5000
+  m_TreeBillboardDistance: 50
+  m_TreeCrossFadeLength: 5
+  m_TreeMaximumFullLODCount: 50
+  m_DetailObjectDistance: 80
+  m_DetailObjectDensity: 1
+  m_HeightmapPixelError: 5
+  m_SplatMapDistance: 1000
+  m_HeightmapMinimumLODSimplification: 0
+  m_HeightmapMaximumLOD: 0
+  m_ShadowCastingMode: 2
+  m_DrawHeightmap: 1
+  m_DrawInstanced: 0
+  m_DrawTreesAndFoliage: 1
+  m_StaticShadowCaster: 0
+  m_IgnoreQualitySettings: 0
+  m_ReflectionProbeUsage: 1
+  m_MaterialTemplate: {fileID: 2100000, guid: a563fe890ec251a40831c7ad252593ce, type: 2}
+  m_BakeLightProbesForTrees: 1
+  m_PreserveTreePrototypeLayers: 0
+  m_DeringLightProbesForTrees: 1
+  m_ReceiveGI: 1
+  m_ScaleInLightmap: 0.256
+  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
+  m_GroupingID: 0
+  m_RenderingLayerMask: 1
+  m_AllowAutoConnect: 1
+  m_EnableHeightmapRayTracing: 1
+  m_EnableTreesAndDetailsRayTracing: 0
+  m_TreeMotionVectorModeOverride: 3
+--- !u!4 &646582186
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 646582183}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -100}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 283682413}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &720123854
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 720123858}
+  - component: {fileID: 720123857}
+  - component: {fileID: 720123856}
+  - component: {fileID: 720123855}
+  m_Layer: 0
+  m_Name: Plane
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!64 &720123855
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 720123854}
+  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!23 &720123856
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 720123854}
+  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_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 5f5391552e06f41988f8ec2b0bb4abc2, 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!33 &720123857
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 720123854}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &720123858
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 720123854}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 3.6, z: 0}
+  m_LocalScale: {x: 48.8, y: 48.8, z: 48.8}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &721346631
 GameObject:
   m_ObjectHideFlags: 0
@@ -479,12 +817,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 721346631}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 100}
+  m_LocalPosition: {x: -100, y: 0, z: 200}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &765614673
 GameObject:
@@ -765,12 +1103,105 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 920841144}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 100, y: 0, z: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 100}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1210642098
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1210642101}
+  - component: {fileID: 1210642100}
+  - component: {fileID: 1210642099}
+  m_Layer: 0
+  m_Name: Terrain_(-100.00, 0.00, -200.00)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 2147483647
+  m_IsActive: 1
+--- !u!154 &1210642099
+TerrainCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210642098}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_TerrainData: {fileID: 15600000, guid: 123b5057bf9f34aa98a34c05e9267e16, type: 2}
+  m_EnableTreeColliders: 1
+--- !u!218 &1210642100
+Terrain:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210642098}
+  m_Enabled: 1
+  serializedVersion: 6
+  m_TerrainData: {fileID: 15600000, guid: 123b5057bf9f34aa98a34c05e9267e16, type: 2}
+  m_TreeDistance: 5000
+  m_TreeBillboardDistance: 50
+  m_TreeCrossFadeLength: 5
+  m_TreeMaximumFullLODCount: 50
+  m_DetailObjectDistance: 80
+  m_DetailObjectDensity: 1
+  m_HeightmapPixelError: 5
+  m_SplatMapDistance: 1000
+  m_HeightmapMinimumLODSimplification: 0
+  m_HeightmapMaximumLOD: 0
+  m_ShadowCastingMode: 2
+  m_DrawHeightmap: 1
+  m_DrawInstanced: 0
+  m_DrawTreesAndFoliage: 1
+  m_StaticShadowCaster: 0
+  m_IgnoreQualitySettings: 0
+  m_ReflectionProbeUsage: 1
+  m_MaterialTemplate: {fileID: 2100000, guid: a563fe890ec251a40831c7ad252593ce, type: 2}
+  m_BakeLightProbesForTrees: 1
+  m_PreserveTreePrototypeLayers: 0
+  m_DeringLightProbesForTrees: 1
+  m_ReceiveGI: 1
+  m_ScaleInLightmap: 0.256
+  m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0}
+  m_GroupingID: 0
+  m_RenderingLayerMask: 1
+  m_AllowAutoConnect: 1
+  m_EnableHeightmapRayTracing: 1
+  m_EnableTreesAndDetailsRayTracing: 0
+  m_TreeMotionVectorModeOverride: 3
+--- !u!4 &1210642101
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1210642098}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -200, y: 0, z: -100}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1696518994
 GameObject:
@@ -858,12 +1289,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1696518994}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -100, y: 0, z: 100}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1704693282
 GameObject:
@@ -1059,12 +1490,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1744196443}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -100, y: 0, z: 100}
+  m_LocalPosition: {x: -200, y: 0, z: 200}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1758990461
 GameObject:
@@ -1129,7 +1560,7 @@ Camera:
   far clip plane: 1000
   field of view: 60
   orthographic: 1
-  orthographic size: 9
+  orthographic size: 7.5
   m_Depth: -1
   m_CullingMask:
     serializedVersion: 2
@@ -1154,7 +1585,7 @@ Transform:
   m_GameObject: {fileID: 1758990461}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
-  m_LocalPosition: {x: -3.16, y: 9.14, z: 3.45}
+  m_LocalPosition: {x: -20.8, y: 9.14, z: -18.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1216,7 +1647,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dc5407d23982245a1bf392697366ba6d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  resolutionWidth: 450
+  resolutionWidth: 1000
   renderImage: {fileID: 765614675}
 --- !u!1 &1792442177
 GameObject:
@@ -1304,12 +1735,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1792442177}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -100}
+  m_LocalPosition: {x: -100, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1810293202
 GameObject:
@@ -1397,12 +1828,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1810293202}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -100, y: 0, z: -100}
+  m_LocalPosition: {x: -200, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1831115026
 GameObject:
@@ -1490,12 +1921,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1831115026}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 100, y: 0, z: 100}
+  m_LocalPosition: {x: 0, y: 0, z: 200}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2135365759
 GameObject:
@@ -1583,12 +2014,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2135365759}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -100, y: 0, z: 0}
+  m_LocalPosition: {x: -200, y: 0, z: 100}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 283682413}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &1885117175165463221
 PrefabInstance:
@@ -1600,15 +2031,15 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -3.88
+      value: -19.6
       objectReference: {fileID: 0}
     - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 4.41
+      value: 6.6
       objectReference: {fileID: 0}
     - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 12.67
+      value: -136.7
       objectReference: {fileID: 0}
     - target: {fileID: 235347041090592828, guid: 5704dc66b89074156933e2ba70d2d2d7, type: 3}
       propertyPath: m_LocalRotation.w
@@ -1653,16 +2084,9 @@ SceneRoots:
   m_Roots:
   - {fileID: 1758990464}
   - {fileID: 778233113}
-  - {fileID: 1696518997}
   - {fileID: 588039980}
   - {fileID: 607859851}
   - {fileID: 1704693286}
   - {fileID: 1885117175165463221}
-  - {fileID: 721346634}
+  - {fileID: 283682413}
-  - {fileID: 2135365762}
+  - {fileID: 720123858}
-  - {fileID: 920841147}
-  - {fileID: 1792442180}
-  - {fileID: 1744196446}
-  - {fileID: 1831115029}
-  - {fileID: 1810293205}
-  - {fileID: 520242668}

blueberryPeak/Assets/Scripts/Pixelation/SetRenderTextureSize.cs

@@ -4,7 +4,7 @@ using UnityEngine.UI;
 public class SetRenderTextureSize : MonoBehaviour
 {
     [SerializeField]
-    [Range(100, 800)]
+    [Range(100, 1200)]
     private int resolutionWidth;
     private int oldResolutionWidth;
     private int oldScreenWidth;

blueberryPeak/Assets/Shaders/Water/StylisedWater.shadergraph

@@ -257,6 +257,9 @@
         },
         {
             "m_Id": "79f5274d5087469ab0f6131939af1be9"
+        },
+        {
+            "m_Id": "7257824a6bf747baa3a75471798f97ef"
         }
     ],
     "m_GroupDatas": [
@@ -673,6 +676,20 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "7257824a6bf747baa3a75471798f97ef"
+                },
+                "m_SlotId": 4
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b308606b3b0c6883895f75e8d6408fcf"
+                },
+                "m_SlotId": 0
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -841,20 +858,6 @@
                 "m_SlotId": 0
             }
         },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "8cc2a4e2cdef0e85bdcb3ca44a2b23e8"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b308606b3b0c6883895f75e8d6408fcf"
-                },
-                "m_SlotId": 0
-            }
-        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -2676,8 +2679,8 @@
     "m_ObjectId": "31fc2353d5fe4fd18e8da705216d4211",
     "m_Title": "Distort UVs based on Flow Map",
     "m_Position": {
-        "x": -3179.99951171875,
+        "x": -3180.00048828125,
-        "y": 803.4998779296875
+        "y": 755.5000610351563
     }
 }
 
@@ -3251,7 +3254,7 @@
     "m_Title": "Vertex Bobbing",
     "m_Position": {
         "x": -182.0,
-        "y": -280.4999084472656
+        "y": -280.5
     }
 }
 
@@ -4062,7 +4065,7 @@
     "m_ObjectId": "59b64edb3e644738ab6c690e98df99b9",
     "m_Title": "Main Foam Voronoi Sample",
     "m_Position": {
-        "x": -1902.9998779296875,
+        "x": -1903.0,
         "y": 164.5
     }
 }
@@ -4313,6 +4316,27 @@
     "m_MipSamplingMode": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "5f7384a2de2e4d07a9455b3eae47df5b",
+    "m_Id": 4,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -4829,7 +4853,52 @@
     "m_Title": "Dark Foam Voronoi Sample",
     "m_Position": {
         "x": -1179.0,
-        "y": -515.4998779296875
+        "y": -515.5
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.RadialShearNode",
+    "m_ObjectId": "7257824a6bf747baa3a75471798f97ef",
+    "m_Group": {
+        "m_Id": "31fc2353d5fe4fd18e8da705216d4211"
+    },
+    "m_Name": "Radial Shear",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2976.00048828125,
+            "y": 814.0000610351563,
+            "width": 166.500244140625,
+            "height": 166.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "a508283d02c0435eaedeadd9c046f348"
+        },
+        {
+            "m_Id": "b2ccd8747e9a42d18dfaa9fac6fb01ed"
+        },
+        {
+            "m_Id": "d0b61afb06fd45eaa723b5c95855605f"
+        },
+        {
+            "m_Id": "8641b00804304a3880348325123f6259"
+        },
+        {
+            "m_Id": "5f7384a2de2e4d07a9455b3eae47df5b"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": false,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
     }
 }
 
@@ -5710,6 +5779,27 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "8641b00804304a3880348325123f6259",
+    "m_Id": 3,
+    "m_DisplayName": "Offset",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Offset",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.NormalFromTextureNode",
@@ -6430,6 +6520,28 @@
     ]
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "a508283d02c0435eaedeadd9c046f348",
+    "m_Id": 0,
+    "m_DisplayName": "UV",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "UV",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0
+    },
+    "m_Labels": [],
+    "m_Channel": 0
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
@@ -6825,6 +6937,27 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "b2ccd8747e9a42d18dfaa9fac6fb01ed",
+    "m_Id": 1,
+    "m_DisplayName": "Center",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Center",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.5
+    },
+    "m_DefaultValue": {
+        "x": 0.5,
+        "y": 0.5
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
@@ -7758,6 +7891,27 @@
     }
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector2MaterialSlot",
+    "m_ObjectId": "d0b61afb06fd45eaa723b5c95855605f",
+    "m_Id": 2,
+    "m_DisplayName": "Strength",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Strength",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 10.0,
+        "y": 10.0
+    },
+    "m_DefaultValue": {
+        "x": 10.0,
+        "y": 10.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.AddNode",
@@ -8699,8 +8853,8 @@
     "m_ObjectId": "f6c718246eb1495a8737edbb77b14cf5",
     "m_Title": "Water Depth Color",
     "m_Position": {
-        "x": -1059.0001220703125,
+        "x": -1059.0,
-        "y": 756.5001220703125
+        "y": 756.5
     }
 }
 

blueberryPeak/Assets/Terrain/TerrainData_570fbd04-450e-4129-a560-ca72150c27da.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 123b5057bf9f34aa98a34c05e9267e16
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 15600000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Terrain/TerrainData_58ed8e55-bb25-44a5-a3fe-7eff1f4b3333.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 278cc5e50e5ee4467b06416d0b819065
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 15600000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

blueberryPeak/Assets/Terrain/TerrainData_7f37e43d-493e-48ce-b3c9-6bd57240caf7.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1cf854006fbd948468cc29b7f01c9b4d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 15600000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

dialogBuilder.html

@@ -0,0 +1,270 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Dialogue Builder</title>
+    <!-- Tailwind CSS CDN -->
+    <script src="https://cdn.tailwindcss.com"></script>
+    <style>
+        /* Custom CSS for a slightly better font */
+        body {
+            font-family: 'Inter', sans-serif;
+        }
+    </style>
+</head>
+<body class="bg-gradient-to-br from-blue-50 to-indigo-100 min-h-screen flex items-center justify-center p-4">
+<div class="bg-white p-8 rounded-xl shadow-lg w-full max-w-2xl border border-blue-200">
+    <h1 class="text-3xl font-bold text-center mb-6 text-gray-800">Dialogue Builder</h1>
+
+    <!-- Party Name Inputs -->
+    <div class="grid grid-cols-1 md:grid-cols-2 gap-4 mb-6">
+        <div>
+            <label for="party1Name" class="block text-gray-700 text-sm font-medium mb-2">Party 1 Name:</label>
+            <input type="text" id="party1Name" value="Alice" placeholder="Enter name for Party 1" class="w-full p-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-400 shadow-sm">
+        </div>
+        <div>
+            <label for="party2Name" class="block text-gray-700 text-sm font-medium mb-2">Party 2 Name:</label>
+            <input type="text" id="party2Name" value="Bob" placeholder="Enter name for Party 2" class="w-full p-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-400 shadow-sm">
+        </div>
+    </div>
+
+    <!-- Dialogue Part Selection -->
+    <div class="mb-6">
+        <label class="block text-gray-700 text-sm font-medium mb-2">Dialogue Part:</label>
+        <div class="flex flex-wrap gap-4">
+            <label class="inline-flex items-center">
+                <input type="radio" name="dialoguePart" value="initial" class="form-radio text-blue-600 h-4 w-4" checked>
+                <span class="ml-2 text-gray-700">Initial Dialog</span>
+            </label>
+            <label class="inline-flex items-center">
+                <input type="radio" name="dialoguePart" value="reminder" class="form-radio text-green-600 h-4 w-4">
+                <span class="ml-2 text-gray-700">Reminder Dialog</span>
+            </label>
+            <label class="inline-flex items-center">
+                <input type="radio" name="dialoguePart" value="success" class="form-radio text-purple-600 h-4 w-4">
+                <span class="ml-2 text-gray-700">Success Dialog</span>
+            </label>
+            <label class="inline-flex items-center">
+                <input type="radio" name="dialoguePart" value="successRepetition" class="form-radio text-red-600 h-4 w-4">
+                <span class="ml-2 text-gray-700">Success Repetition</span>
+            </label>
+        </div>
+    </div>
+
+    <!-- Dialogue Input Section -->
+    <div class="mb-6">
+        <label for="dialogueInput" class="block text-gray-700 text-sm font-medium mb-2">Dialogue Line:</label>
+        <textarea id="dialogueInput" rows="3" placeholder="Type a dialogue line here..." class="w-full p-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-400 shadow-sm resize-y"></textarea>
+    </div>
+
+    <!-- Speaker Selection Buttons -->
+    <div class="flex flex-col sm:flex-row gap-4 mb-8">
+        <button id="addParty1Btn" class="flex-1 bg-blue-500 hover:bg-blue-600 text-white font-semibold py-3 px-6 rounded-lg shadow-md transition duration-300 ease-in-out transform hover:scale-105">
+            Add as Party 1
+        </button>
+        <button id="addParty2Btn" class="flex-1 bg-green-500 hover:bg-green-600 text-white font-semibold py-3 px-6 rounded-lg shadow-md transition duration-300 ease-in-out transform hover:scale-105">
+            Add as Party 2
+        </button>
+    </div>
+
+    <!-- Generated Dialogue Display -->
+    <h2 class="text-2xl font-semibold text-gray-800 mb-4">Conversation Preview:</h2>
+    <div id="conversationDisplay" class="bg-gray-50 p-4 rounded-lg border border-gray-200 min-h-[150px] max-h-[400px] overflow-y-auto mb-6 shadow-inner">
+        <!-- Dialogue lines will be appended here -->
+        <p class="text-gray-500 text-center italic">Start adding dialogue lines above!</p>
+    </div>
+
+    <!-- Generate JSON Button -->
+    <div class="flex justify-center mb-6">
+        <button id="generateJsonBtn" class="bg-purple-600 hover:bg-purple-700 text-white font-bold py-3 px-8 rounded-lg shadow-lg transition duration-300 ease-in-out transform hover:scale-105">
+            Generate JSON
+        </button>
+    </div>
+
+    <!-- JSON Output Display -->
+    <h2 class="text-2xl font-semibold text-gray-800 mb-4">Generated JSON:</h2>
+    <div class="relative">
+        <textarea id="jsonOutput" rows="8" readonly class="w-full p-4 border border-gray-300 rounded-lg bg-gray-100 text-gray-800 font-mono text-sm focus:outline-none focus:ring-2 focus:ring-purple-400 resize-y"></textarea>
+        <button id="copyJsonBtn" class="absolute top-2 right-2 bg-gray-700 hover:bg-gray-800 text-white text-xs font-semibold py-1.5 px-3 rounded-md shadow-sm transition duration-200">
+            Copy
+        </button>
+    </div>
+    <div id="messageBox" class="hidden mt-4 p-3 rounded-lg text-white text-center"></div>
+
+</div>
+
+<script>
+    // Array to store dialogue objects, now structured into parts
+    let dialogue = {
+        initial: [],
+        reminder: [],
+        success: [],
+        successRepetition: []
+    };
+
+    // Get references to HTML elements
+    const party1NameInput = document.getElementById('party1Name');
+    const party2NameInput = document.getElementById('party2Name');
+    const dialogueInput = document.getElementById('dialogueInput');
+    const addParty1Btn = document.getElementById('addParty1Btn');
+    const addParty2Btn = document.getElementById('addParty2Btn');
+    const conversationDisplay = document.getElementById('conversationDisplay');
+    const generateJsonBtn = document.getElementById('generateJsonBtn');
+    const jsonOutput = document.getElementById('jsonOutput');
+    const copyJsonBtn = document.getElementById('copyJsonBtn');
+    const messageBox = document.getElementById('messageBox');
+    const dialoguePartRadios = document.querySelectorAll('input[name="dialoguePart"]');
+
+    /**
+     * Displays a temporary message in the message box.
+     * @param {string} message - The message to display.
+     * @param {string} type - The type of message ('success', 'error', 'info').
+     */
+    function showMessage(message, type) {
+        messageBox.textContent = message;
+        messageBox.className = 'mt-4 p-3 rounded-lg text-white text-center'; // Reset classes
+        if (type === 'success') {
+            messageBox.classList.add('bg-green-500');
+        } else if (type === 'error') {
+            messageBox.classList.add('bg-red-500');
+        } else { // Default to info
+            messageBox.classList.add('bg-blue-500');
+        }
+        messageBox.classList.remove('hidden');
+
+        setTimeout(() => {
+            messageBox.classList.add('hidden');
+        }, 3000); // Hide after 3 seconds
+    }
+
+    /**
+     * Gets the currently selected dialogue part from the radio buttons.
+     * @returns {string} The value of the selected radio button (e.g., 'initial', 'reminder').
+     */
+    function getSelectedDialoguePart() {
+        for (const radio of dialoguePartRadios) {
+            if (radio.checked) {
+                return radio.value;
+            }
+        }
+        return 'initial'; // Default to initial if nothing is checked (shouldn't happen with default check)
+    }
+
+    /**
+     * Adds a dialogue line to the conversation.
+     * @param {string} speakerName - The name of the speaker.
+     */
+    function addDialogueLine(speakerName) {
+        const lineText = dialogueInput.value.trim();
+        if (lineText === '') {
+            showMessage('Please enter some text for the dialogue.', 'error');
+            return;
+        }
+
+        const selectedPart = getSelectedDialoguePart();
+        dialogue[selectedPart].push({
+            speaker: speakerName,
+            text: lineText
+        });
+
+        // Clear the input field
+        dialogueInput.value = '';
+
+        // Update the conversation display
+        renderConversation();
+    }
+
+    /**
+     * Renders the current dialogue array to the conversation display area.
+     * It now organizes dialogue by the four defined parts.
+     */
+    function renderConversation() {
+        conversationDisplay.innerHTML = ''; // Clear previous content
+        let hasContent = false; // Flag to check if any dialogue exists
+
+        const partTitles = {
+            initial: 'Initial Dialog',
+            reminder: 'Reminder Dialog',
+            success: 'Success Dialog',
+            successRepetition: 'Success Repetition'
+        };
+
+        // Iterate over each dialogue part
+        for (const partKey in dialogue) {
+            if (dialogue[partKey].length > 0) {
+                hasContent = true;
+
+                // Add a heading for each part
+                const heading = document.createElement('h3');
+                heading.classList.add('text-lg', 'font-semibold', 'text-gray-700', 'mb-2', 'mt-4', 'border-b-2', 'border-blue-300', 'pb-1');
+                heading.textContent = partTitles[partKey];
+                conversationDisplay.appendChild(heading);
+
+                // Append each line within the current part
+                dialogue[partKey].forEach(line => {
+                    const p = document.createElement('p');
+                    p.classList.add('mb-2', 'p-2', 'rounded-md', 'shadow-sm', 'text-gray-800');
+
+                    // Apply different styles based on the speaker
+                    if (line.speaker === party1NameInput.value) {
+                        p.classList.add('bg-blue-100', 'self-start', 'mr-auto', 'max-w-[90%]');
+                    } else if (line.speaker === party2NameInput.value) {
+                        p.classList.add('bg-green-100', 'self-end', 'ml-auto', 'max-w-[90%]');
+                    } else {
+                        // Fallback for speaker names that might not match inputs
+                        p.classList.add('bg-gray-100');
+                    }
+
+                    p.innerHTML = `<span class="font-bold text-gray-700">${line.speaker}:</span> ${line.text}`;
+                    conversationDisplay.appendChild(p);
+                });
+            }
+        }
+
+        // Display placeholder if no dialogue has been added yet
+        if (!hasContent) {
+            conversationDisplay.innerHTML = '<p class="text-gray-500 text-center italic">Start adding dialogue lines above!</p>';
+        } else {
+            // Scroll to the bottom to show the latest dialogue if content exists
+            conversationDisplay.scrollTop = conversationDisplay.scrollHeight;
+        }
+    }
+
+    /**
+     * Converts the dialogue object to a JSON string and displays it.
+     * The JSON now reflects the structured parts of the dialogue.
+     */
+    function generateJson() {
+        // Check if any dialogue parts have content
+        const hasContent = Object.values(dialogue).some(part => part.length > 0);
+
+        if (!hasContent) {
+            jsonOutput.value = '{}'; // Output an empty object if no dialogue
+            showMessage('No dialogue lines to generate JSON from.', 'info');
+            return;
+        }
+        jsonOutput.value = JSON.stringify(dialogue, null, 2); // Pretty print JSON
+        showMessage('JSON generated successfully!', 'success');
+    }
+
+    /**
+     * Copies the content of the JSON output textarea to the clipboard.
+     */
+    function copyJsonToClipboard() {
+        jsonOutput.select();
+        document.execCommand('copy');
+        showMessage('JSON copied to clipboard!', 'success');
+    }
+
+    // Event Listeners
+    addParty1Btn.addEventListener('click', () => addDialogueLine(party1NameInput.value));
+    addParty2Btn.addEventListener('click', () => addDialogueLine(party2NameInput.value));
+    generateJsonBtn.addEventListener('click', generateJson);
+    copyJsonBtn.addEventListener('click', copyJsonToClipboard);
+
+    // Initial render (empty)
+    renderConversation();
+</script>
+</body>
+</html>