Dragon Discipile WIP

tpdatasrc/tpgamefiles/rules/char_class/class023_dragon_disciple.py

@@ -117,9 +117,10 @@ def alreadyHasDraconicHeritage(obj):
 
 def IsSelectingFeatsOnLevelup(obj):
     newLvl = char_editor.stat_level_get(classEnum)
-    if not newLvl == 1:
-        return 0
-    if alreadyHasDraconicHeritage(obj):
+    if newLvl == 1:
+        if alreadyHasDraconicHeritage(obj):
+            return 0
+    elif newLvl not in [2, 4, 5, 6, 8, 9]:
         return 0
     return 1
 
@@ -128,6 +129,8 @@ def LevelupGetBonusFeats(obj):
     bonus_feats = []
     if newLvl == 1:
         bonus_feats.append("Draconic Heritage")
+    elif newLvl in [2, 4, 5, 6, 8, 9]:
+        bonus_feats.append("Bonus Spell")
 
     bonFeatInfo = []
     for ft in bonus_feats:

tpdatasrc/tpgamefiles/rules/feats/bonus spell bard 0.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Bard 0)
+flags: 9
+prereqs: 8 1
+description: Grants a Bard bonus Spell per Day for Spell Level 0
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell bard 1.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Bard 1)
+flags: 9
+prereqs: 8 2
+description: Grants a Bard bonus Spell per Day for Spell Level 1
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell bard 2.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Bard 2)
+flags: 9
+prereqs: 8 4
+description: Grants a Bard bonus Spell per Day for Spell Level 2
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell bard 3.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Bard 3)
+flags: 9
+prereqs: 8 7
+description: Grants a Bard bonus Spell per Day for Spell Level 3
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell sorcerer 0.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Sorcerer 0)
+flags: 9
+prereqs: 16 1
+description: Grants a Sorcerer bonus Spell per Day for Spell Level 0
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell sorcerer 1.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Sorcerer 1)
+flags: 9
+prereqs: 16 1
+description: Grants a Sorcerer bonus Spell per Day for Spell Level 1
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell sorcerer 2.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Sorcerer 2)
+flags: 9
+prereqs: 16 4
+description: Grants a Sorcerer bonus Spell per Day for Spell Level 2
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell sorcerer 3.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Sorcerer 3)
+flags: 9
+prereqs: 16 6
+description: Grants a Sorcerer bonus Spell per Day for Spell Level 3
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell wizard 0.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Wizard 0)
+flags: 9
+prereqs: 17 1
+description: Grants a Wizard bonus Spell per Day for Spell Level 0
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell wizard 1.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Wizard 1)
+flags: 9
+prereqs: 17 1
+description: Grants a Wizard bonus Spell per Day for Spell Level 1
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell wizard 2.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Wizard 2)
+flags: 9
+prereqs: 17 3
+description: Grants a Wizard bonus Spell per Day for Spell Level 2
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell wizard 3.txt

@@ -0,0 +1,6 @@
+name: Bonus Spell (Wizard 3)
+flags: 9
+prereqs: 17 5
+description: Grants a Wizard bonus Spell per Day for Spell Level 3
+prereq descr:
+parent: Bonus Spell

tpdatasrc/tpgamefiles/rules/feats/bonus spell.txt

@@ -0,0 +1,5 @@
+name: Bonus Spell
+flags: 9
+prereqs:
+description: Grants a Bonus Spell per Day
+prereq descr:

tpdatasrc/tpgamefiles/rules/partsys/breath_weapons_partsys.tab

@@ -0,0 +1,24 @@
+sp-Breath Weapon Cone Medium Acid	smoke emit	10		20	600		Object YPR				Sprite	Same as Emitter	Polar	Cartesian	fire-sprite	120	Blend	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0?30	0	-30?30		30?360	5?40	0	0	0?360	0	0	0,16,0	0	255	144						100
+sp-Breath Weapon Cone Medium Acid	Fire Strike			30	75		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	20?60	0	0	0?720	0	0	0,255,0	0	255	144						20
+sp-Breath Weapon Cone Medium Acid	Fire Strike 2			30	300		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	0,10	0	0	0?720	0	0	0,255,0	0	255	144						30
+sp-Breath Weapon Cone Medium Cold	smoke emit	10		20	600		Object YPR				Sprite	Same as Emitter	Polar	Cartesian	fire-sprite	120	Blend	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0?30	0	-30?30		30?330	5?40	0	0	0?360	0	0	0,16,0	255	255	255						100
+sp-Breath Weapon Cone Medium Cold	Fire Strike			30	100		Object YPR				Sprite	Same as Emitter	Polar		flare-big	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	20?60	0	0	0?720	0	0	0	0	128	255						20
+sp-Breath Weapon Cone Medium Cold	fire strike 3 sparklies			30	50		Object YPR				Sprite	Same as Emitter	Polar		flare-1	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	255,0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,	0	0	0,360	0	0	0	255	255	255						100
+sp-Breath Weapon Cone Medium Electricity	Fire Strike			30	100		Object YPR				Sprite	Same as Emitter	Polar		flare-big	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	20?60	0	0	0?720	0	0	0	0	128	255						20
+sp-Breath Weapon Cone Medium Electricity	fire strike 3 sparklies			30	50		Object YPR				Sprite	Same as Emitter	Polar		flare-1	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	255,0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,	0	0	0,360	0	0	255,0	255,64,64,64,64	255,128,128,128,128	255,255							100
+sp-Breath Weapon Cone Medium Electricity	water droplets	15		30	30		Object YPR	bip01 head			Sprite	Same as Emitter	Polar	Cartesian	flare-1	5	Add	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	3?15	0	0	0?360	0	0	255,0	255,64,64,64,64	255,128,128,128,128	255,255						5
+sp-Breath Weapon Cone Medium Fire	smoke emit	10		20	600		Object YPR				Sprite	Same as Emitter	Polar	Cartesian	fire-sprite	120	Blend	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0?30	0	-30?30		30?330	5?40	0	0	0?360	0	0	0,32,0	0	0	0						100
+sp-Breath Weapon Cone Medium Fire	Fire Strike			30	75		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	20?60	0	0	0?720	0	0	0,255,255,0	255(6),255(10)	255(6),130(10)	0						20
+sp-Breath Weapon Cone Medium Fire	Fire Strike 2			30	300		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	-30?30	0	0,360	0,10	0	0	0?720	0	0	0,255,255,0	255(6),255(10)	255(6),130(10)	0						30
+sp-Breath Weapon Line Medium Acid	smoke emit	10		20	600		Object YPR				Sprite	Same as Emitter	Polar	Cartesian	fire-sprite	120	Blend	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0?30	0	-3?3		30?600	5?40	0	0	0?360	0	0	0,16,0	0	255	144						100
+sp-Breath Weapon Line Medium Acid	Fire Strike			30	75		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-3?3	0	0,600	20?60	0	0	0?720	0	0	0,255,0	0	255	144						20
+sp-Breath Weapon Line Medium Acid	Fire Strike 2			30	300		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	-3?3	0	0,600	0,10	0	0	0?720	0	0	0,255,0	0	255	144						30
+sp-Breath Weapon Line Medium Cold	smoke emit	10		20	600		Object YPR				Sprite	Same as Emitter	Polar	Cartesian	fire-sprite	120	Blend	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0?30	0	-3?3		30?330	5?40	0	0	0?360	0	0	0,16,0	255	255	255						100
+sp-Breath Weapon Line Medium Cold	Fire Strike			30	100		Object YPR				Sprite	Same as Emitter	Polar		flare-big	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	20?60	0	0	0?720	0	0	0	0	128	255						20
+sp-Breath Weapon Line Medium Cold	fire strike 3 sparklies			30	50		Object YPR				Sprite	Same as Emitter	Polar		flare-1	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	255,0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,	0	0	0,360	0	0	0	255	255	255						100
+sp-Breath Weapon Line Medium Electricity	Fire Strike			30	100		Object YPR				Sprite	Same as Emitter	Polar		flare-big	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	20?60	0	0	0?720	0	0	0	0	128	255						20
+sp-Breath Weapon Line Medium Electricity	fire strike 3 sparklies			30	50		Object YPR				Sprite	Same as Emitter	Polar		flare-1	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	255,0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,1,30,20,25,6,26,15,2,28,3,	0	0	0,360	0	0	255,0	255,64,64,64,64	255,128,128,128,128	255,255							100
+sp-Breath Weapon Line Medium Electricity	water droplets	15		30	30		Object YPR	bip01 head			Sprite	Same as Emitter	Polar	Cartesian	flare-1	5	Add	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	3?15	0	0	0?360	0	0	255,0	255,64,64,64,64	255,128,128,128,128	255,255						5
+sp-Breath Weapon Line Medium Fire	smoke emit	10		20	400		Object YPR				Sprite	Same as Emitter	Polar	Cartesian	fire-sprite	120	Blend	0				0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0?30	0	-3?3		30?330	5?40	0	0	0?360	0	0	0,32,0	0	0	0						100
+sp-Breath Weapon Line Medium Fire	Fire Strike			30	50		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	64,0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	20?60	0	0	0?720	0	0	0,255,255,0	255(6),255(10)	255(6),130(10)	0						20
+sp-Breath Weapon Line Medium Fire	Fire Strike 2			30	300		Object YPR				Disc	Same as Emitter	Polar		flare	30	Add	0				0	0	0	0	0	0	0	40	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	0	-3?3	0	0,360	0,10	0	0	0?720	0	0	0,255,255,0	255(6),255(10)	255(6),130(10)	0						30

tpdatasrc/tpgamefiles/rules/spell_enums/dragon_disciple_spell_enum.mes

@@ -3,8 +3,5 @@
 {3231}{Dragon Disciple Cone Breath}
 {3232}{Dragon Disciple Line Breath}
 
-{8231}{Dragon Disciple Cone Breath}
-{8232}{Dragon Disciple Line Breath}
-
 {23231}{DRAGON_DISCIPLE_CONE_BREATH}
 {23232}{DRAGON_DISCIPLE_LINE_BREATH}

tpdatasrc/tpgamefiles/scr/Spell3231 - Dragon Disciple Cone Breath.py

@@ -1,4 +1,5 @@
 from toee import *
+from heritage_feat_utils import getDraconicHeritageElement
 
 def OnBeginSpellCast(spell):
     print "Dragon Disciple Cone Breath OnBeginSpellCast"
@@ -10,10 +11,7 @@ def OnSpellEffect(spell):
 
     targetsToRemove = []
     spell.duration = 0
-    spell.dc = 10 + spell.caster_level + ((spell.caster.stat_level_get(stat_constitution)-10)/2)
-    print "Debug Dragon Disciple Cone Breath"
-    print "Dragon Disciple Breath Weapon DC: {}".format(spell.dc)
-    print "Dragon Disciple Caster Level: {}".format(spell.caster_level)
+    spell.dc = 10 + spell.caster_level + ((spell.caster.stat_level_get(stat_constitution)- 10 ) / 2)
 
     spellDamageDice = dice_new('1d8')
     if spell.caster_level < 7:
@@ -22,27 +20,26 @@ def OnSpellEffect(spell):
         spellDamageDice.number = 4
     else:
         spellDamageDice.number = 6
-    print "spellDamageDice: {}".format(spellDamageDice)
     saveType = D20_Save_Reduction_Half
-    damageType = spell.caster.d20_query("PQ_Dragon_Disciple_Element_Type")
-    print "Dragon Disciple Breath Weapon Element: {}".format(damageType)
-    #If different Breath Weapon Types get added (e.g. Sonic) add them here
+
+    heritage = spell.caster.d20_query("PQ_Selected_Draconic_Heritage")
+    damageType = getDraconicHeritageElement(heritage)
     if damageType == D20DT_ACID:
         saveDescriptor = D20STD_F_SPELL_DESCRIPTOR_ACID
-        particleEffect = "sp-Dragon Disciple Cone Breath Acid"
+        elementString = "Acid"
     elif damageType == D20DT_COLD:
         saveDescriptor = D20STD_F_SPELL_DESCRIPTOR_COLD
-        particleEffect = "sp-Dragon Disciple Cone Breath Cold"
+        elementString = "Cold"
     elif damageType == D20DT_ELECTRICITY:
         saveDescriptor = D20STD_F_SPELL_DESCRIPTOR_ELECTRICITY
-        particleEffect = "sp-Dragon Disciple Cone Breath Electricity"
+        elementString = "Electricity"
     elif damageType == D20DT_FIRE:
         saveDescriptor = D20STD_F_SPELL_DESCRIPTOR_FIRE
-        particleEffect = "sp-Dragon Disciple Cone Breath Fire"
+        elementString = "Fire"
     else: #Fallback
         saveDescriptor = D20STD_F_NONE
-        particleEffect = "sp-Dragon Disciple Cone Breath Fire"
-    print "Dragon Disciple Breath Weapon Descriptor: {}".format(saveDescriptor)
+        elementString = "Fire"
+    particleEffect = "sp-Breath Weapon Cone Medium {}".format(elementString)
 
     game.particles(particleEffect, spell.caster)