Skip to content

GetSpellsLearned CopySpellbook transpiler #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mcb5637 wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

GetSpellsLearned CopySpellbook transpiler #924

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0b9087
UnitHelper_CopySpellbook transpiler
mcb5637 May 26, 2023
b6eb76e
copying more
mcb5637 May 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions ToyBox/classes/MonkeyPatchin/Multiclass/LevelUP+Multiclass.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@
//using Kingmaker.UI._ConsoleUI.Models;
//using Kingmaker.UI.RestCamp;
using Kingmaker.UnitLogic;
using Kingmaker.UnitLogic.Abilities.Blueprints;
using Kingmaker.UnitLogic.Abilities;
using Kingmaker.UnitLogic.Class.LevelUp;
using Kingmaker.UnitLogic.Class.LevelUp.Actions;
using Kingmaker.Utility;
using ModKit;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Emit;
using System.Reflection;
using ToyBox.classes.Infrastructure;
//using Kingmaker.UI._ConsoleUI.GroupChanger;
//using Kingmaker.UI.LevelUp.Phase;
Expand Down Expand Up @@ -226,6 +231,32 @@ public static bool Apply(LevelUpState state, UnitDescriptor unit) {
}
}

// fix CopiedFromScroll not being copied over
[HarmonyPatch(typeof(UnitHelper), nameof(UnitHelper.CopySpellbook))]
private static class UnitHelper_CopySpellbook {
private static AbilityData AddSave(Spellbook th, int lvl, BlueprintAbility ab, bool ev, AbilityData from) {
var added = th.AddKnown(lvl, ab, ev);
added.IsTemporary = from.IsTemporary;
added.CopiedFromScroll = from.CopiedFromScroll;
added.IsFromMythicSpellList = from.IsFromMythicSpellList;
added.IsMysticTheurgeCombinedSpell = from.IsMysticTheurgeCombinedSpell;
added.m_Fact = from.Fact; // SourceItem, SourceItemEquipmentBlueprint, SourceItemUsableBlueprint
return added;
}

public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> instruction) {
var search = AccessTools.Method(typeof(Spellbook), nameof(Spellbook.AddKnown));
foreach (var c in instruction) {
if (c.opcode == OpCodes.Callvirt && c.operand is MethodInfo i && i == search) {
yield return new CodeInstruction(OpCodes.Ldloc_S, 6);
yield return new CodeInstruction(OpCodes.Call, AccessTools.Method(typeof(UnitHelper_CopySpellbook), nameof(UnitHelper_CopySpellbook.AddSave)));
continue;
}
yield return c;
}
}
}

// Fixed a vanilla PFK bug that caused dragon bloodline to be displayed in Magus' feats tree
[HarmonyPatch(typeof(ApplyClassMechanics), nameof(ApplyClassMechanics.ApplyProgressions))]
private static class ApplyClassMechanics_ApplyProgressions_Patch {
Expand Down