diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/bepInEx/plugins/Faupi-HideoutArchitect.dll b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/bepInEx/plugins/Faupi-HideoutArchitect.dll deleted file mode 100644 index 8b20ae1..0000000 Binary files a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/bepInEx/plugins/Faupi-HideoutArchitect.dll and /dev/null differ diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/bepInEx/plugins/Faupi-HideoutArchitect.dll b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/bepInEx/plugins/Faupi-HideoutArchitect.dll new file mode 100644 index 0000000..d3df414 Binary files /dev/null and b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/bepInEx/plugins/Faupi-HideoutArchitect.dll differ diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/LICENSE b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/LICENSE similarity index 100% rename from Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/LICENSE rename to Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/LICENSE diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/config.jsonc b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/config.jsonc similarity index 100% rename from Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/config.jsonc rename to Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/config.jsonc diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/package.json b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/package.json similarity index 92% rename from Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/package.json rename to Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/package.json index 4e2944e..3a7112e 100644 --- a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/package.json +++ b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/package.json @@ -1,10 +1,10 @@ { "name": "HideoutArchitect", - "version": "1.6.8", + "version": "1.6.9", "main": "./src/hideoutarchitect.js", "license": "NCSA Open Source", "author": "Faupi", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "updated by": "CWX", "scripts": { "setup": "npm i", diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/res/icon_neededforhideout_small.png b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/res/icon_neededforhideout_small.png similarity index 100% rename from Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/res/icon_neededforhideout_small.png rename to Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/res/icon_neededforhideout_small.png diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/res/translations.json b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/res/translations.json similarity index 100% rename from Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/res/translations.json rename to Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/res/translations.json diff --git a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/src/hideoutarchitect.ts b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/src/hideoutarchitect.ts similarity index 97% rename from Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/src/hideoutarchitect.ts rename to Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/src/hideoutarchitect.ts index 1fbb2b1..0a715c3 100644 --- a/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.8/user/mods/HideoutArchitect/src/hideoutarchitect.ts +++ b/Faupi-HideoutArchitect/Built/Faupi-HideoutArchitect 1.6.9/user/mods/HideoutArchitect/src/hideoutarchitect.ts @@ -52,7 +52,7 @@ class HideoutArchitect implements IPreAkiLoadMod, IPostAkiLoadMod { const attrValue = attrKvPair[attrKey]; - this.globalLocale[language].interface[attrKey] = attrValue; + this.globalLocale[language][attrKey] = attrValue; } } } diff --git a/Faupi-HideoutArchitect/HideoutArchitect/HideoutArchitect/Program.cs b/Faupi-HideoutArchitect/HideoutArchitect/HideoutArchitect/Program.cs index a3d16bf..a322fac 100644 --- a/Faupi-HideoutArchitect/HideoutArchitect/HideoutArchitect/Program.cs +++ b/Faupi-HideoutArchitect/HideoutArchitect/HideoutArchitect/Program.cs @@ -7,12 +7,10 @@ using System.IO; using System.Linq; using BepInEx; using UnityEngine; -using Hideout = GClass1682; -using Requirement = GClass1706; namespace HideoutArchitect { - [BepInPlugin("com.FAUPI.HideoutArchitect", "FAUPI-HideoutArchitect", "1.6.8")] + [BepInPlugin("com.FAUPI.HideoutArchitect", "FAUPI-HideoutArchitect", "1.6.9")] public class HideoutArchitect : BaseUnityPlugin { private void Awake() @@ -71,16 +69,16 @@ namespace HideoutArchitect public static List GetApplicableUpgrades(Item item) { - List areas = Singleton.Instance.AreaDatas.Where(area => + List areas = Singleton.Instance.AreaDatas.Where(area => { bool areaActive = area.Status != EAreaStatus.NotSet && area.Template.Enabled == true; - List targetedRequirements; + List targetedRequirements; switch (ModConfig.NeededForHideoutDefinition) { case ENeededDefinition.NextLevel: case ENeededDefinition.NextLevelReady: - targetedRequirements = area.NextStage.Requirements.Value as List; + targetedRequirements = area.NextStage.Requirements.Value as List; break; default: throw new NotImplementedException(Enum.GetName(typeof(ENeededDefinition), ModConfig.NeededForHideoutDefinition)); diff --git a/Faupi-HideoutArchitect/server/dist/package.json b/Faupi-HideoutArchitect/server/dist/package.json index 4e2944e..3a7112e 100644 --- a/Faupi-HideoutArchitect/server/dist/package.json +++ b/Faupi-HideoutArchitect/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "HideoutArchitect", - "version": "1.6.8", + "version": "1.6.9", "main": "./src/hideoutarchitect.js", "license": "NCSA Open Source", "author": "Faupi", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "updated by": "CWX", "scripts": { "setup": "npm i", diff --git a/Faupi-HideoutArchitect/server/dist/src/hideoutarchitect.ts b/Faupi-HideoutArchitect/server/dist/src/hideoutarchitect.ts index 1fbb2b1..0a715c3 100644 --- a/Faupi-HideoutArchitect/server/dist/src/hideoutarchitect.ts +++ b/Faupi-HideoutArchitect/server/dist/src/hideoutarchitect.ts @@ -52,7 +52,7 @@ class HideoutArchitect implements IPreAkiLoadMod, IPostAkiLoadMod { const attrValue = attrKvPair[attrKey]; - this.globalLocale[language].interface[attrKey] = attrValue; + this.globalLocale[language][attrKey] = attrValue; } } } diff --git a/Faupi-HideoutArchitect/server/package.json b/Faupi-HideoutArchitect/server/package.json index 4e2944e..3a7112e 100644 --- a/Faupi-HideoutArchitect/server/package.json +++ b/Faupi-HideoutArchitect/server/package.json @@ -1,10 +1,10 @@ { "name": "HideoutArchitect", - "version": "1.6.8", + "version": "1.6.9", "main": "./src/hideoutarchitect.js", "license": "NCSA Open Source", "author": "Faupi", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "updated by": "CWX", "scripts": { "setup": "npm i", diff --git a/Faupi-HideoutArchitect/server/src/hideoutarchitect.ts b/Faupi-HideoutArchitect/server/src/hideoutarchitect.ts index 1fbb2b1..0a715c3 100644 --- a/Faupi-HideoutArchitect/server/src/hideoutarchitect.ts +++ b/Faupi-HideoutArchitect/server/src/hideoutarchitect.ts @@ -52,7 +52,7 @@ class HideoutArchitect implements IPreAkiLoadMod, IPostAkiLoadMod { const attrValue = attrKvPair[attrKey]; - this.globalLocale[language].interface[attrKey] = attrValue; + this.globalLocale[language][attrKey] = attrValue; } } } diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/bepInEx/plugins/Faupi-MunitionsExpert.dll b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/bepInEx/plugins/Faupi-MunitionsExpert.dll deleted file mode 100644 index f8c1e93..0000000 Binary files a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/bepInEx/plugins/Faupi-MunitionsExpert.dll and /dev/null differ diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/bepInEx/plugins/Faupi-MunitionsExpert.dll b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/bepInEx/plugins/Faupi-MunitionsExpert.dll new file mode 100644 index 0000000..8ce0f37 Binary files /dev/null and b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/bepInEx/plugins/Faupi-MunitionsExpert.dll differ diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/LICENSE.txt b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/LICENSE.txt similarity index 100% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/LICENSE.txt rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/LICENSE.txt diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/package.json b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/package.json similarity index 91% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/package.json rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/package.json index 234a9a0..eca8a33 100644 --- a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/package.json +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/package.json @@ -1,10 +1,10 @@ { "name": "MunitionsExpert", "author": "Faupi", - "version": "1.6.7", + "version": "1.6.8", "license": "NCSA Open Source", "main": "./src/MunitionsExpert.js", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "updatedBy": "CWX", "scripts": { "setup": "npm i", diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/res/armorDamage.png b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/res/armorDamage.png similarity index 100% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/res/armorDamage.png rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/res/armorDamage.png diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/res/ricochet.png b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/res/ricochet.png similarity index 100% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/res/ricochet.png rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/res/ricochet.png diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/res/translations.json b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/res/translations.json similarity index 100% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/res/translations.json rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/res/translations.json diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/src/MunitionsExpert.ts b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/src/MunitionsExpert.ts similarity index 98% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/src/MunitionsExpert.ts rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/src/MunitionsExpert.ts index 8fae03c..2adb346 100644 --- a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/src/MunitionsExpert.ts +++ b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/src/MunitionsExpert.ts @@ -55,7 +55,7 @@ class MunitionsExpert implements IPreAkiLoadMod, IPostAkiLoadMod { const attrValue = attrKvPair[attrKey]; - this.globalLocale[language].interface[attrKey] = attrValue; + this.globalLocale[language][attrKey] = attrValue; } } } diff --git a/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/src/config.json b/Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/src/config.json similarity index 100% rename from Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.7/user/mods/Faupi-MunitionsExpert 1.6.7/src/config.json rename to Faupi-MunitionsExpert/Built/Faupi-MunitionsExpert 1.6.8/user/mods/Faupi-MunitionsExpert 1.6.8/src/config.json diff --git a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs index ceae754..e8a159e 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/CachedAttributesPatch.cs @@ -3,7 +3,6 @@ using EFT.InventoryLogic; using System.Collections.Generic; using System.Linq; using System.Reflection; -using ItemAttributes = GClass2210; namespace MunitionsExpert { @@ -15,9 +14,9 @@ namespace MunitionsExpert } [PatchPostfix] - private static void PatchPostfix(ref AmmoTemplate __instance, ref List __result) + private static void PatchPostfix(ref AmmoTemplate __instance, ref List __result) { - if (!__result.Any((ItemAttributes a) => (Attributes.ENewItemAttributeId)a.Id == Attributes.ENewItemAttributeId.Damage)) + if (!__result.Any((ItemAttributeClass a) => (Attributes.ENewItemAttributeId)a.Id == Attributes.ENewItemAttributeId.Damage)) { //MunitionsExpert.FormatExistingAttributes(ref __result, __instance); Plugin.AddNewAttributes(ref __result, __instance); diff --git a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs index 532a528..c91be2d 100644 --- a/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs +++ b/Faupi-MunitionsExpert/MunitionsExpert/MunitionsExpert/Program.cs @@ -9,19 +9,16 @@ using BepInEx; using Comfort.Common; using Newtonsoft.Json; using Aki.Common.Utils; - -using ItemAttribute = GClass2210; -using ServerSettings = GClass1173; using static MunitionsExpert.Attributes; using Aki.Common.Http; namespace MunitionsExpert { - [BepInPlugin("com.Faupi.MunitionsExpert", "Faupi-MunitionsExpert", "1.6.7")] + [BepInPlugin("com.Faupi.MunitionsExpert", "Faupi-MunitionsExpert", "1.6.8")] public class Plugin : BaseUnityPlugin { public static Dictionary iconCache = new Dictionary(); - public static List penAttributes = new List(); + public static List penAttributes = new List(); public static string modPath; private void Awake() @@ -72,7 +69,7 @@ namespace MunitionsExpert } } - public static void AddNewAttributes(ref List attributes, AmmoTemplate template) + public static void AddNewAttributes(ref List attributes, AmmoTemplate template) { int projCount = template.ProjectileCount; int totalDamage = template.Damage * template.ProjectileCount; @@ -83,7 +80,7 @@ namespace MunitionsExpert damageStr += $" ({template.Damage} x {template.ProjectileCount})"; // Add the "damage calculation" after total damage (damage per pellet * pellet count) } - ItemAttribute at_damage = new ItemAttribute(ENewItemAttributeId.Damage) + ItemAttributeClass at_damage = new ItemAttributeClass(ENewItemAttributeId.Damage) { Name = ENewItemAttributeId.Damage.GetName(), Base = () => totalDamage, @@ -94,7 +91,7 @@ namespace MunitionsExpert if (template.ArmorDamage > 0) { - ItemAttribute at_armordmg = new ItemAttribute(ENewItemAttributeId.ArmorDamage) + ItemAttributeClass at_armordmg = new ItemAttributeClass(ENewItemAttributeId.ArmorDamage) { Name = ENewItemAttributeId.ArmorDamage.GetName(), Base = () => template.ArmorDamage, @@ -110,8 +107,8 @@ namespace MunitionsExpert { int ratedClass = 0; - if (!Singleton.Instantiated) { return $"CLASS_DATA_MISSING {template.PenetrationPower.ToString()}"; } - ServerSettings.GClass1220.GClass1221[] classes = Singleton.Instance.Armor.ArmorClass; + if (!Singleton.Instantiated) { return $"CLASS_DATA_MISSING {template.PenetrationPower.ToString()}"; } + BackendConfigSettingsClass.GClass1226.GClass1227[] classes = Singleton.Instance.Armor.ArmorClass; for (int i = 0; i < classes.Length; i++) { if (classes[i].Resistance > template.PenetrationPower) continue; @@ -121,7 +118,7 @@ namespace MunitionsExpert return $"{(ratedClass > 0 ? $"{"ME_class".Localized()} {ratedClass}" : "ME_noarmor".Localized())} ({template.PenetrationPower.ToString()})"; } - ItemAttribute at_pen = new ItemAttribute(ENewItemAttributeId.Penetration) + ItemAttributeClass at_pen = new ItemAttributeClass(ENewItemAttributeId.Penetration) { Name = ENewItemAttributeId.Penetration.GetName(), Base = () => template.PenetrationPower, @@ -133,7 +130,7 @@ namespace MunitionsExpert if (template.FragmentationChance > 0) { - ItemAttribute at_frag = new ItemAttribute(ENewItemAttributeId.FragmentationChance) + ItemAttributeClass at_frag = new ItemAttributeClass(ENewItemAttributeId.FragmentationChance) { Name = ENewItemAttributeId.FragmentationChance.GetName(), Base = () => template.FragmentationChance, @@ -145,7 +142,7 @@ namespace MunitionsExpert if (template.RicochetChance > 0) { - ItemAttribute at_ricochet = new ItemAttribute(ENewItemAttributeId.RicochetChance) + ItemAttributeClass at_ricochet = new ItemAttributeClass(ENewItemAttributeId.RicochetChance) { Name = ENewItemAttributeId.RicochetChance.GetName(), Base = () => template.RicochetChance, diff --git a/Faupi-MunitionsExpert/server/dist/package.json b/Faupi-MunitionsExpert/server/dist/package.json index 234a9a0..eca8a33 100644 --- a/Faupi-MunitionsExpert/server/dist/package.json +++ b/Faupi-MunitionsExpert/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "MunitionsExpert", "author": "Faupi", - "version": "1.6.7", + "version": "1.6.8", "license": "NCSA Open Source", "main": "./src/MunitionsExpert.js", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "updatedBy": "CWX", "scripts": { "setup": "npm i", diff --git a/Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts b/Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts index 8fae03c..2adb346 100644 --- a/Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts +++ b/Faupi-MunitionsExpert/server/dist/src/MunitionsExpert.ts @@ -55,7 +55,7 @@ class MunitionsExpert implements IPreAkiLoadMod, IPostAkiLoadMod { const attrValue = attrKvPair[attrKey]; - this.globalLocale[language].interface[attrKey] = attrValue; + this.globalLocale[language][attrKey] = attrValue; } } } diff --git a/Faupi-MunitionsExpert/server/package.json b/Faupi-MunitionsExpert/server/package.json index 234a9a0..eca8a33 100644 --- a/Faupi-MunitionsExpert/server/package.json +++ b/Faupi-MunitionsExpert/server/package.json @@ -1,10 +1,10 @@ { "name": "MunitionsExpert", "author": "Faupi", - "version": "1.6.7", + "version": "1.6.8", "license": "NCSA Open Source", "main": "./src/MunitionsExpert.js", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "updatedBy": "CWX", "scripts": { "setup": "npm i", diff --git a/Faupi-MunitionsExpert/server/src/MunitionsExpert.ts b/Faupi-MunitionsExpert/server/src/MunitionsExpert.ts index 8fae03c..2adb346 100644 --- a/Faupi-MunitionsExpert/server/src/MunitionsExpert.ts +++ b/Faupi-MunitionsExpert/server/src/MunitionsExpert.ts @@ -55,7 +55,7 @@ class MunitionsExpert implements IPreAkiLoadMod, IPostAkiLoadMod { const attrValue = attrKvPair[attrKey]; - this.globalLocale[language].interface[attrKey] = attrValue; + this.globalLocale[language][attrKey] = attrValue; } } } diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/bepInEx/plugins/KcY-SeeItemValue.dll b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/bepInEx/plugins/KcY-SeeItemValue.dll deleted file mode 100644 index d587e61..0000000 Binary files a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/bepInEx/plugins/KcY-SeeItemValue.dll and /dev/null differ diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/bepInEx/plugins/KcY-SeeItemValue.dll b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/bepInEx/plugins/KcY-SeeItemValue.dll new file mode 100644 index 0000000..05de7af Binary files /dev/null and b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/bepInEx/plugins/KcY-SeeItemValue.dll differ diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/LICENSE.txt b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/LICENSE.txt similarity index 100% rename from KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/LICENSE.txt rename to KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/LICENSE.txt diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/package.json b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/package.json similarity index 91% rename from KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/package.json rename to KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/package.json index f799ae4..fa8f425 100644 --- a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/package.json +++ b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/package.json @@ -1,10 +1,10 @@ { "name": "SeeItemValue", "author": "KcY", - "version": "1.5.0", + "version": "1.5.1", "license": "NCSA Open Source", "main": "src/mod.js", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "UpdatedBy": "CWX", "scripts": { "setup": "npm i", diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/src/config.json b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/src/config.json similarity index 100% rename from KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/src/config.json rename to KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/src/config.json diff --git a/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/src/mod.ts b/KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/src/mod.ts similarity index 100% rename from KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.0/user/mods/KcY-SeeItemValue 1.5.0/src/mod.ts rename to KcY-SeeItemValue/itemValue/Built/KcY-SeeItemValue 1.5.1/user/mods/KcY-SeeItemValue 1.5.1/src/mod.ts diff --git a/KcY-SeeItemValue/itemValue/Patches.cs b/KcY-SeeItemValue/itemValue/Patches.cs index 4d71330..3f1b720 100644 --- a/KcY-SeeItemValue/itemValue/Patches.cs +++ b/KcY-SeeItemValue/itemValue/Patches.cs @@ -2,11 +2,6 @@ using System.Reflection; using Aki.Reflection.Patching; using EFT.InventoryLogic; -using Ammo = BulletClass; -using Grenade = GClass2199; -using GrenadeTemplate = GClass2091; -using SecureContainer = GClass2144; -using SecureContainerTemplate = GClass2051; namespace itemValueMod { @@ -28,11 +23,11 @@ namespace itemValueMod { protected override MethodBase GetTargetMethod() { - return typeof(Ammo).GetConstructor(new Type[] { typeof(string), typeof(AmmoTemplate) }); + return typeof(BulletClass).GetConstructor(new Type[] { typeof(string), typeof(AmmoTemplate) }); } [PatchPostfix] - private static void PatchPostFix(ref Ammo __instance, string id, AmmoTemplate template) + private static void PatchPostFix(ref BulletClass __instance, string id, AmmoTemplate template) { ItemValue.AddItemValue(ref __instance, id, template); } @@ -42,11 +37,11 @@ namespace itemValueMod { protected override MethodBase GetTargetMethod() { - return typeof(Grenade).GetConstructor(new Type[] { typeof(string), typeof(GrenadeTemplate) }); + return typeof(GrenadeClass).GetConstructor(new Type[] { typeof(string), typeof(ThrowableWeaponClass) }); } [PatchPostfix] - private static void PatchPostFix(ref Grenade __instance, string id, GrenadeTemplate template) + private static void PatchPostFix(ref GrenadeClass __instance, string id, ThrowableWeaponClass template) { ItemValue.AddItemValue(ref __instance, id, template); } @@ -56,11 +51,11 @@ namespace itemValueMod { protected override MethodBase GetTargetMethod() { - return typeof(SecureContainer).GetConstructor(new Type[] { typeof(string), typeof(SecureContainerTemplate) }); + return typeof(ItemContainerClass).GetConstructor(new Type[] { typeof(string), typeof(SecureContainerTemplateClass) }); } [PatchPostfix] - private static void PatchPostFix(ref SecureContainer __instance, string id, SecureContainerTemplate template) + private static void PatchPostFix(ref ItemContainerClass __instance, string id, SecureContainerTemplateClass template) { ItemValue.AddItemValue(ref __instance, id, template); } diff --git a/KcY-SeeItemValue/itemValue/Program.cs b/KcY-SeeItemValue/itemValue/Program.cs index 64c50ba..8c41d8d 100644 --- a/KcY-SeeItemValue/itemValue/Program.cs +++ b/KcY-SeeItemValue/itemValue/Program.cs @@ -2,7 +2,7 @@ namespace itemValueMod { - [BepInPlugin("com.KcY.SeeItemValue", "KcY-SeeItemValue", "1.4.9")] + [BepInPlugin("com.KcY.SeeItemValue", "KcY-SeeItemValue", "1.5.1")] public class Plugin : BaseUnityPlugin { private void Awake() diff --git a/KcY-SeeItemValue/itemValue/itemValueMod.cs b/KcY-SeeItemValue/itemValue/itemValueMod.cs index ab4d18b..5a83d89 100644 --- a/KcY-SeeItemValue/itemValue/itemValueMod.cs +++ b/KcY-SeeItemValue/itemValue/itemValueMod.cs @@ -4,7 +4,6 @@ using EFT.InventoryLogic; using System; using System.Collections.Generic; using System.Reflection; -using ItemAttribute = GClass2210; using System.Net; using System.Threading; using UnityEngine; @@ -16,11 +15,11 @@ namespace itemValueMod { public static void AddItemValue(ref T __instance, string id, ItemTemplate template) where T : Item { - var atts = new List(); + var atts = new List(); atts.AddRange(__instance.Attributes); __instance.Attributes = atts; - ItemAttribute attr1 = new ItemAttribute(EItemAttributeId.MoneySum) + ItemAttributeClass attr1 = new ItemAttributeClass(EItemAttributeId.MoneySum) { StringValue = new Func(__instance.TraderPrice), FullStringValue = new Func(__instance.TraderName), @@ -197,12 +196,12 @@ namespace itemValueMod var foodDrink = item.GetItemComponent(); if (foodDrink != null && foodDrink.HpPercent != 0) { - GInterface209 ginterface209_0 = (GInterface209)foodDrink.GetType().GetField("ginterface209_0", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(foodDrink); + GInterface211 ginterface211_0 = (GInterface211)foodDrink.GetType().GetField("ginterface211_0", BindingFlags.NonPublic | BindingFlags.Instance).GetValue(foodDrink); DebugMode($" foodDrink Check - HpPercent is: {foodDrink.HpPercent}"); - DebugMode($" foodDrink Check - MaxResource is: {ginterface209_0.MaxResource}"); + DebugMode($" foodDrink Check - MaxResource is: {ginterface211_0.MaxResource}"); - editedPrice *= foodDrink.HpPercent / ginterface209_0.MaxResource; + editedPrice *= foodDrink.HpPercent / ginterface211_0.MaxResource; } DebugMode($" After foodDrink Check - price is: {editedPrice}"); @@ -210,12 +209,12 @@ namespace itemValueMod var keys = item.GetItemComponent(); if (keys != null) { - GInterface213 gInterface213_0 = (GInterface213)keys.GetType().GetField("Template", BindingFlags.Public | BindingFlags.Instance).GetValue(keys); + GInterface215 gInterface215_0 = (GInterface215)keys.GetType().GetField("Template", BindingFlags.Public | BindingFlags.Instance).GetValue(keys); if (keys.NumberOfUsages > 0) { - double totalMinusUsed = Convert.ToDouble(gInterface213_0.MaximumNumberOfUsage - keys.NumberOfUsages); - double multi = totalMinusUsed / gInterface213_0.MaximumNumberOfUsage; + double totalMinusUsed = Convert.ToDouble(gInterface215_0.MaximumNumberOfUsage - keys.NumberOfUsages); + double multi = totalMinusUsed / gInterface215_0.MaximumNumberOfUsage; DebugMode($" foodDrink Check - totalMinusUsed is: {totalMinusUsed}"); DebugMode($" foodDrink Check - multi is: {multi}"); diff --git a/KcY-SeeItemValue/itemValue/itemValueMod.csproj b/KcY-SeeItemValue/itemValue/itemValueMod.csproj index a65d17f..b6104f8 100644 --- a/KcY-SeeItemValue/itemValue/itemValueMod.csproj +++ b/KcY-SeeItemValue/itemValue/itemValueMod.csproj @@ -2,7 +2,7 @@ net472 - 1.4.9 + 1.5.1 KcY-SeeItemValue diff --git a/KcY-SeeItemValue/itemValue/server/dist/package.json b/KcY-SeeItemValue/itemValue/server/dist/package.json index dde6f29..fa8f425 100644 --- a/KcY-SeeItemValue/itemValue/server/dist/package.json +++ b/KcY-SeeItemValue/itemValue/server/dist/package.json @@ -1,10 +1,10 @@ { "name": "SeeItemValue", "author": "KcY", - "version": "1.4.9", + "version": "1.5.1", "license": "NCSA Open Source", "main": "src/mod.js", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "UpdatedBy": "CWX", "scripts": { "setup": "npm i", diff --git a/KcY-SeeItemValue/itemValue/server/package.json b/KcY-SeeItemValue/itemValue/server/package.json index dde6f29..fa8f425 100644 --- a/KcY-SeeItemValue/itemValue/server/package.json +++ b/KcY-SeeItemValue/itemValue/server/package.json @@ -1,10 +1,10 @@ { "name": "SeeItemValue", "author": "KcY", - "version": "1.4.9", + "version": "1.5.1", "license": "NCSA Open Source", "main": "src/mod.js", - "akiVersion": "3.3.0", + "akiVersion": "3.4.0", "UpdatedBy": "CWX", "scripts": { "setup": "npm i", diff --git a/Shared/EFT/Assembly-CSharp.dll b/Shared/EFT/Assembly-CSharp.dll index 52df8ce..32bd76a 100644 Binary files a/Shared/EFT/Assembly-CSharp.dll and b/Shared/EFT/Assembly-CSharp.dll differ