added crosshair, worked on controls, fixed locals

2024-06-22 18:16:11 +02:00
parent 4d2c52ded5
commit 7b9683bb49
15 changed files with 984 additions and 454 deletions
--- a/Assets/IMG/Materials/Crosshair.mat
+++ b/Assets/IMG/Materials/Crosshair.mat
@@ -0,0 +1,83 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Crosshair
+  m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+  m_BuildTextureStacks: []
--- a/Assets/IMG/Materials/Crosshair.mat.meta
+++ b/Assets/IMG/Materials/Crosshair.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b54ad27a69e6176a09065f7f8bcffc67
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Locals/StringTable/MyTexts
+++ b/Assets/Locals/StringTable/MyTexts
@@ -1312,6 +1312,10 @@ MonoBehaviour:
    m_Key: escapeFail
    m_Metadata:
      m_Items: []
+  - m_Id: 128242867786776576
+    m_Key: normal
+    m_Metadata:
+      m_Items: []
  m_Metadata:
    m_Items: []
  m_KeyGenerator:
--- a/Assets/Locals/StringTable/MyTexts_de.asset
+++ b/Assets/Locals/StringTable/MyTexts_de.asset
@@ -1321,6 +1321,10 @@ MonoBehaviour:
    m_Localized: Deine Flucht ist gescheitert!
    m_Metadata:
      m_Items: []
+  - m_Id: 128242867786776576
+    m_Localized: ' '
+    m_Metadata:
+      m_Items: []
  references:
    version: 2
    RefIds: []
--- a/Assets/Locals/StringTable/MyTexts_en.asset
+++ b/Assets/Locals/StringTable/MyTexts_en.asset
@@ -1364,6 +1364,10 @@ MonoBehaviour:
    m_Localized: You were unable to escape!
    m_Metadata:
      m_Items: []
+  - m_Id: 128242867786776576
+    m_Localized: ' '
+    m_Metadata:
+      m_Items: []
  references:
    version: 2
    RefIds: []
--- a/Assets/Scenes/GameScene.unity
+++ b/Assets/Scenes/GameScene.unity
@@ -2861,7 +2861,7 @@ MonoBehaviour:
    m_TableReference:
      m_TableCollectionName: GUID:493a625c00a76ca27985d7f7e8d2cb79
    m_TableEntryReference:
-      m_KeyId: 0
+      m_KeyId: 13166285942803
      m_Key: 
    m_FallbackState: 0
    m_WaitForCompletion: 0
@@ -5418,6 +5418,43 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 302144438}
  m_CullTransparentMesh: 1
+--- !u!1 &309920028
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 309920029}
+  m_Layer: 2
+  m_Name: crosshair
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &309920029
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 309920028}
+  m_LocalRotation: {x: -0.70710665, y: 4.6566107e-10, z: -3.6437336e-11, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 30}
+  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 927922403}
+  - {fileID: 1438812380}
+  m_Father: {fileID: 1083922200}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1001 &315955575
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -9527,6 +9564,7 @@ GameObject:
  serializedVersion: 6
  m_Component:
  - component: {fileID: 487360473}
+  - component: {fileID: 487360474}
  m_Layer: 0
  m_Name: targetLooking
  m_TagString: Untagged
@@ -9534,21 +9572,33 @@ GameObject:
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
  m_IsActive: 1
--- !u!4 &487360473
-Transform:
+--- !u!224 &487360473
+RectTransform:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 487360472}
-  serializedVersion: 2
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.2, z: 2}
+  m_LocalPosition: {x: 0, y: 0, z: 2}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 923848396}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 1.2}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &487360474
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 487360472}
+  m_CullTransparentMesh: 1
 --- !u!1 &496796917
 GameObject:
  m_ObjectHideFlags: 0
@@ -18493,6 +18543,116 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 926355124}
  m_CullTransparentMesh: 1
+--- !u!1 &927922402
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 927922403}
+  - component: {fileID: 927922406}
+  - component: {fileID: 927922405}
+  - component: {fileID: 927922404}
+  m_Layer: 2
+  m_Name: pnlVertical
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &927922403
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 927922402}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.001, y: 1, z: 0.01}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 309920029}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!64 &927922404
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 927922402}
+  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: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &927922405
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 927922402}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: b54ad27a69e6176a09065f7f8bcffc67, 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 &927922406
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 927922402}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1 &934724952
 GameObject:
  m_ObjectHideFlags: 0
@@ -21082,7 +21242,8 @@ Transform:
  m_LocalPosition: {x: 0, y: 0.007000003, z: 0.002999995}
  m_LocalScale: {x: 0.0025000004, y: 0.0024999988, z: 0.0024999992}
  m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 309920029}
  m_Father: {fileID: 5217556178789079230}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 3.1250005}
 --- !u!114 &1083922201
@@ -21097,8 +21258,6 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: ccf47fd0e7044a6f08a0f3353ee62cf5, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
-  mouseSpeed: 100
-  controllerSpeed: 0.01
 --- !u!82 &1083922202
 AudioSource:
  m_ObjectHideFlags: 0
@@ -26200,6 +26359,8 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 5becc189f2c76a14490d22e7435bbf40, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  mouseSpeed: 10
+  controllerSpeed: 1
 --- !u!114 &1368298272
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -27479,6 +27640,116 @@ MonoBehaviour:
  references:
    version: 2
    RefIds: []
+--- !u!1 &1438812379
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1438812380}
+  - component: {fileID: 1438812383}
+  - component: {fileID: 1438812382}
+  - component: {fileID: 1438812381}
+  m_Layer: 2
+  m_Name: pnlHorizontal
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1438812380
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438812379}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.01, y: 1, z: 0.001}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 309920029}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!64 &1438812381
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438812379}
+  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: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1438812382
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438812379}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: b54ad27a69e6176a09065f7f8bcffc67, 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 &1438812383
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1438812379}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!1001 &1441909029
 PrefabInstance:
  m_ObjectHideFlags: 0
@@ -34442,7 +34713,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Weight: 1
  m_Effectors:
-  - m_Transform: {fileID: 487360473}
+  - m_Transform: {fileID: 0}
    m_Style:
      shape: {fileID: 4300000, guid: e050c2b16fe384bd994474655a4b4968, type: 2}
      color: {r: 1, g: 0, b: 0, a: 0.5}
@@ -34450,6 +34721,14 @@ MonoBehaviour:
      position: {x: 0, y: 0, z: 0}
      rotation: {x: 0, y: 0, z: 0}
    m_Visible: 1
+  - m_Transform: {fileID: 487360473}
+    m_Style:
+      shape: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+      color: {r: 1, g: 0, b: 0, a: 1}
+      size: 0.1
+      position: {x: 0, y: 0, z: 0}
+      rotation: {x: 0, y: 0, z: 0}
+    m_Visible: 1
 --- !u!4 &1823440144
 Transform:
  m_ObjectHideFlags: 0
--- a/Assets/Scripts/Controls.cs
+++ b/Assets/Scripts/Controls.cs
@@ -20,6 +20,9 @@ public class Controls : MonoBehaviour
    PlayerInput playerInput;
    MoveDirection direction;

+    public float mouseSpeed = 10f; //the sensibility
+    public float controllerSpeed = 1f; //the sensibility
+

    void Start()
    {
@@ -51,7 +54,14 @@ public class Controls : MonoBehaviour
            {
                if (uihandler.canPlayerRotate())
                {
-                    playerCam.GetComponent<PlayerCamera>().lookAround(view, playerInput.currentControlScheme == "Controller");
+                    if(playerInput.currentControlScheme == "Controller"){
+                        playerCam.GetComponent<PlayerCamera>().lookAround(view, controllerSpeed);
+                        player.GetComponent<PlayerGameObject>().rotate(view, controllerSpeed);
+                    }
+                    else{
+                        playerCam.GetComponent<PlayerCamera>().lookAround(view, mouseSpeed);
+                        player.GetComponent<PlayerGameObject>().rotate(view, mouseSpeed);
+                    }
                }
                if (uihandler.canPlayerMove())
                {
--- a/Assets/Scripts/Handler/ButtonHandler.cs
+++ b/Assets/Scripts/Handler/ButtonHandler.cs
@@ -85,8 +85,8 @@ namespace Assets.Scripts
            saveText = saveText + uihandler.saveVideoSettings() + "\r\n";
            saveText = saveText + uihandler.saveLanguage() + "\r\n";
            saveText = saveText + audioHandler.saveAudioSettings() + "\r\n";
-            GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
-            GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
+            GameObject.Find("Controls").GetComponent<Controls>().mouseSpeed = GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value;
+            GameObject.Find("Controls").GetComponent<Controls>().controllerSpeed = GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
            saveText = saveText + "SensitivityMouse:"+GameObject.Find("slideSensitivityMouse").GetComponent<Slider>().value + "\r\n";
            saveText = saveText + "SensitivityController:"+GameObject.Find("slideSensitivityController").GetComponent<Slider>().value;
            FileHandler.saveOptions(saveText);
--- a/Assets/Scripts/Handler/FileHandler.cs
+++ b/Assets/Scripts/Handler/FileHandler.cs
@@ -104,12 +104,12 @@ namespace Assets.Scripts
                    break;
                    case "SensitivityMouse":
                        if(isIngame){
-                            GameObject.Find("Main Camera").GetComponent<PlayerCamera>().mouseSpeed = float.Parse(line.Split(':')[1]);
+                            GameObject.Find("Controls").GetComponent<Controls>().mouseSpeed = float.Parse(line.Split(':')[1]);
                        }
                    break;
                    case "SensitivityController":
                        if(isIngame){
-                            GameObject.Find("Main Camera").GetComponent<PlayerCamera>().controllerSpeed = float.Parse(line.Split(':')[1]);
+                            GameObject.Find("Controls").GetComponent<Controls>().controllerSpeed = float.Parse(line.Split(':')[1]);
                        }
                    break;
                }
--- a/Assets/Scripts/Player/PlayerCamera.cs
+++ b/Assets/Scripts/Player/PlayerCamera.cs
@@ -10,8 +10,6 @@ namespace Assets.Scripts.Player
    {
        UIHandler uihandler;
        GameObject interact;
-        public float mouseSpeed = 10f; //the sensibility
-        public float controllerSpeed = 1f; //the sensibility

        // Start is called before the first frame update
        void Start()
@@ -45,24 +43,10 @@ namespace Assets.Scripts.Player
            return null;
        }

-        public void lookAround(Vector2 view, bool isController)
+        public void lookAround(Vector2 view, float speed)
        {
            GameObject target = GameObject.Find("targetLooking");
-            if (isController)
-            {
-                target.transform.localPosition = target.transform.localPosition + new Vector3(view.x,view.y,0) * controllerSpeed * Time.deltaTime;
-            }
-            else
-            {
-                target.transform.localPosition = target.transform.localPosition + new Vector3(view.x,view.y,0) * mouseSpeed * Time.deltaTime;
-            }
-
-            if(target.transform.localPosition.x >= 3){
-                target.transform.localPosition = new Vector3(3f,target.transform.localPosition.y,target.transform.localPosition.z);
-            }
-            if(target.transform.localPosition.x <= -3){
-                target.transform.localPosition = new Vector3(-3f,target.transform.localPosition.y,target.transform.localPosition.z);
-            }
+            target.transform.localPosition = target.transform.localPosition + new Vector3(0,view.y,0) * speed * Time.deltaTime;
            if(target.transform.localPosition.y >= 2){
                target.transform.localPosition = new Vector3(target.transform.localPosition.x,2f,target.transform.localPosition.z);
            }
@@ -80,7 +64,7 @@ namespace Assets.Scripts.Player
                if (hit.collider.gameObject.tag.ToLower().Contains("object"))
                {
                    string obj = hit.collider.gameObject.tag.Split(':')[1];
-                    if (hit.distance <= 3 && !obj.ToLower().Equals("house"))
+                    if (hit.distance <= 10 && !obj.ToLower().Equals("house"))
                    {
                        if (!uihandler.isPlayerInFight())
                        {
--- a/Assets/Scripts/Player/PlayerGameObject.cs
+++ b/Assets/Scripts/Player/PlayerGameObject.cs
@@ -10,6 +10,8 @@ using Assets.Scripts.Races;
 using Newtonsoft.Json.Linq;
 using UnityEngine.InputSystem;
 using Assets.Scripts.InteractableObjects;
+using UnityEngine.UIElements;
+using UnityEngine.Animations;

 namespace Assets.Scripts.Player
 {
@@ -185,6 +187,10 @@ namespace Assets.Scripts.Player
            GameObject.Find("QuestLog").GetComponent<QuestLog>().updateQuests("explore", gameObject, 1);
        }

+        public void rotate(Vector2 input, float speed){
+            transform.Rotate(Vector3.up, input.x * speed * 10 * Time.deltaTime);
+        }
+
        public void getRotation()
        {
            GameObject needle = GameObject.Find("imgNeedle");