Merge pull request #392 from doug1234/BlackguardDM

Blackguards can now use Divine Might issue #372.
GrognardsFromHell · May 14, 2020 · b81c021 · b81c021
2 parents 501f69a + 2007aac
commit b81c021
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 3 deletions.
diff --git a/TemplePlus/feat.cpp b/TemplePlus/feat.cpp
@@ -829,10 +829,10 @@ uint32_t LegacyFeatSystem::FeatPrereqsCheck(objHndl objHnd, feat_enums featIdx,
 			auto clericLvl = objects.StatLevelGet(objHnd, stat_level_cleric);
 			auto clericTurnLvl = clericLvl + (classCodeBeingLevelledUp == stat_level_cleric) - 0;
 
-			auto otherTurnLvl = max(0, d20Sys.D20QueryPython(objHnd, "Turn Undead Level"));
+			auto otherTurnLvl = max(0, d20Sys.D20QueryPython(objHnd, "Turn Undead Level", 0, classCodeBeingLevelledUp));
+			otherTurnLvl += max(0, d20Sys.D20QueryPython(objHnd, "Turn Undead Level", 1, classCodeBeingLevelledUp));
 
 			auto highestTurnLvl = clericTurnLvl + paladinTurnLvl + otherTurnLvl;
-
 
 			if (featIdx == FEAT_TURN_UNDEAD){
 				if (!(critterAlignment & ALIGNMENT_EVIL || critterAlignment == (ALIGNMENT_CHAOTIC | ALIGNMENT_LAWFUL)))// TODO: is this a bug??? might be harmless mistake, might be deliberate

diff --git a/tpdata/co8infra.dat b/tpdata/co8infra.dat
diff --git a/tpdata/kotbfixes.dat b/tpdata/kotbfixes.dat
diff --git a/tpdata/tpgamefiles.dat b/tpdata/tpgamefiles.dat
diff --git a/tpdatasrc/tpgamefiles/scr/tpModifiers/blackguard.py b/tpdatasrc/tpgamefiles/scr/tpModifiers/blackguard.py
@@ -53,9 +53,12 @@ def BlackguardSneakAttackDice(attachee, args, evt_obj):
 	return 0
 
 def BlackguardRebukeUndeadLevel(attachee, args, evt_obj):
+	level_up = 0
 	if evt_obj.data1 != 1: # rebuke undead
 		return 0
-	blg_lvl = attachee.stat_level_get(classEnum)
+	if evt_obj.data2 == classEnum: #class leveling up (0 if not called on level up)
+		level_up = 1
+	blg_lvl = attachee.stat_level_get(classEnum) + level_up
 	if blg_lvl < 3:
 		return 0
 	evt_obj.return_val += blg_lvl - 2