Skip to content

Commit

Permalink
[Hunter] TotH affects pets
Browse files Browse the repository at this point in the history
  • Loading branch information
@Jayezi
Jayezi committed Nov 22, 2019
1 parent acdee6b commit eb157e7
Show file tree
Hide file tree
Showing 5 changed files with 68 additions and 4 deletions.
22 changes: 22 additions & 0 deletions SpellDataDump/allspells.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -320746,6 +320746,28 @@ Effects :
Description : Deals $s1 damage to target creature, and increases Harmonic Dematerializer's damage to targets with the same name by $s2%. This bonus resets if you use it on a target with a different name.
Tooltip : Harmonic Dematerializer's damage increased by $w2% against targets whose name match the last target you harmonically dematerialized.

Name : Thrill of the Hunt (id=312365) [Spell Family (9), Hidden]
Class : Hunter
School : Physical
Spell Type : None
Range : 100 yards
Duration : 8 seconds
Stacks : 3 maximum
Proc Chance : 101%
Attributes : ....x..x ........ ........ ........ ........ ........ ........ ........
: ..x..... ........ ........ ........ ........ ........ ........ ......x.
: ........ .......x ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ....x... ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ x......x ........ ........ ........
: Hidden (7)
Effects :
#1 (id=793988) : Apply Aura (6) | Modify Critical Strike% (290)
Base Value: 3 | Scaled Value: 3 | PvP Coefficient: 1.00000 | Target: Friend (21)
Description : $@spelldesc257944
Tooltip : Critical strike chance increased by $s1%.

Name : Contemptuous Homily (id=313267) [Scaling Spell (-1), Spell Family (6), Hidden]
School : Holy
Spell Type : None
Expand Down
22 changes: 22 additions & 0 deletions SpellDataDump/hunter.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10643,4 +10643,26 @@ Description : Your damaging spells and abilities have a chance to crash a w

When your health drops below $s2%, gain a shield absorbing $s3 damage within $303390d. When this occurs, Undulating Tides cannot trigger again for $s4 sec.

Name : Thrill of the Hunt (id=312365) [Spell Family (9), Hidden]
Class : Hunter
School : Physical
Spell Type : None
Range : 100 yards
Duration : 8 seconds
Stacks : 3 maximum
Proc Chance : 101%
Attributes : ....x..x ........ ........ ........ ........ ........ ........ ........
: ..x..... ........ ........ ........ ........ ........ ........ ......x.
: ........ .......x ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ....x... ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ ........ ........ ........ ........
: ........ ........ ........ ........ x......x ........ ........ ........
: Hidden (7)
Effects :
#1 (id=793988) : Apply Aura (6) | Modify Critical Strike% (290)
Base Value: 3 | Scaled Value: 3 | PvP Coefficient: 1.00000 | Target: Friend (21)
Description : $@spelldesc257944
Tooltip : Critical strike chance increased by $s1%.


Expand Down
1 change: 1 addition & 0 deletions dbc_extract3/dbc/generator.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1362,6 +1362,7 @@ class SpellDataGenerator(DataGenerator):
(
( 75, 0 ), # Auto Shot
( 131900, 0 ), # Murder of Crows damage spell
( 312365, 0 ), # Thrill of the Hunt
( 171457, 1 ), # Chimaera Shot - Nature
( 201594, 1 ), # Stampede
( 118459, 5 ), # Beast Cleave
Expand Down
17 changes: 17 additions & 0 deletions engine/class_modules/sc_hunter.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ struct hunter_t: public player_t
std::array<buff_t*, BARBED_SHOT_BUFFS_MAX> barbed_shot;
buff_t* dire_beast;
buff_t* thrill_of_the_hunt;
buff_t* thrill_of_the_hunt_pet;
buff_t* spitting_cobra;

// Marksmanship
Expand Down Expand Up @@ -985,6 +986,15 @@ struct hunter_pet_t: public pet_t
main_hand_weapon.swing_time = 2.0_s;
}

double composite_melee_crit_chance() const override
{
double cc = pet_t::composite_melee_crit_chance();

cc += o() -> buffs.thrill_of_the_hunt_pet -> check_stack_value();

return cc;
}

double composite_player_multiplier( school_e school ) const override
{
double m = pet_t::composite_player_multiplier( school );
Expand Down Expand Up @@ -2385,6 +2395,7 @@ struct barbed_shot_t: public hunter_ranged_attack_t
(*it) -> trigger(); // TODO: error when don't have enough buffs?

p() -> buffs.thrill_of_the_hunt -> trigger();
p() -> buffs.thrill_of_the_hunt_pet -> trigger();

// Adjust BW cd
timespan_t t = timespan_t::from_seconds( p() -> specs.bestial_wrath -> effectN( 3 ).base_value() );
Expand Down Expand Up @@ -4983,6 +4994,12 @@ void hunter_t::create_buffs()
-> set_default_value( talents.thrill_of_the_hunt -> effectN( 1 ).trigger() -> effectN( 1 ).percent() )
-> set_trigger_spell( talents.thrill_of_the_hunt );

const spell_data_t* thrill_of_the_hunt_pet = find_spell( 312365 );
buffs.thrill_of_the_hunt_pet =
make_buff( this, "thrill_of_the_hunt_pet", thrill_of_the_hunt_pet )
-> set_default_value( thrill_of_the_hunt_pet -> effectN( 1 ).percent() )
-> set_trigger_spell( talents.thrill_of_the_hunt );

buffs.spitting_cobra =
make_buff( this, "spitting_cobra", talents.spitting_cobra )
-> set_default_value( find_spell( 194407 ) -> effectN( 2 ).resource( RESOURCE_FOCUS ) )
Expand Down
10 changes: 6 additions & 4 deletions engine/dbc/generated/sc_spell_data.inc
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#define SPELL_SIZE (15859)
#define SPELL_SIZE (15860)

// 15859 spells, wow build level 8.2.5.32580
// 15860 spells, wow build level 8.2.5.32580
static struct spell_data_t __spell_data[] = {
{ "Power Word: Shield" , 17, 0x0000000000000000, 0.000000, 2, 0x00000010, 0x0000000000000000, 0, 0, 8, 0, 0.000000, 40.000000, 0, 1500, 0, 0, 0, 0, 15000, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 327680, 0, 2621696, 0, 0, 0, 0, 0, 4096, 0, 0, 0, 0, 0 }, { 1, 0, 0, 0 }, 6, 0x08000000, 218, 0, 0, "Shields an ally for $d, absorbing $<shield> damage. You cannot shield the target again for $6788d.", "Absorbs $w1 damage.", "$rapture=$?a47536[${(1+$47536s1/100)}][${1}]\r\n$shadow=$?a137033[${1.36}][${1}]\r\n$shield=${$SP*1.54*(1+$@versadmg)*$<rapture>*$<shadow>}", 0, 0, 1, 0, 0, 0, 0, 0 }, /* 13 */
{ "Backstab" , 53, 0x0000000000000000, 0.000000, 1, 0x00000008, 0x0000000000000000, 0, 0, 10, 0, 0.000000, 5.000000, 0, 1000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 2, 0, 32768, 0, 0, 0, 0, 0, 0, { 327696, 201327104, 1048576, 1024, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 }, { 4, 4194304, 0, 0 }, 8, 0x00000000, 0, 0, 0, "Stab the target, causing ${$s2*$<mult>} Physical damage. Damage increased by $s4% when you are behind your target.\r\n\r\n|cFFFFFFFFAwards $s3 combo $lpoint:points;.|r", 0, "$mult=${($max(0,$min($pl-10,10))*11+260)/370}", 0, 0, 2, 0, 0, 0, 0, 0 }, /* 30, 31, 32, 297239 */
Expand Down Expand Up @@ -15860,13 +15860,14 @@ static struct spell_data_t __spell_data[] = {
{ "Necrotic Touch" , 309567, 0x0000000000000000, 0.000000, 32, 0x00000000, 0x0000000000000000, -9, 0, 0, 0, 0.000000, 20.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 2, 0, 173555, 0, 0, 0, 0, 0, 0, { 262144, 0, 0, 1140850688, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, 0, 0, "Your melee weapon attacks deal $s1 additional Shadow damage.", 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 }, /* 789338 */
{ "Explorer's Certification" , 311270, 0x0000000000000000, 0.000000, 0, 0x00000000, 0x0000000000000000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 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, 0x00000000, 0, 0, 0, "Grants the title of \"Renowned Explorer\".", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 792127 */
{ "Harmonic Dematerializer" , 312058, 0x0000000000000000, 0.000000, 64, 0x00000000, 0x0000000000000000, 0, 0, 0, 0, 0.000000, 0.000000, 15000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 192, 0, 0, 0, 0, 0, 0, 0, 4096, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, 0, 0, "Deals $s1 damage to target creature, and increases Harmonic Dematerializer's damage to targets with the same name by $s2%. This bonus resets if you use it on a target with a different name.", "Harmonic Dematerializer's damage increased by $w2% against targets whose name match the last target you harmonically dematerialized.", 0, 0, 0, 1, 0, 0, 0, 0, 0 }, /* 793424 */
{ "Thrill of the Hunt" , 312365, 0x0000000000000000, 0.000000, 1, 0x00000004, 0x0000000000000000, 0, 0, 0, 0, 0.000000, 100.000000, 0, 0, 0, 0, 0, 0, 8000, 3, 101, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 144, 0, 4, 1073741824, 32768, 0, 0, 0, 4096, 0, 0, 0, 0, 129 }, { 0, 0, 0, 0 }, 9, 0x00000000, 0, 0, 0, "$@spelldesc257944", "Critical strike chance increased by $s1%.", 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 793988 */
{ "Contemptuous Homily" , 313267, 0x0000000000000000, 0.000000, 2, 0x00000000, 0x0000000000000000, -1, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, -1, 0, 100, 0, 65536, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 128, 0, 0, 1048576, 2097152, 0, 0, 4, 4096, 0, 0, 4, 2147483648, 1073741824 }, { 0, 0, 0, 0 }, 6, 0x00000000, 0, 0, 0, "$@spelldesc278629", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* 795450 */
{ 0 , 0, 0x0000000000000000, 0.000000, 0, 0x00000000, 0x0000000000000000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 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, 0x00000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, /* */
};

#define __SPELLEFFECT_SIZE (22249)
#define __SPELLEFFECT_SIZE (22250)

// 22249 effects, wow build level 8.2.5.32580
// 22250 effects, wow build level 8.2.5.32580
static struct spelleffect_data_t __spelleffect_data[] = {
{ 13, 0x00000000, 17, 0, 6, 69, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 0.0000, 127, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 21, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 30, 0x00000000, 53, 0, 3, 0, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 1.0000, 0, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 6, 0, 0.000000, 1.000000, 0, 0, 0 },
Expand Down Expand Up @@ -38115,6 +38116,7 @@ static struct spelleffect_data_t __spelleffect_data[] = {
{ 792127, 0x00000000, 311270, 0, 3, 0, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 0.0000, 0, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 0, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 792945, 0x00000000, 215149, 1, 6, 4, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 20.0000, 0, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 1, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 793424, 0x00000000, 312058, 0, 6, 4, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 0.0000, 0, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 1, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 793988, 0x00000000, 312365, 0, 6, 290, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 3.0000, 0, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 21, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 795450, 0x00000000, 313267, 0, 6, 42, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 0.0000, 0, 0, { 0, 0, 0, 0 }, 278904, 1.000000, 0.000000, 0.000000, 0, 0, 1, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 797538, 0xffffffff, 51723, 1, 3, 0, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 1.0000, 0, 0, { 0, 0, 0, 0 }, 0, 1.000000, 0.000000, 0.000000, 0, 0, 0, 0, 0.000000, 1.000000, 0, 0, 0 },
{ 0, 0x00000000, 0, 0, 0, 0, 0.000000, 0.000000, 0.000000, 0.000000, 0.000000, 0, 0.000000, 0.000000, 0.0000, 0, 0, { 0, 0, 0, 0 }, 0, 0.000000, 0.000000, 0.000000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0 },
Expand Down

0 comments on commit eb157e7

Please sign in to comment.