MICOST/Barrack-Unity
2
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

TO SQUASH: Nuke ball fixes.

Browse Source
This commit is contained in:
WallyHackenslacker
2026-08-28 17:44:31 -04:00
parent 7e4b5a2055
commit 716e35c615
10 changed files with 153 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Animations/Yummies/YummyKeyBounce.anim
+1 -1
View File
@@ -101,7 +101,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
Assets/Animations/Yummies/YummyLigthningBounce.anim
+1 -1
View File
@@ -107,7 +107,7 @@ AnimationClip:
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
Assets/Scenes/Game.unity
+1
View File
@@ -1187,6 +1187,7 @@ MonoBehaviour:
fruitBallPrefab: {fileID: 3086586548818580311, guid: b67974a0c09fbe75aac299e30a0c665b, type: 3}
gameBoard: {fileID: 297740150}
player: {fileID: 1002905792}
worldFiller: {fileID: 2071167548}
--- !u!4 &240489637
Transform:
m_ObjectHideFlags: 0
Assets/Scripts/Game/Balls/NukeBall.cs
+24 -8
View File
@@ -6,10 +6,12 @@ public class NukeBall : BallBase
public AudioClip explosionSound;
public WorldFiller worldFiller;
// Tracks escalating danger/critical phases for audio cues.
private int criticalState = 0;
private float criticalTime = 1.0f;
private float criticalTime = 0.5f;
private float criticalTimer = 0.0f;
@@ -92,12 +94,16 @@ public class NukeBall : BallBase
transform.position = currentPosition;
}
}
// When in critical state 2, play the critical sound every half a second.
if (criticalState == 2)
{
criticalTimer = 0.5f;
}
void Update()
{
// Set critical state.
var area = worldFiller != null ? worldFiller.GetAreaPercentOfFreeRegion(transform.position) : -1.0f;
criticalState = (area < 0.2f) ? 2 : (area < 0.4f) ? 1 : 0;
// State 1 beeps every 0.5s, state 2 beeps every 0.25s.
criticalTime = (criticalState == 2) ? 0.5f : 1.0f;
// If in a critical state, increment the critical timer and play the
// critical sound if the timer exceeds the critical time.
@@ -108,9 +114,13 @@ public class NukeBall : BallBase
if (criticalTimer >= criticalTime)
{
audioSource.PlayOneShot(criticalSound);
}
// Restart timing window for the next critical beep.
// Keep fractional overflow so cadence stays stable across frame rates.
criticalTimer -= criticalTime;
}
}
else
{
criticalTimer = 0.0f;
}
}
@@ -142,6 +152,12 @@ public class NukeBall : BallBase
currentPosition.y = bounceStartY;
transform.position = currentPosition;
}
else if (contact.normal.y <= -0.5f)
{
isBouncingToHeight = false;
bounceTimer = 0.0f;
height = contact.point.y - 0.01f;
}
}
else
{
Assets/Scripts/Game/Player/Player.cs
+1 -1
View File
@@ -251,7 +251,7 @@ public class Player : MonoBehaviour
// Mouse input handling for firing lasers, magnets, or normal barriers.
if (
Mouse.current.leftButton.wasPressedThisFrame &&
worldFiller.IsPositionInFreeArea(transform.position) &&
worldFiller.IsPositionInFreeRegion(transform.position) &&
canFire &&
!exploding
)
Assets/Scripts/Game/Spawners/BallSpawner.cs
+11
View File
@@ -20,6 +20,8 @@ public class BallSpawner : Spawner
public Player player;
public WorldFiller worldFiller;
private static WaitForSeconds _waitForSeconds0_5 = new WaitForSeconds(0.5f);
private Queue<System.Action> ballQueue = new Queue<System.Action>();
@@ -35,6 +37,7 @@ public class BallSpawner : Spawner
ballQueue.Enqueue(() => SpawnBall(basicBallPrefab));
ballQueue.Enqueue(() => SpawnBall(basicBallPrefab));
ballQueue.Enqueue(() => SpawnBall(nuclearBallPrefab));
basicBallCount = 2;
StartCoroutine(SpawnBalls());
@@ -195,6 +198,14 @@ public class BallSpawner : Spawner
oozeBallScript.spawner = this;
}
}
else if (ballPrefab == nuclearBallPrefab)
{
var nuclearBallScript = newBall.GetComponent<NukeBall>();
if (nuclearBallScript != null)
{
nuclearBallScript.worldFiller = worldFiller;
}
}
balls.Enqueue(newBall);
Assets/Scripts/Game/Spawners/SharkSpawner.cs
+1 -1
View File
@@ -32,7 +32,7 @@ public class SharkSpawner : Spawner
{
spawnTimer += Time.fixedDeltaTime;
if (spawnTimer >= 1f && isActive && isSpawning && player.level >= 1)
if (spawnTimer >= 1f && isActive && isSpawning && player.level >= 10)
{
spawnTimer = 0f;
if (Random.value < spawnProbability)
Assets/Scripts/Game/WorldFiller.cs
+19 -1
View File
@@ -281,7 +281,7 @@ public class WorldFiller : MonoBehaviour
boardArea = boardRect.width * boardRect.height;
}
public bool IsPositionInFreeArea(Vector2 position)
public bool IsPositionInFreeRegion(Vector2 position)
{
if (freeAreas.Count == 0 && gameBoardSpriteRenderer != null)
{
@@ -299,6 +299,24 @@ public class WorldFiller : MonoBehaviour
return false;
}
public float GetAreaPercentOfFreeRegion(Vector2 position)
{
if (freeAreas.Count == 0 && gameBoardSpriteRenderer != null)
{
InitializeFreeAreas();
}
for (int i = 0; i < freeAreas.Count; i++)
{
if (RectContainsWithTolerance(freeAreas[i], position))
{
return (freeAreas[i].width * freeAreas[i].height) / boardArea;
}
}
return -1.0f;
}
public Vector2 GetRandomPositionInFreeAreas(Bounds? clearingArea = null)
{
if (freeAreas.Count == 0 && gameBoardSpriteRenderer != null)
Assets/Scripts/Game/Yummies/YummyCake.cs
+1 -1
View File
@@ -50,7 +50,7 @@ public class YummyCake : MonoBehaviour
public void BreakOrMiss()
{
// TODO: Implement logic to check if the cake is in a clear area or not
bool inClearArea = worldFiller.IsPositionInFreeArea(transform.position);
bool inClearArea = worldFiller.IsPositionInFreeRegion(transform.position);
if (inClearArea)
{
ProjectSettings/ProjectSettings.asset
+93 -1
View File
@@ -306,7 +306,99 @@ PlayerSettings:
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetPlatformIcons: []
m_BuildTargetPlatformIcons:
- m_BuildTarget: Android
m_Icons:
- m_Textures: []
m_Width: 432
m_Height: 432
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 324
m_Height: 324
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 216
m_Height: 216
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 162
m_Height: 162
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 108
m_Height: 108
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 81
m_Height: 81
m_Kind: 2
m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 192
m_Height: 192
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 144
m_Height: 144
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 96
m_Height: 96
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 72
m_Height: 72
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 48
m_Height: 48
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 36
m_Height: 36
m_Kind: 0
m_SubKind:
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1