Skip to content

Commit

Permalink
Merge pull request #3864 from johnnylam88/fix/warrior-victory-rush-he…
Browse files Browse the repository at this point in the history
…alth

fix: use correct expression name for `victory_rush_health_pct`
  • Loading branch information
Hekili authored Sep 27, 2024
2 parents 05c0b46 + 1bb1488 commit 734de08
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions TheWarWithin/Priorities/WarriorProtection.simc
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ actions+=/potion,if=buff.avatar.up|buff.avatar.up&target.health.pct<=20
actions+=/ignore_pain,if=target.health.pct>=20&(rage.deficit<=15&cooldown.shield_slam.ready|rage.deficit<=40&cooldown.shield_charge.ready&talent.champions_bulwark.enabled|rage.deficit<=20&cooldown.shield_charge.ready|rage.deficit<=30&cooldown.demoralizing_shout.ready&talent.booming_voice.enabled|rage.deficit<=20&cooldown.avatar.ready|rage.deficit<=45&cooldown.demoralizing_shout.ready&talent.booming_voice.enabled&buff.last_stand.up&talent.unnerving_focus.enabled|rage.deficit<=30&cooldown.avatar.ready&buff.last_stand.up&talent.unnerving_focus.enabled|rage.deficit<=20|rage.deficit<=40&cooldown.shield_slam.ready&buff.violent_outburst.up&talent.heavy_repercussions.enabled&talent.impenetrable_wall.enabled|rage.deficit<=55&cooldown.shield_slam.ready&buff.violent_outburst.up&buff.last_stand.up&talent.unnerving_focus.enabled&talent.heavy_repercussions.enabled&talent.impenetrable_wall.enabled|rage.deficit<=17&cooldown.shield_slam.ready&talent.heavy_repercussions.enabled|rage.deficit<=18&cooldown.shield_slam.ready&talent.impenetrable_wall.enabled)|(rage>=70|buff.seeing_red.stack=7&rage>=35)&cooldown.shield_slam.remains<=1&buff.shield_block.remains>=4&set_bonus.tier31_2pc,use_off_gcd=1
actions+=/last_stand,use_off_gcd=1,if=tanking&incoming_damage_5s>last_stand_damage_taken&health.pct<=last_stand_health_pct&!(buff.shield_wall.up|buff.last_stand.up|buff.rallying_cry.up|buff.potion.up)
actions+=/rallying_cry,if=tanking&incoming_damage_5s>rallying_cry_damage_taken&health.pct<=rallying_cry_health_pct&!(buff.shield_wall.up|buff.last_stand.up|buff.rallying_cry.up|buff.potion.up)
actions+=/victory_rush,if=health.pct<victory_rush_health&talent.impending_victory.disabled
actions+=/impending_victory,if=health.pct<victory_rush_health&talent.impending_victory.enabled
actions+=/victory_rush,if=health.pct<victory_rush_health_pct&talent.impending_victory.disabled
actions+=/impending_victory,if=health.pct<victory_rush_health_pct&talent.impending_victory.enabled
actions+=/ravager
actions+=/demoralizing_shout,if=talent.booming_voice.enabled
actions+=/champions_spear
Expand Down
2 changes: 1 addition & 1 deletion TheWarWithin/WarriorProtection.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2078,4 +2078,4 @@ spec:RegisterOptions( {
} )


spec:RegisterPack( "Protection Warrior", 20240926, [[Hekili:nV16VnoUr8)wUVyeJM1XpJ9EioF4oGcSlq3waFO9BsIwI2wn6fOOCUuyO)27qs9GKMK2oz3Tf3HD3inCMFZdoZqQjEt8(dVnrik27BthpD(4pp9XrJNm(XXl92qFRa7TPaf(cAp8pYqPWF(pi5uCinopRo4FHiK4CcJM3sYrrmEvMxrcb6oqPfL)6dpSpMEOA7OW80hkJtRsqSLgsq7OSFo8bVnBRItOFjZBRjGSy(kGNf4qVVTCgW14OiSGuCzO3ggPFA8N)00h)16Gnf4KK6GFljp8L6aeqzu9xR)AhnZbA(BX049CmucKKfvh8L0cCuC2(6G)zCinN8wDWFn(pLx6QpnzX91balg)zMyIt)96GcMMhtbQRkyWUSN(Lcr9hhWCte8hGniodmtK8DXjGXbXnGLJkiyWWSfr)lRFa(tAc2VKIYcX3tZ3VpbVgSYF1fXhYROmb3qd8MIQ0uCI8tcpGi7X3hVBnnofVE8PtP5hXP4m6OOyH4EEL8cQkX(XuCAP8drhrueHXLTv72ncCQzryI)2eujWN8xZoDYWla2h(YtRNkZPsMBcEp4LUNjQ8D783hgTEchIOSxaNXG4mqxH)HFkAFCOFec(BS)IYNLwD7tPOxWzdoGrj0dJkcPpTwMiXZ9HNp4xUJdrXBj4DjIaz)i8oCwjEuvXqfGEigNe5)kkj5kaQee7xNdikrKbi2)wavnMwMfLhFe1)mcqXBmXhsER)Pf5mDqxFa7rEK)Ukiex(PysjMW0ff3njeLb4oNqGaf53KeV)aT0)FxfTpv7v7IjyUqu4eeFvsbC6hcyvrYO9Gn1NsIdFrjwta)UynrOxV219ZdOSiB6iz760XYCkEFwob7xGIZeonn6FgOFWDeWfncccIdJbomzXGW88ewmDRFOmbLoIGrrVD6KkXZhFgXI9BcYbeMW2ObplTGHj)TvjVIiVmcNH2MGJ053u38tN8zsKhHtZbZC8)HfoWZmOIHT5Ia1J5XH4Rr(n2zZ69IpOGhCEiDl9vzzyYr2k2LhwvAdQZSa1poNNo(kCZ9XecbEmoNjdFq93wrGCF9IfI3o(gKWPataPwYZM3AgAijgQcLHHTjWdfB7TGTfUIoTJKB2M8Ja7tw6c7xwGNXVvxb)SIUHNoX35)86LJBYSuIXmdbbhjQCTE5abfZwm0MOsHClLawgiN4Mx6P9LpVE(Gsm1FBEgyFPXyYSj(tlcvlQOKJTZrDtfE6xM96os08tQSJmTxqbKj1UkOq1pjL4OO3qFsv5bMsiHh5x1ahLyViEUpbrSoU4bFkfP0P6JiGMGBvhWrWqsKF05PSfEg75R16OSPAg0kfsHXkT)X4POzlrH3s1UdHIVdS1ZOAlJm4MelS88veMNKxwc9uKY6grSeyxQbKKxv6tYvbPsHvdVq0BARSmTLg2VR0NbPkZx8t(aoP3ZoR0Auo((sw3nuXoxZMIWeuHg0znkDo72dPXaMj1U)iqcMS5r5SkWqOEpATTgM0VXL0jgRfBmQOc9SXJl3cxtvOsAErbpj9UCIH4ola)9aI53ki6AJJGGObyRrd76lm9oGXJ3kk0nfe8rCM4KDT1XA5rjoUmfo3eJec0Hp)eVDAJkMAyJCmyJaKk01kKNw)443J2cTqDjJOZ4nxHbx0UmRPFUNz9X1MKdrG)hmrqNbXzaC6Hrp)A2Yzk4)o7zUe(vUnHD(MI8xbLS5KWtUvN(qtOrZXCNvb6idlGf7oYHcd2tsHuT5Gp3D1Jl8FIdROkrKDnzzVfAEchBIP1ZTW9Yh22bxf7cIGt0JGIN9MxLh7qbK48vffCEAZPw6bNbCxS0EI43lh7dvDu4bIbC6v(fRrixJY8ZtYs75BI3wn(8Rh45PTjVAO36Limqe(B)egCqEfmdez)bnmIPzlUc2ah3DX3pmXootZoJue0hviXqrMZ2w7WU)HJdxFPWHBkA4wId)(k5i8rqBzxJ9gOYl70RD3N9CVnVIiSsnLEB(sAroHcM7G51bc2uhW61RCu9x92GQOhyxS(MURm)3zxzU3MTOsC0FpZY9WZza7w4HcHWF9n(T734y9(nVnHKykauK3g90m1bpTUoys7vt7TrX75rbT4JZlM9MXQzwzLnBDDWG6aRnxuh8miWPCIulVYF0LkX6qPN)dbPZFVivMiRTrfC6udZFpWRo4X3l6S7Wxy1mYsPjmklhlleNnWAqjAZdXz1SEK08CgiE8cGGf0(44pM57PoV7f8s9iukLddLl5BFngpkbEGWvMiKBWvP7ZxHTFwJA3)K5kEdRnlBYqdaTjFO7uq31yMn0BADG6(ztT22KL59gSwhm8DLS7oNqsf2g1Sgu7okBOS)4PZ2DO3KS1Oj7zAv34Xe2Dg8)Ukm6cq6HtlUg2nuYQO1hVsQbd9Y3BaA6vPl5TjdJ6ge7jNmxytYbBSNChHv2tb99suTzCx6ka2E3q8canrNx03)loJGDygw9)HGR1WzpDPY(JvT7h1ATMJXPYvr6Be32k4EAb)63Wpz1vSJ5gesdSgAyVUtDz2IBsmmOZwYpADHjJHYzf0phJXwaMmwoLqBQc10btMitt7I1OXz9bNrWRV(q4Bk(TBZ1e758)Ff2A3BnrjJS0rLKnUu2B2HQsODTp0UcXSTO5lS7kyJ7cVKCZ2XZg7fEK0QE(l(GaD1nBFC38WOj5lC4a1Q)8BRPpi3ARbt7LROHg3LOA(yACFITzMHRM2MBg(k13bBE(zAZR22cKJ5OrjmqIBcJzZ3ZK5DDwu0OYPPw9FSVRqTKi2HAP89dL8zkFdr5ewQFhrP309TevTh9cWK9q5ea9ZSJR2)7NHhtn)3fpPmtp6P0usnQnKpotr2n1pgts2jCLXasNuL9BkZfKoLxytN0Ha68c6hmWsbyP8mC3gxC678AjrAWIuJypVyvF19MQUTdWqtXXfUkoIIERVxA1fAPfD5XfsUaP1rqYg)NEn838sNPTuBtiKm(m)vNVsSjp)pwTxl(UbQbMZimq6yNghQMR1EPQoFVL20X3yiLCSOZA)9qYXu8itM1HZXgcxC5DlxcHVtB5pEDBYYRr3UgqyH)oBdxJ)oqVPZqSu(ip6JrfVjmHYjDNtDDW7UztTB5PHgLPXq(wvnnOvMQYo5d12HLjTIVe9klgN4koL)mB6ONpgTg2VVGRWAyDSTmApSm(w)0TiY0ZTb2VwcfvOoWWazD2whJt9vVWLzbx42V3HpQWBzAFVl6KWpgLs)FnJmM(rTSFzUUQxkFKp9sUC2Q0OO2WLPdb7NU1XKMD2hiY6Do74G1tVqRNMMjTZ(EeTxukNHlK17g51oVA669JY0Q0kMoL23k7ibkpl74ZKG4qBmUAFZXLUsbq7ftbhlxtFeM6eZj(2L(IFhJyF9sMm13t0fIOnFCklU9BpWVjHUFNz6UlbXVynEB4NjP7ahs)Q3y66f0jKh5QDRfI)Z7)(d]] )
spec:RegisterPack( "Protection Warrior", 20240926, [[Hekili:nV1wVnUUr4FlNxmIrZ64RXzpiopCoafyxGUTa(G23KeTeTTA0nqr5CsrG(T3HK6cjnj9LKnTal2KinCMV5cNzi9yVjE)H36ief79JPJNoF8xNE)Oj3pDXCV10xlWERlqHpJ2b)sgkf())bjNIdPX5z1b)leHeNty08AsokIXQY8ksiq3EkTO8xV7UDX09vBgfMNExzCAvcIT0qcAlL93H35TEtvCc9BzEBmIJjlaEwGd9(XYzaxJJIWcsXLHERzK(LXF9ltV)xRdwxGtsQd(TK8WNRdqaLr1FV(7D0mhO5VftJ3XXqjqswuDW3slWrXz7Qd(NXH0CYR1b)14)uEPp8LjlUToayX4VYetC6VxhuW08ykqDvbd2L90VuiQ)ypMBIG)dSbXzGzIKVnobmoiUbSCubbdgMni6Fz1DW)ttW(Luuwi(wA(UDj4vGv(7UiEFEfLj4gAG3uuLMItKFs4Eezh(24TROXP4vJF7T08d4uCgDuuSqCp9G8cQkX(XuCAP8drhqueHXLnvB3ocCQzryI)MeujWN8xYE7ndVayF4ZpUAQmNkzUj49Gx6wMOY3U1Fxy0QjCiIYEgCgdIZaDf(f)u0U4q)ie8tS)IYNKwD7tPONXzd2Jrj09JkcPpUsMiXZ9HNp4xUHdrXBj4TjIaz)i8wCwjEuvXqfGUpgNe5)ckj5maQee7xNdikrKbi2)wavnMwMfLhFe1)mcqXRmXhsET)Pf5mDqxFa7rEK)2kiex(PysjMW0ff3njeLb4oNqGaf53KeVBpT0)FxfTlv7vBJjyUqu4eeFvsbC6hcyvrYODGn1NsIdFwjwta)UynrOxV2193dOSiB6iz760XYCkExwob7xGIZeonn6FcOFWneWfncccIdJbomzXGW88ewmDRFOmbLoIGrrV(2BQepF8rel2VjihqycBJg8S0cgM83uL8cI88iCgAtcosNFtDZpDYNjrEeonhmZX)hw4apZGkg2KlcupKhhIph53yNnR3lENcEWXH0T0xLLHjhyRyBEyvPnOoZcuF)CE64ZWn3htie4H4CMm8b1FtfbY91lwiE7WRqcNcmbKAjpBERzOHKyOkugg2MapuST3c2w4k60osUyBYpdSpzPlSFAbEe)E4m4Nv0n8T3478FA1YXnzwkXyMHGGJevUwTCGGIzlgAtuPqULsaldKtCZl90(YNwnFqjM6VjpdSV0ymz2e)PfHQfvuYX25OUOcp9lZEDhjA(Kk7it7juazsTRcku9jPehe9g6tQk3Zucj8i)kz4ih)fXZ)jiK11fpauPqLovVxH0eKR6ioaguI8Joo1TWdzpVTwNLnv1GwQqkmwPnqgpfnDjkaxQ2LiueEGTEhvBDKb3KyHhGVIW8K8YsO3IuwxjILa7wnGK8QsFsUkivkWA4fIEuBLLPT2W(EL(nivz(I)YhWj9w2zMwHYX3wY6YHk2bB2ueMGk0GoRHPJz3oiDgWmP2(hbsWKnpkNvjgc57rRT1WK(fUKoXyTOJrfvONnEC5w5AQgvsZlk4jR3Mtme3zb4xdiMFPGORDoccIgGTgnSRVa1vaJ7VuuOBki4d4mXj8ARN1YJsCCzkC(jgjeOtF(jF70gvm1Wg5yWgbivWRvipU6(XxJ2cTsDkJOZ4nxHbN0UmRPVUNy9Z1MKdrG)bMiOdH4mao9WONFnB5mf8FJ9mxc)k3MWoNtr(lGs2CI4jxQtFOj0O5yUXQaDKHfWIDh5qHb7rPqQ2CWh7U6Xf(pXHvuLiYUMTS3knpHJnX065w4E5dB7KRIDrrWj7rqb0EZRYJDOasC(SIcooT5ul9IZaUlwApr81YX(qvhfEGyaNELFXAeY5OmFEswApFt82dJp(AcEAABYRg6TEzcdeH)2pPbhKNbZar2FGdJyA2IZGnWXEx8XHj2XAA2zKIG(OcjgkYC02Ah293DC4QtfoCrrdxsC4hRKJWhaTLDD2RHkVStX2FV2ERFbryLAk9w)T0ICcfm3bZRdeSPoG1Rx5O6V7TM)BSRvhQOb)4h8BRVXd59BERdjXuqIiV165lQdECvDWK27A2BTIBWJcW59ZlMHJXQzwzLnJwDWG6aRDjuh8eiWPCIuRtYF0PQv6qPN)tbPZVwKktK1(HcE7TgMFnWRo4(RfD2D4lSAgz5MegLLJLfIZornOeTju4SAwpsAEode3FcqWcAVF87Z89yN39eEPEekL7GHYL8TVgJhLapq4dMiKBWvP7RNHTFwJA3)K5kEdRD9AYqdaTjXM7uq30yMn0KzDG6(zt9O2KL5AdwRdgEvj7UXjKuHTrnRb1UJYgk7pE8ODh6D7AnAYEMw1nEmHDJb)VRkCUaKE40IZHDdLSkAnKRKAWqt59gGMMo6sEBYWOUbXEYjZf2KCWgBU2ryL9uqFuIQnJ7sxbW2BRHxaOj68K((FXzeSdZWd)Fi4AnC2txQS)4H29JA9iZX4u5Qi9DuBBfCpTGF9B4N8WzSJ5cesdSgAyVUtDz2IlsmmOZwYpBDHjJHYzf0pqIXwaMmwoLqBQc10btMitt7I1OXz9bNrWRo)q4lk(TBZ1e758)Ff2A3BnrjJS0zEKnUu2B2IQsODTp0UcXWQO5lS7kyZVcVKCZ2XJMJfEK0d98xCZ(D1nBFC3aUOj5tC4a1Q)8RDPpi3ARbt7LROHMUsusF0Em7IfDw8PLX9r2gkgUABBWy4RuFhT5bKPnpBBlrogugLWcjU1vu86von1Q)tZ7muljIDOwkFaHs(qLpKq5eyQFqHsVP7dlu1E0lGJobq)q44Q9)(HYXuZ)DXtkdPJEknLuJAtTJZuKDJXJXKKDcxzUE0jvz)MYG(Ot5j20jDiGoRU(bdSuawkpd3nXf3P251UePjhsnI94Ix9v7BQc3oHcnflx4Qyjk61(ERvxOLw2LNhi5cMwNXiB8F65WFZlDM2sTncqY4Z8hN8zIn5b8XQ9AXhgOgyoJWaPJHACQzox7LQ68rlTPJVWqk5yrN9c0djhJPJmzwN(gBiCXP3TCkeEL2YF(62KLNJUDoGWc)D2wUg)DGEtNPyP8rG0NtkEtzcLt6oO66O3DZNA36tdnkJzH8TSAAsQ4z2)qB7WYOuXxIELgJJufNYpZMo65d3Ay)(codT36Cyzu)TmpwF6waz652a7xlHIkuhyz6QoA7IXX4QhaYSHda739WhbaAzCFpl6KWpoLsFGnZaM(rUSFPUUQtkF0p9sTC2Q0WO20IPdb7NY1XOJD0huK17E2XbSNEIwqnnKzh95s0EHPCgUqwVBKx7aOPR33ltRsly6uAFlTJeN8SRJpscDhwBQ9njN6QfaTxmwB8mTDryQJaN4ZW0x8LhI9PyYKP((IUqeTbEtzXTFge8BuO7ldt3Dki(gZ4TMF2KUdEi9DQX01mOtipYv72lOSxxIJ(7zw(2pHQO7z)CD33VPFN99BIVuV)l]] )

0 comments on commit 734de08

Please sign in to comment.