Skip to content

Commit

Permalink
Update to 3.9.0 - 30626
Browse files Browse the repository at this point in the history
  • Loading branch information
@TommySoucy
TommySoucy committed Jul 7, 2024
1 parent c6ab664 commit 01c7bd5
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
24 changes: 12 additions & 12 deletions MoreCheckmarks.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
using System.Linq;
using TMPro;
using BepInEx;
using Aki.Common.Http;
using SPT.Common.Http;
using Comfort.Common;

using EFT.Hideout;
Expand All @@ -36,7 +36,7 @@ public class MoreCheckmarksMod : BaseUnityPlugin
// BepinEx
public const string pluginGuid = "VIP.TommySoucy.MoreCheckmarks";
public const string pluginName = "MoreCheckmarks";
public const string pluginVersion = "1.5.13";
public const string pluginVersion = "1.5.14";

// Config settings
public static bool fulfilledAnyCanBeUpgraded = false;
Expand Down Expand Up @@ -788,7 +788,7 @@ public static void DoPatching()
// UPDATE: This is to know when a new profile is selected so we can load up to date data
// We want to do this when client makes request "/client/game/profile/select"
// Look for that string in dnspy, this creates a callback with a method_0, that is the method we want to postfix
ProfileSelector = assemblies[i].GetType("Class263").GetNestedType("Class1291", BindingFlags.Public);
ProfileSelector = assemblies[i].GetType("Class266").GetNestedType("Class1337", BindingFlags.Public);
}
}

Expand Down Expand Up @@ -969,7 +969,7 @@ public static bool GetNeededCraft(string itemTemplateID, ref string tooltip, boo
if (currentStage.Production != null && currentStage.Production.Data != null)
{
bool areaNameAdded = false;
foreach (GClass1922 productionData in currentStage.Production.Data)
foreach (ProductionBuildAbstractClass productionData in currentStage.Production.Data)
{
Requirement[] requirements = productionData.requirements;

Expand Down Expand Up @@ -1034,7 +1034,7 @@ public static bool IsQuestItem(IEnumerable<QuestDataClass> quests, string templa
{
if (quest.Template.Conditions != null)
{
foreach (KeyValuePair<EQuestStatus, GClass3368> keyValuePair in quest.Template.Conditions)
foreach (KeyValuePair<EQuestStatus, GClass3392> keyValuePair in quest.Template.Conditions)
{
if (keyValuePair.Key == EQuestStatus.AvailableForFinish)
{
Expand Down Expand Up @@ -1402,10 +1402,10 @@ private static void SetTooltip(EFT.Profile profile, List<string> areaNames, ref
{
// UPDATE: Look for the type used in QuestDataClass's Template var of type RawQuestClass
// with QuestConditionsList, for the value
foreach (KeyValuePair<EQuestStatus, GClass3368> kvp in questDataClass.Template.Conditions)
foreach (KeyValuePair<EQuestStatus, GClass3392> kvp in questDataClass.Template.Conditions)
{
EQuestStatus equestStatus;
GClass3368 gclass;
GClass3392 gclass;
kvp.Deconstruct(out equestStatus, out gclass);
foreach (Condition condition in gclass)
{
Expand Down Expand Up @@ -1668,20 +1668,20 @@ static void Postfix(GamePlayerOwner owner, LootItem lootItem, ref ActionsReturnC
}

[HarmonyPatch]
class GClass1249StatusPatch
class QuestClassStatusPatch
{
private static EQuestStatus preStatus;

// This prefix will run before a quest's status has been set
[HarmonyPatch(typeof(GClass1249), "SetStatus")]
static void Prefix(GClass1249 __instance)
[HarmonyPatch(typeof(QuestClass), "SetStatus")]
static void Prefix(QuestClass __instance)
{
preStatus = __instance.QuestStatus;
}

// This postfix will run after a quest's status has been set
[HarmonyPatch(typeof(GClass1249), "SetStatus")]
static void Postfix(GClass1249 __instance)
[HarmonyPatch(typeof(QuestClass), "SetStatus")]
static void Postfix(QuestClass __instance)
{
if(__instance == null)
{
Expand Down
9 changes: 4 additions & 5 deletions MoreCheckmarks.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\SPT BetterTark\Game\BepInEx\core\0Harmony.dll</HintPath>
</Reference>
<Reference Include="Aki.Common, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\SPT BetterTark\Game\EscapeFromTarkov_Data\Managed\Aki.Common.dll</HintPath>
</Reference>
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\SPT BetterTark\Game\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll</HintPath>
<HintPath>..\..\..\SPT Installer Bettertark\EscapeFromTarkov_Data\Managed\Assembly-CSharp.dll</HintPath>
</Reference>
<Reference Include="BepInEx, Version=5.4.21.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand All @@ -67,6 +63,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\SPT BetterTark\Game\EscapeFromTarkov_Data\Managed\Sirenix.Serialization.dll</HintPath>
</Reference>
<Reference Include="spt-common">
<HintPath>..\..\..\SPT Installer Bettertark\BepInEx\plugins\spt\spt-common.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Unity.TextMeshPro, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
4 changes: 2 additions & 2 deletions Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.5.13.0")]
[assembly: AssemblyFileVersion("1.5.13.0")]
[assembly: AssemblyVersion("1.5.14.0")]
[assembly: AssemblyFileVersion("1.5.14.0")]

0 comments on commit 01c7bd5

Please sign in to comment.