From e444ebf95017fb5fa5c0473351b8427b07adbebe Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Sat, 13 Apr 2024 15:54:23 +0200 Subject: [PATCH] fix: consume boost capacity when only boosting, double play field exit trigger --- Assets/Prefabs/Ships/Blue Ship.prefab | 6 +++--- Assets/Prefabs/Ships/Red Ship.prefab | 6 +++--- Assets/Scripts/Ship.cs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Prefabs/Ships/Blue Ship.prefab b/Assets/Prefabs/Ships/Blue Ship.prefab index c15de12..d44e30d 100644 --- a/Assets/Prefabs/Ships/Blue Ship.prefab +++ b/Assets/Prefabs/Ships/Blue Ship.prefab @@ -51,8 +51,8 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0.05, z: 0} + m_Radius: 0.4 + m_Center: {x: 0, y: 0.3, z: -0.13130158} --- !u!1 &950156585708023501 GameObject: m_ObjectHideFlags: 0 @@ -281,7 +281,7 @@ BoxCollider: m_Bits: 256 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 8 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 1 diff --git a/Assets/Prefabs/Ships/Red Ship.prefab b/Assets/Prefabs/Ships/Red Ship.prefab index a39add3..8f4516e 100644 --- a/Assets/Prefabs/Ships/Red Ship.prefab +++ b/Assets/Prefabs/Ships/Red Ship.prefab @@ -51,8 +51,8 @@ SphereCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Radius: 0.5 - m_Center: {x: 0, y: 0.05, z: 0} + m_Radius: 0.4 + m_Center: {x: 0, y: 0.3, z: 0} --- !u!1 &1372816401649438144 GameObject: m_ObjectHideFlags: 0 @@ -171,7 +171,7 @@ BoxCollider: m_Bits: 256 m_ExcludeLayers: serializedVersion: 2 - m_Bits: 0 + m_Bits: 8 m_LayerOverridePriority: 0 m_IsTrigger: 0 m_ProvidesContacts: 1 diff --git a/Assets/Scripts/Ship.cs b/Assets/Scripts/Ship.cs index 5b80631..bc03926 100644 --- a/Assets/Scripts/Ship.cs +++ b/Assets/Scripts/Ship.cs @@ -258,7 +258,7 @@ public class Ship : MonoBehaviour void BoostStateUpdate(float deltaTime) { boostUI.UpdateFill(Math.Min(state.boostCapacity / props.maxBoostCapacity, 1)); - if (IsBoosting() && state.thrustInput != 0) + if (IsBoosting()) { state.boostCapacity -= deltaTime; } @@ -271,7 +271,7 @@ public class Ship : MonoBehaviour canBoost = false; } - if ((state.boostInput <= 0 || state.thrustInput == 0 || !canBoost) + if ((state.boostInput <= 0 || !canBoost) && zone == Zone.NimbleZone && state.boostCapacity <= props.maxBoostCapacity) {