muffin v7.5.1
This commit is contained in:
parent
a6481e7b9a
commit
965a736f84
59 changed files with 4112 additions and 5059 deletions
|
|
@ -1,6 +1,5 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Runtime.InteropServices;
|
||||
using System.Text;
|
||||
using Dalamud.Game.Addon.Lifecycle;
|
||||
|
|
@ -114,8 +113,6 @@ internal sealed class ChocoboNameHandler : IDisposable
|
|||
|
||||
private unsafe void FireInputStringCallback(AtkUnitBase* addon, string text)
|
||||
{
|
||||
//IL_005b: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_00a1: Unknown result type (might be due to invalid IL or missing references)
|
||||
AtkComponentNode* componentNodeById = addon->GetComponentNodeById(9u);
|
||||
if (componentNodeById == null)
|
||||
{
|
||||
|
|
@ -130,13 +127,13 @@ internal sealed class ChocoboNameHandler : IDisposable
|
|||
}
|
||||
asAtkComponentTextInput->SetText(text);
|
||||
AtkValue* ptr = stackalloc AtkValue[2];
|
||||
Unsafe.Write(&ptr->Type, (AtkValueType)3);
|
||||
ptr->Type = AtkValueType.Int;
|
||||
ptr->Int = 0;
|
||||
byte[] bytes = Encoding.UTF8.GetBytes(text);
|
||||
nint num = Marshal.AllocHGlobal(bytes.Length + 1);
|
||||
Marshal.Copy(bytes, 0, num, bytes.Length);
|
||||
Marshal.WriteByte(num + bytes.Length, 0);
|
||||
Unsafe.Write(&ptr[1].Type, (AtkValueType)8);
|
||||
ptr[1].Type = AtkValueType.String;
|
||||
ptr[1].String = (byte*)num;
|
||||
addon->FireCallback(2u, ptr);
|
||||
Marshal.FreeHGlobal(num);
|
||||
|
|
@ -144,9 +141,8 @@ internal sealed class ChocoboNameHandler : IDisposable
|
|||
|
||||
private unsafe static void ClickYes(AtkUnitBase* addon)
|
||||
{
|
||||
//IL_000e: Unknown result type (might be due to invalid IL or missing references)
|
||||
AtkValue* ptr = stackalloc AtkValue[1];
|
||||
Unsafe.Write(&ptr->Type, (AtkValueType)3);
|
||||
ptr->Type = AtkValueType.Int;
|
||||
ptr->Int = 0;
|
||||
addon->FireCallback(1u, ptr);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -54,8 +54,6 @@ internal sealed class CraftworksSupplyController : IDisposable
|
|||
|
||||
private unsafe void InteractWithBankaCraftworksSupply(AtkUnitBase* addon)
|
||||
{
|
||||
//IL_006d: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_0093: Unknown result type (might be due to invalid IL or missing references)
|
||||
AtkValue* atkValues = addon->AtkValues;
|
||||
uint uInt = atkValues[7].UInt;
|
||||
uint num = 6 - uInt;
|
||||
|
|
@ -68,12 +66,12 @@ internal sealed class CraftworksSupplyController : IDisposable
|
|||
{
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 2
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = i
|
||||
}
|
||||
};
|
||||
|
|
@ -90,11 +88,6 @@ internal sealed class CraftworksSupplyController : IDisposable
|
|||
|
||||
private unsafe void ContextIconMenuPostReceiveEvent(AddonEvent type, AddonArgs args)
|
||||
{
|
||||
//IL_0084: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_00aa: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_00d3: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_0100: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_0129: Unknown result type (might be due to invalid IL or missing references)
|
||||
if (!ShouldHandleUiInteractions)
|
||||
{
|
||||
return;
|
||||
|
|
@ -117,27 +110,27 @@ internal sealed class CraftworksSupplyController : IDisposable
|
|||
{
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 0
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 0
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)5,
|
||||
Type = AtkValueType.UInt,
|
||||
UInt = 20802u
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)5,
|
||||
Type = AtkValueType.UInt,
|
||||
UInt = 0u
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)0,
|
||||
Type = AtkValueType.Undefined,
|
||||
Int = 0
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -186,8 +186,6 @@ internal sealed class InteractionUiController : IDisposable
|
|||
|
||||
private unsafe void SelectStringPostSetup(AddonSelectString* addonSelectString, bool checkAllSteps)
|
||||
{
|
||||
//IL_004c: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_0052: Invalid comparison between Unknown and I4
|
||||
if (!ShouldHandleUiInteractions)
|
||||
{
|
||||
return;
|
||||
|
|
@ -200,7 +198,7 @@ internal sealed class InteractionUiController : IDisposable
|
|||
List<string> list = new List<string>();
|
||||
for (ushort num = 7; num < addonSelectString->AtkUnitBase.AtkValuesCount; num++)
|
||||
{
|
||||
if ((int)addonSelectString->AtkUnitBase.AtkValues[(int)num].Type == 8)
|
||||
if (addonSelectString->AtkUnitBase.AtkValues[(int)num].Type == AtkValueType.String)
|
||||
{
|
||||
list.Add(addonSelectString->AtkUnitBase.AtkValues[(int)num].ReadAtkString());
|
||||
}
|
||||
|
|
@ -874,8 +872,6 @@ internal sealed class InteractionUiController : IDisposable
|
|||
|
||||
private unsafe void DifficultySelectYesNoPostSetup(AtkUnitBase* addonDifficultySelectYesNo, bool checkAllSteps)
|
||||
{
|
||||
//IL_00f6: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_011c: Unknown result type (might be due to invalid IL or missing references)
|
||||
if (!_questController.IsRunning)
|
||||
{
|
||||
return;
|
||||
|
|
@ -903,12 +899,12 @@ internal sealed class InteractionUiController : IDisposable
|
|||
{
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 0
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = _configuration.SinglePlayerDuties.RetryDifficulty
|
||||
}
|
||||
};
|
||||
|
|
@ -996,8 +992,6 @@ internal sealed class InteractionUiController : IDisposable
|
|||
|
||||
private unsafe void PointMenuPostSetup(AtkUnitBase* addonPointMenu)
|
||||
{
|
||||
//IL_00f5: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_011c: Unknown result type (might be due to invalid IL or missing references)
|
||||
if (!ShouldHandleUiInteractions)
|
||||
{
|
||||
return;
|
||||
|
|
@ -1035,12 +1029,12 @@ internal sealed class InteractionUiController : IDisposable
|
|||
{
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 13
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)5,
|
||||
Type = AtkValueType.UInt,
|
||||
UInt = num
|
||||
}
|
||||
};
|
||||
|
|
@ -1060,9 +1054,6 @@ internal sealed class InteractionUiController : IDisposable
|
|||
|
||||
private unsafe void EasterMowingResultPostSetup(AddonEvent type, AddonArgs args)
|
||||
{
|
||||
//IL_004d: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_0072: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_009a: Unknown result type (might be due to invalid IL or missing references)
|
||||
if (_seasonalDutyController.IsRunning || ShouldHandleUiInteractions)
|
||||
{
|
||||
_logger.LogInformation("Dismissing EasterMowingResult");
|
||||
|
|
@ -1071,17 +1062,17 @@ internal sealed class InteractionUiController : IDisposable
|
|||
{
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = -1
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 1
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 1
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -137,30 +137,26 @@ internal sealed class ShopController : IDisposable, IShopWindow
|
|||
|
||||
public unsafe void TriggerPurchase(AtkUnitBase* addonShop, int buyNow)
|
||||
{
|
||||
//IL_0016: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_003b: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_0072: Unknown result type (might be due to invalid IL or missing references)
|
||||
//IL_009a: Unknown result type (might be due to invalid IL or missing references)
|
||||
AtkValue* values = stackalloc AtkValue[4]
|
||||
{
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = 0
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = _shop.ItemForSale.Position
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)3,
|
||||
Type = AtkValueType.Int,
|
||||
Int = buyNow
|
||||
},
|
||||
new AtkValue
|
||||
{
|
||||
Type = (AtkValueType)0,
|
||||
Type = AtkValueType.Undefined,
|
||||
Int = 0
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue