bugfixing after playtest; v1.4.0

Assets/Prefabs/House.prefab

@@ -11,7 +11,12 @@ GameObject:
   - component: {fileID: 2475709711252233216}
   - component: {fileID: 1944602544116445065}
   - component: {fileID: 7520107037247386643}
-  - component: {fileID: 4626187484870903098}
+  - component: {fileID: 954893319406625109}
+  - component: {fileID: 1767011682744252576}
+  - component: {fileID: 5010910893148806149}
+  - component: {fileID: 793041006294504099}
+  - component: {fileID: 3900849479010375039}
+  - component: {fileID: 1007100526981742462}
   m_Layer: 0
   m_Name: House
   m_TagString: Object:House
@@ -86,8 +91,8 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
---- !u!64 &4626187484870903098
+--- !u!65 &954893319406625109
-MeshCollider:
+BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -96,10 +101,74 @@ MeshCollider:
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 4
+  serializedVersion: 2
-  m_Convex: 0
+  m_Size: {x: 0.02, y: 0.12, z: 0.020000005}
-  m_CookingOptions: 30
+  m_Center: {x: 0, y: 0.05, z: 0}
-  m_Mesh: {fileID: 4887216478360415443, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3}
+--- !u!65 &1767011682744252576
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662282263901986782}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.12, y: 0.02, z: 0.020000005}
+  m_Center: {x: -0.05, y: 0.1, z: 0}
+--- !u!65 &5010910893148806149
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662282263901986782}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.02, y: 0.12, z: 0.020000005}
+  m_Center: {x: -0.1, y: 0.05, z: 0}
+--- !u!65 &793041006294504099
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662282263901986782}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.05, y: 0.02, z: 0.020000005}
+  m_Center: {x: -0.015, y: 0, z: 0}
+--- !u!65 &3900849479010375039
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662282263901986782}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.05, y: 0.02, z: 0.020000005}
+  m_Center: {x: -0.085, y: 0, z: 0}
+--- !u!65 &1007100526981742462
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7662282263901986782}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.05, y: 0.02, z: 0.01}
+  m_Center: {x: -0.05, y: 0, z: 0.005}
 --- !u!1 &7955543730560905336
 GameObject:
   m_ObjectHideFlags: 0
@@ -125,7 +194,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7955543730560905336}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -14.550851, y: 0.000005722046, z: 43.306564}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -191,6 +260,7 @@ GameObject:
   - component: {fileID: 7446729486537163711}
   - component: {fileID: 6658625636071885056}
   - component: {fileID: 115121537636242588}
+  - component: {fileID: 1282026774396919808}
   m_Layer: 0
   m_Name: Door
   m_TagString: Object:Door
@@ -274,7 +344,7 @@ MeshCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 4
-  m_Convex: 0
+  m_Convex: 1
   m_CookingOptions: 30
   m_Mesh: {fileID: 2619086233303812490, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3}
 --- !u!114 &6658625636071885056
@@ -289,6 +359,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 14e8c3bbd04c0574da570d1bc8d00649, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  hasInteracted: 0
 --- !u!95 &115121537636242588
 Animator:
   serializedVersion: 5
@@ -310,6 +381,19 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
+--- !u!65 &1282026774396919808
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8263785157974351812}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.02, y: 0.04170223, z: 0.020000005}
+  m_Center: {x: 0, y: -0.010851122, z: 1.2354351e-17}
 --- !u!1001 &8303087274738875168
 PrefabInstance:
   m_ObjectHideFlags: 0

Assets/Scenes/MenuScene.unity

@@ -8091,8 +8091,8 @@ RectTransform:
   m_Father: {fileID: 1481292146}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.25, y: 0}
+  m_AnchorMin: {x: 0.55, y: 0}
-  m_AnchorMax: {x: 0.45, y: 0.1}
+  m_AnchorMax: {x: 0.75, y: 0.1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
@@ -14540,8 +14540,8 @@ RectTransform:
   m_Father: {fileID: 1481292146}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.55, y: 0}
+  m_AnchorMin: {x: 0.25, y: 0}
-  m_AnchorMax: {x: 0.75, y: 0.1}
+  m_AnchorMax: {x: 0.45, y: 0.1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

Assets/Scripts/Controls.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.EventSystems;
+using UnityEngine.UI;
 
 public class Controls : MonoBehaviour
 {
@@ -136,4 +137,6 @@ public class Controls : MonoBehaviour
             fight.GetComponent<Fight>().playerAction(6);
         }
     }
+
+    
 }

Assets/Scripts/Door.cs

@@ -34,6 +34,7 @@ namespace Assets.Scripts
                 int openChance = new System.Random().Next(4);
                 if(openChance == 0){
                     gameObject.GetComponent<Animator>().Play("DoorOpen");
+                    Destroy(gameObject.GetComponent<BoxCollider>());
                     isOpen = true;
                 }
                 else{
@@ -58,6 +59,7 @@ namespace Assets.Scripts
             transform.parent.Find("chest").Find("Body").GetComponent<Chest>().loadChest(bool.Parse(json["gotItem"].ToString()));
             if(isOpen){
                 gameObject.GetComponent<Animator>().Play("DoorOpen");
+                Destroy(gameObject.GetComponent<BoxCollider>());
             }
         }
     }

Assets/Scripts/Handler/UIHandler.cs

@@ -23,7 +23,6 @@ namespace Assets.Scripts
         public GameObject introduction;
         public GameObject tooltip;
         public GameObject tutorial;
-        public GameObject buttonsHUD;
         public GameObject inventory;
         public GameObject waterLayer;
 
@@ -107,7 +106,7 @@ namespace Assets.Scripts
             introduction.transform.localScale = new Vector3(0, 0, 0);
             tutorial.transform.localScale = new Vector3(1, 1, 1);
             showHUD();
-            state = UIState.GAME;
+            state = UIState.TUTORIAL;
         }
 
         public void switchCharactersheet()
@@ -171,6 +170,7 @@ namespace Assets.Scripts
 
         public void closeInventory()
         {
+            inventory.GetComponent<Inventory>().OnMouseUp();
             inventory.transform.localScale = new Vector3(0, 0, 0);
             showHUD();
             state = UIState.GAME;
@@ -194,7 +194,6 @@ namespace Assets.Scripts
         {
             playerHUD.transform.localScale = new Vector3(1,1,1);
             compass.transform.localScale = new Vector3(1, 1, 1);
-            buttonsHUD.transform.localScale = new Vector3(1, 1, 1);
         }
 
         public void openMainMenu()
@@ -204,7 +203,7 @@ namespace Assets.Scripts
 
         public void switchPauseMenu()
         {
-            if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST)
+            if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST || state == UIState.INVENTORY || state == UIState.INTRODUCTION)
             {
                 if (state == UIState.PAUSE)
                 {
@@ -533,7 +532,7 @@ namespace Assets.Scripts
                 GameObject.Find("Player").GetComponent<Player>().generatePlayer();
                 GameObject.Find("Player").GetComponent<Player>().finishPlayerCreation();
                 hideOtherElements(introduction);
-                state = UIState.TUTORIAL;
+                state = UIState.INTRODUCTION;
             }
             else
             {
@@ -550,6 +549,7 @@ namespace Assets.Scripts
         public void closeTutorial()
         {
             tutorial.transform.localScale = new Vector3(0,0,0);
+            state = UIState.GAME;
         }
     }
 }

Assets/Scripts/Inventory.cs

@@ -382,5 +382,12 @@ namespace Assets.Scripts
                 }
             }
         }
+        public void OnMouseUp(){
+            if(dragImage.GetComponent<RawImage>().texture != null){
+                dragImage.GetComponent<RawImage>().color = new Color(0,0,0,0);
+                dragImage.GetComponent<RawImage>().texture = null;
+                dragImage.transform.position = new Vector3(0,0,0);
+            }
+        }
     }
 }

Assets/Scripts/InventorySlot.cs

@@ -110,7 +110,7 @@ namespace Assets.Scripts
             {
                 inventory.dragImage.GetComponent<RawImage>().color = toMove.rarityColor;
                 inventory.dragImage.GetComponent<RawImage>().texture = toMove.image;
-                inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x - 50, Input.mousePosition.y - 50, 0);
+                inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x + 50, Input.mousePosition.y - 50, 0);
             }
         }
 

Assets/Scripts/PlayerCamera.cs

@@ -11,8 +11,8 @@ namespace Assets.Scripts
         GameObject player;
         Vector2 rotation = Vector2.zero;
 	    public float speed = 1; //the sensibility
-        public float xMaxLimit = 25.0f;
+        public float xMaxLimit = 5.0f;
-        public float xMinLimit = -25.0f;
+        public float xMinLimit = -5.0f;
         GameObject interact;
 
         // Start is called before the first frame update
@@ -26,13 +26,17 @@ namespace Assets.Scripts
 
         // Update is called once per frame
         void Update()
-        {   
+        {
             if(uihandler.canPlayerRotate()){
+                Cursor.lockState = CursorLockMode.Locked;
                 rotation.y += Input.GetAxis("Mouse X");
                 rotation.x += -Input.GetAxis("Mouse Y");
                 rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit);
                 transform.eulerAngles = (Vector2)rotation * speed;
             }
+            else{
+                Cursor.lockState = CursorLockMode.Confined;
+            }
             transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z);
         }
 

Assets/Scripts/UIState.cs

@@ -17,6 +17,7 @@ namespace Assets.Scripts
         PAUSEOPTIONS,
         TUTORIAL,
         QUEST,
-        INVENTORY
+        INVENTORY,
+        INTRODUCTION
     }
 }

UserSettings/Layouts/default-2021.dwlt

@@ -19,7 +19,7 @@ MonoBehaviour:
     width: 1920
     height: 989
   m_ShowMode: 4
-  m_Title: Inspector
+  m_Title: Project
   m_RootView: {fileID: 2}
   m_MinSize: {x: 875, y: 371}
   m_MaxSize: {x: 10000, y: 10000}
@@ -119,7 +119,7 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 172
+  controlID: 37
 --- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -144,7 +144,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 1
-  controlID: 177
+  controlID: 38
 --- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -169,7 +169,7 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 100}
   m_MaxSize: {x: 16192, y: 8096}
   vertical: 0
-  controlID: 178
+  controlID: 22
 --- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
@@ -189,8 +189,8 @@ MonoBehaviour:
     y: 0
     width: 306
     height: 659
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 13}
   m_Panes:
   - {fileID: 13}
@@ -215,8 +215,8 @@ MonoBehaviour:
     y: 0
     width: 1224
     height: 659
-  m_MinSize: {x: 200, y: 200}
+  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4002, y: 4021}
   m_ActualView: {fileID: 14}
   m_Panes:
   - {fileID: 14}
@@ -270,8 +270,8 @@ MonoBehaviour:
     y: 0
     width: 390
     height: 939
-  m_MinSize: {x: 275, y: 50}
+  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4000, y: 4000}
+  m_MaxSize: {x: 4001, y: 4021}
   m_ActualView: {fileID: 18}
   m_Panes:
   - {fileID: 18}
@@ -402,9 +402,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
+      m_SelectedIDs: c8590000
       m_LastClickedID: 0
-      m_ExpandedIDs: d23ff9ff2240f9ffbc42f9ffca42f9ff8244f9ffd244f9ff7247f9ff8047f9ffea4df9ff384ef9ffd250f9ffe050f9ff3e66f9ff3695f9ff8695f9ff2698f9ff3498f9fff2b6f9ff42b7f9ffdcb9f9ffeab9f9ffc6dcf9ff18ddf9fffedff9ff0ce0f9ff34f0f9ff84f0f9ff66f3f9ff74f3f9ff52f5f9ffa2f5f9ff84f8f9ff92f8f9ff7cfaf9ffcafaf9ffacfdf9ffbafdf9ffb401faff0402faffe604fafff404faff722efaff742efaff7c2efaff802efaffb02efaff7431fafff231faff4c34faffca36faffd639faff7a3bfaffce3ffaffc280faffc481faff1482fafff684faff0885faffe286faff3287faff228afaff388afaffaca1fdffd2d1fdfffa6cffffe08cffff188dffff8ec1ffffd2c1ffffacc2fffff2c2ffffaac9ffff24caffffdad0fffff8edffff56f0ffff8ef0ffff46f4ffff38fbffff9a8e0000ea8e00005c8f000088910000c0db000086dd00001c0e01007a140100067c0100524b0600844b0600424c0600e64c06007a4d0600064e06000e4e0600ac4e0600144f06002c4f0600cc4f0600d04f0600a250060050df0600caff0600240107003c010700b60a0700560e0700a6180700001a07006eaf0800f2af08002cb10800d24709005648090012bd0900dac20900dec50900e0240a000e4c0a00924c0a006cc20a00f4c50a009cca0a00
+      m_ExpandedIDs: 38fbffff
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -738,7 +738,7 @@ MonoBehaviour:
   m_Rotation:
     m_Target: {x: 0.13015747, y: 0.006062416, z: -0.00087758794, w: 0.99141186}
     speed: 2
-    m_Value: {x: 0.13016555, y: 0.006062792, z: -0.0008776424, w: 0.9914734}
+    m_Value: {x: -0.13015747, y: -0.006062416, z: 0.0008775879, w: -0.99141186}
   m_Size:
     m_Target: 1047.0226
     speed: 2
@@ -908,22 +908,22 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SearchArea: 1
     m_Folders:
-    - Assets
+    - Assets/Scripts
     m_Globs: []
     m_OriginalText: 
   m_ViewMode: 1
   m_StartGridSize: 64
   m_LastFolders:
-  - Assets/TextMesh Pro
+  - Assets/Scripts
   m_LastFoldersGridSize: -1
   m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel
   m_LockTracker:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 5}
-    m_SelectedIDs: 725a0000
+    m_SelectedIDs: c8590000
-    m_LastClickedID: 23154
+    m_LastClickedID: 22984
-    m_ExpandedIDs: 00000000725a000000ca9a3b
+    m_ExpandedIDs: 000000005a59000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -951,7 +951,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000725a000000ca9a3b
+    m_ExpandedIDs: 000000005a590000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -976,9 +976,9 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
+    m_SelectedInstanceIDs: c8590000
-    m_LastClickedInstanceID: 0
+    m_LastClickedInstanceID: 22984
-    m_HadKeyboardFocusLastEvent: 0
+    m_HadKeyboardFocusLastEvent: 1
     m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f010000000000
     m_RenameOverlay:
       m_UserAcceptedRename: 0

settings.txt

@@ -2,4 +2,4 @@ Resolution:2
 Mode:2
 Music:0.05210853
 Effects:0.4071819
-Sensitivity:1
+Sensitivity:10