hz/ggj2026
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adding basket blocking feature

Browse Source
This commit is contained in:
hz
2026-02-01 15:41:21 -06:00
parent 2d38838efd
commit cb176962a9
3 changed files with 286 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scripts/TrickController.cs
+234 -15
View File
@@ -11,6 +11,8 @@ public class TrickController : MonoBehaviour
private static readonly List<TrickController> ActiveTricks = new List<TrickController>();
private static PlayerPlatformerController[] cachedPlayers = Array.Empty<PlayerPlatformerController>();
private static float nextPlayerCacheTime;
private static bool hasCanonicalScale;
private static Vector3 canonicalScale;
public static int ActiveCount => ActiveTricks.Count;
[SerializeField] private string treatTag = "Interactable";
@@ -30,6 +32,12 @@ public class TrickController : MonoBehaviour
[SerializeField] private float jumpChancePerSecond = 0.5f;
[SerializeField] private float jumpArcChance = 0.5f;
[SerializeField] private float jumpArcHorizontalImpulse = 2f;
[SerializeField] private float basketSeekRadius = 8f;
[SerializeField] private float basketSeekWeight = 0.9f;
[SerializeField] private float basketMinHeight = 0.5f;
[SerializeField] private float basketRefreshInterval = 0.6f;
[SerializeField] private float basketJumpChance = 0.35f;
[SerializeField] private float basketJumpHorizontalRange = 0.8f;
[SerializeField] private LayerMask groundMask = ~0;
[SerializeField] private float groundCheckDistance = 0.05f;
[SerializeField] private float despawnMinX = -12f;
@@ -39,10 +47,13 @@ public class TrickController : MonoBehaviour
[SerializeField] private float throwControlLockTime = 0.35f;
[SerializeField] private float wallCheckDistance = 0.1f;
[SerializeField] private float wallAvoidDuration = 0.6f;
[SerializeField] private float wallAvoidCooldown = 0.2f;
private Rigidbody2D body;
private Transform target;
private float nextTargetTime;
private Transform basketTarget;
private float nextBasketTime;
private Vector2 wanderDirection;
private float nextWanderTime;
private bool isCarried;
@@ -55,6 +66,7 @@ public class TrickController : MonoBehaviour
private readonly RaycastHit2D[] wallHits = new RaycastHit2D[4];
private float wallAvoidUntil;
private float wallAvoidDirection;
private float nextWallAvoidTime;
private RigidbodyType2D basketBodyType;
private float basketGravityScale;
private bool basketSimulated;
@@ -65,6 +77,7 @@ public class TrickController : MonoBehaviour
private SpriteRenderer cachedRenderer;
private string originalSortingLayer;
private int originalSortingOrder;
private Vector3 originalLocalScale;
public bool IsCarried => isCarried;
public bool IsBasketed => isBasketed;
@@ -78,6 +91,12 @@ public class TrickController : MonoBehaviour
body.collisionDetectionMode = CollisionDetectionMode2D.Continuous;
body.interpolation = RigidbodyInterpolation2D.Interpolate;
cachedRenderer = GetComponent<SpriteRenderer>();
originalLocalScale = transform.localScale;
if (!hasCanonicalScale)
{
canonicalScale = transform.localScale;
hasCanonicalScale = true;
}
}
private void OnEnable()
@@ -131,6 +150,12 @@ public class TrickController : MonoBehaviour
nextTargetTime = Time.time + targetRefreshInterval;
}
if (Time.time >= nextBasketTime)
{
basketTarget = FindNearestBasketAbove();
nextBasketTime = Time.time + basketRefreshInterval;
}
if (Time.time >= nextWanderTime)
{
wanderDirection = Random.insideUnitCircle.normalized;
@@ -189,6 +214,15 @@ public class TrickController : MonoBehaviour
desiredX += wanderDirection.x * wanderWeight;
}
if (!hasTarget && basketTarget != null)
{
var basketDelta = (Vector2)basketTarget.position - (Vector2)transform.position;
if (basketDelta.y >= basketMinHeight && basketDelta.magnitude <= basketSeekRadius)
{
desiredX += Mathf.Sign(basketDelta.x) * basketSeekWeight;
}
}
// No trick-avoidance bias.
if (Mathf.Abs(desiredX) < 0.01f)
@@ -196,11 +230,15 @@ public class TrickController : MonoBehaviour
desiredX = wanderDirection.x * 0.2f;
}
var wallDirection = GetWallAvoidDirection(desiredX);
if (wallDirection != 0f)
if (Time.time >= nextWallAvoidTime)
{
wallAvoidDirection = wallDirection;
wallAvoidUntil = Time.time + wallAvoidDuration;
var wallDirection = GetWallAvoidDirection(desiredX);
if (wallDirection != 0f)
{
wallAvoidDirection = wallDirection;
wallAvoidUntil = Time.time + wallAvoidDuration;
nextWallAvoidTime = Time.time + wallAvoidDuration + wallAvoidCooldown;
}
}
if (Time.time < wallAvoidUntil && Mathf.Abs(wallAvoidDirection) > 0.01f)
@@ -241,6 +279,14 @@ public class TrickController : MonoBehaviour
{
continue;
}
if (candidate.GetComponent<TrickController>() != null)
{
continue;
}
if (candidate.GetComponent<PlayerPlatformerController>() != null)
{
continue;
}
if (!candidate.TryGetComponent<Collider2D>(out var collider) || !collider.enabled)
{
@@ -258,6 +304,48 @@ public class TrickController : MonoBehaviour
return best;
}
private Transform FindNearestBasketAbove()
{
var baskets = FindObjectsByType<BasketController>(FindObjectsSortMode.None);
if (baskets == null || baskets.Length == 0)
{
return null;
}
Transform best = null;
var bestDistance = float.MaxValue;
var origin = transform.position;
for (var i = 0; i < baskets.Length; i++)
{
var basket = baskets[i];
if (basket == null || !basket.gameObject.activeInHierarchy)
{
continue;
}
var basketPos = basket.transform.position;
var delta = (Vector2)basketPos - (Vector2)origin;
if (delta.y < basketMinHeight)
{
continue;
}
var distance = delta.magnitude;
if (distance > basketSeekRadius)
{
continue;
}
if (distance < bestDistance)
{
bestDistance = distance;
best = basket.transform;
}
}
return best;
}
private void TryConsumeTreat()
{
if (isCarried)
@@ -293,22 +381,130 @@ public class TrickController : MonoBehaviour
}
}
private void SpawnTrick(Vector3 position)
private bool SpawnTrick(Vector3 position)
{
if (maxTricks > 0 && ActiveTricks.Count >= maxTricks)
{
return;
return false;
}
if (trickPrefab != null)
{
Instantiate(trickPrefab, position, Quaternion.identity);
return;
var instance = Instantiate(trickPrefab, position, Quaternion.identity);
if (instance != null)
{
instance.ResetRuntimeState(canonicalScale);
}
return true;
}
Instantiate(gameObject, position, Quaternion.identity);
var clone = Instantiate(gameObject, position, Quaternion.identity);
if (clone.TryGetComponent<TrickController>(out var spawned))
{
spawned.ResetRuntimeState(canonicalScale);
}
return true;
}
private void ResetRuntimeState(Vector3? forcedScale = null)
{
isCarried = false;
isBasketed = false;
hasBasketAnchor = false;
movementLockUntil = 0f;
wallAvoidUntil = 0f;
wallAvoidDirection = 0f;
if (forcedScale.HasValue)
{
transform.localScale = forcedScale.Value;
}
if (cachedRenderer != null)
{
if (!string.IsNullOrWhiteSpace(basketSortingLayer))
{
cachedRenderer.sortingLayerName = originalSortingLayer;
}
cachedRenderer.sortingOrder = originalSortingOrder;
}
body.simulated = true;
body.bodyType = RigidbodyType2D.Dynamic;
body.gravityScale = 1f;
body.linearVelocity = Vector2.zero;
body.angularVelocity = 0f;
if (TryGetComponent<Collider2D>(out var collider))
{
collider.enabled = true;
}
}
public static bool TrySpawnAt(Vector3 position)
{
if (ActiveTricks.Count == 0)
{
return false;
}
TrickController candidate = null;
TrickController fallback = null;
for (var i = 0; i < ActiveTricks.Count; i++)
{
var trick = ActiveTricks[i];
if (trick == null)
{
continue;
}
if (fallback == null)
{
fallback = trick;
}
if (!trick.isCarried && !trick.isBasketed)
{
if (trick.TryGetComponent<Collider2D>(out var collider) && collider.enabled)
{
candidate = trick;
break;
}
}
}
if (candidate == null)
{
candidate = fallback;
}
return candidate != null && candidate.SpawnTrick(position);
}
public static bool TrySpawnFromPrefabAt(Vector3 position)
{
if (ActiveTricks.Count == 0)
{
return false;
}
for (var i = 0; i < ActiveTricks.Count; i++)
{
var trick = ActiveTricks[i];
if (trick == null)
{
continue;
}
if (trick.trickPrefab == null)
{
continue;
}
return trick.SpawnTrick(position);
}
return false;
}
private float GetAvoidPlayerDirection()
{
if (Time.time >= nextPlayerCacheTime)
@@ -353,7 +549,7 @@ public class TrickController : MonoBehaviour
private void TryJump(bool isMoving, float jumpDirection)
{
if (!isMoving || Time.time < nextJumpTime)
if (Time.time < nextJumpTime)
{
return;
}
@@ -363,20 +559,43 @@ public class TrickController : MonoBehaviour
return;
}
if (body.linearVelocity.y > 0.01f)
var wantsBasketJump = false;
var basketDir = 0f;
if (basketTarget != null)
{
return;
var delta = (Vector2)basketTarget.position - (Vector2)transform.position;
if (delta.y >= basketMinHeight && Mathf.Abs(delta.x) <= basketJumpHorizontalRange)
{
if (Random.value < basketJumpChance)
{
wantsBasketJump = true;
basketDir = Mathf.Sign(delta.x);
}
}
}
var chance = jumpChancePerSecond * Time.fixedDeltaTime;
if (Random.value > chance)
if (!wantsBasketJump)
{
if (!isMoving)
{
return;
}
var chance = jumpChancePerSecond * Time.fixedDeltaTime;
if (Random.value > chance)
{
return;
}
}
if (body.linearVelocity.y > 0.01f)
{
return;
}
var velocity = body.linearVelocity;
velocity.y = 0f;
var jumpDir = Mathf.Sign(jumpDirection);
var jumpDir = wantsBasketJump ? basketDir : Mathf.Sign(jumpDirection);
if (jumpDir == 0f)
{
jumpDir = Random.value < 0.5f ? -1f : 1f;