AmongUsMods/MiraAPI
1
0 Fork 0
mirror of https://github.com/All-Of-Us-Mods/MiraAPI.git synced 2026-10-19 15:51:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear helper warnings

Browse Source
This commit is contained in:
Atony committed 2026-10-04 00:16:04 -05:00
1 parent 7cb8246953
commit d0138936be
3 files changed
+56 -41
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MiraAPI/Resources/Locale/en_US.xml
+2
View File
@@ -45,10 +45,12 @@ Outlive the timer or eliminate the crew.</string>
<string name="MiraApi.Page">Page</string> <string name="MiraApi.Page">Page</string>
<string name="MiraApi.Main">Main</string> <string name="MiraApi.Main">Main</string>
<string name="MiraApi.AbilityType.Basic">Ability</string> <string name="MiraApi.AbilityType.Basic">Ability</string>
<string name="MiraApi.AbilityType.Indirect">Indirect Ability</string>
<string name="MiraApi.AbilityType.Interaction">Interaction Ability</string> <string name="MiraApi.AbilityType.Interaction">Interaction Ability</string>
<string name="MiraApi.AbilityType.Radius">Radius Ability</string> <string name="MiraApi.AbilityType.Radius">Radius Ability</string>
<string name="MiraApi.AbilityType.Menu">Menu Ability</string> <string name="MiraApi.AbilityType.Menu">Menu Ability</string>
<string name="MiraApi.AbilityType.Meeting">Meeting Ability</string> <string name="MiraApi.AbilityType.Meeting">Meeting Ability</string>
<string name="MiraApi.AbilityType.SelectiveMeeting">Selective Meeting Ability</string> <string name="MiraApi.AbilityType.SelectiveMeeting">Selective Meeting Ability</string>
<string name="MiraApi.AbilityType.MeetingMenu">Meeting Menu Ability</string>
<string name="Options">Options</string> <string name="Options">Options</string>
</resources> </resources>
MiraAPI/Roles/ICustomRole.cs
+1 -1
View File
@@ -76,7 +76,7 @@ public interface ICustomRole : IOptionable
/// Gets the wiki description of the role. Used in the wiki and normally appends the options text as well. /// Gets the wiki description of the role. Used in the wiki and normally appends the options text as well.
/// </summary> /// </summary>
string RoleWikiDescription => MiraLocaleManager.Get(RoleWikiDescriptionLocale, RoleLongDescription) + string RoleWikiDescription => MiraLocaleManager.Get(RoleWikiDescriptionLocale, RoleLongDescription) +
Helpers.GetModdedOptionsForType(GetType()); Helpers.GetOptionsText(GetType());
/// <summary> /// <summary>
/// Gets the role's wiki description id for localization. /// Gets the role's wiki description id for localization.
MiraAPI/Utilities/Helpers.cs
+53 -40
View File
@@ -43,8 +43,8 @@ public static class Helpers
return string.Empty; return string.Empty;
} }
ISummarizedOptions? summaryProvider = null; ISummarizedOptions? summaryProvider;
IReadOnlySet<StringNames>? hiddenKeys = null; IReadOnlySet<StringNames>? hiddenKeys;
try try
{ {
var optionGroups = var optionGroups =
@@ -60,8 +60,9 @@ public static class Helpers
} }
var builder = new StringBuilder(); var builder = new StringBuilder();
builder.AppendLine(MiraApiPlugin.Culture, builder.AppendLine(
$"\n<size=50%> \n</size><b><color=#21AA8C>{MiraLocaleManager.Get("Options")}</color></b>"); MiraApiPlugin.Culture,
$"\n<size=50%> \n</size><b><color=#29D7B5>{MiraLocaleManager.Get("Options")}</color></b>");
var insertedSummary = false; var insertedSummary = false;
foreach (var option in options) foreach (var option in options)
@@ -73,7 +74,7 @@ public static class Helpers
ModdedToggleOption t => t.StringName, ModdedToggleOption t => t.StringName,
ModdedEnumOption e => e.StringName, ModdedEnumOption e => e.StringName,
ModdedNumberOption n => n.StringName, ModdedNumberOption n => n.StringName,
_ => null _ => null,
}; };
if (key.HasValue && hiddenKeys.Contains(key.Value)) if (key.HasValue && hiddenKeys.Contains(key.Value))
{ {
@@ -102,8 +103,9 @@ public static class Helpers
continue; continue;
} }
builder.AppendLine(TranslationController.Instance.GetString(toggleOption.StringName) + ": " + builder.AppendLine(
toggleOption.Value); TranslationController.Instance.GetString(toggleOption.StringName) + ": " +
toggleOption.Value);
break; break;
/*case ModdedMultiSelectOption<Enum> enumOption: /*case ModdedMultiSelectOption<Enum> enumOption:
if (!enumOption.Visible()) if (!enumOption.Visible())
@@ -124,9 +126,11 @@ public static class Helpers
continue; continue;
} }
builder.AppendLine(TranslationController.Instance.GetString(enumOption.StringName) + ": " + builder.AppendLine(
MiraLocaleManager.Get(enumOption.Values[enumOption.Value], TranslationController.Instance.GetString(enumOption.StringName) + ": " +
enumOption.Values[enumOption.Value])); MiraLocaleManager.Get(
enumOption.Values[enumOption.Value],
enumOption.Values[enumOption.Value]));
break; break;
case ModdedNumberOption numberOption: case ModdedNumberOption numberOption:
if (!numberOption.Visible()) if (!numberOption.Visible())
@@ -142,15 +146,15 @@ public static class Helpers
var optionStr = numberOption.Data.GetValueString(numberOption.Value); var optionStr = numberOption.Data.GetValueString(numberOption.Value);
if (optionStr.Contains(".000")) if (optionStr.Contains(".000"))
{ {
optionStr = optionStr.Replace(".000", ""); optionStr = optionStr.Replace(".000", string.Empty);
} }
else if (optionStr.Contains(".00")) else if (optionStr.Contains(".00"))
{ {
optionStr = optionStr.Replace(".00", ""); optionStr = optionStr.Replace(".00", string.Empty);
} }
else if (optionStr.Contains(".0")) else if (optionStr.Contains(".0"))
{ {
optionStr = optionStr.Replace(".0", ""); optionStr = optionStr.Replace(".0", string.Empty);
} }
var title = TranslationController.Instance.GetString(numberOption.StringName); var title = TranslationController.Instance.GetString(numberOption.StringName);
@@ -173,6 +177,7 @@ public static class Helpers
return builder.ToString(); return builder.ToString();
} }
/// <summary> /// <summary>
/// Get all living players. /// Get all living players.
/// </summary> /// </summary>
@@ -381,7 +386,7 @@ public static class Helpers
var popper = HudManager.Instance.Notifier; var popper = HudManager.Instance.Notifier;
var newMessage = Object.Instantiate(popper.notificationMessageOrigin, Vector3.zero, Quaternion.identity, popper.transform); var newMessage = Object.Instantiate(popper.notificationMessageOrigin, Vector3.zero, Quaternion.identity, popper.transform);
newMessage.transform.localPosition = localPos; newMessage.transform.localPosition = localPos;
newMessage.SetUp(text, spr ?? null, color, new System.Action(() => popper.OnMessageDestroy(newMessage))); newMessage.SetUp(text, spr ?? null, color, new Action(() => popper.OnMessageDestroy(newMessage)));
popper.lastMessageKey = -1; popper.lastMessageKey = -1;
popper.ShiftMessages(); popper.ShiftMessages();
popper.AddMessageToQueue(newMessage); popper.AddMessageToQueue(newMessage);
@@ -433,9 +438,12 @@ public static class Helpers
{ {
var results = new CppCollections.List<Collider2D>(); var results = new CppCollections.List<Collider2D>();
Physics2D.OverlapCircle(source, radius, filter, results); Physics2D.OverlapCircle(source, radius, filter, results);
return [.. results.ToArray() return
.Where(collider2D => collider2D.CompareTag("DeadBody")) [
.Select(collider2D => collider2D.GetComponent<DeadBody>())]; .. results.ToArray()
.Where(collider2D => collider2D.CompareTag("DeadBody"))
.Select(collider2D => collider2D.GetComponent<DeadBody>())
];
} }
/// <summary> /// <summary>
@@ -452,9 +460,12 @@ public static class Helpers
{ {
var results = new CppCollections.List<Collider2D>(); var results = new CppCollections.List<Collider2D>();
Physics2D.OverlapCircle(source, radius, filter, results); Physics2D.OverlapCircle(source, radius, filter, results);
return [.. results.ToArray() return
.Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag)) [
.Select(collider2D => collider2D.GetComponent<T>())]; .. results.ToArray()
.Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
.Select(collider2D => collider2D.GetComponent<T>())
];
} }
/// <summary> /// <summary>
@@ -473,15 +484,18 @@ public static class Helpers
return !ignoreColliders return !ignoreColliders
? newList ? newList
: [.. from player in newList :
let vector = player.GetTruePosition() - source [
let magnitude = vector.magnitude .. from player in newList
where !PhysicsHelpers.AnyNonTriggersBetween( let vector = player.GetTruePosition() - source
source, let magnitude = vector.magnitude
vector.normalized, where !PhysicsHelpers.AnyNonTriggersBetween(
magnitude, source,
Constants.ShipAndObjectsMask) vector.normalized,
select player]; magnitude,
Constants.ShipAndObjectsMask)
select player
];
} }
/// <summary> /// <summary>
@@ -542,17 +556,16 @@ public static class Helpers
Constants.ShipAndObjectsMask)) Constants.ShipAndObjectsMask))
select playerControl); select playerControl);
outputList.Sort( outputList.Sort((a, b) =>
(a, b) => {
{ var magnitude2 = (a.GetTruePosition() - source).magnitude;
var magnitude2 = (a.GetTruePosition() - source).magnitude; var magnitude3 = (b.GetTruePosition() - source).magnitude;
var magnitude3 = (b.GetTruePosition() - source).magnitude; return magnitude2 > magnitude3
return magnitude2 > magnitude3 ? 1
? 1 : magnitude2 < magnitude3
: magnitude2 < magnitude3 ? -1
? -1 : 0;
: 0; });
});
return outputList; return outputList;
} }