Merge pull request #104 from wowsims/feature/paladin

Retribution / Protection implementation

Author: hillerstorm

assets/database/db.json

@@ -18034,7 +18034,6 @@
 {"id":740,"name":"Tranquility","icon":"spell_nature_tranquility","hasBuff":true},
 {"id":768,"name":"Cat Form","icon":"ability_druid_catform","hasBuff":true},
 {"id":770,"name":"Faerie Fire","icon":"spell_nature_faeriefire","hasBuff":true},
-{"id":779,"name":"Swipe","icon":"inv_misc_monsterclaw_03"},
 {"id":879,"name":"Exorcism","icon":"spell_holy_excorcism_02"},
 {"id":1079,"name":"Rip","icon":"ability_ghoulfrenzy","hasBuff":true},
 {"id":1130,"name":"Hunter's Mark","icon":"ability_hunter_snipershot","hasBuff":true},
@@ -18212,6 +18211,7 @@
 {"id":20035,"name":"Enchant 2H Weapon - Major Spirit","icon":"inv_misc_note_01"},
 {"id":20036,"name":"Enchant 2H Weapon - Major Intellect","icon":"inv_misc_note_01"},
 {"id":20066,"name":"Repentance","icon":"spell_holy_prayerofhealing","hasBuff":true},
+{"id":20154,"name":"Seal of Righteousness","icon":"spell_holy_righteousnessaura","hasBuff":true},
 {"id":20164,"name":"Seal of Justice","icon":"spell_holy_sealofwrath","hasBuff":true},
 {"id":20165,"name":"Seal of Insight","icon":"spell_holy_healingaura","hasBuff":true},
 {"id":20167,"name":"Seal of Insight","icon":"spell_holy_healingaura"},
@@ -18250,6 +18250,7 @@
 {"id":24165,"name":"Hoodoo Hex","icon":"spell_shadow_impphaseshift"},
 {"id":24167,"name":"Prophetic Aura","icon":"spell_holy_holyprotection"},
 {"id":24168,"name":"Animist's Caress","icon":"spell_nature_reincarnation"},
+{"id":24275,"name":"Hammer of Wrath","icon":"spell_paladin_hammerofwrath"},
 {"id":24302,"name":"Eternium Fishing Line","icon":"inv_fabric_mageweave_02"},
 {"id":24420,"name":"Zandalar Signet of Serenity","icon":"spell_holy_powerwordshield"},
 {"id":24421,"name":"Zandalar Signet of Mojo","icon":"inv_jewelry_ring_46"},
@@ -18264,6 +18265,7 @@
 {"id":25084,"name":"Enchant Cloak - Subtlety","icon":"inv_misc_note_01"},
 {"id":25086,"name":"Enchant Cloak - Dodge","icon":"inv_misc_note_01"},
 {"id":25780,"name":"Righteous Fury","icon":"spell_holy_sealoffury","hasBuff":true},
+{"id":25956,"name":"Sanctity of Battle","icon":"inv_sword_136","hasBuff":true},
 {"id":26016,"name":"Vindication","icon":"spell_holy_vindication","hasBuff":true},
 {"id":26023,"name":"Pursuit of Justice","icon":"ability_paladin_veneration","hasBuff":true},
 {"id":26297,"name":"Berserking","icon":"racial_troll_berserk","hasBuff":true},
@@ -18327,6 +18329,10 @@
 {"id":31372,"name":"Runic Spellthread","icon":"spell_nature_astralrecalgroup"},
 {"id":31661,"name":"Dragon's Breath","icon":"inv_misc_head_dragon_01","hasBuff":true},
 {"id":31687,"name":"Summon Water Elemental","icon":"spell_frost_summonwaterelemental_2"},
+{"id":31801,"name":"Seal of Truth","icon":"spell_holy_sealofvengeance","hasBuff":true},
+{"id":31803,"name":"Censure","icon":"spell_holy_sealofvengeance","hasBuff":true},
+{"id":31821,"name":"Devotion Aura","icon":"spell_holy_auramastery","hasBuff":true},
+{"id":31850,"name":"Ardent Defender","icon":"spell_holy_ardentdefender","hasBuff":true},
 {"id":31884,"name":"Avenging Wrath","icon":"spell_holy_avenginewrath","hasBuff":true},
 {"id":31935,"name":"Avenger's Shield","icon":"spell_holy_avengersshield","hasBuff":true},
 {"id":32379,"name":"Shadow Word: Death","icon":"spell_shadow_demonicfortitude"},
@@ -18386,6 +18392,7 @@
 {"id":35495,"name":"Nethercleft Leg Armor","icon":"inv_misc_armorkit_25"},
 {"id":36554,"name":"Shadowstep","icon":"ability_rogue_shadowstep","hasBuff":true},
 {"id":42231,"name":"Hurricane","icon":"spell_nature_cyclone"},
+{"id":42463,"name":"Seal of Truth","icon":"spell_holy_sealofvengeance"},
 {"id":42620,"name":"Enchant Weapon - Greater Agility","icon":"inv_misc_note_01"},
 {"id":42687,"name":"Adamantite Weapon Chain","icon":"spell_frost_chainsofice"},
 {"id":42974,"name":"Enchant Weapon - Executioner","icon":"inv_misc_note_01"},
@@ -18473,8 +18480,11 @@
 {"id":53344,"name":"Rune of the Fallen Crusader","icon":"trade_engraving"},
 {"id":53351,"name":"Kill Shot","icon":"ability_hunter_assassinate2"},
 {"id":53376,"name":"Sanctified Wrath","icon":"ability_paladin_sanctifiedwrath","hasBuff":true},
+{"id":53385,"name":"Divine Storm","icon":"ability_paladin_divinestorm"},
+{"id":53503,"name":"Sword of Light","icon":"ability_paladin_sheathoflight","hasBuff":true},
 {"id":53592,"name":"Guarded by the Light","icon":"ability_paladin_touchedbylight","hasBuff":true},
-{"id":54428,"name":"Divine Plea","icon":"spell_holy_aspiration","hasBuff":true},
+{"id":53595,"name":"Hammer of the Righteous","icon":"ability_paladin_hammeroftherighteous"},
+{"id":53600,"name":"Shield of the Righteous","icon":"ability_paladin_shieldofvengeance"},
 {"id":54446,"name":"Rune of Swordbreaking","icon":"trade_engraving"},
 {"id":54447,"name":"Rune of Spellbreaking","icon":"trade_engraving"},
 {"id":54637,"name":"Blood of the North","icon":"inv_weapon_shortblade_79","hasBuff":true},
@@ -18516,6 +18526,7 @@
 {"id":58129,"name":"Inscription of Kings","icon":"spell_holy_sealofwisdom"},
 {"id":58410,"name":"Master Poisoner","icon":"ability_creature_poison_06","hasBuff":true},
 {"id":58413,"name":"Savage Combat","icon":"ability_creature_disease_03","hasBuff":true},
+{"id":59578,"name":"The Art of War","icon":"ability_paladin_artofwar","hasBuff":true},
 {"id":59619,"name":"Enchant Weapon - Accuracy","icon":"inv_misc_enchantedscroll"},
 {"id":59621,"name":"Enchant Weapon - Berserking","icon":"inv_misc_enchantedscroll"},
 {"id":59625,"name":"Enchant Weapon - Black Magic","icon":"inv_misc_enchantedscroll"},
@@ -18550,7 +18561,6 @@
 {"id":61119,"name":"Master's Inscription of the Pinnacle","icon":"trade_engraving"},
 {"id":61120,"name":"Master's Inscription of the Storm","icon":"trade_engraving"},
 {"id":61468,"name":"Diamond-cut Refractor Scope","icon":"ability_hunter_rapidregeneration"},
-{"id":62078,"name":"Swipe","icon":"inv_misc_monsterclaw_03"},
 {"id":62158,"name":"Rune of the Stoneskin Gargoyle","icon":"trade_engraving"},
 {"id":62201,"name":"Titanium Plating","icon":"inv_shield_19"},
 {"id":62256,"name":"Enchant Bracer - Major Stamina","icon":"inv_misc_enchantedscroll"},
@@ -18567,6 +18577,7 @@
 {"id":64441,"name":"Enchant Weapon - Blade Ward","icon":"inv_misc_enchantedscroll"},
 {"id":64579,"name":"Enchant Weapon - Blood Draining","icon":"inv_misc_enchantedscroll"},
 {"id":65855,"name":"Insect Swarm","icon":"spell_nature_insectswarm","hasBuff":true},
+{"id":66235,"name":"Ardent Defender","icon":"spell_holy_holybolt"},
 {"id":67839,"name":"Mind Amplification Dish","icon":"trade_engraving"},
 {"id":70164,"name":"Rune of the Nerubian Carapace","icon":"trade_engraving"},
 {"id":71692,"name":"Enchant Gloves - Angler","icon":"inv_enchant_formulagood_01"},
@@ -18630,7 +18641,7 @@
 {"id":75175,"name":"Darkglow Embroidery","icon":"trade_engraving"},
 {"id":75178,"name":"Swordguard Embroidery","icon":"trade_engraving"},
 {"id":76659,"name":"Mastery: Wild Quiver","icon":"ability_hunter_wildquiver","hasBuff":true},
-{"id":76672,"name":"Mastery: Hand of Light","icon":"ability_paladin_blessedhands","hasBuff":true},
+{"id":76671,"name":"Mastery: Divine Bulwark","icon":"spell_holy_holyprotection","hasBuff":true},
 {"id":76808,"name":"Mastery: Executioner","icon":"inv_axe_06","hasBuff":true},
 {"id":76857,"name":"Mastery: Critical Block","icon":"ability_warrior_criticalblock","hasBuff":true},
 {"id":76858,"name":"Opportunity Strike","icon":"ability_backstab"},
@@ -18665,12 +18676,15 @@
 {"id":84425,"name":"Cardboard Assassin","icon":"trade_engraving"},
 {"id":84427,"name":"Grounded Plasma Shield","icon":"trade_engraving"},
 {"id":84839,"name":"Vengeance","icon":"spell_shadow_charm","hasBuff":true},
+{"id":84963,"name":"Inquisition","icon":"spell_paladin_inquisition","hasBuff":true},
 {"id":85007,"name":"Fur Lining - Stamina","icon":"trade_engraving"},
 {"id":85008,"name":"Fur Lining - Agility","icon":"trade_engraving"},
 {"id":85009,"name":"Fur Lining - Strength","icon":"trade_engraving"},
 {"id":85010,"name":"Fur Lining - Intellect","icon":"trade_engraving"},
 {"id":85256,"name":"Templar's Verdict","icon":"spell_paladin_templarsverdict"},
+{"id":85416,"name":"Grand Crusader","icon":"inv_helmet_74","hasBuff":true},
 {"id":85499,"name":"Speed of Light","icon":"ability_paladin_speedoflight","hasBuff":true},
+{"id":85673,"name":"Word of Glory","icon":"inv_helmet_96"},
 {"id":85804,"name":"Selfless Healer","icon":"ability_paladin_gaurdedbythelight","hasBuff":true},
 {"id":86091,"name":"Nethermancy","icon":"inv_enchant_essencenetherlarge","hasBuff":true},
 {"id":86172,"name":"Divine Purpose","icon":"spell_holy_divinepurpose","hasBuff":true},
@@ -18682,6 +18696,9 @@
 {"id":86524,"name":"Plate Specialization","icon":"inv_chest_plate12"},
 {"id":86525,"name":"Plate Specialization","icon":"inv_chest_plate12"},
 {"id":86529,"name":"Mail Specialization","icon":"inv_chest_chain_11"},
+{"id":86659,"name":"Guardian of Ancient Kings","icon":"spell_holy_heroism","hasBuff":true},
+{"id":86669,"name":"Guardian of Ancient Kings","icon":"spell_holy_heroism","hasBuff":true},
+{"id":86698,"name":"Guardian of Ancient Kings","icon":"spell_holy_heroism","hasBuff":true},
 {"id":86700,"name":"Ancient Power","icon":"ability_paladin_blessedhands","hasBuff":true},
 {"id":86704,"name":"Ancient Fury","icon":"ability_paladin_sanctifiedwrath"},
 {"id":86847,"name":"Inscription of Unbreakable Quartz","icon":"inv_misc_gem_crystal_01"},
@@ -18696,6 +18713,7 @@
 {"id":86949,"name":"Cauterize","icon":"spell_fire_rune","hasBuff":true},
 {"id":87160,"name":"Surge of Darkness","icon":"ability_priest_surgeofdarkness","hasBuff":true},
 {"id":87172,"name":"Long Arm of the Law","icon":"ability_paladin_longarmofthelaw","hasBuff":true},
+{"id":88263,"name":"Hammer of the Righteous","icon":"ability_paladin_hammeroftherighteous"},
 {"id":88747,"name":"Wild Mushroom","icon":"druid_ability_wildmushroom_a"},
 {"id":88751,"name":"Wild Mushroom: Detonate","icon":"druid_ability_wildmushroom_b"},
 {"id":89744,"name":"Wizardry","icon":"inv_enchant_essencemagiclarge","hasBuff":true},
@@ -18719,6 +18737,7 @@
 {"id":100780,"name":"Jab","icon":"ability_monk_jab"},
 {"id":100784,"name":"Blackout Kick","icon":"ability_monk_roundhousekick"},
 {"id":100787,"name":"Tiger Palm","icon":"ability_monk_tigerpalm"},
+{"id":101423,"name":"Seal of Righteousness","icon":"spell_holy_righteousnessaura"},
 {"id":101546,"name":"Spinning Crane Kick","icon":"ability_monk_cranekick_new","hasBuff":true},
 {"id":101598,"name":"Drakehide Leg Armor","icon":"inv_misc_cataclysmarmorkit_08"},
 {"id":102051,"name":"Frostjaw","icon":"ability_mage_frostjaw","hasBuff":true},
@@ -18767,6 +18786,7 @@
 {"id":104445,"name":"Enchant Off-Hand - Major Intellect","icon":"inv_misc_enchantedscroll"},
 {"id":105593,"name":"Fist of Justice","icon":"spell_holy_fistofjustice","hasBuff":true},
 {"id":105622,"name":"Clemency","icon":"ability_paladin_clemency","hasBuff":true},
+{"id":105805,"name":"Sanctuary","icon":"spell_nature_lightningshield","hasBuff":true},
 {"id":105809,"name":"Holy Avenger","icon":"ability_paladin_holyavenger","hasBuff":true},
 {"id":106707,"name":"Faerie Swarm","icon":"spell_druid_swarm","hasBuff":true},
 {"id":106731,"name":"Incarnation","icon":"spell_druid_incarnation","hasBuff":true},
@@ -18866,6 +18886,7 @@
 {"id":114163,"name":"Eternal Flame","icon":"inv_torch_thrown","hasBuff":true},
 {"id":114165,"name":"Holy Prism","icon":"spell_paladin_holyprism"},
 {"id":114556,"name":"Purgatory","icon":"inv_misc_shadowegg","hasBuff":true},
+{"id":114637,"name":"Bastion of Glory","icon":"achievement_dungeon_ulduarraid_misc_03","hasBuff":true},
 {"id":114923,"name":"Nether Tempest","icon":"spell_mage_nethertempest","hasBuff":true},
 {"id":115008,"name":"Chi Torpedo","icon":"ability_monk_quitornado","hasBuff":true},
 {"id":115069,"name":"Stance of the Sturdy Ox","icon":"monk_stance_drunkenox","hasBuff":true},
@@ -18908,6 +18929,7 @@
 {"id":118636,"name":"Power Guard","icon":"ability_warrior_shieldbash","hasBuff":true},
 {"id":118675,"name":"Crouching Tiger, Hidden Chimera","icon":"ability_hunter_pet_chimera","hasBuff":true},
 {"id":118864,"name":"Combo Breaker: Tiger Palm","icon":"ability_monk_palmstrike","hasBuff":true},
+{"id":119072,"name":"Holy Wrath","icon":"spell_holy_weaponmastery","hasBuff":true},
 {"id":119381,"name":"Leg Sweep","icon":"ability_monk_legsweep","hasBuff":true},
 {"id":119392,"name":"Charging Ox Wave","icon":"ability_monk_chargingoxwave","hasBuff":true},
 {"id":119582,"name":"Purifying Brew","icon":"inv_misc_beer_06"},
@@ -18997,6 +19019,7 @@
 {"id":131862,"name":"Cerulean Spellthread","icon":"inv_misc_thread_eternium"},
 {"id":131863,"name":"Pearlescent Spellthread","icon":"inv_bracer_69"},
 {"id":131894,"name":"A Murder of Crows","icon":"ability_hunter_murderofcrows","hasBuff":true},
+{"id":132403,"name":"Shield of the Righteous","icon":"ability_paladin_shieldofvengeance","hasBuff":true},
 {"id":132469,"name":"Typhoon","icon":"ability_druid_typhoon"},
 {"id":134871,"name":"Enchant Cloak - PvP Power","icon":"trade_engraving"},
 {"id":136336,"name":"Stance of the Wise Serpent","icon":"monk_stance_wiseserpent","hasBuff":true},

proto/apl.proto

@@ -85,7 +85,7 @@ message APLAction {
     }
 }
 
-// NextIndex: 101
+// NextIndex: 102
 message APLValue {
 	UUID uuid = 87;
 
@@ -215,6 +215,7 @@ message APLValue {
         APLValueMonkCurrentChi monk_current_chi = 95;
 		APLValueMonkMaxChi monk_max_chi = 96;
 		APLValueBrewmasterMonkCurrentStaggerPercent brewmaster_monk_current_stagger_percent = 100;
+		APLValueProtectionPaladinDamageTakenLastGlobal protection_paladin_damage_taken_last_global = 101;
     }
 }
 
@@ -700,3 +701,4 @@ message APLValueShamanFireElementalDuration {}
 message APLValueMonkCurrentChi {}
 message APLValueMonkMaxChi {}
 message APLValueBrewmasterMonkCurrentStaggerPercent {}
+message APLValueProtectionPaladinDamageTakenLastGlobal {}

proto/common.proto

@@ -503,7 +503,7 @@ message IndividualBuffs {
 	// Other Buffs
 	int32 unholy_frenzy_count = 12;
 	TristateEffect tricks_of_the_trade = 101; // "Regular" = Glyphed, "Improved" = un-Glyphed
-	int32 divine_guardian_count = 23;
+	int32 devotion_aura_count = 23;
 	int32 pain_suppression_count = 24;
 	int32 hand_of_sacrifice_count = 25;
 	int32 guardian_spirit_count = 26;

proto/monk.proto

@@ -3,7 +3,6 @@ package proto;
 
 option go_package = "./proto";
 
-import "common.proto";
 // DO NOT REMOVE THE COMMENTS
 // BEGIN GENERATED
 // MonkTalents message.

proto/paladin.proto

@@ -87,12 +87,6 @@ enum Blessings {
 	BlessingOfMight = 2;
 }
 
-enum PaladinAura {
-	Devotion = 0;
-	Retribution = 1;
-	Resistance = 2;
-}
-
 enum PaladinSeal {
 	Truth = 0;
 	Justice = 1;
@@ -102,8 +96,6 @@ enum PaladinSeal {
 
 message PaladinOptions {
 	PaladinSeal seal = 2;
-	PaladinAura aura = 3;
-	bool snapshot_guardian = 4;
 }
 
 message RetributionPaladin {

sim/common/cata/other_effects.go

@@ -279,7 +279,7 @@ func init() {
 			},
 		})
 
-		character.AddDynamicDamageTakenModifier(func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult) {
+		character.AddDynamicDamageTakenModifier(func(sim *core.Simulation, spell *core.Spell, result *core.SpellResult, isPeriodic bool) {
 			if absorbAura.IsActive() && result.Damage > 0 && totalAbsorbed < maxShieldStrength {
 				remainingAbsorb := maxShieldStrength - totalAbsorbed
 				absorbedDamage := min(result.Damage*0.2, remainingAbsorb)

sim/core/aura.go

@@ -253,6 +253,22 @@ func (aura *Aura) ExpiresAt() time.Duration {
 	return aura.expires
 }
 
+// Adds a handler to be called OnInit, in addition to any current handlers.
+// We then return the Aura for chaining
+func (aura *Aura) ApplyOnInit(newOnInit OnInit) *Aura {
+	oldOnInit := aura.OnInit
+	if oldOnInit == nil {
+		aura.OnInit = newOnInit
+	} else {
+		aura.OnInit = func(aura *Aura, sim *Simulation) {
+			oldOnInit(aura, sim)
+			newOnInit(aura, sim)
+		}
+	}
+
+	return aura
+}
+
 // Adds a handler to be called OnGain, in addition to any current handlers.
 func (aura *Aura) ApplyOnGain(newOnGain OnGain) *Aura {
 	oldOnGain := aura.OnGain
@@ -268,6 +284,20 @@ func (aura *Aura) ApplyOnGain(newOnGain OnGain) *Aura {
 	return aura
 }
 
+func (aura *Aura) AttachDependentAura(sibling *Aura) *Aura {
+	return aura.ApplyOnGain(func(aura *Aura, sim *Simulation) {
+		sibling.Activate(sim)
+	}).ApplyOnExpire(func(aura *Aura, sim *Simulation) {
+		sibling.Deactivate(sim)
+	}).ApplyOnStacksChange(func(aura *Aura, sim *Simulation, oldStacks, newStacks int32) {
+		if sibling.MaxStacks == 0 {
+			return
+		}
+
+		sibling.SetStacks(sim, newStacks)
+	})
+}
+
 // Adds a handler to be called OnExpire, in addition to any current handlers.
 func (aura *Aura) ApplyOnExpire(newOnExpire OnExpire) *Aura {
 	oldOnExpire := aura.OnExpire
@@ -283,6 +313,22 @@ func (aura *Aura) ApplyOnExpire(newOnExpire OnExpire) *Aura {
 	return aura
 }
 
+// Adds a handler to be called OnStacksChange, in addition to any current handlers.
+// We then return the Aura for chaining
+func (aura *Aura) ApplyOnStacksChange(newOnStacksChange OnStacksChange) *Aura {
+	oldOnStacksChange := aura.OnStacksChange
+	if oldOnStacksChange == nil {
+		aura.OnStacksChange = newOnStacksChange
+	} else {
+		aura.OnStacksChange = func(aura *Aura, sim *Simulation, oldStacks int32, newStacks int32) {
+			oldOnStacksChange(aura, sim, oldStacks, newStacks)
+			newOnStacksChange(aura, sim, oldStacks, newStacks)
+		}
+	}
+
+	return aura
+}
+
 type AuraFactory func(*Simulation) *Aura
 
 // Callback for doing something on reset.