From c8e298f038503d9af3ef0ac147de52b5bb7dabb0 Mon Sep 17 00:00:00 2001
From: Melbyj1125 <60886701+Melbyj1125@users.noreply.github.com>
Date: Fri, 8 Oct 2021 13:59:04 -0500
Subject: [PATCH] Updated Item scripts and objects Scripts and objects should
 actually be committed now Use Items script to make objects

---
 Assets/Scripts/PlayerScripts/ItemScripts.meta |  8 +++
 .../ItemScripts/InventoryManager.cs           |  8 +++
 .../ItemScripts/InventoryManager.cs.meta      | 11 ++++
 .../Scripts/PlayerScripts/ItemScripts/Item.cs | 51 +++++++++++++++++++
 .../PlayerScripts/ItemScripts/Item.cs.meta    | 11 ++++
 .../ItemScripts/ItemObjects.meta              |  8 +++
 .../ItemObjects/QuickStandup.asset            | 27 ++++++++++
 .../ItemObjects/QuickStandup.asset.meta       |  8 +++
 .../ItemObjects/RollerSkates.asset            | 27 ++++++++++
 .../ItemObjects/RollerSkates.asset.meta       |  8 +++
 .../ItemScripts/ItemObjects/Springs.asset     | 27 ++++++++++
 .../ItemObjects/Springs.asset.meta            |  8 +++
 .../ItemObjects/StrongerKick.asset            | 27 ++++++++++
 .../ItemObjects/StrongerKick.asset.meta       |  8 +++
 .../ItemScripts/ItemObjects/TripleJump.asset  | 27 ++++++++++
 .../ItemObjects/TripleJump.asset.meta         |  8 +++
 .../PlayerScripts/ItemScripts/SpecialItem.cs  |  7 +++
 .../ItemScripts/SpecialItem.cs.meta           | 11 ++++
 18 files changed, 290 insertions(+)
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/Item.cs
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset.meta
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs
 create mode 100644 Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta

diff --git a/Assets/Scripts/PlayerScripts/ItemScripts.meta b/Assets/Scripts/PlayerScripts/ItemScripts.meta
new file mode 100644
index 0000000..92741f4
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7c3b0fb28afc8e04c8324830d2bbcc2f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs b/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs
new file mode 100644
index 0000000..737815d
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs
@@ -0,0 +1,8 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InventoryManager : MonoBehaviour
+{
+  
+}
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs.meta b/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs.meta
new file mode 100644
index 0000000..d9b5a76
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 66519fc5420181e45850c591aa1179ec
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs b/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs
new file mode 100644
index 0000000..5c6d405
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs
@@ -0,0 +1,51 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[CreateAssetMenu]
+public class Item: ScriptableObject {
+    public int id;
+    public string itemName;
+    public string description;
+    [Space]
+    public float maxVelM;
+    public float minVelM;
+    public float curVelM;
+    public float accM;
+    public float jumpPowM;
+    public int jumpNumM;
+    public float tractionM;
+    public float kickPowM;
+    public float recovTimeM;
+    public float playerGravM;
+
+    public void Equip(PlayerStats p){
+        if(maxVelM != 0){
+            p.MaxVel += maxVelM;
+        }
+        if(minVelM != 0){
+            p.MinVel += minVelM;
+        }
+        if(curVelM != 0){
+            p.CurVel += curVelM;
+        }
+        if(accM != 0){
+             p.Acc += accM;
+        }
+        if(jumpPowM != 0){
+             p.JumpPow += jumpPowM;
+        }
+        if(jumpNumM != 0){
+            p.JumpNum += jumpNumM;
+        }
+        if(tractionM != 0){
+            p.Traction += tractionM;
+        }
+        if(kickPowM != 0){
+            p.KickPow += kickPowM;
+        }
+        if(playerGravM != 0){
+            p.PlayerGrav += playerGravM;
+        }
+    }
+}
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta b/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta
new file mode 100644
index 0000000..53715aa
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/Item.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d76cac0a7f5ea2a4cadbec8ef3315ec1
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects.meta b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects.meta
new file mode 100644
index 0000000..128779d
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e292b284ab595e24684a1ed7e69c6a2d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset
new file mode 100644
index 0000000..b47bdc5
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
+  m_Name: QuickStandup
+  m_EditorClassIdentifier: 
+  id: 4
+  itemName: QuickStandup
+  description: Player gets up faster
+  maxVelM: 0
+  minVelM: 0
+  curVelM: 0
+  accM: 0
+  jumpPowM: 0
+  jumpNumM: 0
+  tractionM: 0
+  kickPowM: 0
+  recovTimeM: 20
+  playerGravM: 0
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset.meta b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset.meta
new file mode 100644
index 0000000..51f226b
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/QuickStandup.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a4f559eb10aa9b243a2a08c544802857
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset
new file mode 100644
index 0000000..e5907a1
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
+  m_Name: RollerSkates
+  m_EditorClassIdentifier: 
+  id: 1
+  itemName: RollerSkates
+  description: More Slidey But Faster
+  maxVelM: 15
+  minVelM: 0
+  curVelM: 0
+  accM: 0.3
+  jumpPowM: 0
+  jumpNumM: 0
+  tractionM: -2.2
+  kickPowM: 0
+  recovTimeM: 0
+  playerGravM: 0
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset.meta b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset.meta
new file mode 100644
index 0000000..9e25aec
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/RollerSkates.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c6fce7543828d16448383a9e0c1d651d
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset
new file mode 100644
index 0000000..c9059bf
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
+  m_Name: Springs
+  m_EditorClassIdentifier: 
+  id: 2
+  itemName: Springs
+  description: Jump Higher
+  maxVelM: 0
+  minVelM: 0
+  curVelM: 0
+  accM: 0
+  jumpPowM: 100
+  jumpNumM: 0
+  tractionM: 0
+  kickPowM: 0
+  recovTimeM: 0
+  playerGravM: 0
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset.meta b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset.meta
new file mode 100644
index 0000000..07a259e
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/Springs.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ca4d5584eacf416478beba5cd283bfa3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset
new file mode 100644
index 0000000..43d6d41
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
+  m_Name: StrongerKick
+  m_EditorClassIdentifier: 
+  id: 0
+  itemName: 
+  description: 
+  maxVelM: 0
+  minVelM: 0
+  curVelM: 0
+  accM: 0
+  jumpPowM: 0
+  jumpNumM: 0
+  tractionM: 0
+  kickPowM: 30
+  recovTimeM: 0
+  playerGravM: 0
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset.meta b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset.meta
new file mode 100644
index 0000000..d020b59
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/StrongerKick.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a96dfb1a70e0d0a4f84c15378f38ce99
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset
new file mode 100644
index 0000000..13f6333
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset
@@ -0,0 +1,27 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d76cac0a7f5ea2a4cadbec8ef3315ec1, type: 3}
+  m_Name: TripleJump
+  m_EditorClassIdentifier: 
+  id: 3
+  itemName: TripleJump
+  description: Player gets an extra jump but has less jump height
+  maxVelM: 0
+  minVelM: 0
+  curVelM: 0
+  accM: 0
+  jumpPowM: -50
+  jumpNumM: 1
+  tractionM: 0
+  kickPowM: 0
+  recovTimeM: 0
+  playerGravM: 0
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset.meta b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset.meta
new file mode 100644
index 0000000..6524b14
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/ItemObjects/TripleJump.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6a839da810e4bd746bb2a72d791cb8a4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs
new file mode 100644
index 0000000..efb9fce
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs
@@ -0,0 +1,7 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SpecialItem : Item
+{
+}
diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta
new file mode 100644
index 0000000..0f6a568
--- /dev/null
+++ b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 220c578e08133f54a95a442eb87b3702
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: