Merge VF Fork into Main Repository

.gitignore

@@ -4,3 +4,10 @@ obj/
 riderModule.iml
 /_ReSharper.Caches/
 .idea/
+*.lock.json
+.vs/
+*.user
+.qodo
+*.DS_Store
+
+.fake

AchievementsAPI/API/AchievementStorage.cs

@@ -34,8 +34,38 @@ public static void AchievementStorageUpdate(BaseAchievement achievement, bool un
     public static void AchievementStorageUpdate(CountAchievement achievement, int progress, bool unlocked)
     {
         var data = GetData(achievement);
+        var newProgress = Math.Clamp(progress, 0, achievement.RequiredValue);
         data.Unlocked = unlocked;
-        if (achievement.ProgressPersists) data.Progress = progress;
+        if (achievement.ProgressPersists is AchPersistence.ThroughoutSessions || data.Unlocked) data.Progress = newProgress;
+
+        Save();
+    }
+    public static void AchievementDataReset(BaseAchievement achievement, bool? unlocked = false)
+    {
+        var data = GetData(achievement);
+        if (unlocked != null)
+        {
+            achievement.Unlocked = unlocked.Value;
+            data.Unlocked = unlocked.Value;
+        }
+
+        Save();
+    }
+
+    public static void AchievementDataReset(CountAchievement achievement, int progress = 0, bool? unlocked = null)
+    {
+        var data = GetData(achievement);
+        data.Progress = Math.Clamp(progress, 0, achievement.RequiredValue);
+        if (unlocked != null)
+        {
+            achievement.Unlocked = unlocked.Value;
+            data.Unlocked = unlocked.Value;
+        }
+        else
+        {
+            data.Unlocked = data.Progress == achievement.RequiredValue;
+            achievement.Unlocked = data.Progress == achievement.RequiredValue;
+        }
 
         Save();
     }
@@ -74,7 +104,7 @@ public static AchievementData GetData(CountAchievement achievement)
     public static void AchievementStorageGet(AchievementsTab tab)
     {
         foreach (var propInfo in tab.GetType().GetProperties().Where(x =>
-                                 x.PropertyType == typeof(BaseAchievement)))
+                                 x.PropertyType.IsAssignableTo(typeof(BaseAchievement))))
         {
             var achievement = propInfo.GetValue(tab) as BaseAchievement;
             if (achievement == null) continue;
@@ -85,7 +115,7 @@ public static void AchievementStorageGet(AchievementsTab tab)
         }
 
         foreach (var propInfo in tab.GetType().GetProperties().Where(x =>
-                                 x.PropertyType == typeof(CountAchievement)))
+                                 x.PropertyType.IsAssignableTo(typeof(CountAchievement))))
         {
             var achievement = propInfo.GetValue(tab) as CountAchievement;
             if (achievement == null) continue;

AchievementsAPI/API/AchievementToast.cs

@@ -1,10 +1,9 @@
 using UnityEngine;
 using System.Collections;
-using Il2CppInterop.Runtime.InteropTypes.Fields;
-using Reactor.Utilities;
-using Reactor.Utilities.Extensions;
 using Rewired.Utils;
 using UnityEngine.UI;
+using VentLib.Utilities;
+using VentLib.Utilities.Extensions;
 
 namespace AchievementsAPI.API;
 public class AchievementToast
@@ -13,12 +12,12 @@ public class AchievementToast
 
     public static void ShowAndDeleteToast(BaseAchievement achievement)
     {
-        Coroutines.Start(CoShowAndDeleteToast(achievement));
+        Async.Execute(CoShowAndDeleteToast(achievement));
     }
 
     public static void ShowAndDeleteToast(CountAchievement achievement, bool unlocked = false)
     {
-        Coroutines.Start(CoShowAndDeleteToast(achievement, unlocked));
+        Async.Execute(CoShowAndDeleteToast(achievement, unlocked));
     }
 
     private static Transform GetOrCreateToast()
@@ -42,11 +41,17 @@ private static Transform GetOrCreateToast()
         }
     }
 
-    private static void PopulateToast(Transform toast, Sprite icon, System.Reflection.Assembly assembly, string title, string subtitle)
+    private static void PopulateToast(Transform toast, Sprite icon, System.Reflection.Assembly assembly, string title, string subtitle, Vector3 titleOffset, Vector3 subtitleOffset, Vector3 iconOffset)
     {
-        toast.FindChild("AchievementIcon").gameObject.GetComponent<Image>().sprite = icon;
-        toast.FindChild("AchievementName").gameObject.GetComponent<TMPro.TextMeshProUGUI>().text = title;
-        toast.FindChild("AchievementObtainedText").gameObject.GetComponent<TMPro.TextMeshProUGUI>().text = subtitle;
+        var icoObj = toast.FindChild("AchievementIcon").gameObject.GetComponent<Image>();
+        icoObj.sprite = icon;
+        icoObj.transform.localPosition += iconOffset;
+        var titleObj = toast.FindChild("AchievementName").gameObject.GetComponent<TMPro.TextMeshProUGUI>();
+        titleObj.text = title;
+        titleObj.transform.localPosition += titleOffset;
+        var subtitleObj = toast.FindChild("AchievementObtainedText").gameObject.GetComponent<TMPro.TextMeshProUGUI>();
+        subtitleObj.text = subtitle;
+        subtitleObj.transform.localPosition += subtitleOffset;
     }
 
     private static IEnumerator CoAnimateAndDestroyToast()
@@ -74,7 +79,7 @@ private static IEnumerator CoAnimateAndDestroyToast()
             yield return null;
         }
 
-        currentToast.gameObject.DeepDestroy();
+        currentToast.gameObject.Destroy();
         yield break;
     }
 
@@ -87,10 +92,18 @@ public static IEnumerator CoShowAndDeleteToast(BaseAchievement achievement)
 
         currentToast = GetOrCreateToast();
         PopulateToast(currentToast, achievement.Icon, achievement.Assembly,
-            title: "Achievement Obtained!",
-            subtitle: achievement.Name);
+            "Achievement Obtained!",
+            achievement.Name,
+            achievement.ToastTitleOffset,
+            achievement.ToastObtainedOffset,
+            achievement.ToastIconOffset);
+        var img = currentToast.GetComponent<Image>();
+        if (achievement.ToastBgSprite != null)
+        {
+            img.m_Sprite = achievement.ToastBgSprite;
+        }
 
-        yield return Coroutines.Start(CoAnimateAndDestroyToast());
+        yield return CoAnimateAndDestroyToast();
     }
 
     public static IEnumerator CoShowAndDeleteToast(CountAchievement achievement, bool unlocked = false)
@@ -104,16 +117,27 @@ public static IEnumerator CoShowAndDeleteToast(CountAchievement achievement, boo
         if (achievement.Hidden && achievement.HideProgress && !unlocked)
         {
             PopulateToast(currentToast, achievement.Icon, achievement.Assembly,
-                title: "Achievement Progressed!",
-                subtitle: $"Hidden Achievement");
+                "Achievement Progressed!",
+                "Hidden Achievement",
+                achievement.ToastTitleOffset,
+                achievement.ToastObtainedOffset,
+                achievement.ToastIconOffset);
         }
         else
         {
             PopulateToast(currentToast, achievement.Icon, achievement.Assembly,
-                title: unlocked ? "Achievement Obtained!" : "Achievement Progressed!",
-                subtitle: $"{achievement.Name} ({achievement.CurrentValue}/{achievement.RequiredValue})");
+                unlocked ? "Achievement Obtained!" : "Achievement Progressed!",
+                $"{achievement.Name} ({achievement.CurrentValue}/{achievement.RequiredValue})",
+                achievement.ToastTitleOffset,
+                achievement.ToastObtainedOffset,
+                achievement.ToastIconOffset);
+        }
+        var img = currentToast.GetComponent<Image>();
+        if (achievement.ToastBgSprite != null)
+        {
+            img.m_Sprite = achievement.ToastBgSprite;
         }
 
-        yield return Coroutines.Start(CoAnimateAndDestroyToast());
+        yield return CoAnimateAndDestroyToast();
     }
 }

AchievementsAPI/API/AchievementsTab.cs

@@ -15,7 +15,7 @@ public abstract class AchievementsTab
     public abstract string Name { get; }
 
     /// <summary>
-    /// Wether the tab should be selectable in the Achievements Menu. Handy for custom UI's or internal achievements.
+    /// Whether the tab should be selectable in the Achievements Menu. Handy for custom UI's or internal achievements.
     /// </summary>
     public virtual bool IsSelectable => true;
 

AchievementsAPI/API/BaseAchievement.cs

@@ -20,10 +20,73 @@
         /// The achievement's icon's path
         /// </summary>
         public string IconPath;
+
+        /// <summary>
+        /// Gets or sets the achievement's icon
+        /// </summary>
+        public virtual Sprite Icon => _sprite;
+
+        /// <summary>
+        /// Gets the background sprite for the achievement in the achievements menu.
+        /// </summary>
+        public virtual Sprite? MenuBgSprite => null;
+
+        /// <summary>
+        /// Gets the background sprite for the achievement in the toast pop up.
+        /// </summary>
+        public virtual Sprite? ToastBgSprite => null;
+
+        /// <summary>
+        /// Gets the offset for the achievement's icon in the achievements menu.
+        /// </summary>
+        public virtual Vector3 MenuIconOffset => new(0, 0);
+
+        /// <summary>
+        /// Gets the offset for the achievement's title in the achievements menu.
+        /// </summary>
+        public virtual Vector3 MenuTitleOffset => new(0, 0);
+
+        /// <summary>
+        /// Gets the offset for the achievement's description in the achievements menu.
+        /// </summary>
+        public virtual Vector3 MenuDescOffset => new(0, 0);
+
+        /// <summary>
+        /// Gets the offset for the achievement's sub-icon, if any.
+        /// </summary>
+        public virtual Vector3 MenuSubIconOffset => new(0, 0);
+
         /// <summary>
-        /// The achievement's icon
+        /// Gets the scale for the achievement's sub-icon, if any.
         /// </summary>
-        public Sprite Icon;
+        public virtual Vector3 MenuSubIconScale => new(0.5f, 0.5f, 1);
+
+        /// <summary>
+        /// Gets the achievement's sub-icon, if any.
+        /// </summary>
+        public virtual Sprite? MenuSubIcon => null;
+
+        /// <summary>
+        /// Gets the offset for the achievement's "Obtained" text in the toast pop up.
+        /// </summary>
+        public virtual Vector3 ToastObtainedOffset => new(0, 0);
+
+        /// <summary>
+        /// Gets the offset for the achievement's title in the toast pop up.
+        /// </summary>
+        public virtual Vector3 ToastTitleOffset => new(0, 0);
+
+        /// <summary>
+        /// Gets the offset for the achievement's icon in the toast pop up.
+        /// </summary>
+        public virtual Vector3 ToastIconOffset => new(0, 0);
+
+        /// <summary>
+        /// Whether the achievement's background becomes colored.
+        /// </summary>
+        public bool RarityOnBgSprite = true;
+
+        private Sprite _sprite;
         public bool Unlocked;
         /// <summary>
         /// The achievement's rarity:
@@ -34,11 +97,11 @@
         /// </summary>
         public int Rarity;
         /// <summary>
-        /// Wether the achievement is hidden or not (hidden achievements get the default icon and have their name and description set to "Hidden Achievement" until unlocked)
+        /// Whether the achievement is hidden or not (hidden achievements get the default icon and have their name and description set to "Hidden Achievement" until unlocked)
         /// </summary>
         public bool Hidden;
         /// <summary>
-        /// Wether to hide the achievement's rarity (if the achievement is hidden)
+        /// Whether to hide the achievement's rarity (if the achievement is hidden)
         /// </summary>
         public bool HideRarity;
         public Assembly Assembly;
@@ -56,15 +119,13 @@
             if (doStorageUpdate) AchievementStorage.AchievementStorageUpdate(this, true);
 
         }
-
-
         public BaseAchievement(string name, string description, string iconPath, int rarity = 0, bool hidden = false, bool hideRarity = true, Assembly? assembly = null)
         {
             Name = name;
             Description = description;
             IconPath = iconPath;
             Assembly = assembly ?? Assembly.GetCallingAssembly();
-            Icon = SpriteTools.LoadSpriteFromPath(IconPath, Assembly, 100);
+            _sprite = SpriteTools.LoadSpriteFromPath(IconPath, Assembly, 100);
             Id = Assembly.GetName().Name + "_" + Name;
             Rarity = rarity;
             Hidden = hidden;
@@ -75,7 +136,17 @@
             Name = name;
             Description = description;
             Assembly = assembly ?? Assembly.GetCallingAssembly();
-            Icon = icon;
+            _sprite = icon;
+            Id = Assembly.GetName().Name + "_" + Name;
+            Rarity = rarity;
+            Hidden = hidden;
+            HideRarity = hideRarity;
+        }
+        public BaseAchievement(string name, string description, int rarity = 0, bool hidden = false, bool hideRarity = true, Assembly? assembly = null)
+        {
+            Name = name;
+            Description = description;
+            Assembly = assembly ?? Assembly.GetCallingAssembly();
             Id = Assembly.GetName().Name + "_" + Name;
             Rarity = rarity;
             Hidden = hidden;

AchievementsAPI/API/CountAchievement.cs

@@ -17,21 +17,28 @@ public class CountAchievement : BaseAchievement
     /// </summary>
     public int RequiredValue;
     /// <summary>
-    /// Defines if the progress persists between games.
+    /// Defines how the progress persists between games.
     /// </summary>
-    public bool ProgressPersists;
+    public AchPersistence ProgressPersists;
     /// <summary>
-    /// Wether to hide the achievement's progress (if the achievement is hidden)
+    /// Whether to hide the achievement's progress (if the achievement is hidden)
     /// </summary>
     public bool HideProgress;
-    public CountAchievement(string name, string description, string iconPath, int currentValue, int requiredValue, bool progressPersists = true, int rarity = 0, bool hidden = false, bool hideRarity = true, bool hideProgress = false) : base(name, description, iconPath, rarity, hidden, hideRarity, System.Reflection.Assembly.GetCallingAssembly())
+    public CountAchievement(string name, string description, string iconPath, int currentValue, int requiredValue, AchPersistence progressPersists = AchPersistence.ThroughoutSessions, int rarity = 0, bool hidden = false, bool hideRarity = true, bool hideProgress = false) : base(name, description, iconPath, rarity, hidden, hideRarity, System.Reflection.Assembly.GetCallingAssembly())
     {
         CurrentValue = currentValue;
         RequiredValue = requiredValue;
         ProgressPersists = progressPersists;
         HideProgress = hideProgress;
     }
-    public CountAchievement(string name, string description, Sprite icon, int currentValue, int requiredValue, bool progressPersists = true, int rarity = 0, bool hidden = false, bool hideRarity = true, bool hideProgress = false) : base(name, description, icon, rarity, hidden, hideRarity, System.Reflection.Assembly.GetCallingAssembly())
+    public CountAchievement(string name, string description, Sprite icon, int currentValue, int requiredValue, AchPersistence progressPersists = AchPersistence.ThroughoutSessions, int rarity = 0, bool hidden = false, bool hideRarity = true, bool hideProgress = false) : base(name, description, icon, rarity, hidden, hideRarity, System.Reflection.Assembly.GetCallingAssembly())
+    {
+        CurrentValue = currentValue;
+        RequiredValue = requiredValue;
+        ProgressPersists = progressPersists;
+        HideProgress = hideProgress;
+    }
+    public CountAchievement(string name, string description, int currentValue, int requiredValue, AchPersistence progressPersists = AchPersistence.ThroughoutSessions, int rarity = 0, bool hidden = false, bool hideRarity = true, bool hideProgress = false) : base(name, description, rarity, hidden, hideRarity, System.Reflection.Assembly.GetCallingAssembly())
     {
         CurrentValue = currentValue;
         RequiredValue = requiredValue;
@@ -54,7 +61,6 @@ public void Increment(int count, bool showOnUI = true)
     /// <param name="showOnUI">Shows an unlock animation on the hud.</param>
     public void SetValue(int value, bool showOnUI = true)
     {
-
         CurrentValue = value;
         if (showOnUI && !Unlocked) AchievementToast.ShowAndDeleteToast(this, Unlocked);
         if (CurrentValue >= RequiredValue)
@@ -67,4 +73,12 @@ public void SetValue(int value, bool showOnUI = true)
         AchievementStorage.AchievementStorageUpdate(this, value, Unlocked);
 
     }
+}
+
+public enum AchPersistence
+{
+    ThroughoutSessions,
+    ThroughoutRounds,
+    ResetOnRoundStart,
+    ResetOnMeetingStart
 }

AchievementsAPI/AchievementsAPI.csproj

@@ -7,11 +7,19 @@
         <VersionPrefix>1.1.3</VersionPrefix>
         <VersionSuffix>dev</VersionSuffix>
         <Description>Achievements API for Among Us</Description>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <!-- <Authors>your name</Authors> -->
+        <PackageLicenseFile>LICENSE</PackageLicenseFile>
+        <IncludeContentInPack>true</IncludeContentInPack>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Reactor" Version="2.5.0-ci.371"/>
+        <None Include="../LICENSE" Pack="true" PackagePath="" />
+        <None Include="../README.md" Pack="true" PackagePath="" />
+        <Reference Include="../VFC/VentFrameworkContinued.dll">
+            <IncludeAssets>runtime; compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+            <PrivateAssets>all</PrivateAssets>
+        </Reference>
         <PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native"/>
         <PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.3.31" PrivateAssets="all" />