From 7cad2bab2fd34be64ba6add428024022d18fbaa3 Mon Sep 17 00:00:00 2001 From: Jens Pitkanen Date: Sun, 4 Aug 2019 03:00:18 +0300 Subject: [PATCH] Add misc stuff --- Assets/Prefabs/RevolverBullet.prefab | 4 +- Assets/Scenes/MainScene.unity | 54 ++++++++++++++++++------ Assets/Scripts/Bullets/RevolverBullet.cs | 4 ++ Assets/Scripts/Explodable.cs | 8 +++- 4 files changed, 52 insertions(+), 18 deletions(-) diff --git a/Assets/Prefabs/RevolverBullet.prefab b/Assets/Prefabs/RevolverBullet.prefab index ac98d23..971d357 100644 --- a/Assets/Prefabs/RevolverBullet.prefab +++ b/Assets/Prefabs/RevolverBullet.prefab @@ -865,7 +865,7 @@ ParticleSystem: rateOverTime: serializedVersion: 2 minMaxState: 0 - scalar: 300 + scalar: 1000 minScalar: 10 maxCurve: serializedVersion: 2 @@ -5353,7 +5353,7 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 - maxNumParticles: 1000 + maxNumParticles: 5000 size3D: 0 rotation3D: 0 gravityModifier: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 95925ce..e0b7b5b 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -137,6 +137,7 @@ GameObject: - component: {fileID: 162528939} - component: {fileID: 162528938} - component: {fileID: 162528937} + - component: {fileID: 162528946} m_Layer: 0 m_Name: Enemy (1) m_TagString: Untagged @@ -291,6 +292,23 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &162528946 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 162528936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2110188365a59e4cb31d0e84789fbbd, type: 3} + m_Name: + m_EditorClassIdentifier: + BodypartPrefabs: + - {fileID: 2029918227067566688, guid: b496cfa87cd1d5c40af61d1604a06788, type: 3} + - {fileID: 2377613320307128713, guid: 478119ba1f7f78243afb4b5ae9a8b99c, type: 3} + - {fileID: 6432268662194301778, guid: 262f47ce8e16b5d4599796ee37c9b637, type: 3} + DebugExplode: 0 --- !u!1 &188743841 GameObject: m_ObjectHideFlags: 0 @@ -327,7 +345,6 @@ MonoBehaviour: ParticleRoot: {fileID: 188743843} MaxParticles: 10000 DebugLaunch: 0 - CensorGore: 1 --- !u!4 &188743843 Transform: m_ObjectHideFlags: 0 @@ -1596,15 +1613,6 @@ Tilemap: m_ObjectToInstantiate: {fileID: 0} m_TileFlags: 1 m_ColliderType: 1 - - first: {x: -3, y: 0, z: 0} - second: - m_TileIndex: 7 - m_TileSpriteIndex: 7 - m_TileMatrixIndex: 0 - m_TileColorIndex: 8 - m_ObjectToInstantiate: {fileID: 0} - m_TileFlags: 1 - m_ColliderType: 1 - first: {x: -2, y: 0, z: 0} second: m_TileIndex: 7 @@ -1747,7 +1755,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 10 + - m_RefCount: 9 m_Data: {fileID: 11400000, guid: 2004c99dc125dd542aafd24f4ad842f4, type: 2} - m_RefCount: 0 m_Data: {fileID: 0} @@ -1778,7 +1786,7 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 10 + - m_RefCount: 9 m_Data: {fileID: 6408231970667830406, guid: 3b5f43ce65db7e74f9d3a906dfc2c460, type: 3} - m_RefCount: 0 @@ -1801,7 +1809,7 @@ Tilemap: - m_RefCount: 2 m_Data: {fileID: 511961965738296472, guid: 3b5f43ce65db7e74f9d3a906dfc2c460, type: 3} m_TileMatrixArray: - - m_RefCount: 22 + - m_RefCount: 21 m_Data: e00: 1 e01: 0 @@ -1836,7 +1844,7 @@ Tilemap: m_Data: {r: 0, g: 0, b: 0, a: 0} - m_RefCount: 0 m_Data: {r: 0, g: 0, b: 0, a: 0} - - m_RefCount: 22 + - m_RefCount: 21 m_Data: {r: 1, g: 1, b: 1, a: 1} m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -1899,6 +1907,7 @@ GameObject: - component: {fileID: 867100016} - component: {fileID: 867100015} - component: {fileID: 867100014} + - component: {fileID: 867100018} m_Layer: 0 m_Name: Enemy m_TagString: Untagged @@ -2053,6 +2062,23 @@ MonoBehaviour: m_EditorClassIdentifier: Behaviours: - {fileID: 867100016} +--- !u!114 &867100018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 867100008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2110188365a59e4cb31d0e84789fbbd, type: 3} + m_Name: + m_EditorClassIdentifier: + BodypartPrefabs: + - {fileID: 2029918227067566688, guid: b496cfa87cd1d5c40af61d1604a06788, type: 3} + - {fileID: 2377613320307128713, guid: 478119ba1f7f78243afb4b5ae9a8b99c, type: 3} + - {fileID: 6432268662194301778, guid: 262f47ce8e16b5d4599796ee37c9b637, type: 3} + DebugExplode: 0 --- !u!1 &895097232 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Bullets/RevolverBullet.cs b/Assets/Scripts/Bullets/RevolverBullet.cs index c492090..5fdfbae 100644 --- a/Assets/Scripts/Bullets/RevolverBullet.cs +++ b/Assets/Scripts/Bullets/RevolverBullet.cs @@ -44,6 +44,10 @@ namespace Saltosion.OneWeapon.Bullets { DeathTimer = 19; // Do damage here, kill everyone + Explodable Explodable = collider.GetComponent(); + if (Explodable != null) { + Explodable.Explode(true); + } } } } diff --git a/Assets/Scripts/Explodable.cs b/Assets/Scripts/Explodable.cs index ab3a280..baed870 100644 --- a/Assets/Scripts/Explodable.cs +++ b/Assets/Scripts/Explodable.cs @@ -21,11 +21,11 @@ namespace Saltosion.OneWeapon { private void Update() { if (DebugExplode) { DebugExplode = false; - Explode(); + Explode(false); } } - public void Explode() { + public void Explode(bool destroyGameObject) { foreach (GameObject Obj in BodypartPrefabs) { // No body parts flying in censored mode if (!Options.CensorGore) { @@ -43,6 +43,10 @@ namespace Saltosion.OneWeapon { // Blood is replaced by flowers though, no problem with that BloodLauncher.Splatter(transform.position, Vector2.zero, 70, 50f, 360f); } + + if (destroyGameObject) { + Destroy(gameObject); + } } } }