Skip to content

Commit f42c5a5

Browse files
committed
fixes for implicit v1.3.5
1 parent ccd92b3 commit f42c5a5

7 files changed

+14
-6
lines changed

Diff for: kg_LastEpoch_Improvements.sln.DotSettings.user

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CStuff_005CRiderProjects_005Ckg_005FLastEpoch_005FImprovements_005Ckg_005FLastEpoch_005FImprovements_005CLibs_005CIl2CppLE_002EUI_002EControls_002Edll/@EntryIndexedValue">True</s:Boolean>
3+
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CStuff_005CRiderProjects_005Ckg_005FLastEpoch_005FImprovements_005Ckg_005FLastEpoch_005FImprovements_005CLibs_005CUnityEngine_002EIMGUIModule_002Edll/@EntryIndexedValue">True</s:Boolean>
24
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=D_003A_005CRiderProjects_005Ckg_005FLastEpoch_005FFilterIcons_005Ckg_005FLastEpoch_005FFilterIcons_005FMelon_005CLibs_005C0Harmony_002Edll/@EntryIndexedValue">True</s:Boolean>
35
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=D_003A_005CRiderProjects_005Ckg_005FLastEpoch_005FFilterIcons_005Ckg_005FLastEpoch_005FFilterIcons_005FMelon_005CLibs_005CIl2CppInterop_002ECommon_002Edll/@EntryIndexedValue">True</s:Boolean>
46
<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=D_003A_005CRiderProjects_005Ckg_005FLastEpoch_005FFilterIcons_005Ckg_005FLastEpoch_005FFilterIcons_005FMelon_005CLibs_005CIl2CppInterop_002ERuntime_002Edll/@EntryIndexedValue">True</s:Boolean>

Diff for: kg_LastEpoch_Improvements/Experimental.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ private static void Postfix(GroundItemLabel __instance)
2727
private static bool CheckFilter(ItemDataUnpacked item)
2828
{
2929
if (ItemFilterManager.Instance.Filter == null) return false;
30-
foreach (var rule in ItemFilterManager.Instance.Filter.rules)
30+
foreach (Rule rule in ItemFilterManager.Instance.Filter.rules)
3131
{
3232
if (!rule.isEnabled || rule.type is Rule.RuleOutcome.HIDE) continue;
3333
bool result = rule.Match(item);
0 Bytes
Binary file not shown.

Diff for: kg_LastEpoch_Improvements/Libs/Il2CppLE.dll

-32 KB
Binary file not shown.

Diff for: kg_LastEpoch_Improvements/Libs/Il2Cppmscorlib.dll

6.5 KB
Binary file not shown.

Diff for: kg_LastEpoch_Improvements/Libs/MelonLoader.dll

-1.5 KB
Binary file not shown.

Diff for: kg_LastEpoch_Improvements/kg_LastEpoch_Improvements.cs

+11-5
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,20 @@ private static void Postfix(ItemDataUnpacked item, ref string __result, int uniq
120120
[HarmonyPatch(typeof(TooltipItemManager),nameof(TooltipItemManager.ImplicitFormatter))]
121121
private static class TooltipItemManager_FormatMod_Patch
122122
{
123-
private static void Postfix(ItemDataUnpacked item, int implicitNumber , ref string __result)
123+
private static void Postfix(ItemDataUnpacked item, int implicitNumber, ref string __result, bool isComparsionItem)
124124
{
125125
if (item == null || AffixShowRoll.Value is DisplayAffixType.None || item.isSet()) return;
126+
ItemDataUnpacked itemToUse = item;
127+
if (isComparsionItem)
128+
{
129+
if (TooltipItemManager.instance.equipedItem == null) return;
130+
itemToUse = TooltipItemManager.instance.equipedItem;
131+
}
126132
__result = AffixShowRoll.Value switch
127133
{
128-
DisplayAffixType.Old_Style => __result.Style1_Implicit(item, implicitNumber),
129-
DisplayAffixType.New_Style => __result.Style2_Implicit(item, implicitNumber),
130-
DisplayAffixType.Letter_Style => __result.Letter_Style_Implicit(item, implicitNumber),
134+
DisplayAffixType.Old_Style => __result.Style1_Implicit(itemToUse, implicitNumber),
135+
DisplayAffixType.New_Style => __result.Style2_Implicit(itemToUse, implicitNumber),
136+
DisplayAffixType.Letter_Style => __result.Letter_Style_Implicit(itemToUse, implicitNumber),
131137
_ => __result
132138
};
133139
}
@@ -278,7 +284,7 @@ private void FixedUpdate()
278284
}
279285
}
280286
}
281-
}
287+
}
282288

283289
[HarmonyPatch(typeof(SettingsPanelTabNavigable), nameof(SettingsPanelTabNavigable.Awake))]
284290
private static class SettingsPanelTabNavigable_Awake_Patch

0 commit comments

Comments
 (0)