Berry-Dash/source
1
2 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix golden / anti berry (it's different to how it was in 26.1>)

Browse Source
This commit is contained in:
Lncvrt committed 2026-03-05 10:59:21 -07:00
1 parent de8b22a33a
commit 009844d518
3 files changed
+39 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Assets/Scripts/GamePlayers/AutoGamePlayer.cs
+13 -5
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using TMPro; using TMPro;
@@ -217,13 +218,20 @@ public class AutoGamePlayer : MonoBehaviour {
TogglePause(); TogglePause();
} }
if (antiLeft > 0f || goldenLeft > 0f) { if (antiLeft > 0f || goldenLeft > 0f) {
string[] berryTags = { "NormalBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "RandomBerry", "AntiBerry", "GoldenBerry" }; List<string> berryTags = new() { "NormalBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "CoinBerry", "RandomBerry", "AntiBerry", "GoldenBerry" };
if (antiLeft > 0f) berryTags.Append("PoisonBerry"); if (antiLeft > 0f) berryTags.Add("PoisonBerry");
float scale = (canvasRect.lossyScale.x + canvasRect.lossyScale.y) / 2f;
float radius = antiLeft > 0f ? 250f * scale : 300f * scale;
float speed = antiLeft > 0f ? 2.5f * scale : -1f * scale;
foreach (string tag in berryTags) { foreach (string tag in berryTags) {
foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) { foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) {
UnityEngine.Vector3 dir = berry.transform.position - bird.transform.position; RectTransform berryRect = berry.GetComponent<RectTransform>();
if (dir.magnitude < (antiLeft > 0 ? 3f : 4.5f)) { UnityEngine.Vector3 dir = berryRect.position - bird.GetComponent<RectTransform>().position;
berry.GetComponent<Rigidbody2D>().linearVelocity = dir.normalized * (antiLeft > 0 ? 5f : -5f);
if (dir.magnitude < radius) {
berryRect.position += speed * dir.normalized;
ClampPosition(berry.GetComponent<Image>()); ClampPosition(berry.GetComponent<Image>());
} }
} }
Assets/Scripts/GamePlayers/CustomGamePlayer.cs
+13 -5
View File
@@ -1,3 +1,4 @@
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using TMPro; using TMPro;
@@ -174,13 +175,20 @@ public class CustomGamePlayer : MonoBehaviour {
if (score != 0) Respawn(); if (score != 0) Respawn();
} }
if (antiLeft > 0f || goldenLeft > 0f) { if (antiLeft > 0f || goldenLeft > 0f) {
string[] berryTags = { "NormalBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "RandomBerry", "AntiBerry", "GoldenBerry", "NothingBerry" }; List<string> berryTags = new() { "NormalBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "CoinBerry", "RandomBerry", "AntiBerry", "GoldenBerry" };
if (antiLeft > 0f) berryTags.Append("PoisonBerry"); if (antiLeft > 0f) berryTags.Add("PoisonBerry");
float scale = (canvasRect.lossyScale.x + canvasRect.lossyScale.y) / 2f;
float radius = antiLeft > 0f ? 250f * scale : 300f * scale;
float speed = antiLeft > 0f ? 2.5f * scale : -1f * scale;
foreach (string tag in berryTags) { foreach (string tag in berryTags) {
foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) { foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) {
UnityEngine.Vector3 dir = berry.transform.position - bird.transform.position; RectTransform berryRect = berry.GetComponent<RectTransform>();
if (dir.magnitude < (antiLeft > 0 ? 3f : 4.5f)) { UnityEngine.Vector3 dir = berryRect.position - bird.GetComponent<RectTransform>().position;
berry.GetComponent<Rigidbody2D>().linearVelocity = dir.normalized * (antiLeft > 0 ? 5f : -5f);
if (dir.magnitude < radius) {
berryRect.position += speed * dir.normalized;
ClampPosition(berry.GetComponent<Image>()); ClampPosition(berry.GetComponent<Image>());
} }
} }
Assets/Scripts/GamePlayers/GamePlayer.cs
+13 -5
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Numerics; using System.Numerics;
using TMPro; using TMPro;
@@ -160,13 +161,20 @@ public class GamePlayer : MonoBehaviour {
if (score != 0) Respawn(); if (score != 0) Respawn();
} }
if (antiLeft > 0f || goldenLeft > 0f) { if (antiLeft > 0f || goldenLeft > 0f) {
string[] berryTags = { "NormalBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "CoinBerry", "RandomBerry", "AntiBerry", "GoldenBerry" }; List<string> berryTags = new() { "NormalBerry", "SlowBerry", "UltraBerry", "SpeedyBerry", "CoinBerry", "RandomBerry", "AntiBerry", "GoldenBerry" };
if (antiLeft > 0f) berryTags.Append("PoisonBerry"); if (antiLeft > 0f) berryTags.Add("PoisonBerry");
float scale = (canvasRect.lossyScale.x + canvasRect.lossyScale.y) / 2f;
float radius = antiLeft > 0f ? 250f * scale : 300f * scale;
float speed = antiLeft > 0f ? 2.5f * scale : -1f * scale;
foreach (string tag in berryTags) { foreach (string tag in berryTags) {
foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) { foreach (var berry in GameObject.FindGameObjectsWithTag(tag)) {
UnityEngine.Vector3 dir = berry.transform.position - bird.transform.position; RectTransform berryRect = berry.GetComponent<RectTransform>();
if (dir.magnitude < (antiLeft > 0 ? 3f : 4.5f)) { UnityEngine.Vector3 dir = berryRect.position - bird.GetComponent<RectTransform>().position;
berry.GetComponent<Rigidbody2D>().linearVelocity = dir.normalized * (antiLeft > 0 ? 5f : -5f);
if (dir.magnitude < radius) {
berryRect.position += speed * dir.normalized;
ClampPosition(berry.GetComponent<Image>()); ClampPosition(berry.GetComponent<Image>());
} }
} }