From 2220eae66440af92c15e7e9a47ec0433eb330b74 Mon Sep 17 00:00:00 2001
From: AdamElf <55642322+AdamElf@users.noreply.github.com>
Date: Mon, 18 Mar 2024 15:52:16 -0400
Subject: [PATCH] Water cooler works now!
---
Assets/Cherian/Scenes/LevelBlockout1.unity | 26 +++++++++++++++--
Assets/Prefabs/WaterLaunch.prefab | 34 ++++++++++++++++++++--
Assets/Scripts/Damage.cs | 8 +++++
Assets/Scripts/Objects/ObjectHealth.cs | 4 ++-
ProjectSettings/TagManager.asset | 1 +
5 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/Assets/Cherian/Scenes/LevelBlockout1.unity b/Assets/Cherian/Scenes/LevelBlockout1.unity
index 49618b1..1ee2526 100644
--- a/Assets/Cherian/Scenes/LevelBlockout1.unity
+++ b/Assets/Cherian/Scenes/LevelBlockout1.unity
@@ -626,7 +626,10 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
- m_AddedComponents: []
+ m_AddedComponents:
+ - targetCorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 1597222352}
m_SourcePrefab: {fileID: 100100000, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
--- !u!1001 &71891073
PrefabInstance:
@@ -887,7 +890,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8219253482053481180, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_TagString
- value: Breaking
+ value: Stay
objectReference: {fileID: 0}
- target: {fileID: 8219253482053906172, guid: 4464063657e217942921d354b9ce0ff1, type: 3}
propertyPath: m_LocalPosition.x
@@ -10222,6 +10225,11 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1235030335}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1247174930 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 4099498095617253306, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
+ m_PrefabInstance: {fileID: 70730237}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1249582970
GameObject:
m_ObjectHideFlags: 0
@@ -12962,6 +12970,20 @@ Transform:
m_CorrespondingSourceObject: {fileID: 822631405258357118, guid: ef6f3a50a67136d46b5c3a49ae69f317, type: 3}
m_PrefabInstance: {fileID: 70730237}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &1597222352
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1247174930}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 64bd17d3301b64ff6beab6874734e116, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ damageMultiplier: 1
+ damageDone: 0
--- !u!1 &1602719883
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Prefabs/WaterLaunch.prefab b/Assets/Prefabs/WaterLaunch.prefab
index f1f2584..a550224 100644
--- a/Assets/Prefabs/WaterLaunch.prefab
+++ b/Assets/Prefabs/WaterLaunch.prefab
@@ -4851,6 +4851,7 @@ GameObject:
- component: {fileID: 3999393771464170262}
- component: {fileID: 2830081865832242949}
- component: {fileID: 6385446843400374972}
+ - component: {fileID: 692925880365906822}
m_Layer: 0
m_Name: WaterLaunch
m_TagString: Untagged
@@ -4867,8 +4868,8 @@ Transform:
m_GameObject: {fileID: 3554791386960356925}
serializedVersion: 2
m_LocalRotation: {x: 1, y: 0, z: 0, w: 0}
- m_LocalPosition: {x: 3.62, y: 17.95, z: -4.33}
- m_LocalScale: {x: 25, y: 25, z: 25}
+ m_LocalPosition: {x: 0, y: 5, z: 0}
+ m_LocalScale: {x: 20, y: 20, z: 20}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 9110501089971106851}
@@ -4943,7 +4944,7 @@ MeshCollider:
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 5
- m_Convex: 0
+ m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: -6745115918668651329, guid: 848cc40a0a4148c449d34b9187bac332, type: 3}
--- !u!136 &2830081865832242949
@@ -4982,3 +4983,30 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
upMult: 50
+--- !u!54 &692925880365906822
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 3554791386960356925}
+ serializedVersion: 4
+ m_Mass: 20
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_CenterOfMass: {x: 0, y: 0, z: 0}
+ m_InertiaTensor: {x: 1, y: 1, z: 1}
+ m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 1
+ m_UseGravity: 1
+ m_IsKinematic: 0
+ m_Interpolate: 0
+ m_Constraints: 112
+ m_CollisionDetection: 0
diff --git a/Assets/Scripts/Damage.cs b/Assets/Scripts/Damage.cs
index 594fa2a..040c485 100644
--- a/Assets/Scripts/Damage.cs
+++ b/Assets/Scripts/Damage.cs
@@ -34,6 +34,14 @@ private void OnCollisionEnter(Collision col)
//call Damage() from object health
objectHealth.Damage(damageDone);
}
+ else if (col.gameObject.CompareTag("Stay"))
+ {
+ objectHealth = col.gameObject.GetComponent<ObjectHealth>();
+ roll = gameObject.GetComponent<Roll>();
+ velocity = roll.myBod.velocity;
+ damageDone = velocity.magnitude * damageMultiplier;
+ objectHealth.Damage(damageDone);
+ }
}
}
diff --git a/Assets/Scripts/Objects/ObjectHealth.cs b/Assets/Scripts/Objects/ObjectHealth.cs
index 02a0006..e877e45 100644
--- a/Assets/Scripts/Objects/ObjectHealth.cs
+++ b/Assets/Scripts/Objects/ObjectHealth.cs
@@ -65,7 +65,9 @@ private void Shatter()
/// </summary>
private void StateChange()
{
- Instantiate(stateChangePrefab, gameObject.transform.position, Quaternion.identity);
+
+ Instantiate(stateChangePrefab, transform.position + stateChangePrefab.transform.position, stateChangePrefab.transform.localRotation);
+ Destroy(gameObject);
}
}
diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset
index ceec62f..7eaaee3 100644
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@@ -7,6 +7,7 @@ TagManager:
- Waypoint
- Enemy
- Breaking
+ - Stay
layers:
- Default
- TransparentFX
--
GitLab