Merge branch 'main' into trick-enhancements

Merge pull request 'Upload files to "Assets/Art"' (#49 ) from reinholzj-patch-7 into main
Reviewed-on: admin/GGJ2026#49 Reviewed-by: Ramdar <[email protected]>
2026-02-01 15:44:48 -06:00 · 2026-02-01 15:39:04 -06:00 · 2026-02-01 15:38:37 -06:00 · 2026-02-01 15:38:12 -06:00 · 2026-02-01 15:37:46 -06:00 · 2026-02-01 15:35:37 -06:00
40 changed files with 1005 additions and 466 deletions
@@ -1,25 +1,21 @@
-<Project>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <!-- Generated file, do not modify, your changes will be overwritten (use AssetPostprocessor.OnGeneratedCSProject) -->
  <PropertyGroup>
-    <BaseIntermediateOutputPath>Temp\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)</IntermediateOutputPath>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <UseCommonOutputDirectory>true</UseCommonOutputDirectory>
-    <OutputPath>Temp\bin\Debug\</OutputPath>
-  </PropertyGroup>
-  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
-  <ItemGroup>
-    <ProjectCapability Include="Unity" />
-    <ProjectCapability Include="EnableOnDemandExcludedFolderLoading" />
-  </ItemGroup>
-  <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-    <EnableDefaultItems>false</EnableDefaultItems>
    <LangVersion>9.0</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>10.0.20506</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
    <RootNamespace></RootNamespace>
+    <ProjectGuid>{1E981750-D248-28D9-7629-4D5A5BCFF26D}</ProjectGuid>
    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
    <AssemblyName>Assembly-CSharp</AssemblyName>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
    <BaseDirectory>.</BaseDirectory>
  </PropertyGroup>
  <PropertyGroup>
@@ -27,23 +23,38 @@
    <DefineConstants>UNITY_6000_3_6;UNITY_6000_3;UNITY_6000;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_2022_1_OR_NEWER;UNITY_2022_2_OR_NEWER;UNITY_2022_3_OR_NEWER;UNITY_2023_1_OR_NEWER;UNITY_2023_2_OR_NEWER;UNITY_2023_3_OR_NEWER;UNITY_6000_0_OR_NEWER;UNITY_6000_1_OR_NEWER;UNITY_6000_2_OR_NEWER;UNITY_6000_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_SCRIPTABLE_PIPELINE;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_EVENT_QUEUE;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_UNITY_CONSENT;ENABLE_UNITY_CLOUD_IDENTIFIERS;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_EDITOR_GAME_SERVICES;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_API;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_MARSHALLING_TESTS;ENABLE_VIDEO;ENABLE_NAVIGATION_OFFMESHLINK_TO_NAVMESHLINK;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ACCESSIBILITY_SCREEN_READER;TEXTCORE_1_0_OR_NEWER;EDITOR_ONLY_NAVMESH_BUILDER_DEPRECATED;PLATFORM_STANDALONE_WIN;PLATFORM_STANDALONE;UNITY_STANDALONE_WIN;UNITY_STANDALONE;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_NVIDIA;ENABLE_AMD;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_CLOUD_SERVICES_ENGINE_DIAGNOSTICS;ENABLE_OUT_OF_PROCESS_CRASH_HANDLER;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;GFXDEVICE_WAITFOREVENT_MESSAGEPUMP;PLATFORM_USES_EXPLICIT_MEMORY_MANAGER_INITIALIZER;PLATFORM_SUPPORTS_WAIT_FOR_PRESENTATION;PLATFORM_SUPPORTS_SPLIT_GRAPHICS_JOBS;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;NET_STANDARD_2_1;NETSTANDARD;NETSTANDARD2_1;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_WIN;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_INPUT_SYSTEM;TEXTCORE_FONT_ENGINE_1_5_OR_NEWER;TEXTCORE_TEXT_ENGINE_1_5_OR_NEWER;TEXTCORE_FONT_ENGINE_1_6_OR_NEWER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
    <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
  </PropertyGroup>
-  <PropertyGroup>
-    <NoStandardLibraries>true</NoStandardLibraries>
-    <NoStdLib>true</NoStdLib>
-    <NoConfig>true</NoConfig>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-    <MSBuildWarningsAsMessages>MSB3277</MSBuildWarningsAsMessages>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>Temp\bin\Debug\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>Temp\bin\Release\</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup>
+    <NoConfig>true</NoConfig>
+    <NoStdLib>true</NoStdLib>
+    <AddAdditionalExplicitAssemblyReferences>false</AddAdditionalExplicitAssemblyReferences>
+    <ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
+    <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ProjectTypeGuids>{E097FAD1-6243-4DAD-9C02-E9B9EFC3FFC1};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
    <UnityProjectGenerator>Package</UnityProjectGenerator>
    <UnityProjectGeneratorVersion>2.0.26</UnityProjectGeneratorVersion>
-    <UnityProjectGeneratorStyle>SDK</UnityProjectGeneratorStyle>
+    <UnityProjectGeneratorStyle>Legacy</UnityProjectGeneratorStyle>
    <UnityProjectType>Game:1</UnityProjectType>
    <UnityBuildTarget>StandaloneWindows64:19</UnityBuildTarget>
    <UnityVersion>6000.3.6f1</UnityVersion>
  </PropertyGroup>
  <ItemGroup>
-    <Analyzer Include="C:\Users\roegnere\.vscode\extensions\visualstudiotoolsforunity.vstuc-1.2.1\Analyzers\Microsoft.Unity.Analyzers.dll" />
    <Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.3.6f1\Editor\Data\Tools\BuildPipeline\Unity.SourceGenerators\Unity.SourceGenerators.dll" />
    <Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.3.6f1\Editor\Data\Tools\BuildPipeline\Unity.SourceGenerators\Unity.Properties.SourceGenerator.dll" />
    <Analyzer Include="C:\Program Files\Unity\Hub\Editor\6000.3.6f1\Editor\Data\Tools\BuildPipeline\Unity.SourceGenerators\Unity.UIToolkit.SourceGenerator.dll" />
@@ -64,12 +75,17 @@
    <Compile Include="Assets\Scripts\WinScreenController.cs" />
    <Compile Include="Assets\Scripts\MainMenuController.cs" />
    <Compile Include="Assets\Scripts\CreditsInputHandler.cs" />
+    <Compile Include="Assets\Scripts\LoseGuiController.cs" />
+    <Compile Include="Assets\Scripts\HealthGUIController.cs" />
+    <Compile Include="Assets\Scripts\PlayerAnimationController.cs" />
  </ItemGroup>
  <ItemGroup>
    <None Include="Assets\UI Toolkit\CreditsGUI.uxml" />
+    <None Include="Assets\ProgressBar.uss" />
    <None Include="Assets\UI Toolkit\LoseScreen.uxml" />
    <None Include="Assets\UI Toolkit\MainMenu.uxml" />
    <None Include="Assets\UI Toolkit\WinScreenMenu.uxml" />
+    <None Include="Assets\UI Toolkit\progressBar.uss" />
    <None Include="Assets\UI Toolkit\GameGUI.uxml" />
  </ItemGroup>
  <ItemGroup>
@@ -1400,15 +1416,13 @@
  </ItemGroup>
  <ItemGroup>
  </ItemGroup>
-  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
-  <ItemGroup>
-    <ProjectCapability Remove="LaunchProfiles" />
-    <ProjectCapability Remove="SharedProjectReferences" />
-    <ProjectCapability Remove="ReferenceManagerSharedProjects" />
-    <ProjectCapability Remove="ReferenceManagerProjects" />
-    <ProjectCapability Remove="COMReferences" />
-    <ProjectCapability Remove="ReferenceManagerCOM" />
-    <ProjectCapability Remove="AssemblyReferences" />
-    <ProjectCapability Remove="ReferenceManagerAssemblies" />
-  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="GenerateTargetFrameworkMonikerAttribute" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
 </Project>
@@ -135,6 +135,31 @@ AnimatorState:
  m_MirrorParameter: 
  m_CycleOffsetParameter: 
  m_TimeParameter: 
+--- !u!1101 &-6621590539747483612
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: isCollapsed
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -1210443090960147805}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.7692308
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-6059084907828803585
 AnimatorStateTransition:
  m_ObjectHideFlags: 1
@@ -172,6 +197,7 @@ AnimatorState:
  m_CycleOffset: 0
  m_Transitions:
  - {fileID: 3261478500395500566}
+  - {fileID: -6621590539747483612}
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -251,9 +277,6 @@ AnimatorStateTransition:
  - m_ConditionMode: 1
    m_ConditionEvent: isJumping
    m_EventTreshold: 0
-  - m_ConditionMode: 2
-    m_ConditionEvent: isRunning
-    m_EventTreshold: 0
  m_DstStateMachine: {fileID: 0}
  m_DstState: {fileID: -5449330869365902308}
  m_Solo: 0
@@ -303,8 +326,7 @@ AnimatorState:
  m_Name: playerCollapse
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions:
-  - {fileID: 7973517625427532113}
+  m_Transitions: []
  m_StateMachineBehaviours: []
  m_Position: {x: 50, y: 50, z: 0}
  m_IKOnFeet: 0
@@ -758,28 +780,3 @@ AnimatorStateTransition:
  m_InterruptionSource: 0
  m_OrderedInterruption: 1
  m_CanTransitionToSelf: 1
--- !u!1101 &7973517625427532113
-AnimatorStateTransition:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 2
-    m_ConditionEvent: isCollapsed
-    m_EventTreshold: 0
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 7407206800022927606}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0.25
-  m_TransitionOffset: 0
-  m_ExitTime: 0.8148148
-  m_HasExitTime: 1
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
@@ -32,6 +32,15 @@
                    "processors": "",
                    "interactions": "",
                    "initialStateCheck": false
+                },
+                {
+                    "name": "Heal",
+                    "type": "Button",
+                    "id": "96a3c855-05a0-4431-961e-d2552c539bf0",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                }
            ],
            "bindings": [
@@ -221,6 +230,17 @@
                    "action": "Interact",
                    "isComposite": false,
                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "95d44eae-cbf8-4ad2-9dc3-9e8524118e9f",
+                    "path": "<Gamepad>/buttonNorth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Gamepad",
+                    "action": "Heal",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                }
            ]
        },
@@ -254,6 +274,15 @@
                    "processors": "",
                    "interactions": "",
                    "initialStateCheck": false
+                },
+                {
+                    "name": "Heal",
+                    "type": "Button",
+                    "id": "d384b3b4-cc86-4a73-a97f-0d04e31417a8",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                }
            ],
            "bindings": [
@@ -268,6 +297,17 @@
                    "isComposite": false,
                    "isPartOfComposite": false
                },
+                {
+                    "name": "",
+                    "id": "d952c2fd-e0f5-4ab9-bbbd-2af129855725",
+                    "path": "<Gamepad>/buttonNorth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Gamepad",
+                    "action": "Heal",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                {
                    "name": "",
                    "id": "0bb7b65d-0e9d-4a2a-8bd4-35a4d9f5b7a2",
@@ -322,6 +362,15 @@
                    "processors": "",
                    "interactions": "",
                    "initialStateCheck": false
+                },
+                {
+                    "name": "Heal",
+                    "type": "Button",
+                    "id": "56e697eb-9ef8-4e3d-9671-74da02a08793",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                }
            ],
            "bindings": [
@@ -336,6 +385,17 @@
                    "isComposite": false,
                    "isPartOfComposite": false
                },
+                {
+                    "name": "",
+                    "id": "bcba7833-70cc-40cf-aa96-a824333c9112",
+                    "path": "<Gamepad>/buttonNorth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Gamepad",
+                    "action": "Heal",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                {
                    "name": "",
                    "id": "a91fe28e-bdb1-4a19-b09b-9bb52dc0940c",
@@ -390,6 +450,15 @@
                    "processors": "",
                    "interactions": "",
                    "initialStateCheck": false
+                },
+                {
+                    "name": "Heal",
+                    "type": "Button",
+                    "id": "7eee99e7-4426-4f8f-812f-0562adbbbbd3",
+                    "expectedControlType": "",
+                    "processors": "",
+                    "interactions": "",
+                    "initialStateCheck": false
                }
            ],
            "bindings": [
@@ -404,6 +473,17 @@
                    "isComposite": false,
                    "isPartOfComposite": false
                },
+                {
+                    "name": "",
+                    "id": "f5d22357-bf6c-456d-95bb-057bd7d482f9",
+                    "path": "<Gamepad>/buttonNorth",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": ";Gamepad",
+                    "action": "Heal",
+                    "isComposite": false,
+                    "isPartOfComposite": false
+                },
                {
                    "name": "",
                    "id": "0f15df45-ecb7-4a35-8e06-293d50b89001",
@@ -1007,4 +1087,4 @@
            ]
        }
    ]
-}
+}
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8062391313330381747
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 191492520573121038}
+  - component: {fileID: 2630265126968092202}
+  m_Layer: 0
+  m_Name: EnemyBarrier
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &191492520573121038
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8062391313330381747}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &2630265126968092202
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8062391313330381747}
+  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: 3
+  m_Size: {x: 1.6092091, y: 10.161938, z: 1}
+  m_Center: {x: 7.4978, y: -0.040241957, z: 0}
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: dd978b6bbfaf7864dbb3a6ec7b2851ba
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
@@ -16,6 +16,8 @@ GameObject:
  - component: {fileID: 7763498473808654306}
  - component: {fileID: 3659140714710275197}
  - component: {fileID: 9133098163257611752}
+  - component: {fileID: 4619270190355407300}
+  - component: {fileID: 72138333084358172}
  m_Layer: 6
  m_Name: Player
  m_TagString: Untagged
@@ -199,6 +201,7 @@ MonoBehaviour:
  actionMapName: Player
  moveActionName: Move
  jumpActionName: Jump
+  healActionName: Heal
  controlSchemeName: Gamepad
  gamepadIndex: 0
  moveSpeed: 6
@@ -229,8 +232,10 @@ MonoBehaviour:
  throwChargeTime: 0.75
  throwUpwardForce: 0
  throwTriggerThreshold: 0.6
+  dropClearance: 0.2
  holdPoint: {fileID: 5569302833446856119}
  pickupRange: 1
+  heldObject: {fileID: 0}
 --- !u!114 &9133098163257611752
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -243,9 +248,46 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: b88e05c37f07ccf48bcc436a9d7def5d, type: 3}
  m_Name: 
  m_EditorClassIdentifier: '::'
-  pickupController: {fileID: 0}
+  pickupController: {fileID: 3659140714710275197}
  currentStress: 0
  maxStress: 100
+  isPanicking: 0
+  isParalyzed: 0
+  paralyseDuration: 1.2
+--- !u!95 &4619270190355407300
+Animator:
+  serializedVersion: 7
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3937090937419967315}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 86632cb6b3835a44e87fb6f039478d61, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_AnimatePhysics: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &72138333084358172
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3937090937419967315}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fdb391b004c27a64da8f6922aab5512e, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
 --- !u!1 &6898135930931977916
 GameObject:
  m_ObjectHideFlags: 0
@@ -272,7 +314,7 @@ Transform:
  m_GameObject: {fileID: 6898135930931977916}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -0.18, y: 1.58, z: 0}
+  m_LocalPosition: {x: -0.18, y: 1.95, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
@@ -0,0 +1,3 @@
+:root {
+
+}
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 71c3121e1dfba1d4996a4dbee8b00bf3
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+  unsupportedSelectorAction: 0
@@ -185,7 +185,7 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3937090937419967315, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
      propertyPath: m_Name
-      value: Player (4)
+      value: Player3 (4)
      objectReference: {fileID: 0}
    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
      propertyPath: moveSpeed
@@ -203,6 +203,10 @@ PrefabInstance:
      propertyPath: actionMapName
      value: Player2
      objectReference: {fileID: 0}
+    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: healActionName
+      value: Heal
+      objectReference: {fileID: 0}
    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
      propertyPath: controlSchemeName
      value: Gamepad
@@ -211,6 +215,18 @@ PrefabInstance:
      propertyPath: m_GravityScale
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.b
+      value: 0.5896226
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.g
+      value: 0.99573493
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -227,6 +243,7 @@ GameObject:
  - component: {fileID: 375061916}
  - component: {fileID: 375061915}
  - component: {fileID: 375061917}
+  - component: {fileID: 375061918}
  m_Layer: 5
  m_Name: GameGUI
  m_TagString: Untagged
@@ -285,6 +302,24 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: Assembly-CSharp::ScoreManager
  Score: 0
+--- !u!114 &375061918
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 375061914}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09397b12132be4248998c82e96a8b7c4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
+  images:
+  - {fileID: 21300000, guid: 03a067405c8cfa945a9ed2e8ff6a71dd, type: 3}
+  - {fileID: 21300000, guid: 4dca6d41e377b4b47ab35b821674514c, type: 3}
+  - {fileID: 21300000, guid: 8abb37071992fbc449fda9db6b2d86f4, type: 3}
+  - {fileID: 21300000, guid: 4b346aed0900f3c469fd51c6fa693e49, type: 3}
+  - {fileID: 21300000, guid: 33f209566f1f6ca44a4c7ae3f01d9bf5, type: 3}
 --- !u!1001 &377513953
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -369,6 +404,14 @@ PrefabInstance:
      propertyPath: actionMapName
      value: Player2
      objectReference: {fileID: 0}
+    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: healActionName
+      value: Heal
+      objectReference: {fileID: 0}
+    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: jumpActionName
+      value: Jump
+      objectReference: {fileID: 0}
    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
      propertyPath: controlSchemeName
      value: Gamepad
@@ -377,125 +420,23 @@ PrefabInstance:
      propertyPath: m_GravityScale
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.b
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.r
+      value: 0.654902
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
--- !u!1 &393625608
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 393625611}
-  - component: {fileID: 393625610}
-  - component: {fileID: 393625609}
-  m_Layer: 0
-  m_Name: Trick_Run01
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!95 &393625609
-Animator:
-  serializedVersion: 7
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 393625608}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: c4f171c0550c83640bad4a8bc02f1c73, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_AnimatePhysics: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorStateOnDisable: 0
-  m_WriteDefaultValuesOnDisable: 0
--- !u!212 &393625610
-SpriteRenderer:
-  serializedVersion: 2
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 393625608}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RayTracingAccelStructBuildFlagsOverride: 0
-  m_RayTracingAccelStructBuildFlags: 1
-  m_SmallMeshCulling: 1
-  m_ForceMeshLod: -1
-  m_MeshLodSelectionBias: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_GlobalIlluminationMeshLod: 0
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_MaskInteraction: 0
-  m_Sprite: {fileID: 21300000, guid: 9c5273d0f7687334ba77aa78d87131b9, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 2.26, y: 2.86}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_SpriteSortPoint: 0
--- !u!4 &393625611
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 393625608}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 7.804798, y: -2.2748086, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &418512664
 GameObject:
  m_ObjectHideFlags: 0
@@ -836,8 +777,8 @@ Camera:
  m_GameObject: {fileID: 486463122}
  m_Enabled: 1
  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
+  m_ClearFlags: 2
+  m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
  m_projectionMatrixMode: 1
  m_GateFitMode: 2
  m_FOVAxisMode: 0
@@ -947,8 +888,9 @@ GameObject:
  m_Component:
  - component: {fileID: 491328828}
  - component: {fileID: 491328827}
+  - component: {fileID: 491328829}
  m_Layer: 0
-  m_Name: WinManager
+  m_Name: GameManager
  m_TagString: Untagged
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
@@ -982,6 +924,18 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &491328829
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 491328826}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f5cdb566677d77e438cdf195197a5b85, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::LoseScreenController
 --- !u!1 &495541363
 GameObject:
  m_ObjectHideFlags: 0
@@ -1290,7 +1244,7 @@ AudioSource:
  m_PlayOnAwake: 1
  m_Volume: 1
  m_Pitch: 1
-  Loop: 0
+  Loop: 1
  Mute: 0
  Spatialize: 0
  SpatializePostEffects: 0
@@ -1439,6 +1393,22 @@ PrefabInstance:
      propertyPath: m_Name
      value: Player (1)
      objectReference: {fileID: 0}
+    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: healActionName
+      value: Heal
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.b
+      value: 0.6462264
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.g
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.r
+      value: 0.71244085
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
@@ -1720,58 +1690,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &908853548
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 908853550}
-  - component: {fileID: 908853549}
-  m_Layer: 0
-  m_Name: Treat Spawner BL
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &908853549
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 908853548}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::Spawner
-  objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
-  spawnInterval: 5
-  maxAlive: 0
-  spawnOnStart: 1
-  repeatSpawns: 1
-  launchForce: 0
-  launchRandomAngle: 0
-  spinSpeed: 0
--- !u!4 &908853550
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 908853548}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -4.5, y: -2, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1063739947
 GameObject:
  m_ObjectHideFlags: 0
@@ -1886,6 +1804,58 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &908853548
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 908853550}
+  - component: {fileID: 908853549}
+  m_Layer: 0
+  m_Name: Treat Spawner BL
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &908853549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908853548}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Assembly-CSharp::Spawner
+  objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
+  spawnInterval: 5
+  maxAlive: 0
+  spawnOnStart: 1
+  repeatSpawns: 1
+  launchForce: 0
+  launchRandomAngle: 0
+  spinSpeed: 0
+--- !u!4 &908853550
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908853548}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.5, y: -2, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1118230342
 GameObject:
  m_ObjectHideFlags: 0
@@ -1922,6 +1892,7 @@ MonoBehaviour:
  actionMapName: Player
  moveActionName: Move
  jumpActionName: Jump
+  healActionName: Heal
  controlSchemeName: 
  gamepadIndex: -1
  moveSpeed: 6
@@ -2223,58 +2194,6 @@ PrefabInstance:
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 99cce68fc82caea44b5a140697be00a8, type: 3}
--- !u!1 &1466477811
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1466477813}
-  - component: {fileID: 1466477812}
-  m_Layer: 0
-  m_Name: Treat Spawner TL
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1466477812
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1466477811}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::Spawner
-  objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
-  spawnInterval: 5
-  maxAlive: 0
-  spawnOnStart: 1
-  repeatSpawns: 1
-  launchForce: 0
-  launchRandomAngle: 0
-  spinSpeed: 0
--- !u!4 &1466477813
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1466477811}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.42, y: 2.93, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1654086541
 GameObject:
  m_ObjectHideFlags: 0
@@ -2497,6 +2416,10 @@ PrefabInstance:
      propertyPath: actionMapName
      value: Player2
      objectReference: {fileID: 0}
+    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: healActionName
+      value: Heal
+      objectReference: {fileID: 0}
    - target: {fileID: 7763498473808654306, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
      propertyPath: controlSchemeName
      value: Gamepad
@@ -2505,115 +2428,23 @@ PrefabInstance:
      propertyPath: m_GravityScale
      value: 2
      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.b
+      value: 0.7791217
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.g
+      value: 0.69411767
+      objectReference: {fileID: 0}
+    - target: {fileID: 8870760143677714522, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
+      propertyPath: m_Color.r
+      value: 1
+      objectReference: {fileID: 0}
    m_RemovedComponents: []
    m_RemovedGameObjects: []
    m_AddedGameObjects: []
    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 414ae949bae840c4589b38dd91c715e0, type: 3}
--- !u!1 &1759124602
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1759124604}
-  - component: {fileID: 1759124603}
-  m_Layer: 0
-  m_Name: Treat Spawner TR
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1759124603
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1759124602}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::Spawner
-  objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
-  spawnInterval: 5
-  maxAlive: 0
-  spawnOnStart: 1
-  repeatSpawns: 1
-  launchForce: 0
-  launchRandomAngle: 0
-  spinSpeed: 0
--- !u!4 &1759124604
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1759124602}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 2.88, y: 2.69, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1830238251
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1830238253}
-  - component: {fileID: 1830238252}
-  m_Layer: 0
-  m_Name: Treat Spawner BR
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1830238252
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1830238251}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 14b0bf07aa1abc44a8ebd00cecacd6f4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: Assembly-CSharp::Spawner
-  objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
-  spawnInterval: 5
-  maxAlive: 0
-  spawnOnStart: 1
-  repeatSpawns: 1
-  launchForce: 0
-  launchRandomAngle: 0
-  spinSpeed: 0
--- !u!4 &1830238253
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1830238251}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 4.5, y: -2, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2057686360
 GameObject:
  m_ObjectHideFlags: 0
@@ -3049,13 +2880,13 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: Assembly-CSharp::Spawner
  objectToSpawn: {fileID: 262983251238298495, guid: 80c527a86ad6fc34dbc73ee80c1f2951, type: 3}
-  spawnInterval: 5
+  spawnInterval: 1.5
  maxAlive: 0
  spawnOnStart: 1
  repeatSpawns: 1
  launchForce: 4
  launchRandomAngle: 360
-  spinSpeed: 180
+  spinSpeed: 100
 --- !u!1001 &1760117322204329348
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -3147,10 +2978,6 @@ SceneRoots:
  - {fileID: 1760117322204329348}
  - {fileID: 1277412258}
  - {fileID: 1227312797}
-  - {fileID: 1830238253}
-  - {fileID: 908853550}
-  - {fileID: 1466477813}
-  - {fileID: 1759124604}
  - {fileID: 792686806}
  - {fileID: 1685410085}
  - {fileID: 377513953}
@@ -3159,7 +2986,5 @@ SceneRoots:
  - {fileID: 2100000001}
  - {fileID: 2100000101}
  - {fileID: 2200000001}
-  - {fileID: 1063739950}
  - {fileID: 491328828}
-  - {fileID: 393625611}
  - {fileID: 738367608}
@@ -129,6 +129,7 @@ GameObject:
  m_Component:
  - component: {fileID: 159786491}
  - component: {fileID: 159786490}
+  - component: {fileID: 159786492}
  m_Layer: 5
  m_Name: UIdocument
  m_TagString: Untagged
@@ -174,6 +175,18 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &159786492
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 159786489}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9c38ae32eef77b54bb36b487e11c7422, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: '::'
 --- !u!1 &168139977
 GameObject:
  m_ObjectHideFlags: 0
@@ -185,6 +198,7 @@ GameObject:
  - component: {fileID: 168139980}
  - component: {fileID: 168139979}
  - component: {fileID: 168139978}
+  - component: {fileID: 168139981}
  m_Layer: 0
  m_Name: Main Camera
  m_TagString: MainCamera
@@ -266,6 +280,50 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &168139981
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 168139977}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData
+  m_RenderShadows: 1
+  m_RequiresDepthTextureOption: 2
+  m_RequiresOpaqueTextureOption: 2
+  m_CameraType: 0
+  m_Cameras: []
+  m_RendererIndex: -1
+  m_VolumeLayerMask:
+    serializedVersion: 2
+    m_Bits: 1
+  m_VolumeTrigger: {fileID: 0}
+  m_VolumeFrameworkUpdateModeOption: 2
+  m_RenderPostProcessing: 0
+  m_Antialiasing: 0
+  m_AntialiasingQuality: 2
+  m_StopNaN: 0
+  m_Dithering: 0
+  m_ClearDepth: 1
+  m_AllowXRRendering: 1
+  m_AllowHDROutput: 1
+  m_UseScreenCoordOverride: 0
+  m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
+  m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
+  m_RequiresDepthTexture: 0
+  m_RequiresColorTexture: 0
+  m_TaaSettings:
+    m_Quality: 3
+    m_FrameInfluence: 0.1
+    m_JitterScale: 1
+    m_MipBias: 0
+    m_VarianceClampScale: 0.9
+    m_ContrastAdaptiveSharpening: 0
+  m_Version: 2
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
  m_ObjectHideFlags: 0
@@ -0,0 +1,84 @@
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+using UnityEngine.UIElements;
+using static UnityEditor.Experimental.GraphView.GraphView;
+
+public class HealthGUIController : MonoBehaviour
+{
+    private List<PlayerStressController> players;
+
+    public List<Sprite> images;
+
+    private UIDocument uiDocument;
+    private List<Image> playerLifeList;
+    private List<ProgressBar> playerStressBarList;
+
+    void Awake()
+    {
+        players = Object.FindObjectsByType<PlayerStressController>(FindObjectsSortMode.InstanceID).ToList();
+
+        uiDocument ??= GetComponent<UIDocument>();
+        if (uiDocument == null)
+        {
+            return;
+        }
+
+        var root = uiDocument.rootVisualElement;
+        if (root == null)
+        {
+            return;
+        }
+
+        playerLifeList = new List<Image>() { new Image(), new Image(), new Image(), new Image() };
+        playerStressBarList = new List<ProgressBar>() { new ProgressBar(), new ProgressBar(), new ProgressBar(), new ProgressBar() };
+
+        playerLifeList[0] = root.Q<Image>("Player1Life");
+        playerLifeList[1] = root.Q<Image>("Player2Life");
+        playerLifeList[2] = root.Q<Image>("Player3Life");
+        playerLifeList[3] = root.Q<Image>("Player4Life");
+
+        playerLifeList[0].tintColor = players[0].gameObject.GetComponent<SpriteRenderer>() ? players[0].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
+        playerLifeList[1].tintColor = players[1].gameObject.GetComponent<SpriteRenderer>() ? players[1].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
+        playerLifeList[2].tintColor = players[2].gameObject.GetComponent<SpriteRenderer>() ? players[2].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
+        playerLifeList[3].tintColor = players[3].gameObject.GetComponent<SpriteRenderer>() ? players[3].gameObject.GetComponent<SpriteRenderer>().color : Color.white;
+
+        playerStressBarList[0] = root.Q<ProgressBar>("Player1StressBar");
+        playerStressBarList[1] = root.Q<ProgressBar>("Player2StressBar");
+        playerStressBarList[2] = root.Q<ProgressBar>("Player3StressBar");
+        playerStressBarList[3] = root.Q<ProgressBar>("Player4StressBar");
+    }
+
+
+    // Update is called once per frame
+    void Update()
+    {
+        for (int i = 0; i < players.Count; i++)
+        {
+            //update stress bar
+            float ratio = Mathf.Clamp01(players[i].currentStress / players[i].maxStress);
+
+            // Update the bar's value (0-100)
+            playerStressBarList[i].value = ratio * 100f;
+
+
+            //update sprite
+            playerLifeList[i].sprite = players[i].currentStress switch
+            {
+                >= 0 and <= 33 => images[0],
+                > 33 and <= 66 => images[1],
+                > 66 and <= 99 => images[2],
+                _ => images[0]
+            };
+
+            if (players[i].isParalyzed)
+            {
+                playerLifeList[i].sprite = images[3];
+            }
+            else if (players[i].isPanicking)
+            {
+                playerLifeList[i].sprite = images[4];
+            }
+        }
+    }
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 09397b12132be4248998c82e96a8b7c4
@@ -0,0 +1,37 @@
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using UnityEngine.UIElements;
+
+public class LoseGuiController : MonoBehaviour
+{
+    private UIDocument uiDocument;
+    private Button button;
+
+    // Start is called once before the first execution of Update after the MonoBehaviour is created
+    private void OnEnable()
+    {
+        uiDocument ??= GetComponent<UIDocument>();
+        if (uiDocument == null)
+        {
+            return;
+        }
+
+        var root = uiDocument.rootVisualElement;
+        if (root == null)
+        {
+            return;
+        }
+
+        button = root.Q<Button>("Button");
+
+        button.clicked += () => HandleClick("MainMenu");
+    }
+
+    private void HandleClick(string sceneName)
+    {
+        if (!string.IsNullOrWhiteSpace(sceneName))
+        {
+            SceneManager.LoadScene(sceneName);
+        }
+    }
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9c38ae32eef77b54bb36b487e11c7422
@@ -8,19 +8,18 @@ public class LoseScreenController : MonoBehaviour
    [SerializeField]private const string LoseSceneName = "Lose";

    private List<PlayerStressController> players;
-    private bool hasLost = false;

    void Awake()
    {
-        players = FindObjectsOfType<PlayerStressController>().ToList();
+        players = Object.FindObjectsByType<PlayerStressController>(FindObjectsSortMode.None).ToList();
    }

    void Update()
    {
-        if (hasLost || players.Count == 0)
+        if (players.Count == 0)
            return;

-        if (players.All(p => p.IsPanicking))
+        if (players.All(p => p.isPanicking))
        {
            TriggerLose();
        }
@@ -28,7 +27,6 @@ public class LoseScreenController : MonoBehaviour

    void TriggerLose()
    {
-        hasLost = true;
        SceneManager.LoadScene(LoseSceneName);
    }
 }
@@ -0,0 +1,10 @@
+using UnityEngine;
+
+public class PlayerAnimationController : MonoBehaviour
+{
+    // Update is called once per frame
+    void Update()
+    {
+        
+    }
+}
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fdb391b004c27a64da8f6922aab5512e
@@ -23,14 +23,22 @@ public class PlayerPickupController : MonoBehaviour
    public Transform holdPoint; // Empty GameObject above head
    public float pickupRange = 2.0f;

-    private GameObject heldObject;
+    public GameObject heldObject;
+    private Rigidbody2D heldBody;
+    private float heldBodyMass;
+    private float heldBodyGravity;
+    private RigidbodyType2D heldBodyType;
+    private bool heldBodySimulated;
    private PlayerPlatformerController platformerController;
+    private PlayerStressController playerStressController;
    private bool isChargingThrow;
    private float throwChargeStartTime;

    private void OnEnable()
    {
        platformerController = GetComponent<PlayerPlatformerController>();
+        playerStressController = GetComponent<PlayerStressController>();
+
        if (inputActions == null)
        {
            Debug.LogError("PlayerPickupController missing InputActionAsset reference.", this);
@@ -76,10 +84,10 @@ public class PlayerPickupController : MonoBehaviour

    private void OnInteractPerformed(InputAction.CallbackContext context)
    {
-        Debug.Log("Interact action performed");
-        if(heldObject != null)
+        if (playerStressController.isPanicking) return;
+
+        if (heldObject != null)
        {
-            Debug.Log("Dropping held object");
            DropObject(false);
            return;
        }
@@ -94,6 +102,12 @@ public class PlayerPickupController : MonoBehaviour
            return;
        }

+        if(playerStressController.isPanicking)
+        {
+            DropObject(false);
+            return;
+        }
+
        if (!heldObject.TryGetComponent<TrickController>(out _))
        {
            return;
@@ -118,13 +132,15 @@ public class PlayerPickupController : MonoBehaviour
        {
            DropObject(true);
        }
+
+
    }

    void TryPickUp()
    {
        // Find all colliders within range
        Collider2D[] colliders = Physics2D.OverlapCircleAll(transform.position, pickupRange);
-        Debug.Log(colliders.Length + " colliders found in range");
+
        foreach (var col in colliders)
        {
            if (col.gameObject == gameObject)
@@ -134,6 +150,9 @@ public class PlayerPickupController : MonoBehaviour

            var hasTrick = col.TryGetComponent<TrickController>(out var trick);
            var hasPlayer = col.TryGetComponent<PlayerPlatformerController>(out var playerController);
+
+            if (hasPlayer) continue;
+
            if (!hasTrick && !hasPlayer && !col.CompareTag("Interactable"))
            {
                continue;
@@ -149,9 +168,17 @@ public class PlayerPickupController : MonoBehaviour
            // Disable physics so it doesn't fall or collide with the player
            if (heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D rb))
            {
+                heldBody = rb;
+                heldBodyMass = rb.mass;
+                heldBodyGravity = rb.gravityScale;
+                heldBodyType = rb.bodyType;
+                heldBodySimulated = rb.simulated;
+
+                rb.simulated = false;
                rb.bodyType = RigidbodyType2D.Kinematic;
-                rb.gravityScale = 0;
-                rb.mass = 0;
+                rb.gravityScale = 0f;
+                rb.linearVelocity = Vector2.zero;
+                rb.angularVelocity = 0f;
            }

            if (trick != null)
@@ -178,14 +205,17 @@ public class PlayerPickupController : MonoBehaviour
        }
    }

-    void DropObject(bool applyThrow)
+    public void DropObject(bool applyThrow)
    {
        // Re-enable physics
-        if (heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D rb))
+        if (heldBody != null)
        {
-            rb.bodyType = RigidbodyType2D.Dynamic;
-            rb.gravityScale = 1;
-            rb.linearVelocity = Vector2.zero;
+            heldBody.simulated = heldBodySimulated;
+            heldBody.bodyType = heldBodyType;
+            heldBody.gravityScale = heldBodyGravity;
+            heldBody.mass = heldBodyMass;
+            heldBody.linearVelocity = Vector2.zero;
+            heldBody.angularVelocity = 0f;
        }
        if (heldObject.TryGetComponent<TrickController>(out var trick))
        {
@@ -203,7 +233,7 @@ public class PlayerPickupController : MonoBehaviour
                heldPickup.enabled = true;
            }
        }
-        if (applyThrow && heldObject.TryGetComponent<Rigidbody2D>(out Rigidbody2D throwBody))
+        if (applyThrow && heldBody != null)
        {
            var direction = 1f;
            if (platformerController != null && Mathf.Abs(platformerController.LastMoveX) > 0.01f)
@@ -217,8 +247,9 @@ public class PlayerPickupController : MonoBehaviour
                charge01 = Mathf.Clamp01(heldTime / Mathf.Max(0.01f, throwChargeTime));
            }
            var throwSpeed = Mathf.Lerp(minThrowSpeed, maxThrowSpeed, charge01);
-            throwBody.linearVelocity = new Vector2(direction * throwSpeed, 0f);
-            throwBody.angularVelocity = 0f;
+            var upwardSpeed = throwUpwardForce * charge01;
+            heldBody.linearVelocity = new Vector2(direction * throwSpeed, upwardSpeed);
+            heldBody.angularVelocity = 0f;
        }
        heldObject.transform.position += Vector3.up * dropClearance;
        Collider2D col = heldObject.GetComponent<Collider2D>();
@@ -227,6 +258,7 @@ public class PlayerPickupController : MonoBehaviour
        // Unparent
        heldObject.transform.SetParent(null);
        heldObject = null;
+        heldBody = null;
        isChargingThrow = false;
    }

@@ -10,6 +10,7 @@ public class PlayerPlatformerController : MonoBehaviour
    [SerializeField] private string actionMapName = "Player";
    [SerializeField] private string moveActionName = "Move";
    [SerializeField] private string jumpActionName = "Jump";
+    [SerializeField] private string healActionName = "Heal";
    [SerializeField] private string controlSchemeName = "";
    [SerializeField] private int gamepadIndex = -1;
    [SerializeField] private float moveSpeed = 6f;
@@ -17,18 +18,29 @@ public class PlayerPlatformerController : MonoBehaviour
    [SerializeField] private LayerMask groundMask = ~0;
    [SerializeField] private float groundCheckDistance = 0.05f;

+    private PlayerStressController playerStressController;
+    private PlayerPickupController playerPickupController;
+    private Animator animator;
+
    private Rigidbody2D body;
    private BoxCollider2D bodyCollider;
    private InputActionAsset runtimeActions;
    private InputAction moveAction;
    private InputAction jumpAction;
+    private InputAction healAction;
    public float LastMoveX { get; private set; }
    private bool deviceFilterEnabled;
+    private int healCoolDownTicks = 15;
+    private int currentHealCoolDown = 0;
+    private bool canHeal = true;

    private void Awake()
    {
        body = GetComponent<Rigidbody2D>();
        bodyCollider = GetComponent<BoxCollider2D>();
+        playerStressController = GetComponent<PlayerStressController>();
+        playerPickupController = GetComponent<PlayerPickupController>();
+        animator = GetComponent<Animator>();
    }

    private void OnEnable()
@@ -51,10 +63,12 @@ public class PlayerPlatformerController : MonoBehaviour
        var map = runtimeActions.FindActionMap(actionMapName, true);
        moveAction = map.FindAction(moveActionName, true);
        jumpAction = map.FindAction(jumpActionName, true);
+        healAction = map.FindAction(healActionName, true);

        moveAction.Enable();
        jumpAction.Enable();
        jumpAction.performed += OnJumpPerformed;
+        healAction.Enable();
    }

    private void OnDisable()
@@ -70,6 +84,11 @@ public class PlayerPlatformerController : MonoBehaviour
            moveAction.Disable();
        }

+        if (healAction != null)
+        {
+            healAction.Disable();
+        }
+
        if (runtimeActions != null)
        {
            runtimeActions.Disable();
@@ -81,11 +100,50 @@ public class PlayerPlatformerController : MonoBehaviour

    private void FixedUpdate()
    {
+        if(IsGrounded())
+        {
+            animator.SetBool("isJumping", false);
+        }
+
+        if (healAction == null) return;
+
+        currentHealCoolDown++;
+
+        if (currentHealCoolDown >= healCoolDownTicks)
+        {
+            currentHealCoolDown = 0;
+            canHeal = true;
+        }
+
        if (moveAction == null)
        {
            return;
        }

+        if (playerStressController.isPanicking) return;
+
+        if (healAction.IsPressed())
+        {
+            animator.SetBool("isBreathing", true);
+
+            if (playerPickupController.heldObject != null)
+            {
+                playerPickupController.DropObject(false);
+            }
+
+            if (canHeal)
+            {
+                playerStressController.ReduceStress(3f);
+                canHeal = false;
+            }
+
+            return;
+        }
+        else
+        {
+            animator.SetBool("isBreathing", false);
+        }
+
        var input = moveAction.ReadValue<Vector2>();
        if (Mathf.Abs(input.x) > 0.01f)
        {
@@ -94,10 +152,29 @@ public class PlayerPlatformerController : MonoBehaviour
        var velocity = body.linearVelocity;
        velocity.x = input.x * moveSpeed;
        body.linearVelocity = velocity;
+
+        if(velocity.x != 0)
+        {
+            animator.SetBool("isRunning", true);
+            if (velocity.x > 0 && IsGrounded())
+            {
+                transform.localScale = new Vector3(.25f, .25f, .25f);
+            }
+            else
+            {
+                transform.localScale = new Vector3(-.25f, .25f, .25f);
+            }
+        }
+        else
+        {
+            animator.SetBool("isRunning", false);
+        }
    }

    private void OnJumpPerformed(InputAction.CallbackContext context)
    {
+        if (playerStressController.isPanicking || healAction.IsPressed()) return;
+
        if (!IsGrounded())
        {
            return;
@@ -107,6 +184,8 @@ public class PlayerPlatformerController : MonoBehaviour
        velocity.y = 0f;
        body.linearVelocity = velocity;
        body.AddForce(Vector2.up * jumpImpulse, ForceMode2D.Impulse);
+
+        animator.SetBool("isJumping", true);
    }

    private bool ShouldFilterDevices()
@@ -196,10 +275,22 @@ public class PlayerPlatformerController : MonoBehaviour
        for (var i = 0; i < hits.Length; i++)
        {
            var hit = hits[i];
-            if (hit != null && hit != bodyCollider)
+            if (hit == null || hit == bodyCollider || hit.isTrigger)
            {
-                return true;
+                continue;
            }
+
+            if (hit.GetComponent<PlayerPlatformerController>() != null)
+            {
+                continue;
+            }
+
+            if (hit.GetComponent<TrickController>() != null)
+            {
+                continue;
+            }
+
+            return true;
        }

        return false;
@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
@@ -6,19 +7,26 @@ using UnityEngine;
 public class PlayerStressController : MonoBehaviour
 {
    public PlayerPickupController pickupController;
-    
+    private Animator animator;
+
    [Header("Stress Settings")]
    public float currentStress = 0f;
    public float maxStress = 100f;
+    
+    public bool isPanicking = false;
+    public bool isParalyzed = false;
+
+    // Define the event
+    public static event Action OnPlayerPanic;
+    public static event Action OnPlayerCalm;

    [Header("Panic Settings")]
-    [SerializeField] private float panicDuration = 1.2f;
-    private float panicEndTime;
+    [SerializeField] private float paralyseDuration = 5f;

-    public bool IsPanicking => Time.time < panicEndTime;

    void Start()
    {
+        animator = GetComponent<Animator>();
        // Start the repeating loop
        StartCoroutine(StressCheckLoop());
    }
@@ -27,35 +35,61 @@ public class PlayerStressController : MonoBehaviour
    {
        while (true) // Runs for the lifetime of the object
        {
-            ApplyStressLogic();
+            yield return ApplyStressLogic();

            // Wait for exactly 1 second before running again
            yield return new WaitForSeconds(1.0f);
        }
    }

-    void ApplyStressLogic()
+    IEnumerator ApplyStressLogic()
    {
+        if (isParalyzed) yield break;
+
        // Find all objects tagged as "Enemy"
        List<GameObject> enemies = GameObject.FindGameObjectsWithTag("Interactable").Where(enemy => enemy.GetComponent<TrickController>() != null).ToList();

        // Keep stress within 0 and Max
-        currentStress = Mathf.Clamp(currentStress, 0, maxStress);
+       
        currentStress += enemies.Count; // Increase stress based on number of enemies nearby

-        Debug.Log($"Current Stress: {currentStress}");
-
-        if (currentStress >= maxStress)
+        if (pickupController.heldObject != null && pickupController.heldObject.TryGetComponent<TrickController>(out _))
        {
-            HandlePanic();
+            currentStress += 5; // Increase stress based on number of carried tricks
+        }
+
+        currentStress = Mathf.Clamp(currentStress, 0, maxStress);
+
+        if (!isPanicking && currentStress >= maxStress)
+        {
+            Debug.Log($"{currentStress}, {isPanicking}, {isParalyzed}");
+            yield return HandlePanic();
+        }
+
+        else if(isPanicking && currentStress < maxStress)
+        {
+            isPanicking = false;
+            HandleCalm();
+            Debug.Log("Player has calmed down.");
        }
    }

-    void HandlePanic()
+    IEnumerator HandlePanic()
    {
-        panicEndTime = Time.time + panicDuration;
+
+        isPanicking = true;
+        animator.SetBool("isCollapsed", true);
+
        Debug.Log("Player is freaking out man!");
        // Add effects like screen shake or slowing down the player here
+        OnPlayerPanic?.Invoke(); // Trigger the panic event
+        yield return StartCoroutine(HandleParalyze());
+    }
+
+    void HandleCalm()
+    {
+        Debug.Log("Player is feeling better now!");
+        OnPlayerCalm?.Invoke(); // Trigger the calm event
    }

    public void ReduceStress(float amount)
@@ -64,4 +98,15 @@ public class PlayerStressController : MonoBehaviour
        currentStress = Mathf.Clamp(currentStress, 0, maxStress);
        Debug.Log($"Stress reduced by {amount}. Current Stress: {currentStress}");
    }
+
+    IEnumerator HandleParalyze()
+    {
+        isParalyzed = true;
+        Debug.Log("Player is paralyzed.");
+
+        yield return new WaitForSecondsRealtime(paralyseDuration);
+
+        Debug.Log("Player has recovered from paralysis.");
+        isParalyzed = false;
+    }
 }
@@ -5,6 +5,8 @@ public class TrickCollisionManager : MonoBehaviour
    [SerializeField] private string trickLayerName = "Trick";
    [SerializeField] private string playerLayerName = "Player";
    [SerializeField] private string treatLayerName = "Treat";
+    [SerializeField] private string destroyTag = "Destroy";
+
    private bool initialized;

    private void Awake()
@@ -43,4 +45,10 @@ public class TrickCollisionManager : MonoBehaviour

        Physics2D.IgnoreLayerCollision(trickLayer, otherLayer, true);
    }
+    private void onTriggerEnter2D(Collider2D destroy){
+        if (destroy.CompareTag(destroyTag))
+        {
+            Destroy(gameObject);
+        }
+    }
 }
@@ -25,14 +25,20 @@ public class TrickController : MonoBehaviour
    [SerializeField] private float wanderWeight = 0.4f;
    [SerializeField] private int maxTricks = 50;
    [SerializeField] private float jumpImpulse = 6f;
+    [SerializeField] private float jumpImpulseVariance = 0.25f;
    [SerializeField] private float jumpCooldown = 1f;
    [SerializeField] private float jumpChancePerSecond = 0.5f;
+    [SerializeField] private float jumpArcChance = 0.5f;
+    [SerializeField] private float jumpArcHorizontalImpulse = 2f;
    [SerializeField] private LayerMask groundMask = ~0;
    [SerializeField] private float groundCheckDistance = 0.05f;
    [SerializeField] private float despawnMinX = -12f;
    [SerializeField] private float despawnMaxX = 12f;
    [SerializeField] private float despawnMinY = -10f;
+    [SerializeField] private float despawnMaxY = 20f;
    [SerializeField] private float throwControlLockTime = 0.35f;
+    [SerializeField] private float wallCheckDistance = 0.1f;
+    [SerializeField] private float wallAvoidDuration = 0.6f;

    private Rigidbody2D body;
    private Transform target;
@@ -44,6 +50,10 @@ public class TrickController : MonoBehaviour
    private float desiredXVelocity;
    private float nextJumpTime;
    private float movementLockUntil;
+    private readonly RaycastHit2D[] groundHits = new RaycastHit2D[4];
+    private readonly RaycastHit2D[] wallHits = new RaycastHit2D[4];
+    private float wallAvoidUntil;
+    private float wallAvoidDirection;

    private void Awake()
    {
@@ -79,7 +89,7 @@ public class TrickController : MonoBehaviour
        }

        var position = transform.position;
-        if (position.x < despawnMinX || position.x > despawnMaxX || position.y < despawnMinY)
+        if (position.x < despawnMinX || position.x > despawnMaxX || position.y < despawnMinY || position.y > despawnMaxY)
        {
            Destroy(gameObject);
            return;
@@ -128,9 +138,6 @@ public class TrickController : MonoBehaviour

        if (!IsGrounded())
        {
-            var airborne = body.linearVelocity;
-            airborne.x = 0f;
-            body.linearVelocity = airborne;
            return;
        }

@@ -156,6 +163,18 @@ public class TrickController : MonoBehaviour
            desiredX = wanderDirection.x * 0.2f;
        }

+        var wallDirection = GetWallAvoidDirection(desiredX);
+        if (wallDirection != 0f)
+        {
+            wallAvoidDirection = wallDirection;
+            wallAvoidUntil = Time.time + wallAvoidDuration;
+        }
+
+        if (Time.time < wallAvoidUntil && Mathf.Abs(wallAvoidDirection) > 0.01f)
+        {
+            desiredX = wallAvoidDirection;
+        }
+
        desiredVelocity = new Vector2(Mathf.Clamp(desiredX, -1f, 1f) * moveSpeed, 0f);

        var velocity = body.linearVelocity;
@@ -311,6 +330,11 @@ public class TrickController : MonoBehaviour
            return;
        }

+        if (body.linearVelocity.y > 0.01f)
+        {
+            return;
+        }
+
        var chance = jumpChancePerSecond * Time.fixedDeltaTime;
        if (Random.value > chance)
        {
@@ -326,7 +350,17 @@ public class TrickController : MonoBehaviour
        }
        velocity.x = jumpDir * moveSpeed;
        body.linearVelocity = velocity;
-        body.AddForce(Vector2.up * jumpImpulse, ForceMode2D.Impulse);
+
+        var minImpulse = Mathf.Max(0f, jumpImpulse * (1f - jumpImpulseVariance));
+        var maxImpulse = Mathf.Max(minImpulse, jumpImpulse * (1f + jumpImpulseVariance));
+        var jumpImpulseActual = Random.Range(minImpulse, maxImpulse);
+        body.AddForce(Vector2.up * jumpImpulseActual, ForceMode2D.Impulse);
+
+        if (Random.value < jumpArcChance && jumpArcHorizontalImpulse > 0f)
+        {
+            var arcDir = Random.value < 0.5f ? -1f : 1f;
+            body.AddForce(Vector2.right * arcDir * jumpArcHorizontalImpulse, ForceMode2D.Impulse);
+        }
        nextJumpTime = Time.time + jumpCooldown;
    }

@@ -338,22 +372,78 @@ public class TrickController : MonoBehaviour
            return false;
        }

-        var bounds = collider.bounds;
-        var checkSize = new Vector2(bounds.size.x * 0.9f, groundCheckDistance * 2f);
-        var checkCenter = new Vector2(bounds.center.x, bounds.min.y - groundCheckDistance);
-        var hits = Physics2D.OverlapBoxAll(checkCenter, checkSize, 0f, groundMask);
-        for (var i = 0; i < hits.Length; i++)
+        var filter = new ContactFilter2D();
+        filter.SetLayerMask(groundMask);
+        filter.useTriggers = false;
+
+        var hitCount = collider.Cast(Vector2.down, filter, groundHits, groundCheckDistance);
+        for (var i = 0; i < hitCount; i++)
        {
-            var hit = hits[i];
-            if (hit != null && hit != collider)
+            var hitCollider = groundHits[i].collider;
+            if (hitCollider == null || hitCollider == collider)
            {
-                return true;
+                continue;
            }
+
+            if (hitCollider.GetComponent<TrickController>() != null)
+            {
+                continue;
+            }
+
+            if (hitCollider.GetComponent<PlayerPlatformerController>() != null)
+            {
+                continue;
+            }
+
+            return true;
        }

        return false;
    }

+    private float GetWallAvoidDirection(float desiredX)
+    {
+        if (Mathf.Abs(desiredX) < 0.01f)
+        {
+            return 0f;
+        }
+
+        var collider = GetComponent<Collider2D>();
+        if (collider == null)
+        {
+            return 0f;
+        }
+
+        var filter = new ContactFilter2D();
+        filter.SetLayerMask(groundMask);
+        filter.useTriggers = false;
+
+        var dir = Mathf.Sign(desiredX);
+        var hitCount = collider.Cast(Vector2.right * dir, filter, wallHits, wallCheckDistance);
+        for (var i = 0; i < hitCount; i++)
+        {
+            var hitCollider = wallHits[i].collider;
+            if (hitCollider == null || hitCollider == collider)
+            {
+                continue;
+            }
+
+            if (hitCollider.GetComponent<TrickController>() != null)
+            {
+                continue;
+            }
+
+            if (hitCollider.GetComponent<PlayerPlatformerController>() != null)
+            {
+                continue;
+            }
+
+            return -dir;
+        }
+
+        return 0f;
+    }
+

    public void SetCarried(bool carried)
    {
@@ -25,10 +25,10 @@ public class WinSceneController : MonoBehaviour

        button = root.Q<Button>("Button");

-        button.clicked += () => HandleStartClicked("MainMenu");
+        button.clicked += () => HandleClick("MainMenu");
    }

-    private void HandleStartClicked(string sceneName)
+    private void HandleClick(string sceneName)
    {
        if (!string.IsNullOrWhiteSpace(sceneName))
        {
@@ -1,18 +1,31 @@
 <ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
+    <Style src="project://database/Assets/UI%20Toolkit/progressBar.uss?fileID=7433441132597879392&amp;guid=2c3cb808f8496d4438df1bd06428d6f1&amp;type=3#progressBar"/>
    <ui:VisualElement style="flex-grow: 1; background-color: rgba(0, 0, 0, 0); height: 20%;">
-        <ui:Label text="Score: 0" name="Score" style="font-size: 40px; height: 10%;"/>
+        <ui:Label text="Score: 0" name="Score" style="font-size: 40px; height: auto; background-color: rgb(0, 0, 0); color: rgb(255, 255, 255);"/>
    </ui:VisualElement>
    <ui:VisualElement style="flex-grow: 1; align-self: auto; align-items: flex-start; align-content: auto; height: 80%; flex-direction: row;">
        <ui:VisualElement style="flex-grow: 1; height: 100%; width: 10%; background-size: 100% 100%;">
-            <ui:Image name="Player1Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
+            <ui:VisualElement style="flex-grow: 1;">
+                <ui:Image name="Player1Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
+                <ui:ProgressBar value="23" title="" name="Player1StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
+            </ui:VisualElement>
            <ui:VisualElement style="flex-grow: 1; height: 50%;"/>
-            <ui:Image name="Player2Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
+            <ui:VisualElement style="flex-grow: 1;">
+                <ui:Image name="Player2Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
+                <ui:ProgressBar value="23" title="" name="Player2StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
+            </ui:VisualElement>
        </ui:VisualElement>
        <ui:VisualElement style="flex-grow: 1; width: 80%; height: 100%;"/>
        <ui:VisualElement style="flex-grow: 1; width: 10%; height: 100%;">
-            <ui:Image name="Player3Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
+            <ui:VisualElement name="VisualElement" style="flex-grow: 1;">
+                <ui:Image name="Player3Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
+                <ui:ProgressBar value="23" title="" name="Player3StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
+            </ui:VisualElement>
            <ui:VisualElement style="flex-grow: 1; height: 50%;"/>
-            <ui:Image name="Player4Life" style="background-image: url(&quot;project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=2800000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01&quot;); height: 50%;"/>
+            <ui:VisualElement name="VisualElement" style="flex-grow: 1;">
+                <ui:Image name="Player4Life" source="project://database/Assets/Art/Final%20Sprites/P_Health01.png?fileID=21300000&amp;guid=03a067405c8cfa945a9ed2e8ff6a71dd&amp;type=3#P_Health01" style="background-image: none; height: 85%; -unity-background-image-tint-color: rgb(182, 255, 165);"/>
+                <ui:ProgressBar value="23" title="" name="Player4StressBar" style="background-color: rgb(255, 255, 255); -unity-background-image-tint-color: rgb(255, 255, 255);"/>
+            </ui:VisualElement>
        </ui:VisualElement>
    </ui:VisualElement>
 </ui:UXML>
@@ -1,3 +1,4 @@
 <ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Label text="Loser"/>
+    <ui:Label text="Loser... Gross" style="font-size: 50px;"/>
+    <ui:Button text="Just... *sigh* Whatever" name="Button" style="font-size: 50px;"/>
 </ui:UXML>
@@ -1,9 +1,11 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" editor-extension-mode="False">
-    <ui:Label text="Fun Fun Happy Time Game" name="Title" style="color: rgb(255, 255, 255); font-size: 25px; align-self: center; background-color: rgb(10, 10, 10); -unity-text-align: lower-left; top: auto;"/>
-    <ui:VisualElement style="flex-grow: 1; justify-content: center; align-self: auto; align-content: auto; background-color: rgb(17, 17, 17);">
-        <ui:Button text="Start" name="Start" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
-        <ui:Button text="Experiment" name="Experiment" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
-        <ui:Button text="Level 2" name="Level2" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
+    <ui:VisualElement style="flex-grow: 1; justify-content: center; background-color: rgb(0, 0, 0);">
+        <ui:Label text="Candy Crashout" name="Title" style="color: rgb(255, 255, 255); font-size: 60px; align-self: center; background-color: rgb(10, 10, 10); -unity-text-align: lower-left; top: auto;"/>
+    </ui:VisualElement>
+    <ui:VisualElement style="flex-grow: 1; justify-content: center; align-self: auto; align-content: auto; background-color: rgb(0, 0, 0);">
+        <ui:Button text="Start" name="Start" emoji-fallback-support="true" enabled="false" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
+        <ui:Button text="Experiment" name="Experiment" emoji-fallback-support="true" enabled="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
+        <ui:Button text="Level 2" name="Level2" emoji-fallback-support="true" enabled="false" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
        <ui:Button text="Credits&#10;" name="Credits" emoji-fallback-support="true" style="background-color: rgb(101, 24, 101); color: rgb(255, 255, 255); font-size: 30px; width: 75%; align-self: center;"/>
    </ui:VisualElement>
 </ui:UXML>
@@ -1,4 +1,4 @@
 <ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
-    <ui:Label text="Win"/>
-    <ui:Button text="Dun"/>
+    <ui:Label text="Win" style="font-size: 50px;"/>
+    <ui:Button text="Dun" name="Button" style="font-size: 50px;"/>
 </ui:UXML>
@@ -0,0 +1,14 @@
+:root {
+}
+
+unityprogressbar__progress {
+    background-color: rgb(0, 197, 10);
+}
+
+.unity-progress-bar__progress {
+    background-color: rgb(243, 0, 40);
+}
+
+.unity-progress-bar__background {
+    background-color: rgb(70, 0, 11);
+}
@@ -0,0 +1,12 @@
+fileFormatVersion: 2
+guid: 2c3cb808f8496d4438df1bd06428d6f1
+ScriptedImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 2
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
+  script: {fileID: 12385, guid: 0000000000000000e000000000000000, type: 0}
+  disableValidation: 0
+  unsupportedSelectorAction: 0
@@ -20,6 +20,9 @@ EditorBuildSettings:
  - enabled: 1
    path: Assets/Scenes/Credits.unity
    guid: 08e6b38f452419e4480fc1510dc9a2de
+  - enabled: 1
+    path: Assets/Scenes/Lose.unity
+    guid: d554758d849cd094e9fe7db190ef082e
  m_configObjects:
    com.unity.input.settings.actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3}
  m_UseUCBPForAssetBundles: 0
Author	SHA1	Message	Date
hz	6e43949591	Merge branch 'main' into trick-enhancements	2026-02-01 15:44:48 -06:00
Ramdar	dfd4014286	Merge pull request 'Upload files to "Assets/Art"' (#49 ) from reinholzj-patch-7 into main Reviewed-on: admin/GGJ2026#49 Reviewed-by: Ramdar <[email protected]>	2026-02-01 15:39:04 -06:00
Ramdar	706c128369	Merge pull request 'Upload files to "Assets/Art"' (#47 ) from reinholzj-patch-6 into main Reviewed-on: admin/GGJ2026#47 Reviewed-by: Ramdar <[email protected]>	2026-02-01 15:38:37 -06:00
Ramdar	14c99f1b7d	Merge pull request 'Upload files to "Assets/Art"' (#46 ) from reinholzj-patch-5 into main Reviewed-on: admin/GGJ2026#46 Reviewed-by: Ramdar <[email protected]>	2026-02-01 15:38:12 -06:00
Ramdar	cb335c78ec	Merge pull request 'destory bad things' (#45 ) from destroyTricks into main Reviewed-on: admin/GGJ2026#45 Reviewed-by: Ramdar <[email protected]>	2026-02-01 15:37:46 -06:00
reinholzj	d557e098b8	Merge pull request 'Healing' (#50 ) from Healing into main Reviewed-on: admin/GGJ2026#50 Reviewed-by: reinholzj <[email protected]>	2026-02-01 15:35:37 -06:00
Walter	1a498ce99d	Player Animations	2026-02-01 15:34:36 -06:00
reinholzj	b78957739c	Upload files to "Assets/Art"	2026-02-01 15:28:16 -06:00
hz	b09362917a	Trick ehancements	2026-02-01 14:51:50 -06:00
reinholzj	5c158aed5e	Upload files to "Assets/Art"	2026-02-01 14:36:33 -06:00
Walter	7362c7f57e	Merge remote-tracking branch 'origin/LosersCreditsSFX' into Healing	2026-02-01 14:29:59 -06:00
reinholzj	b57c4f8202	Upload files to "Assets/Art"	2026-02-01 14:27:53 -06:00
Walter	f57c7313c6	added self heal	2026-02-01 14:27:47 -06:00
Josiah	2aca024b1c	destory bad things	2026-02-01 14:19:40 -06:00
reinholzj	86381e4067	Merge pull request 'Losers' (#42 ) from Losers into main Reviewed-on: admin/GGJ2026#42 Reviewed-by: reinholzj <[email protected]>	2026-02-01 13:43:20 -06:00
Walter	659a0ffd23	No More Player Pickup	2026-02-01 13:41:09 -06:00
Walter	64a9edf527	Merge remote-tracking branch 'origin/LosersCreditsSFX' into Losers	2026-02-01 13:25:23 -06:00
Walter	efbad01d46	Merge remote-tracking branch 'origin/Losers' into Losers	2026-02-01 13:23:04 -06:00
Walter	2814b6c7a2	Some Nice UI	2026-02-01 13:21:59 -06:00