fix: remove mastery perks by hardcoded ids

This prevents unintended removal of perks such as Bandage Mastery.

Author: LordMidas

mod_ptr/hooks/skills/backgrounds/swordmaster_background.nut

@@ -59,21 +59,37 @@
 	local buildPerkTree = ::mods_getMember(o, "buildPerkTree");
 	o.buildPerkTree <- function()
 	{
-		if (this.m.CustomPerkTree == null)
+		if (this.m.CustomPerkTree != null) return buildPerkTree();
+
+		local ret = buildPerkTree();
+		foreach (row in this.getPerkTree())
 		{
-			local ret = buildPerkTree();
-			local masteryRow = this.getPerkTree()[3];
-			for (local i = masteryRow.len() - 1; i >= 0; i--)
+			foreach (perk in row)
 			{
-				if (masteryRow[i].ID != "perk.mastery.sword" && masteryRow[i].ID.find("mastery") != null)
+				for (local i = row.len() - 1; i >= 0; i--)
 				{
-					this.removePerk(::Const.Perks.PerkDefs[masteryRow[i].Const]);
+					switch (row[i].ID)
+					{
+						case "perk.mastery.axe":
+						case "perk.mastery.bow":
+						case "perk.mastery.cleaver":
+						case "perk.mastery.crossbow":
+						case "perk.mastery.dagger":
+						case "perk.mastery.flail":
+						case "perk.mastery.hammer":
+						case "perk.mastery.mace":
+						case "perk.mastery.polearm":
+						case "perk.mastery.spear":
+						case "perk.mastery.throwing":
+						case "perk.legend_mastery_slings":
+						case "perk.legend_mastery_staves":
+							this.removePerk(::Const.Perks.PerkDefs[row[i].Const]);
+							break;
+					}
 				}
 			}
-
-			return ret;
 		}
 
-		return buildPerkTree();
+		return ret;
 	}
 });

scripts/skills/effects/ptr_swordmaster_scenario_recruit_effect.nut

@@ -246,15 +246,29 @@ this.ptr_swordmaster_scenario_recruit_effect <- this.inherit("scripts/skills/eff
 			{
 				for (local i = row.len() - 1; i >= 0; i--)
 				{
-					if (row[i].ID != "perk.mastery.sword" && row[i].ID.find("mastery") != null)
+					switch (row[i].ID)
 					{
-						if (this.getContainer().hasSkill(row[i].ID))
-						{
-							this.getContainer().removeByID(row[i].ID);
-							actor.m.PerkPoints++;
-							actor.m.PerkPointsSpent--;
-						}
-						bg.removePerk(::Const.Perks.PerkDefs[row[i].Const]);
+						case "perk.mastery.axe":
+						case "perk.mastery.bow":
+						case "perk.mastery.cleaver":
+						case "perk.mastery.crossbow":
+						case "perk.mastery.dagger":
+						case "perk.mastery.flail":
+						case "perk.mastery.hammer":
+						case "perk.mastery.mace":
+						case "perk.mastery.polearm":
+						case "perk.mastery.spear":
+						case "perk.mastery.throwing":
+						case "perk.legend_mastery_slings":
+						case "perk.legend_mastery_staves":
+							if (this.getContainer().hasSkill(row[i].ID))
+							{
+								this.getContainer().removeByID(row[i].ID);
+								actor.m.PerkPoints++;
+								actor.m.PerkPointsSpent--;
+							}
+							bg.removePerk(::Const.Perks.PerkDefs[row[i].Const]);
+							break;
 					}
 				}
 			}