Season of Discovery combined hit/crit stats

VgerMods · Feb 24, 2024 · e0ee1ea · e0ee1ea
1 parent 1ee43c4
commit e0ee1ea
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 0 deletions.
diff --git a/Localization.deDE.lua b/Localization.deDE.lua
@@ -277,6 +277,7 @@ Weitere Informationen zur Anpassung von Pawn findet ihr in der Hilfedatei (Readm
 		["Crit"] = "^%+?# [Kk]ritischer Trefferwert%.?$",
 		["Crit2"] = "^UNUSED$",
 		["CritPercent"] = "^Anlegen: Erhöht Eure Chance, einen kritischen Treffer zu erzielen, um #%%%.$",
+		["CritPercentCombined"] = "^Anlegen: Erhöht die Chance auf einen kritischen Treffer mit Nahkampf%- und Distanzangriffen sowie Zaubern um #%%%.$",
 		["CritRating"] = "^Anlegen: Erhöht Eure kritische Trefferwertung um #%.$",
 		["CritRating2"] = "^Anlegen: Erhöht die kritische Trefferwertung um #%.$",
 		["CritRating3"] = "^UNUSED$",
@@ -343,6 +344,7 @@ Weitere Informationen zur Anpassung von Pawn findet ihr in der Hilfedatei (Readm
 		["HeroicWarforged"] = "^Heroisch, Kriegsgeschmiedet$",
 		["Hit"] = "^Anlegen: Verbessert Eure Trefferchance um #%%%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^Anlegen: Erhöht Eure Trefferchance mit Zaubern sowie Nahkampf%- und Distanzangriffen um #%%%.$",
 		["HitRating"] = "^Anlegen: Erhöht die Trefferwertung um #%.$",
 		["HitRating2"] = "^Anlegen: Erhöht Eure Trefferwertung um #%.$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.es.lua b/Localization.es.lua
@@ -314,6 +314,7 @@ Para más información sobre como personalizar Pawn, por favor lee el archivo (R
 		["Crit"] = "^%+?# golpe crítico%.?$",
 		["Crit2"] = "^UNUSED$",
 		["CritPercent"] = "^Equipar: Mejora un #%% tu probabilidad de conseguir un golpe crítico%.$",
+		["CritPercentCombined"] = "^Equipar: Aumenta un #%% tu probabilidad de golpe crítico con hechizos y ataques cuerpo a cuerpo y a distancia%.$",
 		["CritRating"] = "^Equipar: Aumenta tu índice de golpe crítico e?n? ?# p%.$",
 		["CritRating2"] = "^Equipar: Mejora el índice de golpe crítico en # p%.$",
 		["CritRating3"] = "^Equipar: Aumenta # p%. el golpe crítico%.$",
@@ -380,6 +381,7 @@ Para más información sobre como personalizar Pawn, por favor lee el archivo (R
 		["HeroicWarforged"] = "^Heroico Forjas de la guerra$",
 		["Hit"] = "^Equipar: Mejora tu probabilidad de golpear un #%%%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^Equipar: Aumenta un #%% tu probabilidad de golpear con hechizos y con ataques cuerpo a cuerpo y a distancia%.$",
 		["HitRating"] = "^Equipar: Aumenta # p%. el golpe%.$",
 		["HitRating2"] = "^Equipar: Aumenta tu índice de golpe e?n? ?# p%.$",
 		["HitRating3"] = "^Equipar: Mejora el índice de golpe e?n? ?# p%.$",
@@ -849,6 +851,8 @@ if GetLocale() == "esES" then
 		{
 			["Ap2"] = "^Equipar: %+# p%. de poder de ataque%.$",
 			["ArcaneResist"] = "^%+?# Arcano Resistencia$",
+			["CritPercentCombined"] = "^Equipar: Aumenta las probabilidades de conseguir un golpe crítico con ataques cuerpo a cuerpo, ataques a distancia y hechizos un #%%%.$",
+			["HitPercentCombined"] = "^Equipar: Aumenta en un #%% tu probabilidad de golpear con hechizos, ataques cuerpo a cuerpo y ataques a distancia%.$",
 			["FireResist"] = "^%+?# Fuego Resistencia$",
 			["FrostResist"] = "^%+?# Escarcha Resistencia$",
 			["NatureResist"] = "^%+?# Naturaleza Resistencia$",

diff --git a/Localization.frFR.lua b/Localization.frFR.lua
@@ -282,6 +282,7 @@ Pour plus d'information sur la Personnalisation de Pawn, regarder le fichier d'a
 		["Crit"] = "^%+?# Score de crit%.?$",
 		["Crit2"] = "^%+?# au score de critique$",
 		["CritPercent"] = "^E?\195?\137?quipé : Augmente vos chances d'infliger un coup critique de #%%%.$",
+		["CritPercentCombined"] = "^Equipé : Augmente de #%% vos chances d’infliger un coup critique avec vos attaques en mêlée et à distance et vos sorts%.$",
 		["CritRating"] = "^Équipé : Augmente votre score de coup critique de #%.$",
 		["CritRating2"] = "^UNUSED$",
 		["CritRating3"] = "^Équipé : Augmente de # le score de coup critique%.$",
@@ -348,6 +349,7 @@ Pour plus d'information sur la Personnalisation de Pawn, regarder le fichier d'a
 		["HeroicWarforged"] = "^De guerre héroïque$",
 		["Hit"] = "^E?\195?\137?quipé : Augmente vos chances de toucher de #%%%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^Equipé : Augmente les chances de toucher avec les sorts et les attaques en mêlée et à distance de # %%%.$",
 		["HitRating"] = "^Équipé : Augmente de # le score de toucher%.$",
 		["HitRating2"] = "^Équipé : Augmente votre score de toucher de #%.$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.itIT.lua b/Localization.itIT.lua
@@ -282,6 +282,7 @@ Per maggiori informazioni su come personalizzare Pawn, per favore leggere il fil
 		["Crit"] = "^%+?# Indice di [Cc]ritico%.?$",
 		["Crit2"] = "UNUSED",
 		["CritPercent"] = "^UNUSED$",
+		["CritPercentCombined"] = "^UNUSED$",
 		["CritRating"] = "^UNUSED$",
 		["CritRating2"] = "^UNUSED$",
 		["CritRating3"] = "^UNUSED$",
@@ -348,6 +349,7 @@ Per maggiori informazioni su come personalizzare Pawn, per favore leggere il fil
 		["HeroicWarforged"] = "^Eroico Guerraforgiat[oa]$",
 		["Hit"] = "^UNUSED$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^UNUSED$",
 		["HitRating"] = "^UNUSED$",
 		["HitRatingShort"] = "^UNUSED$",
 		["HitRating2"] = "^UNUSED$",

diff --git a/Localization.koKR.lua b/Localization.koKR.lua
@@ -283,6 +283,7 @@ Pawn 사용자 설정의 더 자세한 정보는, 애드온에 포함된 help
 		["Crit"] = "^치명타 및 극대화 %+?#$",
 		["Crit2"] = "^UNUSED$",
 		["CritPercent"] = "^착용 효과: 치명타를 적중시킬 확률이 #%%만큼 증가합니다%.$",
+		["CritPercentCombined"] = "^착용 효과: 근접 및 원거리 공격과 주문 사용 시 치명타 및 극대화 효과를 낼 확률이 #%%만큼 증가합니다%.$",
 		["CritRating"] = "^착용 효과: 치명타 적중도가 #만큼 증가합니다%.$",
 		["CritRating2"] = "^착용 효과: 치명타 및 주문 극대화 적중도가 #만큼 증가합니다%.$",
 		["CritRating3"] = "^착용 효과: 치명타 및 극대화 적중도가 #만큼 증가합니다%.$",
@@ -350,6 +351,7 @@ Pawn 사용자 설정의 더 자세한 정보는, 애드온에 포함된 help
 		["HeroicWarforged"] = "^상급 전쟁벼림$",
 		["Hit"] = "^착용 효과: 무기의 적중률이 #%%만큼 증가합니다%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^착용 효과: 주문, 근접 및 원거리 공격 적중률이 #%%만큼 증가합니다%.$",
 		["HitRating"] = "^착용 효과: 적중도가 #만큼 증가합니다%.$",
 		["HitRating2"] = "^UNUSED$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.lua b/Localization.lua
@@ -282,6 +282,7 @@ For more information on customizing Pawn, please see the help file (Readme.htm)
 		["Crit"] = "^%+?# Critical [Ss]trike%.?$",
 		["Crit2"] = "^UNUSED$",
 		["CritPercent"] = "^Equip: Improves your chance to get a critical strike by #%%%.$",
+		["CritPercentCombined"] = "^Equip: Improves your chance to get a critical strike with melee and ranged attacks and with spells by #%%%.$",
 		["CritRating"] = "^Equip: Increases your critical strike rating by #%.$",
 		["CritRating2"] = "^Equip: Improves critical strike rating by #%.$",
 		["CritRating3"] = "^UNUSED$",
@@ -348,6 +349,7 @@ For more information on customizing Pawn, please see the help file (Readme.htm)
 		["HeroicWarforged"] = "^Heroic Warforged$",
 		["Hit"] = "^Equip: Improves your chance to hit by #%%%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^Equip: Improves your chance to hit with spells and with melee and ranged attacks by #%%%.$",
 		["HitRating"] = "^Equip: Improves hit rating by #%.$",
 		["HitRating2"] = "^Equip: Increases your hit rating by #%.$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.ptBR.lua b/Localization.ptBR.lua
@@ -283,6 +283,7 @@ Para mais informações sobre personalizar o Pawn, favor veja o arquivo de ajuda
 		["Crit"] = "^%+?# Acerto Crítico%.?$",
 		["Crit2"] = "^%+?# de Acerto Crítico%.?$",
 		["CritPercent"] = "^Equipado: Aumenta em #%% a chance de realizar acertos críticos%.$",
+		["CritPercentCombined"] = "^Equipado: Aumenta em #%% a chance de obter um acerto crítico com ataques de longo alcance, corpo a corpo e feitiços%.$",
 		["CritRating"] = "^Equipado: Aumenta em # a taxa de acerto crítico%.$",
 		["CritRating2"] = "^UNUSED$",
 		["CritRating3"] = "^UNUSED$",
@@ -349,6 +350,7 @@ Para mais informações sobre personalizar o Pawn, favor veja o arquivo de ajuda
 		["HeroicWarforged"] = "^Forjado para a Guerra Heroico$",
 		["Hit"] = "^Equipado: Aumenta em #%% a chance de acerto%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^Equipado: Aumenta sua chance de acerto com feitiços e ataques corpo a corpo e de longo alcance em #%%%.$",
 		["HitRating"] = "^Equipado: Aumenta em # a taxa de acerto%.$",
 		["HitRating2"] = "^Equipado: Aumenta em # a sua taxa de acerto%.$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.ruRU.lua b/Localization.ruRU.lua
@@ -278,6 +278,7 @@ For more information on customizing Pawn, please see the help file (Readme.htm)
 		["Crit"] = "^%+?# к критическому удару$",
 		["Crit2"] = "^%+?# к показателю критического удара$",
 		["CritPercent"] = "^Если на персонаже: Увеличение вероятности нанесения критического урона на #%%%.$",
+		["CritPercentCombined"] = "^Если на персонаже: Повышает вероятность нанести критический удар атаками ближнего и дальнего боя, а также заклинаниями на #%%%.$",
 		["CritRating"] = "^Если на персонаже: Увеличение вероятности нанесения критического урона на # ед%.$",
 		["CritRating2"] = "^Если на персонаже: Повышает рейтинг критического удара на #%.$",
 		["CritRating3"] = "^UNUSED$",
@@ -344,6 +345,7 @@ For more information on customizing Pawn, please see the help file (Readme.htm)
 		["HeroicWarforged"] = "^Предмет закален в бою %(героич%.%)$",
 		["Hit"] = "^Если на персонаже: Вероятность нанесения удара увеличена на #%%%.$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^Если на персонаже: Повышает вероятность попадания заклинаниями и атаками в ближнем и дальнем бою на #%%%.$",
 		["HitRating"] = "^Если на персонаже: Повышает рейтинг меткости на #%.$",
 		["HitRating2"] = "^Если на персонаже: Увеличение рейтинга меткости на # ед%.$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.zhCN.lua b/Localization.zhCN.lua
@@ -281,6 +281,7 @@ PawnLocal =
 		["Crit"] = "^%+?# 爆击$",
 		["Crit2"] = "^UNUSED$",
 		["CritPercent"] = "^装备： ?使你造成致命一击的几率提高#%%。$",
+		["CritPercentCombined"] = "^装备： 使你的近战攻击、远程攻击和法术造成爆击的几率提高#%%。$",
 		["CritRating"] = "^装备： 使你的爆击等级提高#。$",
 		["CritRating2"] = "^UNUSED$",
 		["CritRating3"] = "^装备： 爆击等级提高#点。$",
@@ -347,6 +348,7 @@ PawnLocal =
 		["HeroicWarforged"] = "英雄战火",
 		["Hit"] = "^装备： ?使你击中目标的几率提高#%%。$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^装备： 使你的法术、近战和远程攻击的命中几率提高#%%。$",
 		["HitRating"] = "^装备： 命中等级提高#点。$",
 		["HitRating2"] = "^装备： 使你的命中等级提高#。$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Localization.zhTW.lua b/Localization.zhTW.lua
@@ -284,6 +284,7 @@ PawnLocal =
 		["Crit"] = "^%+?#致命一擊$",
 		["Crit2"] = "^裝備: 提高#點致命一擊。$",
 		["CritPercent"] = "^裝備： 使你造成致命一擊的機率提高#%%。$",
+		["CritPercentCombined"] = "^裝備： 使你近戰攻擊、遠程攻擊和法術的致命一擊機率提高#%%。$",
 		["CritRating"] = "^裝備: 使你的致命一擊等級提高#點。$",
 		["CritRating2"] = "^UNUSED$",
 		["CritRating3"] = "^UNUSED$",
@@ -351,6 +352,7 @@ PawnLocal =
 		["HeroicWarforged"] = "^英雄難度戰鑄$",
 		["Hit"] = "^裝備： 使你擊中目標的機率提高#%%。$",
 		["Hit2"] = "^UNUSED$",
+		["HitPercentCombined"] = "^裝備： 使你以法術與近戰及遠程攻擊的命中率提高#%%。$",
 		["HitRating"] = "^裝備: 提高#點命中。$",
 		["HitRating2"] = "^裝備: 使你的命中等級提高#點。$",
 		["HitRating3"] = "^UNUSED$",

diff --git a/Readme.htm b/Readme.htm
@@ -308,6 +308,9 @@ <h3><span style="text-decoration: underline;">In</span>compatible addons</h3>
 
 <h2>Updates</h2>
 <h3>Version 2.8.10</h3>
+<ul>
+	<li>Classic Season of Discovery: Added support for the new Gnomeregan items with hit or crit to all attacks. Items with the new hit stat will receive points for your Hit and Hit (Spell) stats, and items with the new crit stat will receive points for your Crit and Crit (Spell) stats.</li>
+</ul>
 <h3>Version 2.8.9</h3>
 <ul>
 	<li>Dragonflight: Updated stat weights for all classes and specs.</li>

diff --git a/TooltipParsing.lua b/TooltipParsing.lua
@@ -219,6 +219,7 @@ PawnRegexes =
 	{L.Crit, "CritRating"},
 	{L.Crit2, "CritRating"},
 	{L.CritPercent, "CritRating"}, -- Classic, /pawn compare 15062
+	{L.CritPercentCombined, "CritRating", 1, PawnMultipleStatsExtract, "SpellCritRating", 1, PawnMultipleStatsExtract}, -- Classic Season of Discovery, /pawn compare 216621
 	{L.CritRating, "CritRating"}, -- Burning Crusade, /pawn compare 15062
 	{L.CritRating2, "CritRating"}, -- Burning Crusade, /pawn compare 30710
 	{L.CritRating3, "CritRating"}, -- Burning Crusade, /pawn compare 28796
@@ -232,6 +233,7 @@ PawnRegexes =
 	{L.SpellCritRatingShort2, "SpellCritRating"}, -- Burning Crusade, /pawn compare 29317 (socket bonus)
 	{L.Hit, "HitRating"}, -- Classic, /pawn compare 16947
 	{L.Hit2, "HitRating"}, -- unused in English
+	{L.HitPercentCombined, "HitRating", 1, PawnMultipleStatsExtract, "SpellHitRating", 1, PawnMultipleStatsExtract}, -- Classic Season of Discovery, /pawn compare 213312
 	{L.HitRating, "HitRating"}, -- Burning Crusade, /pawn compare 28182
 	{L.HitRating2, "HitRating"}, -- Burning Crusade, /pawn compare 18500
 	{L.HitRating3, "HitRating"}, -- Burning Crusade in Spanish, /pawn compare 32570