diff --git a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
index cd3a416..9886c16 100644
--- a/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
+++ b/FlufflParty/.idea/.idea.FlufflParty/.idea/workspace.xml
@@ -3,11 +3,9 @@
-
-
+
-
@@ -25,6 +23,7 @@
+
@@ -41,22 +40,22 @@
- {
+ "keyToString": {
+ "Discover.Launch.Via.Unity": "true",
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "WebServerToolWindowFactoryState": "false",
+ "vue.rearranger.settings.migration": "true"
},
- "keyToStringList": {
- "rider.external.source.directories": [
- "C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
- "C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
- "C:\\Users\\afist\\AppData\\Local\\Symbols\\src"
+ "keyToStringList": {
+ "rider.external.source.directories": [
+ "C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\DecompilerCache",
+ "C:\\Users\\afist\\AppData\\Roaming\\JetBrains\\Rider2022.3\\resharper-host\\SourcesCache",
+ "C:\\Users\\afist\\AppData\\Local\\Symbols\\src"
]
}
-}]]>
+}
@@ -154,7 +153,8 @@
-
+
+
diff --git a/FlufflParty/Assets/Prefabs/Items/Trap.prefab b/FlufflParty/Assets/Prefabs/Items/Trap.prefab
index c6d7104..e56ee9a 100644
--- a/FlufflParty/Assets/Prefabs/Items/Trap.prefab
+++ b/FlufflParty/Assets/Prefabs/Items/Trap.prefab
@@ -12,6 +12,7 @@ GameObject:
- component: {fileID: 2750814446728092090}
- component: {fileID: 128401396820962672}
- component: {fileID: -9117868828834893705}
+ - component: {fileID: 4223208957881069775}
m_Layer: 0
m_Name: Trap
m_TagString: Untagged
@@ -99,3 +100,16 @@ MonoBehaviour:
sprite: {fileID: 21300000, guid: 00828533b32c7964692b06d8fe99431d, type: 3}
type: 2
cost: 3
+--- !u!114 &4223208957881069775
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1930021224252099749}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e9469e33d7a7b9241a723b431a7e98e5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ target: {fileID: 0}
diff --git a/FlufflParty/Assets/Scripts/Items/Trap.cs b/FlufflParty/Assets/Scripts/Items/Trap.cs
new file mode 100644
index 0000000..a71a1aa
--- /dev/null
+++ b/FlufflParty/Assets/Scripts/Items/Trap.cs
@@ -0,0 +1,9 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Trap : MonoBehaviour
+{
+ public Player target;
+
+}
diff --git a/FlufflParty/Assets/Scripts/Items/Trap.cs.meta b/FlufflParty/Assets/Scripts/Items/Trap.cs.meta
new file mode 100644
index 0000000..87dfec5
--- /dev/null
+++ b/FlufflParty/Assets/Scripts/Items/Trap.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e9469e33d7a7b9241a723b431a7e98e5
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
index 592d0ad..085975b 100644
--- a/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
+++ b/FlufflParty/Assets/Scripts/Players/PlayablePlayer.cs
@@ -363,6 +363,8 @@ public class PlayablePlayer : Player
{
currentField.placedItem = items[index];
GameObject temp = Instantiate(items[index].gameObject);
+ Trap t = temp.GetComponent();
+ t.target = this;
temp.transform.position = currentField.transform.position + (Vector3.up / 2);
activeItem = Item.Type.None;
}
diff --git a/FlufflParty/Assets/Scripts/Players/Player.cs b/FlufflParty/Assets/Scripts/Players/Player.cs
index 8705851..0e1fc70 100644
--- a/FlufflParty/Assets/Scripts/Players/Player.cs
+++ b/FlufflParty/Assets/Scripts/Players/Player.cs
@@ -110,6 +110,8 @@ public abstract class Player : MonoBehaviour
{
currentField.placedItem = items[index];
GameObject temp = Instantiate(items[index].gameObject);
+ Trap t = temp.GetComponent();
+ t.target = this;
temp.transform.position = currentField.transform.position + (Vector3.up / 2);
activeItem = Item.Type.None;
}
diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
index 1eb8cd6..6cf5582 100644
--- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt
+++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt
@@ -19,7 +19,7 @@ MonoBehaviour:
width: 1536
height: 772.8
m_ShowMode: 4
- m_Title: Scene
+ m_Title: Inspector
m_RootView: {fileID: 6}
m_MinSize: {x: 875, y: 300}
m_MaxSize: {x: 10000, y: 10000}
@@ -48,7 +48,7 @@ MonoBehaviour:
m_MinSize: {x: 300, y: 200}
m_MaxSize: {x: 24288, y: 16192}
vertical: 0
- controlID: 117
+ controlID: 19
--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -68,8 +68,8 @@ MonoBehaviour:
y: 0
width: 363.19995
height: 722.8
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 276, y: 71}
+ m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 13}
m_Panes:
- {fileID: 13}
@@ -94,8 +94,8 @@ MonoBehaviour:
y: 0
width: 290.4
height: 427.2
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 201, y: 221}
+ m_MaxSize: {x: 4001, y: 4021}
m_ActualView: {fileID: 14}
m_Panes:
- {fileID: 14}
@@ -223,7 +223,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 16192, y: 16192}
vertical: 1
- controlID: 212
+ controlID: 59
--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -248,7 +248,7 @@ MonoBehaviour:
m_MinSize: {x: 200, y: 100}
m_MaxSize: {x: 16192, y: 8096}
vertical: 0
- controlID: 50
+ controlID: 60
--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
@@ -268,8 +268,8 @@ MonoBehaviour:
y: 0
width: 882.4
height: 427.2
- m_MinSize: {x: 200, y: 200}
- m_MaxSize: {x: 4000, y: 4000}
+ m_MinSize: {x: 202, y: 221}
+ m_MaxSize: {x: 4002, y: 4021}
m_ActualView: {fileID: 15}
m_Panes:
- {fileID: 15}
@@ -330,23 +330,23 @@ MonoBehaviour:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 240}
- m_SelectedIDs: dc9b0000
- m_LastClickedID: 39900
- m_ExpandedIDs: 00000000ce670000d0670000d2670000929b0000989b0000ac9b0000d2c1000000ca9a3b
+ m_SelectedIDs: 746b0000
+ m_LastClickedID: 27508
+ m_ExpandedIDs: 00000000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name: Items
- m_OriginalName: Items
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: 39900
+ m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 0
+ m_OriginalEventType: 11
m_IsRenamingFilename: 1
m_ClientGUIView: {fileID: 5}
m_SearchString:
@@ -360,7 +360,7 @@ MonoBehaviour:
scrollPos: {x: 0, y: 0}
m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 00000000ce670000d0670000d2670000
+ m_ExpandedIDs: 00000000e46a0000e66a0000e86a0000ea6a0000ec6a0000ee6a0000f06a0000
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -387,7 +387,7 @@ MonoBehaviour:
m_ListAreaState:
m_SelectedInstanceIDs:
m_LastClickedInstanceID: 0
- m_HadKeyboardFocusLastEvent: 1
+ m_HadKeyboardFocusLastEvent: 0
m_ExpandedInstanceIDs: c6230000f8650000
m_RenameOverlay:
m_UserAcceptedRename: 0
@@ -451,7 +451,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_LastInspectedObjectInstanceID: -1
- m_LastVerticalScrollValue: 388.00012
+ m_LastVerticalScrollValue: 0
m_GlobalObjectId:
m_InspectorMode: 0
m_LockTracker:
@@ -487,24 +487,24 @@ MonoBehaviour:
m_SaveData: []
m_SceneHierarchy:
m_TreeViewState:
- scrollPos: {x: 0, y: 14.799988}
- m_SelectedIDs: cab5ffff
- m_LastClickedID: -18998
- m_ExpandedIDs: 3cb6ffffe0d0ffffded9ffff04fbffff729c0000ec9c0000e2c20000fac2000002c300007ec30000d4c400007ec5000032c600004cc60000c4c600007cc70000b0c700007ac80000
+ scrollPos: {x: 0, y: 0}
+ m_SelectedIDs:
+ m_LastClickedID: 0
+ m_ExpandedIDs: 04fbffff
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name: Dice
- m_OriginalName: Dice
+ m_Name:
+ m_OriginalName:
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: 51068
+ m_UserData: 0
m_IsWaitingForDelay: 0
m_IsRenaming: 0
- m_OriginalEventType: 0
+ m_OriginalEventType: 11
m_IsRenamingFilename: 0
m_ClientGUIView: {fileID: 4}
m_SearchString: