Merge pull request #753 from doug1234/SagenlichtWarmage

Warmage spells from Sagenlicht

TemplePlus/dispatcher.cpp

@@ -1228,7 +1228,7 @@ int32_t _dispatch1ESkillLevel(objHndl objHnd, SkillEnum skill, BonusList* bonOut
 
 void DispIoEffectTooltip::Append(int effectTypeId, int spellEnum, const char* text) const
 {
-	BuffDebuffSub * bdbSub;
+	BuffDebuffSub * bdbSub = nullptr;
 	auto findSpec = uiParty.IndicatorSpecGet(effectTypeId);
 	switch (findSpec.type)
 	{
@@ -1250,14 +1250,20 @@ void DispIoEffectTooltip::Append(int effectTypeId, int spellEnum, const char* te
 	}
 
 	//copy the text
-	bdbSub->effectTypeId = effectTypeId;
-	bdbSub->spellEnum = spellEnum;
-	if (text){
-		bdbSub->text = new char[strlen(text) + 1];
-		strcpy( const_cast<char*>(bdbSub->text), text);
-	} else
-	{
-		bdbSub->text = nullptr;
+	if (bdbSub != nullptr) {
+		bdbSub->effectTypeId = effectTypeId;
+		bdbSub->spellEnum = spellEnum;
+		if (text) {
+			bdbSub->text = new char[strlen(text) + 1];
+			strcpy(const_cast<char*>(bdbSub->text), text);
+		}
+		else
+		{
+			bdbSub->text = nullptr;
+		}
+	}
+	else {
+		logger->error("Unknown tooltip effect {}", effectTypeId);
 	}
 }
 

tpdata/templeplus/lib/templeplus/pymod.py

@@ -56,3 +56,12 @@ def AddSpellTeleportReconnectStandard(self):
 	def AddSpellDispelCheckStandard(self):
 		self.add_spell_dispel_check_standard()
 
+class BasicPyMod(tpdp.ModifierSpec):
+	def AddHook(self, eventType, eventKey, callbackFcn, argsTuple):
+		self.add_hook(eventType, eventKey, callbackFcn, argsTuple)
+	def ExtendExisting(self, condName):
+		self.extend_existing(condName)
+
+class FeatPyMod(BasicPyMod):
+	def __init__(self, feat_enum, feat_cond_arg2 = 0, args = 2, preventDuplicate = True, feat_list_max = -1):
+		self.add_to_feat_dict(feat_enum, feat_list_max, feat_cond_arg2)

tpdatasrc/co8infra/mes/help/class_spell_lists.tab

@@ -10,6 +10,16 @@ TAG_BLACKGUARD_1	TAG_SPELLS			Level 1 Blackguard Spells	[CMD_CHILDREN_SORTED]
 TAG_BLACKGUARD_2	TAG_SPELLS			Level 2 Blackguard Spells	[CMD_CHILDREN_SORTED]
 TAG_BLACKGUARD_3	TAG_SPELLS			Level 3 Blackguard Spells	[CMD_CHILDREN_SORTED]
 TAG_BLACKGUARD_4	TAG_SPELLS			Level 4 Blackguard Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_0	TAG_SPELLS			Level 0 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_1	TAG_SPELLS			Level 1 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_2	TAG_SPELLS			Level 2 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_3	TAG_SPELLS			Level 3 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_4	TAG_SPELLS			Level 4 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_5	TAG_SPELLS			Level 5 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_6	TAG_SPELLS			Level 6 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_7	TAG_SPELLS			Level 7 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_8	TAG_SPELLS			Level 8 Warmage Spells	[CMD_CHILDREN_SORTED]
+TAG_WARMAGE_9	TAG_SPELLS			Level 9 Warmage Spells	[CMD_CHILDREN_SORTED]
 TAG_SPELLS_BULL'S_STRENGTH	TAG_SPELLS		TAG_BLACKGUARD_2 TAG_CLERIC_2 TAG_DRUID_2 TAG_PALADIN_2 TAG_SORCERER_2 TAG_STRENGTH_D TAG_WIZARD_2	Bull's Strength	~Transmutation~[TAG_MAGIC_SCHOOLS_TRANSMUTATION]Level: ~Blackguard~[TAG_BLACKGUARDS] 2, ~Cleric~[TAG_CLERICS] 2, ~Druid~[TAG_DRUIDS] 2, ~Paladin~[TAG_PALADINS] 2, ~Sorcerer~[TAG_SORCERERS]/~Wizard~[TAG_WIZARDS] 2, ~Domain: Strength~[TAG_STRENGTH_D] 2Components: V, SCasting Time: 1 ~standard action~[TAG_STANDARD_ACTION]Range: TouchTarget: Creature touchedDuration: 1 min./levelSaving Throw: ~Will~[TAG_WILL] negates (harmless)Spell Resistance: Yes (harmless)The subject becomes stronger. The spell grants a +4 ~enhancement~[TAG_ENHANCEMENT_BONUS] bonus to ~Strength~[TAG_STRENGTH], adding the usual benefits to melee ~attack rolls~[TAG_ATTACK_ROLL], melee damage rolls, and other uses of the Strength modifier.
 TAG_SPELLS_CATS_GRACE	TAG_SPELLS		TAG_ASSASSIN_2 TAG_BARD_2 TAG_DRUID_2 TAG_RANGER_2 TAG_SORCERER_2 TAG_WIZARD_2	Cat's Grace	~Transmutation~[TAG_MAGIC_SCHOOLS_TRANSMUTATION]Level: ~Assassin~[TAG_ASSASSINS] 2, ~Bard~[TAG_BARDS] 2, ~Druid~[TAG_DRUIDS] 2, ~Ranger~[TAG_RANGERS] 2, ~Sorcerer~[TAG_SORCERERS]/~Wizard~[TAG_WIZARDS] 2Components: V, SCasting Time: 1 ~standard action~[TAG_STANDARD_ACTION]Range: TouchTarget: Creature touchedDuration: 1 min./levelSaving Throw: ~Will~[TAG_WILL] negates (harmless)Spell Resistance: YesThe transmuted creature becomes more graceful, agile, and coordinated. The spell grants a +4 ~enhancement~[TAG_ENHANCEMENT_BONUS] bonus to ~Dexterity~[TAG_DEXTERITY], adding the usual benefits to ~AC~[TAG_ARMOR_CLASS], ~Reflex~[TAG_REFLEX] saves, and other uses of the Dexterity modifier.
 TAG_SPELLS_CAUSE_FEAR	TAG_SPELLS		TAG_BARD_1 TAG_BLACKGUARD_1 TAG_CLERIC_1 TAG_DEATH_D TAG_SORCERER_1 TAG_WIZARD_1	Cause Fear	~Necromancy~[TAG_MAGIC_SCHOOLS_NECROMANCY] Fear, Mind-AffectingLevel: ~Bard~[TAG_BARDS] 1, ~Blackguard~[TAG_BLACKGUARDS] 1, ~Cleric~[TAG_CLERICS] 1, ~Domain: Death~[TAG_DEATH_D] 1, ~Sorcerer~[TAG_SORCERERS]/~Wizard~[TAG_WIZARDS] 1Components: V, SCasting Time: 1 ~standard action~[TAG_STANDARD_ACTION]Range: Close (25 ft. + 5 ft./2 levels)Target: One living creature with 5 or fewer HDDuration: 1d4 rounds (if saving throw is failed) or 1 round (if saving throw is successful)Saving Throw: ~Will~[TAG_WILL] partialSpell Resistance: YesThe affected creature becomes ~frightened~[TAG_FRIGHTENED]. If the subject succeeds on a Will save, it is ~shaken~[TAG_SHAKEN] for 1 round.  Creatures with 6 or more HD are immune to this effect. Cause Fear counters and dispels ~Remove Fear~[TAG_SPELLS_REMOVE_FEAR].

tpdatasrc/tpgamefiles/art/meshes/Particle/bullseye.mdf

@@ -0,0 +1,3 @@
+Textured
+Texture "art/meshes/particle/bullseye.tga"
+Color 255 255 255 255

tpdatasrc/tpgamefiles/mes/damage_ext.mes

@@ -13,6 +13,7 @@
 {3006}{~Undead Bane Weapon~[TAG_SPELLS_UNDEAD_BANE_WEAPON]}
 {3007}{~Lawful Sword~[TAG_SPELLS_LAWFUL_SWORD]}
 {3008}{~Weapon of Energy~[TAG_SPELLS_WEAPON_OF_ENERGY]}
+{3010}{~Blades of Fire~[TAG_SPELLS_BLADES_OF_FIRE]}
 
 // Feat Damage effects
 {4000}{~Flying Kick~[TAG_FLYING_KICK]}