diff --git a/R2API.sln b/R2API.sln index 2c43af7d..41195b49 100644 --- a/R2API.sln +++ b/R2API.sln @@ -24,8 +24,8 @@ Global GlobalSection(ProjectConfigurationPlatforms) = postSolution {2F8A40CC-6D15-486D-B689-0A7A472DB89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2F8A40CC-6D15-486D-B689-0A7A472DB89E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F8A40CC-6D15-486D-B689-0A7A472DB89E}.Release|Any CPU.ActiveCfg = Debug|Any CPU - {2F8A40CC-6D15-486D-B689-0A7A472DB89E}.Release|Any CPU.Build.0 = Debug|Any CPU + {2F8A40CC-6D15-486D-B689-0A7A472DB89E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F8A40CC-6D15-486D-B689-0A7A472DB89E}.Release|Any CPU.Build.0 = Release|Any CPU {EA7A07AF-BCF5-48C1-BEFB-B569785743FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {EA7A07AF-BCF5-48C1-BEFB-B569785743FF}.Debug|Any CPU.Build.0 = Debug|Any CPU {EA7A07AF-BCF5-48C1-BEFB-B569785743FF}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/R2API/ItemDropAPI.cs b/R2API/ItemDropAPI.cs index b03c075c..d0bb5d9d 100644 --- a/R2API/ItemDropAPI.cs +++ b/R2API/ItemDropAPI.cs @@ -190,7 +190,6 @@ private static void PopulateScene(On.RoR2.SceneDirector.orig_PopulateScene orig, rouletteCommandArtifactLists.Clear(); chestCommandArtifactLists.Clear(); - sceneDirector.interactableCredit = sceneDirector.interactableCredit * 25; var allInteractables = Resources.LoadAll(AllInteractablesResourcesPath); foreach (var spawnCard in allInteractables) { var interactableName = InteractableCalculator.GetSpawnCardName(spawnCard); diff --git a/R2API/PlayerAPI.cs b/R2API/PlayerAPI.cs deleted file mode 100644 index ad8f321d..00000000 --- a/R2API/PlayerAPI.cs +++ /dev/null @@ -1,88 +0,0 @@ -// Nullable context not needed for deprecated APIs -#pragma warning disable CS8605 // Unboxing a possibly null value. -#pragma warning disable CS8600 // Converting null literal or possible null value to non-nullable type. -#pragma warning disable CS8603 // Possible null reference return. -#pragma warning disable CS8602 // Dereference of a possibly null reference. -#pragma warning disable CS8604 // Possible null reference argument. -#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. -#pragma warning disable CS8601 // Possible null reference assignment. -#pragma warning disable CS8625 // Cannot convert null literal to non-nullable reference type. - -using R2API.Utils; -using RoR2; -using System; -using System.Collections.Generic; - -namespace R2API { - // ReSharper disable once InconsistentNaming - public static class PlayerAPI { - public static List> CustomEffects { get; private set; } - - internal static void InitHooks() { - On.RoR2.CharacterBody.RecalculateStats += (orig, self) => RecalcStats(self); - } - - public static void RecalcStats(CharacterBody characterBody) { - characterBody.SetFieldValue("experience", - TeamManager.instance.GetTeamExperience(characterBody.teamComponent.teamIndex)); - characterBody.SetFieldValue("level", - TeamManager.instance.GetTeamLevel(characterBody.teamComponent.teamIndex)); - - /* Calculate Vanilla items effects - * - * TODO - */ - - PlayerStats playerStats = null; //TODO: initialize this from characterBody - - foreach (var effectAction in CustomEffects) { - effectAction(playerStats); - } - - //characterBody.statsDirty = false; - } - } - - public class PlayerStats { - //Character Stats - public int maxHealth = 0; - public int healthRegen = 0; - public bool isElite = false; - public int maxShield = 0; - public float movementSpeed = 0; - public float acceleration = 0; - public float jumpPower = 0; - public float maxJumpHeight = 0; - public float maxJumpCount = 0; - public float attackSpeed = 0; - public float damage = 0; - public float Crit = 0; - public float Armor = 0; - public float critHeal = 0; - - //Primary Skill - public float PrimaryCooldownScale = 0; - public float PrimaryStock = 0; - - //Secondary Skill - public float SecondaryCooldownScale = 0; - public float SecondaryStock = 0; - - //Utility Skill - public float UtilityCooldownScale = 0; - public float UtilityStock = 0; - - //Special Skill - public float SpecialCooldownScale = 0; - public float SpecialStock = 0; - } -} - -#pragma warning restore CS8605 // Unboxing a possibly null value. -#pragma warning restore CS8600 // Converting null literal or possible null value to non-nullable type. -#pragma warning restore CS8603 // Possible null reference return. -#pragma warning restore CS8602 // Dereference of a possibly null reference. -#pragma warning restore CS8604 // Possible null reference argument. -#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable. -#pragma warning restore CS8601 // Possible null reference assignment. -#pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.