Skip to content

Commit

Permalink
Fix asserts from generating profiles .
Browse files Browse the repository at this point in the history
  • Loading branch information
@Collisionc
Collisionc committed Apr 1, 2016
1 parent 994216b commit 9b8c04e
Show file tree
Hide file tree
Showing 12 changed files with 27 additions and 50 deletions.
3 changes: 1 addition & 2 deletions engine/class_modules/sc_druid.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1689,8 +1689,7 @@ struct druid_spell_t : public druid_spell_base_t<spell_t>
ap_per_hit( 0 ),
ap_per_tick( 0 ),
ap_per_cast( 0 ),
blessing_of_elune( data().affected_by( p -> spell.blessing_of_elune -> effectN( 1 ) )
|| data().affected_by( p -> spell.blessing_of_elune -> effectN( 2 ) ) ),
blessing_of_elune( data().affected_by( p -> spell.blessing_of_elune -> effectN( 1 ) ) ),
consumes_owlkin_frenzy( false ),
ap_gain( p->get_gain( name() ) )
{
Expand Down
19 changes: 10 additions & 9 deletions engine/class_modules/sc_warrior.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1478,8 +1478,10 @@ struct execute_off_hand_t: public warrior_attack_t
struct execute_t: public warrior_attack_t
{
execute_off_hand_t* oh_attack;
double arms_bonus_damage;
execute_t( warrior_t* p, const std::string& options_str ):
warrior_attack_t( "execute", p, p -> spec.execute )
warrior_attack_t( "execute", p, p -> spec.execute ),
arms_bonus_damage( p -> find_spell( 168874 ) -> effectN( 2 ).percent() )
{
parse_options( options_str );
weapon = &( p -> main_hand_weapon );
Expand All @@ -1503,10 +1505,9 @@ struct execute_t: public warrior_attack_t

if ( p() -> mastery.colossal_might -> ok() )
{
if ( target -> health_percentage() < 20 )
{
am *= 4.0 * std::min( 40.0, ( p() -> resources.current[RESOURCE_RAGE] ) ) / 40;
}
double added_weapon_damage;
added_weapon_damage = ( std::min( 30.0, ( p() -> resources.current[RESOURCE_RAGE] ) ) / 30 ) * arms_bonus_damage;

}
else if ( p() -> has_shield_equipped() )
{ am *= 1.0 + p() -> spec.protection -> effectN( 2 ).percent(); }
Expand Down Expand Up @@ -3227,10 +3228,10 @@ void warrior_t::init_spells()
if ( sets.has_set_bonus( WARRIOR_PROTECTION, T17, B4 ) ) spell.t17_prot_2p = find_spell( 169688 );
if ( spec.rampage -> ok() )
{
rampage_attack_t* first = new rampage_attack_t( this, spec.rampage -> effectN( 5 ).trigger(), "rampage1" );
rampage_attack_t* second = new rampage_attack_t( this, spec.rampage -> effectN( 6 ).trigger(), "rampage2" );
rampage_attack_t* third = new rampage_attack_t( this, spec.rampage -> effectN( 7 ).trigger(), "rampage3" );
rampage_attack_t* fourth = new rampage_attack_t( this, spec.rampage -> effectN( 8 ).trigger(), "rampage4" );
rampage_attack_t* first = new rampage_attack_t( this, spec.rampage -> effectN( 4 ).trigger(), "rampage1" );
rampage_attack_t* second = new rampage_attack_t( this, spec.rampage -> effectN( 5 ).trigger(), "rampage2" );
rampage_attack_t* third = new rampage_attack_t( this, spec.rampage -> effectN( 6 ).trigger(), "rampage3" );
rampage_attack_t* fourth = new rampage_attack_t( this, spec.rampage -> effectN( 7 ).trigger(), "rampage4" );
first -> weapon = &( this -> off_hand_weapon );
second -> weapon = &( this -> main_hand_weapon );
third -> weapon = &( this -> off_hand_weapon );
Expand Down
14 changes: 7 additions & 7 deletions engine/dbc/generated/sc_spell_data.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3195,7 +3195,7 @@ static struct spell_data_t __spell_data[] = {
{ "Mastery: Deep Healing" , 77226, 0x00, 0.000000, 1, 0x040, 0x000, 0, 0, 78, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 320, 0, 0, 0, 0, 0, 0, 0, 536870912, 0, 0, 0 }, { 0, 0, 0, 0 }, 11, 0x00000000, 0, "Increases healing from your spells by up to $77226s1%, based on the current health of your target. Lower health targets are healed for more.", 0, 0, 0, 0, 0, 0 }, /* 68079, 92128 */
{ "Lava Burst Overload" , 77451, 0x00, 32.000000, 4, 0x040, 0x000, 0, 0, 1, 0, 0.000000, 100.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 2000, 2000, 0, 0, 0, 0, { 65536, 0, 0, 1073741824, 32896, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 4227072, 0 }, 11, 0x00000000, 0, "You hurl molten lava at the target, dealing $s1 Fire damage. If your Flame Shock is on the target, Lava Burst will deal a critical strike.", 0, 0, 0, 0, 0, 0 }, /* 68090, 287602 */
//{ Name , Id,Flags,PrjSp, Sch, Class, Race,Sca,MSL,SpLv,MxL,MinRange,MaxRange,Cooldown, GCD,Chg, ChrgCd, Cat, Duration, RCost, RPG,Stac, PCh,PCr, ProcFlags,EqpCl, EqpInvType,EqpSubclass,CastMn,CastMx,Div, Scaling,SLv, RplcId, { Attr1, Attr2, Attr3, Attr4, Attr5, Attr6, Attr7, Attr8, Attr9, Attr10, Attr11, Attr12 }, { Flags1, Flags2, Flags3, Flags4 }, Family, Description, Tooltip, Description Variable, Icon, ActiveIcon, Effect1, Effect2, Effect3 },
{ "Healing Wave" , 77472, 0x00, 0.000000, 8, 0x040, 0x000, 0, 0, 56, 0, 0.000000, 40.000000, 0, 1500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 2500, 2500, 0, 0, 0, 0, { 65536, 0, 0, 0, 0, 0, 0, 0, 16777216, 0, 0, 0 }, { 0, 0, 65536, 0 }, 11, 0x00000000, 0, "A slow but efficient wave of healing energy that restores $s1 of a friendly target’s health.", 0, 0, 0, 0, 0, 0 }, /* 68093 */
{ "Healing Wave" , 77472, 0x00, 0.000000, 8, 0x040, 0x000, 0, 0, 56, 0, 0.000000, 40.000000, 0, 1500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 2500, 2500, 0, 0, 0, 0, { 65536, 0, 0, 0, 0, 0, 0, 0, 16777216, 0, 0, 0 }, { 0, 0, 65536, 0 }, 11, 0x00000000, 0, "A slow but efficient wave of healing energy that restores $s1 of a friendly target�s health.", 0, 0, 0, 0, 0, 0 }, /* 68093 */
{ "Earthquake" , 77478, 0x00, 0.000000, 1, 0x040, 0x000, 0, 0, 50, 0, 0.000000, 100.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 150994944, 136, 1074282496, 1073741824, 32896, 67502088, 2101248, 0, 4096, 8, 0, 2 }, { 0, 0, 524288, 0 }, 11, 0x00000000, 0, "$@spelldesc61882", 0, 0, 0, 0, 0, 0 }, /* 68094, 68095 */
{ "Mastery: Absolution" , 77484, 0x00, 0.000000, 1, 0x010, 0x000, 0, 0, 78, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 320, 0, 0, 0, 0, 0, 0, 0, 536870912, 0, 0, 0 }, { 0, 0, 0, 0 }, 6, 0x00000000, 0, "Increases the healing transferred through Atonement by $77484s1%.", 0, 0, 0, 0, 0, 0 }, /* 68099, 90768 */
{ "Mastery: Echo of Light" , 77485, 0x00, 0.000000, 1, 0x010, 0x000, 0, 0, 78, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 100, 0, 16384, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 320, 0, 0, 67108864, 0, 0, 0, 0, 536870912, 0, 0, 0 }, { 0, 0, 0, 0 }, 6, 0x00000000, 0, "Your direct healing spells heal for an additional $77485s1% over $77489d.", 0, 0, 0, 0, 0, 0 }, /* 68102, 90770 */
Expand Down Expand Up @@ -11529,7 +11529,7 @@ static struct spell_data_t __spell_data[] = {
{ "Wilfred's Sigil of Superior Summoning", 214345, 0x00, 0.000000, 32, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 5, 0x00000000, 0, "Reduce the cooldown of Doomguard and Infernal by ${$s1/-1000}.1 seconds for every Dreadstalker, Wild Imp, or Beholder you summon.", 0, 0, 0, 0, 0, 0 }, /* 318288 */
{ "Nightmare Essence" , 214349, 0x00, 0.000000, 32, 0x000, 0x000, -1, 0, 0, 0, 0.000000, 100.000000, 0, 0, 0, 0, 0, 0, 0, 101, 0, 69952, 0, 2.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 64, 0, 0, 1140850688, 0, 0, 0, 0, 0, 0, 0, 4 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Your ranged attacks and spells have a chance to inflict Nightmare Essence on enemies, reducing their movement speed by $214350s2% and dealing $214350o1 Shadow damage over $214350d.", 0, 0, 0, 0, 0, 0 }, /* 318300 */
{ "Nightmare Essence" , 214350, 0x00, 0.000000, 32, 0x000, 0x000, -1, 0, 98, 0, 0.000000, 100.000000, 0, 0, 0, 0, 0, 6000, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 0, 8, 0, 1140850688, 0, 0, 0, 0, 4096, 0, 0, 4 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "$@spelldesc214349", "Suffering $w1 Shadow damage every $t1 sec.\r\nMovement speed reduced by $s2%.", 0, 0, 0, 0, 0 }, /* 318302, 318303 */
{ "Black Arrow" , 214351, 0x00, 40.000000, 32, 0x004, 0x000, 0, 0, 1, 0, 0.000000, 0.000000, 15000, 1500, 0, 0, 0, 0, 0, 100, 0, 2, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 192, 0, 0, 0, 32768, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Fires a Black Arrow at the target, dealing $3674o1 Shadow damage over $3674d and summoning a skeletal minion to taunt it for the duration.\r\n\r\nBlack Arrow’s cooldown is reset when you kill an enemy.", "Taking $w1 Shadow damage every $t1 seconds.", 0, 0, 0, 0, 0 }, /* 318304 */
{ "Black Arrow" , 214351, 0x00, 40.000000, 32, 0x004, 0x000, 0, 0, 1, 0, 0.000000, 0.000000, 15000, 1500, 0, 0, 0, 0, 0, 100, 0, 2, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 192, 0, 0, 0, 32768, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Fires a Black Arrow at the target, dealing $3674o1 Shadow damage over $3674d and summoning a skeletal minion to taunt it for the duration.\r\n\r\nBlack Arrow�s cooldown is reset when you kill an enemy.", "Taking $w1 Shadow damage every $t1 seconds.", 0, 0, 0, 0, 0 }, /* 318304 */
{ "Crystalline Body" , 214366, 0x00, 0.000000, 1, 0x000, 0x000, -1, 0, 98, 0, 0.000000, 0.000000, 90000, 0, 0, 0, 0, 10000, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 262144, 1024, 0, 0, 0, 0, 0, 0, 4096, 0, 0, 268435460 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Encase your body in crystal, absorbing up to $s1 damage from each attack against you. Absorbs up to ${$s1*$s2} total damage.\r\n\r\nLasts $d.", "Absorbing up to $s1 damage from each attack against you.", 0, 0, 0, 0, 0 }, /* 318327, 318346 */
//{ Name , Id,Flags,PrjSp, Sch, Class, Race,Sca,MSL,SpLv,MxL,MinRange,MaxRange,Cooldown, GCD,Chg, ChrgCd, Cat, Duration, RCost, RPG,Stac, PCh,PCr, ProcFlags,EqpCl, EqpInvType,EqpSubclass,CastMn,CastMx,Div, Scaling,SLv, RplcId, { Attr1, Attr2, Attr3, Attr4, Attr5, Attr6, Attr7, Attr8, Attr9, Attr10, Attr11, Attr12 }, { Flags1, Flags2, Flags3, Flags4 }, Family, Description, Tooltip, Description Variable, Icon, ActiveIcon, Effect1, Effect2, Effect3 },
{ "Assassin's Blades" , 214368, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 2147483712, 268435456, 0, 0, 0, 0, 1024, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 8, 0x00000000, 0, "Mutilate damage increased by $s1%.", 0, 0, 0, 0, 0, 0 }, /* 318330 */
Expand Down Expand Up @@ -11953,11 +11953,11 @@ static struct spell_data_t __spell_data[] = {
{ "Ensemble: Wild Gladiator's Ringmail Armor", 216668, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator's Ringmail armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322359 */
//{ Name , Id,Flags,PrjSp, Sch, Class, Race,Sca,MSL,SpLv,MxL,MinRange,MaxRange,Cooldown, GCD,Chg, ChrgCd, Cat, Duration, RCost, RPG,Stac, PCh,PCr, ProcFlags,EqpCl, EqpInvType,EqpSubclass,CastMn,CastMx,Div, Scaling,SLv, RplcId, { Attr1, Attr2, Attr3, Attr4, Attr5, Attr6, Attr7, Attr8, Attr9, Attr10, Attr11, Attr12 }, { Flags1, Flags2, Flags3, Flags4 }, Family, Description, Tooltip, Description Variable, Icon, ActiveIcon, Effect1, Effect2, Effect3 },
{ "Ensemble: Wild Gladiator's Ringmail Armor", 216669, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator's Ringmail armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322360 */
{ "Ensemble: Wild Gladiator's Satin Armor", 216670, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator’s Satin armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322361 */
{ "Ensemble: Wild Gladiator's Satin Armor", 216671, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator’s Satin armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322362 */
{ "Ensemble: Wild Gladiator's Scaled Set", 216672, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator’s Scaled armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322363 */
{ "Ensemble: Wild Gladiator's Scaled Set", 216673, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator’s Scaled armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322364 */
{ "Ensemble: Wild Gladiator's Silk Armor", 216674, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator’s Silk armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322365 */
{ "Ensemble: Wild Gladiator's Satin Armor", 216670, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator�s Satin armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322361 */
{ "Ensemble: Wild Gladiator's Satin Armor", 216671, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator�s Satin armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322362 */
{ "Ensemble: Wild Gladiator's Scaled Set", 216672, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator�s Scaled armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322363 */
{ "Ensemble: Wild Gladiator's Scaled Set", 216673, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator�s Scaled armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322364 */
{ "Ensemble: Wild Gladiator's Silk Armor", 216674, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator�s Silk armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322365 */
{ "Ensemble: Wild Gladiator's Silk Armor", 216675, 0x00, 0.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.000000, 0, 0, 0, 0, 0, 0, 0, 0, 0, { 384, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 0, 0, 0, 0 }, 0, 0x00000000, 0, "Collect the appearances of the Wild Gladiator's Silk armor set.", 0, 0, "Transmog Set", 0, 0, 0 }, /* 322366 */
{ "Tormented Soul Aura" , 216695, 0x00, 20.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 60.000000, 0, 0, 0, 0, 0, 45000, 12, 101, 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, 0x00000000, 0, "Ulthalesh consumes Tormented Souls, doubling the effect of all passives and lasting an additional 5s for each Tormented Soul consumed.", "Ulthalesh consumes Tormented Souls, doubling the effect of all passives and lasting an additional 5s for each Tormented Soul consumed.", 0, 0, 0, 0, 0 }, /* 322408 */
{ "Reap Souls" , 216698, 0x00, 20.000000, 1, 0x000, 0x000, 0, 0, 0, 0, 0.000000, 0.000000, 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, 0x00000000, 0, "Ulthalesh consumes Tormented Souls, doubling the effect of all of Ulthalesh's passives by 5 seconds for each soul consumed.", "Ulthalesh consumes Tormented Souls, doubling the effect of all of Ulthalesh's passives by 5 seconds for each soul consumed.", 0, 0, 0, 0, 0 }, /* 322412 */
Expand Down
5 changes: 1 addition & 4 deletions profiles/Tier17B/Paladin_Retribution_T17B.simc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ actions.single+=/divine_hammer
actions.single+=/blade_of_justice
actions.single+=/execution_sentence
actions.single+=/consecration
actions.single+=/crusader_flurry,if=charges=3
actions.single+=/zeal
actions.single+=/crusader_strike
actions.single+=/templars_verdict,if=holy_power>=3
actions.single+=/crusader_flurry
actions.single+=/blade_of_wrath
actions.single+=/wake_of_ashes

Expand All @@ -55,10 +54,8 @@ actions.cleave+=/blade_of_justice
actions.cleave+=/consecration
actions.cleave+=/execution_sentence
actions.cleave+=/zeal
actions.cleave+=/crusader_flurry,if=charges=3
actions.cleave+=/crusader_strike
actions.cleave+=/divine_storm,if=holy_power>=3
actions.cleave+=/crusader_flurry
actions.cleave+=/wake_of_ashes
actions.cleave+=/blade_of_wrath

Expand Down
5 changes: 1 addition & 4 deletions profiles/Tier17H/Paladin_Retribution_T17H.simc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ actions.single+=/divine_hammer
actions.single+=/blade_of_justice
actions.single+=/execution_sentence
actions.single+=/consecration
actions.single+=/crusader_flurry,if=charges=3
actions.single+=/zeal
actions.single+=/crusader_strike
actions.single+=/templars_verdict,if=holy_power>=3
actions.single+=/crusader_flurry
actions.single+=/blade_of_wrath
actions.single+=/wake_of_ashes

Expand All @@ -55,10 +54,8 @@ actions.cleave+=/blade_of_justice
actions.cleave+=/consecration
actions.cleave+=/execution_sentence
actions.cleave+=/zeal
actions.cleave+=/crusader_flurry,if=charges=3
actions.cleave+=/crusader_strike
actions.cleave+=/divine_storm,if=holy_power>=3
actions.cleave+=/crusader_flurry
actions.cleave+=/wake_of_ashes
actions.cleave+=/blade_of_wrath

Expand Down
5 changes: 1 addition & 4 deletions profiles/Tier17M/Paladin_Retribution_T17M.simc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,9 @@ actions.single+=/divine_hammer
actions.single+=/blade_of_justice
actions.single+=/execution_sentence
actions.single+=/consecration
actions.single+=/crusader_flurry,if=charges=3
actions.single+=/zeal
actions.single+=/crusader_strike
actions.single+=/templars_verdict,if=holy_power>=3
actions.single+=/crusader_flurry
actions.single+=/blade_of_wrath
actions.single+=/wake_of_ashes

Expand All @@ -55,10 +54,8 @@ actions.cleave+=/blade_of_justice
actions.cleave+=/consecration
actions.cleave+=/execution_sentence
actions.cleave+=/zeal
actions.cleave+=/crusader_flurry,if=charges=3
actions.cleave+=/crusader_strike
actions.cleave+=/divine_storm,if=holy_power>=3
actions.cleave+=/crusader_flurry
actions.cleave+=/wake_of_ashes
actions.cleave+=/blade_of_wrath

Expand Down
Loading

0 comments on commit 9b8c04e

Please sign in to comment.