Skip to content

Commit 371b40f

Browse files
nihilistzschenihilistzsche
committed
Split EPB tag for breed into ally/enemy formats allowing to show both breed text and breed icon, which are now the new defaults.
1 parent feab9a4 commit 371b40f

10 files changed

Lines changed: 40 additions & 13 deletions

File tree

‎ProjectAzilroka/Locales/deDE.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ ACL["3D Portraits"] = true
180180
ACL["Add More Detailed Info if BreedInfo is available."] = "Füge weitere detaillierte Informationen hinzu, wenn Rasseninfo verfügbar ist."
181181
ACL["Add Pet Level Breakdown if BreedInfo is available."] = "Aufschlüsselung der Begleiterstufe hinzufügen, wenn Rasseninfo verfügbar ist."
182182
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = "Zusätzliche Optionen für Haustierkämpfe: Verbesserte Tooltips, Porträts, Schriftarten und mehr"
183-
ACL["Breed Format"] = "Rasseformat"
183+
ACL["Breed Format (Ally Team)"] = "Rasseformat (Ally Team)"
184+
ACL["Breed Format (Enemy Team)"] = "Rasseformat (gegnerisches Team)"
184185
ACL["Enhance Tooltip"] = "Tooltip verbessern"
185186
ACL["Experience Format"] = "Erfahrungsformat"
186187
ACL["Font Flag"] = "Schriftumrandung"

‎ProjectAzilroka/Locales/enUS.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ ACL["3D Portraits"] = true
180180
ACL["Add More Detailed Info if BreedInfo is available."] = true
181181
ACL["Add Pet Level Breakdown if BreedInfo is available."] = true
182182
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = true
183-
ACL["Breed Format"] = true
183+
ACL["Breed Format (Ally Team)"] = true
184+
ACL["Breed Format (Enemy Team)"] = true
184185
ACL["Enhance Tooltip"] = true
185186
ACL["Experience Format"] = true
186187
ACL["Font Flag"] = true

‎ProjectAzilroka/Locales/esMX.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ ACL["3D Portraits"] = true
179179
ACL["Add More Detailed Info if BreedInfo is available."] = true
180180
ACL["Add Pet Level Breakdown if BreedInfo is available."] = true
181181
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = true
182-
ACL["Breed Format"] = true
182+
ACL["Breed Format (Ally Team)"] = true
183+
ACL["Breed Format (Enemy Team)"] = true
183184
ACL["Enhance Tooltip"] = true
184185
ACL["Experience Format"] = true
185186
ACL["Font Flag"] = true

‎ProjectAzilroka/Locales/frFR.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,8 @@ ACL["3D Portraits"] = "Portraits 3D"
180180
ACL["Add More Detailed Info if BreedInfo is available."] = "Ajouter des informations plus détaillées si BreedInfo est disponible."
181181
ACL["Add Pet Level Breakdown if BreedInfo is available."] = "Ajouter le détail du niveau des familiers si BreedInfo est disponible."
182182
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = "Options supplémentaires pour les combats de familiers : info-bulles améliorées, portraits, polices et plus"
183-
ACL["Breed Format"] = "Format de race"
183+
ACL["Breed Format (Ally Team)"] = "Format de race (équipe alliée)"
184+
ACL["Breed Format (Enemy Team)"] = "Format de race (équipe ennemie)"
184185
ACL["Enhance Tooltip"] = "Améliorer l'info-bulle"
185186
ACL["Experience Format"] = "Format de l'expérience"
186187
ACL["Font Flag"] = "Style de police"

‎ProjectAzilroka/Locales/itIT.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ ACL["3D Portraits"] = true
179179
ACL["Add More Detailed Info if BreedInfo is available."] = true
180180
ACL["Add Pet Level Breakdown if BreedInfo is available."] = true
181181
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = true
182-
ACL["Breed Format"] = true
182+
ACL["Breed Format (Ally Team)"] = true
183+
ACL["Breed Format (Enemy Team)"] = true
183184
ACL["Enhance Tooltip"] = true
184185
ACL["Experience Format"] = true
185186
ACL["Font Flag"] = true

‎ProjectAzilroka/Locales/koKR.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ ACL["3D Portraits"] = "3D 초상화"
160160
ACL["Add More Detailed Info if BreedInfo is available."] = "번식 정보가 있으면 더 자세한 정보를 추가하십시오."
161161
ACL["Add Pet Level Breakdown if BreedInfo is available."] = "종 정보를 사용할 수 있는 경우 애완동물 레벨 분류를 추가합니다."
162162
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = "애완동물 대전을 위한 추가 옵션 : 향상된 툴팁, 초상화, 글꼴 등"
163-
ACL["Breed Format"] = "번식 형식"
163+
ACL["Breed Format (Ally Team)"] = "번식 형식(동맹팀)"
164+
ACL["Breed Format (Enemy Team)"] = "번식 형식(적 팀)"
164165
ACL["Enhance Tooltip"] = "향상된 툴팁"
165166
ACL["Experience Format"] = "XP 형석"
166167
ACL["Font Flag"] = "외곽선 글꼴"

‎ProjectAzilroka/Locales/ruRU.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ ACL["3D Portraits"] = true
179179
ACL["Add More Detailed Info if BreedInfo is available."] = true
180180
ACL["Add Pet Level Breakdown if BreedInfo is available."] = true
181181
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = true
182-
ACL["Breed Format"] = true
182+
ACL["Breed Format (Ally Team)"] = true
183+
ACL["Breed Format (Enemy Team)"] = true
183184
ACL["Enhance Tooltip"] = true
184185
ACL["Experience Format"] = true
185186
ACL["Font Flag"] = true

‎ProjectAzilroka/Locales/zhCN.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,8 @@ ACL["3D Portraits"] = true
173173
ACL["Add More Detailed Info if BreedInfo is available."] = true
174174
ACL["Add Pet Level Breakdown if BreedInfo is available."] = true
175175
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = true
176-
ACL["Breed Format"] = true
176+
ACL["Breed Format (Ally Team)"] = true
177+
ACL["Breed Format (Enemy Team)"] = true
177178
ACL["Enhance Tooltip"] = true
178179
ACL["Experience Format"] = true
179180
ACL["Font Flag"] = true

‎ProjectAzilroka/Locales/zhTW.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@ ACL["3D Portraits"] = true
179179
ACL["Add More Detailed Info if BreedInfo is available."] = true
180180
ACL["Add Pet Level Breakdown if BreedInfo is available."] = true
181181
ACL["Additional options for pet battles: Enhanced tooltips, portraits, fonts and more"] = true
182-
ACL["Breed Format"] = true
182+
ACL["Breed Format (Ally Team)"] = true
183+
ACL["Breed Format (Enemy Team)"] = true
183184
ACL["Enhance Tooltip"] = true
184185
ACL["Experience Format"] = true
185186
ACL["Font Flag"] = true

‎ProjectAzilroka/Modules/EnhancedPetBattleUI.lua‎

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,11 @@ function EPB:InitPetFrameAPI()
753753
end
754754
frame:Tag(frame.PBPower.value, EPB.db.powerFormat)
755755
frame:Tag(frame.PBSpeed.value, EPB.db.speedFormat)
756-
frame:Tag(frame.BreedID, EPB.db.breedFormat)
756+
if petInfo.petOwner == Enum_BattlePetOwner_Ally then
757+
frame:Tag(frame.BreedID, EPB.db.breedAllyFormat)
758+
else
759+
frame:Tag(frame.BreedID, EPB.db.breedEnemyFormat)
760+
end
757761
end
758762

759763
function EPB:UpdatePetFrame(frame)
@@ -1639,8 +1643,8 @@ function EPB:GetOptions()
16391643
return not EPB.db.UseoUF
16401644
end
16411645
)
1642-
EnhancedPetBattleUI.args.General.args.breedFormat = ACH:Input(
1643-
ACL["Breed Format"],
1646+
EnhancedPetBattleUI.args.General.args.breedAllyFormat = ACH:Input(
1647+
ACL["Breed Format (Ally Team)"],
16441648
nil,
16451649
23,
16461650
nil,
@@ -1652,6 +1656,19 @@ function EPB:GetOptions()
16521656
return not EPB.db.UseoUF or not BattlePetBreedID
16531657
end
16541658
)
1659+
EnhancedPetBattleUI.args.General.args.breedEnemyFormat = ACH:Input(
1660+
ACL["Breed Format (Enemy Team)"],
1661+
nil,
1662+
24,
1663+
nil,
1664+
"full",
1665+
nil,
1666+
nil,
1667+
nil,
1668+
function()
1669+
return not EPB.db.UseoUF or not BattlePetBreedID
1670+
end
1671+
)
16551672
end
16561673

16571674
function EPB:BuildProfile()
@@ -1678,7 +1695,8 @@ function EPB:BuildProfile()
16781695
xpFormat = "[pbuf:xp:current-max-percent]",
16791696
powerFormat = "[pbuf:power:comparecolor][pbuf:power]",
16801697
speedFormat = "[pbuf:speed:comparecolor][pbuf:speed]",
1681-
breedFormat = "[pbuf:breedicon]",
1698+
breedAllyFormat = "[pbuf:breed][pbuf:breedicon]",
1699+
breedEnemyFormat = "[pbuf:breedicon][pbuf:breed]",
16821700
healthThreshold = 0.85,
16831701
wildHealthThreshold = 0.65,
16841702
}

0 commit comments

Comments
 (0)