muffin v7.5.4
This commit is contained in:
parent
40d48d62b0
commit
a8f2c1df37
14 changed files with 1093 additions and 957 deletions
|
|
@ -14,22 +14,22 @@
|
||||||
<ItemGroup />
|
<ItemGroup />
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Dalamud">
|
<Reference Include="Dalamud">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Dalamud.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Lumina">
|
<Reference Include="Lumina">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Lumina.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FFXIVClientStructs">
|
<Reference Include="FFXIVClientStructs">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dalamud.Bindings.ImGui">
|
<Reference Include="Dalamud.Bindings.ImGui">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Dalamud.Bindings.ImGui.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.Bindings.ImGui.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Lumina.Excel">
|
<Reference Include="Lumina.Excel">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="InteropGenerator.Runtime">
|
<Reference Include="InteropGenerator.Runtime">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\InteropGenerator.Runtime.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\InteropGenerator.Runtime.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|
@ -394271,16 +394271,16 @@ public static class AssemblyQuestLoader
|
||||||
reference217 = obj235;
|
reference217 = obj235;
|
||||||
questRoot25.QuestSequence = list298;
|
questRoot25.QuestSequence = list298;
|
||||||
AddQuest(questId25, questRoot25);
|
AddQuest(questId25, questRoot25);
|
||||||
QuestId questId26 = new QuestId(5444);
|
QuestId questId26 = new QuestId(5443);
|
||||||
QuestRoot questRoot26 = new QuestRoot();
|
QuestRoot questRoot26 = new QuestRoot();
|
||||||
num = 1;
|
num = 1;
|
||||||
List<string> list305 = new List<string>(num);
|
List<string> list305 = new List<string>(num);
|
||||||
CollectionsMarshal.SetCount(list305, num);
|
CollectionsMarshal.SetCount(list305, num);
|
||||||
CollectionsMarshal.AsSpan(list305)[0] = "WigglyMuffin";
|
CollectionsMarshal.AsSpan(list305)[0] = "Wigglez";
|
||||||
questRoot26.Author = list305;
|
questRoot26.Author = list305;
|
||||||
questRoot26.IsSeasonalQuest = true;
|
questRoot26.IsSeasonalQuest = true;
|
||||||
questRoot26.SeasonalQuestExpiry = new DateTime(2026, 3, 12, 14, 59, 0, DateTimeKind.Utc);
|
questRoot26.SeasonalQuestExpiry = new DateTime(2026, 6, 24, 14, 59, 0, DateTimeKind.Utc);
|
||||||
num = 9;
|
num = 8;
|
||||||
List<QuestSequence> list306 = new List<QuestSequence>(num);
|
List<QuestSequence> list306 = new List<QuestSequence>(num);
|
||||||
CollectionsMarshal.SetCount(list306, num);
|
CollectionsMarshal.SetCount(list306, num);
|
||||||
Span<QuestSequence> span169 = CollectionsMarshal.AsSpan(list306);
|
Span<QuestSequence> span169 = CollectionsMarshal.AsSpan(list306);
|
||||||
|
|
@ -394292,7 +394292,7 @@ public static class AssemblyQuestLoader
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list307 = new List<QuestStep>(num2);
|
List<QuestStep> list307 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list307, num2);
|
CollectionsMarshal.SetCount(list307, num2);
|
||||||
CollectionsMarshal.AsSpan(list307)[0] = new QuestStep(EInteractionType.AcceptQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130)
|
CollectionsMarshal.AsSpan(list307)[0] = new QuestStep(EInteractionType.AcceptQuest, 1056358u, new Vector3(-87.44946f, 4f, -103.44098f), 130)
|
||||||
{
|
{
|
||||||
AetheryteShortcut = EAetheryteLocation.Uldah,
|
AetheryteShortcut = EAetheryteLocation.Uldah,
|
||||||
SkipConditions = new SkipConditions
|
SkipConditions = new SkipConditions
|
||||||
|
|
@ -394313,12 +394313,21 @@ public static class AssemblyQuestLoader
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list308 = new List<QuestStep>(num2);
|
List<QuestStep> list308 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list308, num2);
|
CollectionsMarshal.SetCount(list308, num2);
|
||||||
CollectionsMarshal.AsSpan(list308)[0] = new QuestStep(EInteractionType.Interact, 1057901u, new Vector3(-33.951355f, 5.0000005f, -130.87665f), 130)
|
CollectionsMarshal.AsSpan(list308)[0] = new QuestStep(EInteractionType.Interact, 1056359u, new Vector3(-13.809448f, 14.00001f, -10.940796f), 131)
|
||||||
{
|
{
|
||||||
AetheryteShortcut = EAetheryteLocation.Uldah,
|
AetheryteShortcut = EAetheryteLocation.Uldah,
|
||||||
|
AethernetShortcut = new AethernetShortcut
|
||||||
|
{
|
||||||
|
From = EAetheryteLocation.Uldah,
|
||||||
|
To = EAetheryteLocation.UldahGladiator
|
||||||
|
},
|
||||||
SkipConditions = new SkipConditions
|
SkipConditions = new SkipConditions
|
||||||
{
|
{
|
||||||
AetheryteShortcutIf = new SkipAetheryteCondition
|
AetheryteShortcutIf = new SkipAetheryteCondition
|
||||||
|
{
|
||||||
|
InSameTerritory = true
|
||||||
|
},
|
||||||
|
AethernetShortcutIf = new SkipAetheryteCondition
|
||||||
{
|
{
|
||||||
InSameTerritory = true
|
InSameTerritory = true
|
||||||
}
|
}
|
||||||
|
|
@ -394331,194 +394340,135 @@ public static class AssemblyQuestLoader
|
||||||
{
|
{
|
||||||
Sequence = 2
|
Sequence = 2
|
||||||
};
|
};
|
||||||
num2 = 2;
|
num2 = 1;
|
||||||
List<QuestStep> list309 = new List<QuestStep>(num2);
|
List<QuestStep> list309 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list309, num2);
|
CollectionsMarshal.SetCount(list309, num2);
|
||||||
Span<QuestStep> span170 = CollectionsMarshal.AsSpan(list309);
|
CollectionsMarshal.AsSpan(list309)[0] = new QuestStep(EInteractionType.Interact, 1056359u, new Vector3(-13.809448f, 14.00001f, -10.940796f), 131);
|
||||||
ref QuestStep reference221 = ref span170[0];
|
|
||||||
QuestStep questStep20 = new QuestStep(EInteractionType.Interact, 1057909u, new Vector3(29.984009f, 4.0999947f, -152.63605f), 130);
|
|
||||||
num3 = 6;
|
|
||||||
List<QuestWorkValue> list310 = new List<QuestWorkValue>(num3);
|
|
||||||
CollectionsMarshal.SetCount(list310, num3);
|
|
||||||
Span<QuestWorkValue> span171 = CollectionsMarshal.AsSpan(list310);
|
|
||||||
span171[0] = null;
|
|
||||||
span171[1] = null;
|
|
||||||
span171[2] = null;
|
|
||||||
span171[3] = null;
|
|
||||||
span171[4] = null;
|
|
||||||
span171[5] = new QuestWorkValue((byte)4, 0, EQuestWorkMode.Bitwise);
|
|
||||||
questStep20.CompletionQuestVariablesFlags = list310;
|
|
||||||
reference221 = questStep20;
|
|
||||||
span170[1] = new QuestStep(EInteractionType.Interact, 1057906u, new Vector3(33.6156f, 3.9999995f, -140.91711f), 130);
|
|
||||||
obj238.Steps = list309;
|
obj238.Steps = list309;
|
||||||
reference220 = obj238;
|
reference220 = obj238;
|
||||||
ref QuestSequence reference222 = ref span169[3];
|
ref QuestSequence reference221 = ref span169[3];
|
||||||
QuestSequence obj239 = new QuestSequence
|
QuestSequence obj239 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = 3
|
Sequence = 3
|
||||||
};
|
};
|
||||||
num2 = 2;
|
num2 = 2;
|
||||||
List<QuestStep> list311 = new List<QuestStep>(num2);
|
List<QuestStep> list310 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list311, num2);
|
CollectionsMarshal.SetCount(list310, num2);
|
||||||
Span<QuestStep> span172 = CollectionsMarshal.AsSpan(list311);
|
Span<QuestStep> span170 = CollectionsMarshal.AsSpan(list310);
|
||||||
ref QuestStep reference223 = ref span172[0];
|
ref QuestStep reference222 = ref span170[0];
|
||||||
QuestStep questStep21 = new QuestStep(EInteractionType.Interact, 1057911u, new Vector3(10.36084f, 7.9999804f, -109.26984f), 130);
|
QuestStep questStep20 = new QuestStep(EInteractionType.Interact, 1056373u, new Vector3(125.10864f, 4.100009f, -32.303406f), 131);
|
||||||
num3 = 6;
|
num3 = 1;
|
||||||
List<QuestWorkValue> list312 = new List<QuestWorkValue>(num3);
|
List<DialogueChoice> list311 = new List<DialogueChoice>(num3);
|
||||||
|
CollectionsMarshal.SetCount(list311, num3);
|
||||||
|
CollectionsMarshal.AsSpan(list311)[0] = new DialogueChoice
|
||||||
|
{
|
||||||
|
Type = EDialogChoiceType.List,
|
||||||
|
ExcelSheet = "quest/054/FesGsx001_05443",
|
||||||
|
Prompt = new ExcelRef("TEXT_FESGSX001_05443_Q2_000_000"),
|
||||||
|
Answer = new ExcelRef("TEXT_FESGSX001_05443_A2_000_001")
|
||||||
|
};
|
||||||
|
questStep20.DialogueChoices = list311;
|
||||||
|
reference222 = questStep20;
|
||||||
|
ref QuestStep reference223 = ref span170[1];
|
||||||
|
QuestStep obj240 = new QuestStep(EInteractionType.None, null, null, 131)
|
||||||
|
{
|
||||||
|
DelaySecondsAtStart = 5f
|
||||||
|
};
|
||||||
|
num3 = 1;
|
||||||
|
List<DialogueChoice> list312 = new List<DialogueChoice>(num3);
|
||||||
CollectionsMarshal.SetCount(list312, num3);
|
CollectionsMarshal.SetCount(list312, num3);
|
||||||
Span<QuestWorkValue> span173 = CollectionsMarshal.AsSpan(list312);
|
CollectionsMarshal.AsSpan(list312)[0] = new DialogueChoice
|
||||||
span173[0] = null;
|
{
|
||||||
span173[1] = null;
|
Type = EDialogChoiceType.List,
|
||||||
span173[2] = null;
|
ExcelSheet = "quest/054/FesGsx001_05443",
|
||||||
span173[3] = null;
|
Prompt = new ExcelRef("TEXT_FESGSX001_05443_Q2_000_000"),
|
||||||
span173[4] = null;
|
Answer = new ExcelRef("TEXT_FESGSX001_05443_A2_000_001")
|
||||||
span173[5] = new QuestWorkValue((byte)8, 0, EQuestWorkMode.Bitwise);
|
};
|
||||||
questStep21.CompletionQuestVariablesFlags = list312;
|
obj240.DialogueChoices = list312;
|
||||||
reference223 = questStep21;
|
reference223 = obj240;
|
||||||
span172[1] = new QuestStep(EInteractionType.Interact, 1057912u, new Vector3(15.396301f, 6.999997f, -82.993835f), 130);
|
obj239.Steps = list310;
|
||||||
obj239.Steps = list311;
|
reference221 = obj239;
|
||||||
reference222 = obj239;
|
|
||||||
ref QuestSequence reference224 = ref span169[4];
|
ref QuestSequence reference224 = ref span169[4];
|
||||||
QuestSequence obj240 = new QuestSequence
|
QuestSequence obj241 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = 4
|
Sequence = 4
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list313 = new List<QuestStep>(num2);
|
List<QuestStep> list313 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list313, num2);
|
CollectionsMarshal.SetCount(list313, num2);
|
||||||
CollectionsMarshal.AsSpan(list313)[0] = new QuestStep(EInteractionType.Interact, 1058069u, new Vector3(-15.121765f, 7.999998f, -112.81f), 130);
|
ref QuestStep reference225 = ref CollectionsMarshal.AsSpan(list313)[0];
|
||||||
obj240.Steps = list313;
|
QuestStep questStep21 = new QuestStep(EInteractionType.Interact, 1056377u, new Vector3(128.58777f, 7.992012f, 75.791504f), 131);
|
||||||
reference224 = obj240;
|
num3 = 1;
|
||||||
ref QuestSequence reference225 = ref span169[5];
|
List<DialogueChoice> list314 = new List<DialogueChoice>(num3);
|
||||||
QuestSequence obj241 = new QuestSequence
|
CollectionsMarshal.SetCount(list314, num3);
|
||||||
|
CollectionsMarshal.AsSpan(list314)[0] = new DialogueChoice
|
||||||
|
{
|
||||||
|
Type = EDialogChoiceType.List,
|
||||||
|
ExcelSheet = "quest/054/FesGsx001_05443",
|
||||||
|
Prompt = new ExcelRef("TEXT_FESGSX001_05443_Q3_000_000"),
|
||||||
|
Answer = new ExcelRef("TEXT_FESGSX001_05443_A3_000_001")
|
||||||
|
};
|
||||||
|
questStep21.DialogueChoices = list314;
|
||||||
|
reference225 = questStep21;
|
||||||
|
obj241.Steps = list313;
|
||||||
|
reference224 = obj241;
|
||||||
|
ref QuestSequence reference226 = ref span169[5];
|
||||||
|
QuestSequence obj242 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = 5
|
Sequence = 5
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list314 = new List<QuestStep>(num2);
|
List<QuestStep> list315 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list314, num2);
|
CollectionsMarshal.SetCount(list315, num2);
|
||||||
CollectionsMarshal.AsSpan(list314)[0] = new QuestStep(EInteractionType.Interact, 1057902u, new Vector3(-12.100403f, 7.999999f, -110.76526f), 130);
|
CollectionsMarshal.AsSpan(list315)[0] = new QuestStep(EInteractionType.Interact, 1056381u, new Vector3(-14.816589f, 14.04987f, 55.191895f), 131);
|
||||||
obj241.Steps = list314;
|
obj242.Steps = list315;
|
||||||
reference225 = obj241;
|
reference226 = obj242;
|
||||||
ref QuestSequence reference226 = ref span169[6];
|
ref QuestSequence reference227 = ref span169[6];
|
||||||
QuestSequence obj242 = new QuestSequence
|
QuestSequence obj243 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = 6
|
Sequence = 6
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list315 = new List<QuestStep>(num2);
|
|
||||||
CollectionsMarshal.SetCount(list315, num2);
|
|
||||||
CollectionsMarshal.AsSpan(list315)[0] = new QuestStep(EInteractionType.Interact, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130);
|
|
||||||
obj242.Steps = list315;
|
|
||||||
reference226 = obj242;
|
|
||||||
ref QuestSequence reference227 = ref span169[7];
|
|
||||||
QuestSequence obj243 = new QuestSequence
|
|
||||||
{
|
|
||||||
Sequence = 7
|
|
||||||
};
|
|
||||||
num2 = 2;
|
|
||||||
List<QuestStep> list316 = new List<QuestStep>(num2);
|
List<QuestStep> list316 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list316, num2);
|
CollectionsMarshal.SetCount(list316, num2);
|
||||||
Span<QuestStep> span174 = CollectionsMarshal.AsSpan(list316);
|
CollectionsMarshal.AsSpan(list316)[0] = new QuestStep(EInteractionType.Interact, 1056385u, new Vector3(-13.626343f, 14.000009f, -12.40564f), 131);
|
||||||
ref QuestStep reference228 = ref span174[0];
|
|
||||||
QuestStep obj244 = new QuestStep(EInteractionType.Interact, 1055771u, new Vector3(-37.369385f, 5.0000005f, -130.14423f), 130)
|
|
||||||
{
|
|
||||||
IgnoreQuestMarker = true
|
|
||||||
};
|
|
||||||
num3 = 3;
|
|
||||||
List<DialogueChoice> list317 = new List<DialogueChoice>(num3);
|
|
||||||
CollectionsMarshal.SetCount(list317, num3);
|
|
||||||
Span<DialogueChoice> span175 = CollectionsMarshal.AsSpan(list317);
|
|
||||||
span175[0] = new DialogueChoice
|
|
||||||
{
|
|
||||||
Type = EDialogChoiceType.List,
|
|
||||||
ExcelSheet = "custom/009/FesPdy2026FateDisguise_00951",
|
|
||||||
Prompt = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_Q1_000_000"),
|
|
||||||
Answer = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_A1_000_001")
|
|
||||||
};
|
|
||||||
span175[1] = new DialogueChoice
|
|
||||||
{
|
|
||||||
Type = EDialogChoiceType.List,
|
|
||||||
ExcelSheet = "custom/009/FesPdy2026FateDisguise_00951",
|
|
||||||
Prompt = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_Q2_000_000"),
|
|
||||||
Answer = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_A2_100_004")
|
|
||||||
};
|
|
||||||
span175[2] = new DialogueChoice
|
|
||||||
{
|
|
||||||
Type = EDialogChoiceType.YesNo,
|
|
||||||
ExcelSheet = "custom/009/FesPdy2026FateDisguise_00951",
|
|
||||||
Prompt = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_CONFIRM_100_004")
|
|
||||||
};
|
|
||||||
obj244.DialogueChoices = list317;
|
|
||||||
reference228 = obj244;
|
|
||||||
ref QuestStep reference229 = ref span174[1];
|
|
||||||
QuestStep questStep22 = new QuestStep(EInteractionType.FateAction, null, new Vector3(-38.322124f, 3.9999998f, -144.23155f), 130);
|
|
||||||
num3 = 4;
|
|
||||||
List<FateActionTarget> list318 = new List<FateActionTarget>(num3);
|
|
||||||
CollectionsMarshal.SetCount(list318, num3);
|
|
||||||
Span<FateActionTarget> span176 = CollectionsMarshal.AsSpan(list318);
|
|
||||||
span176[0] = new FateActionTarget
|
|
||||||
{
|
|
||||||
DataId = 18862u,
|
|
||||||
Action = EAction.CheerRhythmYellow
|
|
||||||
};
|
|
||||||
span176[1] = new FateActionTarget
|
|
||||||
{
|
|
||||||
DataId = 18860u,
|
|
||||||
Action = EAction.CheerRhythmBlue
|
|
||||||
};
|
|
||||||
span176[2] = new FateActionTarget
|
|
||||||
{
|
|
||||||
DataId = 18861u,
|
|
||||||
Action = EAction.CheerRhythmGreen
|
|
||||||
};
|
|
||||||
span176[3] = new FateActionTarget
|
|
||||||
{
|
|
||||||
DataId = 18859u,
|
|
||||||
Action = EAction.CheerRhythmRed
|
|
||||||
};
|
|
||||||
questStep22.FateActionTargets = list318;
|
|
||||||
reference229 = questStep22;
|
|
||||||
obj243.Steps = list316;
|
obj243.Steps = list316;
|
||||||
reference227 = obj243;
|
reference227 = obj243;
|
||||||
ref QuestSequence reference230 = ref span169[8];
|
ref QuestSequence reference228 = ref span169[7];
|
||||||
QuestSequence obj245 = new QuestSequence
|
QuestSequence obj244 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = byte.MaxValue
|
Sequence = byte.MaxValue
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list319 = new List<QuestStep>(num2);
|
List<QuestStep> list317 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list319, num2);
|
CollectionsMarshal.SetCount(list317, num2);
|
||||||
CollectionsMarshal.AsSpan(list319)[0] = new QuestStep(EInteractionType.CompleteQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130)
|
CollectionsMarshal.AsSpan(list317)[0] = new QuestStep(EInteractionType.CompleteQuest, 1056390u, new Vector3(-53.391357f, -1.706183E-06f, 102.67798f), 144);
|
||||||
{
|
obj244.Steps = list317;
|
||||||
NextQuestId = new QuestId(5445)
|
reference228 = obj244;
|
||||||
};
|
|
||||||
obj245.Steps = list319;
|
|
||||||
reference230 = obj245;
|
|
||||||
questRoot26.QuestSequence = list306;
|
questRoot26.QuestSequence = list306;
|
||||||
AddQuest(questId26, questRoot26);
|
AddQuest(questId26, questRoot26);
|
||||||
QuestId questId27 = new QuestId(5445);
|
QuestId questId27 = new QuestId(5444);
|
||||||
QuestRoot questRoot27 = new QuestRoot();
|
QuestRoot questRoot27 = new QuestRoot();
|
||||||
num = 1;
|
num = 1;
|
||||||
List<string> list320 = new List<string>(num);
|
List<string> list318 = new List<string>(num);
|
||||||
CollectionsMarshal.SetCount(list320, num);
|
CollectionsMarshal.SetCount(list318, num);
|
||||||
CollectionsMarshal.AsSpan(list320)[0] = "WigglyMuffin";
|
CollectionsMarshal.AsSpan(list318)[0] = "WigglyMuffin";
|
||||||
questRoot27.Author = list320;
|
questRoot27.Author = list318;
|
||||||
questRoot27.IsSeasonalQuest = true;
|
questRoot27.IsSeasonalQuest = true;
|
||||||
questRoot27.SeasonalQuestExpiry = new DateTime(2026, 3, 12, 14, 59, 0, DateTimeKind.Utc);
|
questRoot27.SeasonalQuestExpiry = new DateTime(2026, 3, 12, 14, 59, 0, DateTimeKind.Utc);
|
||||||
num = 3;
|
num = 9;
|
||||||
List<QuestSequence> list321 = new List<QuestSequence>(num);
|
List<QuestSequence> list319 = new List<QuestSequence>(num);
|
||||||
CollectionsMarshal.SetCount(list321, num);
|
CollectionsMarshal.SetCount(list319, num);
|
||||||
Span<QuestSequence> span177 = CollectionsMarshal.AsSpan(list321);
|
Span<QuestSequence> span171 = CollectionsMarshal.AsSpan(list319);
|
||||||
ref QuestSequence reference231 = ref span177[0];
|
ref QuestSequence reference229 = ref span171[0];
|
||||||
QuestSequence obj246 = new QuestSequence
|
QuestSequence obj245 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = 0
|
Sequence = 0
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list322 = new List<QuestStep>(num2);
|
List<QuestStep> list320 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list322, num2);
|
CollectionsMarshal.SetCount(list320, num2);
|
||||||
CollectionsMarshal.AsSpan(list322)[0] = new QuestStep(EInteractionType.AcceptQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130)
|
CollectionsMarshal.AsSpan(list320)[0] = new QuestStep(EInteractionType.AcceptQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130)
|
||||||
{
|
{
|
||||||
AetheryteShortcut = EAetheryteLocation.Uldah,
|
AetheryteShortcut = EAetheryteLocation.Uldah,
|
||||||
SkipConditions = new SkipConditions
|
SkipConditions = new SkipConditions
|
||||||
|
|
@ -394529,32 +394479,258 @@ public static class AssemblyQuestLoader
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
obj246.Steps = list322;
|
obj245.Steps = list320;
|
||||||
reference231 = obj246;
|
reference229 = obj245;
|
||||||
ref QuestSequence reference232 = ref span177[1];
|
ref QuestSequence reference230 = ref span171[1];
|
||||||
QuestSequence obj247 = new QuestSequence
|
QuestSequence obj246 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = 1
|
Sequence = 1
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list323 = new List<QuestStep>(num2);
|
List<QuestStep> list321 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list323, num2);
|
CollectionsMarshal.SetCount(list321, num2);
|
||||||
CollectionsMarshal.AsSpan(list323)[0] = new QuestStep(EInteractionType.Interact, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130);
|
CollectionsMarshal.AsSpan(list321)[0] = new QuestStep(EInteractionType.Interact, 1057901u, new Vector3(-33.951355f, 5.0000005f, -130.87665f), 130)
|
||||||
obj247.Steps = list323;
|
{
|
||||||
reference232 = obj247;
|
AetheryteShortcut = EAetheryteLocation.Uldah,
|
||||||
ref QuestSequence reference233 = ref span177[2];
|
SkipConditions = new SkipConditions
|
||||||
|
{
|
||||||
|
AetheryteShortcutIf = new SkipAetheryteCondition
|
||||||
|
{
|
||||||
|
InSameTerritory = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
obj246.Steps = list321;
|
||||||
|
reference230 = obj246;
|
||||||
|
ref QuestSequence reference231 = ref span171[2];
|
||||||
|
QuestSequence obj247 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 2
|
||||||
|
};
|
||||||
|
num2 = 2;
|
||||||
|
List<QuestStep> list322 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list322, num2);
|
||||||
|
Span<QuestStep> span172 = CollectionsMarshal.AsSpan(list322);
|
||||||
|
ref QuestStep reference232 = ref span172[0];
|
||||||
|
QuestStep questStep22 = new QuestStep(EInteractionType.Interact, 1057909u, new Vector3(29.984009f, 4.0999947f, -152.63605f), 130);
|
||||||
|
num3 = 6;
|
||||||
|
List<QuestWorkValue> list323 = new List<QuestWorkValue>(num3);
|
||||||
|
CollectionsMarshal.SetCount(list323, num3);
|
||||||
|
Span<QuestWorkValue> span173 = CollectionsMarshal.AsSpan(list323);
|
||||||
|
span173[0] = null;
|
||||||
|
span173[1] = null;
|
||||||
|
span173[2] = null;
|
||||||
|
span173[3] = null;
|
||||||
|
span173[4] = null;
|
||||||
|
span173[5] = new QuestWorkValue((byte)4, 0, EQuestWorkMode.Bitwise);
|
||||||
|
questStep22.CompletionQuestVariablesFlags = list323;
|
||||||
|
reference232 = questStep22;
|
||||||
|
span172[1] = new QuestStep(EInteractionType.Interact, 1057906u, new Vector3(33.6156f, 3.9999995f, -140.91711f), 130);
|
||||||
|
obj247.Steps = list322;
|
||||||
|
reference231 = obj247;
|
||||||
|
ref QuestSequence reference233 = ref span171[3];
|
||||||
QuestSequence obj248 = new QuestSequence
|
QuestSequence obj248 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 3
|
||||||
|
};
|
||||||
|
num2 = 2;
|
||||||
|
List<QuestStep> list324 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list324, num2);
|
||||||
|
Span<QuestStep> span174 = CollectionsMarshal.AsSpan(list324);
|
||||||
|
ref QuestStep reference234 = ref span174[0];
|
||||||
|
QuestStep questStep23 = new QuestStep(EInteractionType.Interact, 1057911u, new Vector3(10.36084f, 7.9999804f, -109.26984f), 130);
|
||||||
|
num3 = 6;
|
||||||
|
List<QuestWorkValue> list325 = new List<QuestWorkValue>(num3);
|
||||||
|
CollectionsMarshal.SetCount(list325, num3);
|
||||||
|
Span<QuestWorkValue> span175 = CollectionsMarshal.AsSpan(list325);
|
||||||
|
span175[0] = null;
|
||||||
|
span175[1] = null;
|
||||||
|
span175[2] = null;
|
||||||
|
span175[3] = null;
|
||||||
|
span175[4] = null;
|
||||||
|
span175[5] = new QuestWorkValue((byte)8, 0, EQuestWorkMode.Bitwise);
|
||||||
|
questStep23.CompletionQuestVariablesFlags = list325;
|
||||||
|
reference234 = questStep23;
|
||||||
|
span174[1] = new QuestStep(EInteractionType.Interact, 1057912u, new Vector3(15.396301f, 6.999997f, -82.993835f), 130);
|
||||||
|
obj248.Steps = list324;
|
||||||
|
reference233 = obj248;
|
||||||
|
ref QuestSequence reference235 = ref span171[4];
|
||||||
|
QuestSequence obj249 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 4
|
||||||
|
};
|
||||||
|
num2 = 1;
|
||||||
|
List<QuestStep> list326 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list326, num2);
|
||||||
|
CollectionsMarshal.AsSpan(list326)[0] = new QuestStep(EInteractionType.Interact, 1058069u, new Vector3(-15.121765f, 7.999998f, -112.81f), 130);
|
||||||
|
obj249.Steps = list326;
|
||||||
|
reference235 = obj249;
|
||||||
|
ref QuestSequence reference236 = ref span171[5];
|
||||||
|
QuestSequence obj250 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 5
|
||||||
|
};
|
||||||
|
num2 = 1;
|
||||||
|
List<QuestStep> list327 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list327, num2);
|
||||||
|
CollectionsMarshal.AsSpan(list327)[0] = new QuestStep(EInteractionType.Interact, 1057902u, new Vector3(-12.100403f, 7.999999f, -110.76526f), 130);
|
||||||
|
obj250.Steps = list327;
|
||||||
|
reference236 = obj250;
|
||||||
|
ref QuestSequence reference237 = ref span171[6];
|
||||||
|
QuestSequence obj251 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 6
|
||||||
|
};
|
||||||
|
num2 = 1;
|
||||||
|
List<QuestStep> list328 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list328, num2);
|
||||||
|
CollectionsMarshal.AsSpan(list328)[0] = new QuestStep(EInteractionType.Interact, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130);
|
||||||
|
obj251.Steps = list328;
|
||||||
|
reference237 = obj251;
|
||||||
|
ref QuestSequence reference238 = ref span171[7];
|
||||||
|
QuestSequence obj252 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 7
|
||||||
|
};
|
||||||
|
num2 = 2;
|
||||||
|
List<QuestStep> list329 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list329, num2);
|
||||||
|
Span<QuestStep> span176 = CollectionsMarshal.AsSpan(list329);
|
||||||
|
ref QuestStep reference239 = ref span176[0];
|
||||||
|
QuestStep obj253 = new QuestStep(EInteractionType.Interact, 1055771u, new Vector3(-37.369385f, 5.0000005f, -130.14423f), 130)
|
||||||
|
{
|
||||||
|
IgnoreQuestMarker = true
|
||||||
|
};
|
||||||
|
num3 = 3;
|
||||||
|
List<DialogueChoice> list330 = new List<DialogueChoice>(num3);
|
||||||
|
CollectionsMarshal.SetCount(list330, num3);
|
||||||
|
Span<DialogueChoice> span177 = CollectionsMarshal.AsSpan(list330);
|
||||||
|
span177[0] = new DialogueChoice
|
||||||
|
{
|
||||||
|
Type = EDialogChoiceType.List,
|
||||||
|
ExcelSheet = "custom/009/FesPdy2026FateDisguise_00951",
|
||||||
|
Prompt = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_Q1_000_000"),
|
||||||
|
Answer = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_A1_000_001")
|
||||||
|
};
|
||||||
|
span177[1] = new DialogueChoice
|
||||||
|
{
|
||||||
|
Type = EDialogChoiceType.List,
|
||||||
|
ExcelSheet = "custom/009/FesPdy2026FateDisguise_00951",
|
||||||
|
Prompt = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_Q2_000_000"),
|
||||||
|
Answer = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_A2_100_004")
|
||||||
|
};
|
||||||
|
span177[2] = new DialogueChoice
|
||||||
|
{
|
||||||
|
Type = EDialogChoiceType.YesNo,
|
||||||
|
ExcelSheet = "custom/009/FesPdy2026FateDisguise_00951",
|
||||||
|
Prompt = new ExcelRef("TEXT_FESPDY2026FATEDISGUISE_00951_CONFIRM_100_004")
|
||||||
|
};
|
||||||
|
obj253.DialogueChoices = list330;
|
||||||
|
reference239 = obj253;
|
||||||
|
ref QuestStep reference240 = ref span176[1];
|
||||||
|
QuestStep questStep24 = new QuestStep(EInteractionType.FateAction, null, new Vector3(-38.322124f, 3.9999998f, -144.23155f), 130);
|
||||||
|
num3 = 4;
|
||||||
|
List<FateActionTarget> list331 = new List<FateActionTarget>(num3);
|
||||||
|
CollectionsMarshal.SetCount(list331, num3);
|
||||||
|
Span<FateActionTarget> span178 = CollectionsMarshal.AsSpan(list331);
|
||||||
|
span178[0] = new FateActionTarget
|
||||||
|
{
|
||||||
|
DataId = 18862u,
|
||||||
|
Action = EAction.CheerRhythmYellow
|
||||||
|
};
|
||||||
|
span178[1] = new FateActionTarget
|
||||||
|
{
|
||||||
|
DataId = 18860u,
|
||||||
|
Action = EAction.CheerRhythmBlue
|
||||||
|
};
|
||||||
|
span178[2] = new FateActionTarget
|
||||||
|
{
|
||||||
|
DataId = 18861u,
|
||||||
|
Action = EAction.CheerRhythmGreen
|
||||||
|
};
|
||||||
|
span178[3] = new FateActionTarget
|
||||||
|
{
|
||||||
|
DataId = 18859u,
|
||||||
|
Action = EAction.CheerRhythmRed
|
||||||
|
};
|
||||||
|
questStep24.FateActionTargets = list331;
|
||||||
|
reference240 = questStep24;
|
||||||
|
obj252.Steps = list329;
|
||||||
|
reference238 = obj252;
|
||||||
|
ref QuestSequence reference241 = ref span171[8];
|
||||||
|
QuestSequence obj254 = new QuestSequence
|
||||||
{
|
{
|
||||||
Sequence = byte.MaxValue
|
Sequence = byte.MaxValue
|
||||||
};
|
};
|
||||||
num2 = 1;
|
num2 = 1;
|
||||||
List<QuestStep> list324 = new List<QuestStep>(num2);
|
List<QuestStep> list332 = new List<QuestStep>(num2);
|
||||||
CollectionsMarshal.SetCount(list324, num2);
|
CollectionsMarshal.SetCount(list332, num2);
|
||||||
CollectionsMarshal.AsSpan(list324)[0] = new QuestStep(EInteractionType.CompleteQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130);
|
CollectionsMarshal.AsSpan(list332)[0] = new QuestStep(EInteractionType.CompleteQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130)
|
||||||
obj248.Steps = list324;
|
{
|
||||||
reference233 = obj248;
|
NextQuestId = new QuestId(5445)
|
||||||
questRoot27.QuestSequence = list321;
|
};
|
||||||
|
obj254.Steps = list332;
|
||||||
|
reference241 = obj254;
|
||||||
|
questRoot27.QuestSequence = list319;
|
||||||
AddQuest(questId27, questRoot27);
|
AddQuest(questId27, questRoot27);
|
||||||
|
QuestId questId28 = new QuestId(5445);
|
||||||
|
QuestRoot questRoot28 = new QuestRoot();
|
||||||
|
num = 1;
|
||||||
|
List<string> list333 = new List<string>(num);
|
||||||
|
CollectionsMarshal.SetCount(list333, num);
|
||||||
|
CollectionsMarshal.AsSpan(list333)[0] = "WigglyMuffin";
|
||||||
|
questRoot28.Author = list333;
|
||||||
|
questRoot28.IsSeasonalQuest = true;
|
||||||
|
questRoot28.SeasonalQuestExpiry = new DateTime(2026, 3, 12, 14, 59, 0, DateTimeKind.Utc);
|
||||||
|
num = 3;
|
||||||
|
List<QuestSequence> list334 = new List<QuestSequence>(num);
|
||||||
|
CollectionsMarshal.SetCount(list334, num);
|
||||||
|
Span<QuestSequence> span179 = CollectionsMarshal.AsSpan(list334);
|
||||||
|
ref QuestSequence reference242 = ref span179[0];
|
||||||
|
QuestSequence obj255 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 0
|
||||||
|
};
|
||||||
|
num2 = 1;
|
||||||
|
List<QuestStep> list335 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list335, num2);
|
||||||
|
CollectionsMarshal.AsSpan(list335)[0] = new QuestStep(EInteractionType.AcceptQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130)
|
||||||
|
{
|
||||||
|
AetheryteShortcut = EAetheryteLocation.Uldah,
|
||||||
|
SkipConditions = new SkipConditions
|
||||||
|
{
|
||||||
|
AetheryteShortcutIf = new SkipAetheryteCondition
|
||||||
|
{
|
||||||
|
InSameTerritory = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
obj255.Steps = list335;
|
||||||
|
reference242 = obj255;
|
||||||
|
ref QuestSequence reference243 = ref span179[1];
|
||||||
|
QuestSequence obj256 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = 1
|
||||||
|
};
|
||||||
|
num2 = 1;
|
||||||
|
List<QuestStep> list336 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list336, num2);
|
||||||
|
CollectionsMarshal.AsSpan(list336)[0] = new QuestStep(EInteractionType.Interact, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130);
|
||||||
|
obj256.Steps = list336;
|
||||||
|
reference243 = obj256;
|
||||||
|
ref QuestSequence reference244 = ref span179[2];
|
||||||
|
QuestSequence obj257 = new QuestSequence
|
||||||
|
{
|
||||||
|
Sequence = byte.MaxValue
|
||||||
|
};
|
||||||
|
num2 = 1;
|
||||||
|
List<QuestStep> list337 = new List<QuestStep>(num2);
|
||||||
|
CollectionsMarshal.SetCount(list337, num2);
|
||||||
|
CollectionsMarshal.AsSpan(list337)[0] = new QuestStep(EInteractionType.CompleteQuest, 1056476u, new Vector3(-35.1416f, 5.000001f, -130.38837f), 130);
|
||||||
|
obj257.Steps = list337;
|
||||||
|
reference244 = obj257;
|
||||||
|
questRoot28.QuestSequence = list334;
|
||||||
|
AddQuest(questId28, questRoot28);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void LoadQuests109()
|
private static void LoadQuests109()
|
||||||
|
|
|
||||||
|
|
@ -97,18 +97,7 @@ internal sealed class ChocoboNameHandler : IDisposable
|
||||||
{
|
{
|
||||||
return "Kweh";
|
return "Kweh";
|
||||||
}
|
}
|
||||||
string text2 = text.Substring(0, 1).ToUpperInvariant();
|
return text.Substring(0, 1).ToUpperInvariant() + ((text.Length > 1) ? text.Substring(1).ToLowerInvariant() : string.Empty);
|
||||||
string text3;
|
|
||||||
if (text.Length <= 1)
|
|
||||||
{
|
|
||||||
text3 = string.Empty;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string text4 = text;
|
|
||||||
text3 = text4.Substring(1, text4.Length - 1).ToLowerInvariant();
|
|
||||||
}
|
|
||||||
return text2 + text3;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private unsafe void FireInputStringCallback(AtkUnitBase* addon, string text)
|
private unsafe void FireInputStringCallback(AtkUnitBase* addon, string text)
|
||||||
|
|
|
||||||
|
|
@ -65,9 +65,7 @@ internal sealed class TaskCreator
|
||||||
string text = x.GetType().FullName ?? x.GetType().Name;
|
string text = x.GetType().FullName ?? x.GetType().Name;
|
||||||
if (text.Contains('.', StringComparison.Ordinal))
|
if (text.Contains('.', StringComparison.Ordinal))
|
||||||
{
|
{
|
||||||
string text2 = text;
|
text = text.Substring(text.LastIndexOf('.') + 1);
|
||||||
int num3 = text.LastIndexOf('.') + 1;
|
|
||||||
text = text2.Substring(num3, text2.Length - num3);
|
|
||||||
}
|
}
|
||||||
_logger.LogTrace("Factory {FactoryName} created Task {TaskNames}", text, string.Join(", ", list4.Select((ITask y) => y.ToString())));
|
_logger.LogTrace("Factory {FactoryName} created Task {TaskNames}", text, string.Join(", ", list4.Select((ITask y) => y.ToString())));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -325,18 +325,7 @@ internal sealed class QuestRegistry
|
||||||
{
|
{
|
||||||
string text = fileName.Substring(0, fileName.Length - ".json".Length);
|
string text = fileName.Substring(0, fileName.Length - ".json".Length);
|
||||||
int num = text.IndexOf('_', StringComparison.Ordinal);
|
int num = text.IndexOf('_', StringComparison.Ordinal);
|
||||||
string text2;
|
name = ((num >= 0 && num + 1 < text.Length) ? text.Substring(num + 1) : text);
|
||||||
if (num < 0 || num + 1 >= text.Length)
|
|
||||||
{
|
|
||||||
text2 = text;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string text3 = text;
|
|
||||||
int num2 = num + 1;
|
|
||||||
text2 = text3.Substring(num2, text3.Length - num2);
|
|
||||||
}
|
|
||||||
name = text2;
|
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
{
|
{
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
|
|
@ -160,17 +160,6 @@ internal sealed class DebugConfigComponent : ConfigComponent
|
||||||
{
|
{
|
||||||
return string.Empty;
|
return string.Empty;
|
||||||
}
|
}
|
||||||
string text = name.Substring(0, 1).ToUpperInvariant();
|
return name.Substring(0, 1).ToUpperInvariant() + ((name.Length > 1) ? name.Substring(1).ToLowerInvariant() : string.Empty);
|
||||||
string text2;
|
|
||||||
if (name.Length <= 1)
|
|
||||||
{
|
|
||||||
text2 = string.Empty;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
string text3 = name;
|
|
||||||
text2 = text3.Substring(1, text3.Length - 1).ToLowerInvariant();
|
|
||||||
}
|
|
||||||
return text + text2;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -475,16 +475,11 @@ internal sealed class DutyConfigComponent : ConfigComponent
|
||||||
{
|
{
|
||||||
base.Configuration.Duties.BlacklistedDutyCfcIds.Add(result2);
|
base.Configuration.Duties.BlacklistedDutyCfcIds.Add(result2);
|
||||||
}
|
}
|
||||||
if (!text3.StartsWith("M:", StringComparison.InvariantCulture))
|
if (text3.StartsWith("M:", StringComparison.InvariantCulture))
|
||||||
{
|
{
|
||||||
continue;
|
|
||||||
}
|
|
||||||
ReadOnlySpan<char> span = text3.AsSpan("M:".Length);
|
ReadOnlySpan<char> span = text3.AsSpan("M:".Length);
|
||||||
int num2 = span.IndexOf(':');
|
int num2 = span.IndexOf(':');
|
||||||
if (num2 > 0 && uint.TryParse(span.Slice(0, num2), CultureInfo.InvariantCulture, out var result3))
|
if (num2 > 0 && uint.TryParse(span.Slice(0, num2), CultureInfo.InvariantCulture, out var result3) && int.TryParse(span.Slice(num2 + 1), CultureInfo.InvariantCulture, out var result4) && Enum.IsDefined(typeof(EDutyMode), result4))
|
||||||
{
|
|
||||||
int num3 = num2 + 1;
|
|
||||||
if (int.TryParse(span.Slice(num3, span.Length - num3), CultureInfo.InvariantCulture, out var result4) && Enum.IsDefined(typeof(EDutyMode), result4))
|
|
||||||
{
|
{
|
||||||
base.Configuration.Duties.DutyModeOverrides[result3] = (EDutyMode)result4;
|
base.Configuration.Duties.DutyModeOverrides[result3] = (EDutyMode)result4;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ internal sealed class ActiveQuestComponent
|
||||||
public event EventHandler? Reload;
|
public event EventHandler? Reload;
|
||||||
|
|
||||||
[GeneratedRegex("\\s\\s+", RegexOptions.IgnoreCase, "en-US")]
|
[GeneratedRegex("\\s\\s+", RegexOptions.IgnoreCase, "en-US")]
|
||||||
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.21808")]
|
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.23019")]
|
||||||
private static Regex MultipleWhitespaceRegex()
|
private static Regex MultipleWhitespaceRegex()
|
||||||
{
|
{
|
||||||
return _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0.Instance;
|
return _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0.Instance;
|
||||||
|
|
|
||||||
|
|
@ -519,9 +519,7 @@ internal sealed class SavedPresetsComponent
|
||||||
string text = ImGui.GetClipboardText().Trim();
|
string text = ImGui.GetClipboardText().Trim();
|
||||||
if (text.StartsWith("qst:preset:", StringComparison.InvariantCulture))
|
if (text.StartsWith("qst:preset:", StringComparison.InvariantCulture))
|
||||||
{
|
{
|
||||||
string text2 = text;
|
string s = text.Substring("qst:preset:".Length);
|
||||||
int length = "qst:preset:".Length;
|
|
||||||
string s = text2.Substring(length, text2.Length - length);
|
|
||||||
return JsonConvert.DeserializeObject<PresetExportData>(Encoding.UTF8.GetString(Convert.FromBase64String(s)));
|
return JsonConvert.DeserializeObject<PresetExportData>(Encoding.UTF8.GetString(Convert.FromBase64String(s)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -538,9 +536,7 @@ internal sealed class SavedPresetsComponent
|
||||||
string text = ImGui.GetClipboardText().Trim();
|
string text = ImGui.GetClipboardText().Trim();
|
||||||
if (text.StartsWith("qst:presets:", StringComparison.InvariantCulture))
|
if (text.StartsWith("qst:presets:", StringComparison.InvariantCulture))
|
||||||
{
|
{
|
||||||
string text2 = text;
|
string s = text.Substring("qst:presets:".Length);
|
||||||
int length = "qst:presets:".Length;
|
|
||||||
string s = text2.Substring(length, text2.Length - length);
|
|
||||||
return JsonConvert.DeserializeObject<List<PresetExportData>>(Encoding.UTF8.GetString(Convert.FromBase64String(s)));
|
return JsonConvert.DeserializeObject<List<PresetExportData>>(Encoding.UTF8.GetString(Convert.FromBase64String(s)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,25 +21,25 @@
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="Dalamud">
|
<Reference Include="Dalamud">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Dalamud.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="LLib">
|
<Reference Include="LLib">
|
||||||
<HintPath>..\..\LLib.dll</HintPath>
|
<HintPath>..\..\LLib.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="FFXIVClientStructs">
|
<Reference Include="FFXIVClientStructs">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\FFXIVClientStructs.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Questionable.Model">
|
<Reference Include="Questionable.Model">
|
||||||
<HintPath>..\..\Questionable.Model.dll</HintPath>
|
<HintPath>..\..\Questionable.Model.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Newtonsoft.Json">
|
<Reference Include="Newtonsoft.Json">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Newtonsoft.Json.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
|
<Reference Include="Microsoft.Extensions.Logging.Abstractions">
|
||||||
<HintPath>..\..\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
|
<HintPath>..\..\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Serilog">
|
<Reference Include="Serilog">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Serilog.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Serilog.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Extensions.DependencyInjection">
|
<Reference Include="Microsoft.Extensions.DependencyInjection">
|
||||||
<HintPath>..\..\Microsoft.Extensions.DependencyInjection.dll</HintPath>
|
<HintPath>..\..\Microsoft.Extensions.DependencyInjection.dll</HintPath>
|
||||||
|
|
@ -48,19 +48,19 @@
|
||||||
<HintPath>..\..\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
|
<HintPath>..\..\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Dalamud.Bindings.ImGui">
|
<Reference Include="Dalamud.Bindings.ImGui">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Dalamud.Bindings.ImGui.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Dalamud.Bindings.ImGui.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Lumina.Excel">
|
<Reference Include="Lumina.Excel">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Lumina.Excel.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Lumina">
|
<Reference Include="Lumina">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\Lumina.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\Lumina.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="JsonSchema.Net">
|
<Reference Include="JsonSchema.Net">
|
||||||
<HintPath>..\..\JsonSchema.Net.dll</HintPath>
|
<HintPath>..\..\JsonSchema.Net.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="InteropGenerator.Runtime">
|
<Reference Include="InteropGenerator.Runtime">
|
||||||
<HintPath>..\..\..\..\..\ffxiv\alyssile-xivl\addon\Hooks\dev\InteropGenerator.Runtime.dll</HintPath>
|
<HintPath>C:\Users\Aly\AppData\Roaming\XIVLauncher\addon\Hooks\dev\InteropGenerator.Runtime.dll</HintPath>
|
||||||
</Reference>
|
</Reference>
|
||||||
<Reference Include="Microsoft.Extensions.Logging">
|
<Reference Include="Microsoft.Extensions.Logging">
|
||||||
<HintPath>..\..\Microsoft.Extensions.Logging.dll</HintPath>
|
<HintPath>..\..\Microsoft.Extensions.Logging.dll</HintPath>
|
||||||
|
|
|
||||||
|
|
@ -46,15 +46,7 @@ public sealed class QuestionablePlugin : IDalamudPlugin, IDisposable
|
||||||
ServiceCollection serviceCollection = new ServiceCollection();
|
ServiceCollection serviceCollection = new ServiceCollection();
|
||||||
serviceCollection.AddLogging(delegate(ILoggingBuilder builder)
|
serviceCollection.AddLogging(delegate(ILoggingBuilder builder)
|
||||||
{
|
{
|
||||||
builder.SetMinimumLevel(LogLevel.Trace).ClearProviders().AddProvider(new DalamudLoggerProvider(pluginLog, delegate(string t)
|
builder.SetMinimumLevel(LogLevel.Trace).ClearProviders().AddProvider(new DalamudLoggerProvider(pluginLog, (string t) => t?.Substring(t.LastIndexOf('.') + 1)));
|
||||||
{
|
|
||||||
if (t == null)
|
|
||||||
{
|
|
||||||
return (string?)null;
|
|
||||||
}
|
|
||||||
int num = t.LastIndexOf('.') + 1;
|
|
||||||
return t.Substring(num, t.Length - num);
|
|
||||||
}));
|
|
||||||
});
|
});
|
||||||
((IServiceCollection)serviceCollection).AddSingleton((IDalamudPlugin)this);
|
((IServiceCollection)serviceCollection).AddSingleton((IDalamudPlugin)this);
|
||||||
serviceCollection.AddSingleton(pluginInterface);
|
serviceCollection.AddSingleton(pluginInterface);
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ using System.Runtime.CompilerServices;
|
||||||
|
|
||||||
namespace System.Text.RegularExpressions.Generated;
|
namespace System.Text.RegularExpressions.Generated;
|
||||||
|
|
||||||
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.21808")]
|
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.23019")]
|
||||||
[SkipLocalsInit]
|
[SkipLocalsInit]
|
||||||
internal sealed class _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0 : Regex
|
internal sealed class _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__MultipleWhitespaceRegex_0 : Regex
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ using System.CodeDom.Compiler;
|
||||||
|
|
||||||
namespace System.Text.RegularExpressions.Generated;
|
namespace System.Text.RegularExpressions.Generated;
|
||||||
|
|
||||||
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.21808")]
|
[GeneratedCode("System.Text.RegularExpressions.Generator", "10.0.14.23019")]
|
||||||
internal static class _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__Utilities
|
internal static class _003CRegexGenerator_g_003EFBB8301322196CF81C64F1652C2FA6E1D6BF3907141F781E9D97ABED51BF056C4__Utilities
|
||||||
{
|
{
|
||||||
internal static readonly TimeSpan s_defaultTimeout = ((AppContext.GetData("REGEX_DEFAULT_MATCH_TIMEOUT") is TimeSpan timeSpan) ? timeSpan : Regex.InfiniteMatchTimeout);
|
internal static readonly TimeSpan s_defaultTimeout = ((AppContext.GetData("REGEX_DEFAULT_MATCH_TIMEOUT") is TimeSpan timeSpan) ? timeSpan : Regex.InfiniteMatchTimeout);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue