Monk: Fix chi cost of Tiger Palm for Windwalker monks.

diff --git a/scripts/ovale_monk_spells.lua b/scripts/ovale_monk_spells.lua
index a16a2ec..316b815 100644
--- a/scripts/ovale_monk_spells.lua
+++ b/scripts/ovale_monk_spells.lua
@@ -9,9 +9,9 @@ do

 Define(blackout_kick 100784)
 	SpellInfo(blackout_kick chi=2)
-	SpellInfo(blackout_kick buff_chi_none=combo_breaker_bok_buff mastery=windwalker)
-	SpellInfo(blackout_kick buff_chi=focus_of_xuen_buff buff_chi_amount=-1 mastery=windwalker)
-	SpellAddBuff(blackout_kick combo_breaker_bok_buff=0 mastery=windwalker)
+	SpellInfo(blackout_kick buff_chi_none=combo_breaker_bok_buff if_spell=combo_breaker)
+	SpellInfo(blackout_kick buff_chi=focus_of_xuen_buff buff_chi_amount=-1 itemset=T16_melee itemcount=4)
+	SpellAddBuff(blackout_kick combo_breaker_bok_buff=0 if_spell=combo_breaker)
 	SpellAddBuff(blackout_kick muscle_memory_buff=0 if_spell=muscle_memory)
 	SpellAddBuff(blackout_kick serpents_zeal_buff=1 if_spell=teachings_of_the_monastery)
 	SpellAddBuff(blackout_kick shuffle_buff=1 if_spell=brewmaster_training)
@@ -27,6 +27,7 @@ Define(chi_burst_talent 6)
 Define(chi_wave 115098)
 	SpellInfo(chi_wave cd=15)
 Define(chi_wave_talent 4)
+Define(combo_breaker 137384)
 Define(combo_breaker_bok_buff 116768)
 	SpellInfo(combo_breaker_bok_buff duration=15)
 Define(combo_breaker_tp_buff 118864)
@@ -63,7 +64,7 @@ Define(expel_harm_glyphed 147489)
 Define(fists_of_fury 113656)
 	SpellInfo(fists_of_fury channel=4 cd=25 chi=3)
 	SpellInfo(fists_of_fury addcd=-5 itemset=T14_melee itemcount=2)
-	SpellInfo(fists_of_fury buff_chi=focus_of_xuen_buff buff_chi_amount=-1)
+	SpellInfo(fists_of_fury buff_chi=focus_of_xuen_buff buff_chi_amount=-1 itemset=T16_melee itemcount=4)
 Define(focus_of_xuen_buff 145024)
 	SpellInfo(focus_of_xuen_buff duration=10)
 Define(fortifying_brew 115203)
@@ -134,7 +135,7 @@ Define(revival 115310)
 	SpellInfo(revival cd=180)
 Define(rising_sun_kick 107428)
 	SpellInfo(rising_sun_kick cd=8 chi=2)
-	SpellInfo(rising_sun_kick buff_chi=focus_of_xuen_buff buff_chi_amount=-1)
+	SpellInfo(rising_sun_kick buff_chi=focus_of_xuen_buff buff_chi_amount=-1 itemset=T16_melee itemcount=4)
 	SpellAddTargetDebuff(rising_sun_kick rising_sun_kick_debuff=1)
 Define(rising_sun_kick_debuff 130320)
 	SpellInfo(rising_sun_kick_debuff duration=15)
@@ -176,10 +177,10 @@ Define(thunder_focus_tea_buff 116680)
 	SpellInfo(thunder_focus_tea duration=30)
 Define(tiger_palm 100787)
 	SpellInfo(tiger_palm chi=1)
-	SpellInfo(tiger_palm buff_chi_none=combo_break_tp mastery=windwalker)
+	SpellInfo(tiger_palm buff_chi_none=combo_breaker_tp_buff if_spell=combo_breaker)
 	SpellInfo(tiger_palm chi=0 if_spell=brewmaster_training)
 	SpellAddBuff(tiger_palm tiger_power_buff=1)
-	SpellAddBuff(tiger_palm combo_break_tp_buff=0 mastery=windwalker)
+	SpellAddBuff(tiger_palm combo_breaker_tp_buff=0 if_spell=combo_breaker)
 	SpellAddBuff(tiger_palm muscle_memory_buff=0 if_spell=muscle_memory)
 	SpellAddBuff(tiger_palm power_guard_buff=1 if_spell=brewmaster_training)
 	SpellAddBuff(tiger_palm vital_mists_buff=1 if_spell=teachings_of_the_monastery)