diff --git a/assets/database/db.bin b/assets/database/db.bin index e791310483..ba6dc0cb75 100644 Binary files a/assets/database/db.bin and b/assets/database/db.bin differ diff --git a/assets/database/db.json b/assets/database/db.json index 2d79314e45..4139414f17 100644 --- a/assets/database/db.json +++ b/assets/database/db.json @@ -9548,7 +9548,6 @@ {"id":76858,"name":"Opportunity Strike","icon":"ability_backstab"}, {"id":77130,"name":"Improved Cleanse Spirit","icon":"ability_shaman_cleansespirit"}, {"id":77215,"name":"Potent Afflictions","icon":"ability_warlock_everlastingaffliction"}, -{"id":77219,"name":"Master Demonologist","icon":"spell_shadow_shadowpact"}, {"id":77220,"name":"Fiery Apocalypse","icon":"spell_fire_moltenblood"}, {"id":77223,"name":"Enhanced Elements","icon":"spell_nature_elementalprecision_2"}, {"id":77478,"name":"Earthquake","icon":"spell_shaman_earthquake"}, @@ -9575,6 +9574,7 @@ {"id":77794,"name":"Focused Insight","icon":"spell_shaman_measuredinsight"}, {"id":77795,"name":"Focused Insight","icon":"spell_shaman_measuredinsight"}, {"id":77796,"name":"Focused Insight","icon":"spell_shaman_measuredinsight"}, +{"id":77799,"name":"Fel Flame","icon":"spell_fire_felfirenova"}, {"id":77801,"name":"Demon Soul","icon":"spell_warlock_demonsoul"}, {"id":77829,"name":"Ancestral Resolve","icon":"spell_nature_rune"}, {"id":77830,"name":"Ancestral Resolve","icon":"spell_nature_rune"}, diff --git a/assets/db_inputs/atlasloot_db.json b/assets/db_inputs/atlasloot_db.json index 210760c0ed..23f109ec09 100644 --- a/assets/db_inputs/atlasloot_db.json +++ b/assets/db_inputs/atlasloot_db.json @@ -11817,7 +11817,7 @@ {"id":62365,"sources":[{"rep":{"repFactionId":1135,"repLevel":8}}]}, {"id":62366,"sources":[{"rep":{"repFactionId":1135,"repLevel":7}}]}, {"id":62367,"sources":[{"rep":{"repFactionId":1158,"repLevel":7}}]}, -{"id":62368,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}]}, +{"id":62368,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}],"factionRestriction":2}, {"id":62369,"sources":[{"rep":{"repFactionId":1173,"repLevel":7}}]}, {"id":62374,"sources":[{"rep":{"repFactionId":1158,"repLevel":6}}]}, {"id":62375,"sources":[{"rep":{"repFactionId":1158,"repLevel":6}}]}, @@ -11831,31 +11831,31 @@ {"id":62384,"sources":[{"rep":{"repFactionId":1158,"repLevel":8}}]}, {"id":62385,"sources":[{"rep":{"repFactionId":1158,"repLevel":8}}]}, {"id":62386,"sources":[{"rep":{"repFactionId":1158,"repLevel":8}}]}, -{"id":62404,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}]}, -{"id":62405,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}]}, -{"id":62406,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}]}, -{"id":62407,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}]}, -{"id":62408,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}]}, -{"id":62409,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}]}, -{"id":62410,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}]}, -{"id":62415,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}]}, -{"id":62416,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}]}, -{"id":62417,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}]}, -{"id":62418,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}]}, -{"id":62420,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}]}, -{"id":62422,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}]}, -{"id":62423,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}]}, -{"id":62424,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}]}, -{"id":62425,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}]}, -{"id":62426,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}]}, -{"id":62427,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}]}, -{"id":62428,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}]}, -{"id":62429,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}]}, -{"id":62430,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}]}, -{"id":62431,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}]}, -{"id":62432,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}]}, -{"id":62433,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}]}, -{"id":62434,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}]}, +{"id":62404,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":62405,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":62406,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":62407,"sources":[{"rep":{"repFactionId":1172,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":62408,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62409,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62410,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62415,"sources":[{"rep":{"repFactionId":1172,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62416,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62417,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62418,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62420,"sources":[{"rep":{"repFactionId":1172,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62422,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62423,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":62424,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":62425,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":62426,"sources":[{"rep":{"repFactionId":1174,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":62427,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62428,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62429,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62430,"sources":[{"rep":{"repFactionId":1174,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62431,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62432,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62433,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62434,"sources":[{"rep":{"repFactionId":1174,"repLevel":8,"factionId":1}}],"factionRestriction":1}, {"id":62436,"sources":[{"rep":{"repFactionId":1173,"repLevel":6}}]}, {"id":62437,"sources":[{"rep":{"repFactionId":1173,"repLevel":6}}]}, {"id":62438,"sources":[{"rep":{"repFactionId":1173,"repLevel":6}}]}, @@ -11868,45 +11868,45 @@ {"id":62448,"sources":[{"rep":{"repFactionId":1173,"repLevel":8}}]}, {"id":62449,"sources":[{"rep":{"repFactionId":1173,"repLevel":8}}]}, {"id":62450,"sources":[{"rep":{"repFactionId":1173,"repLevel":8}}]}, -{"id":62454,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62455,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62456,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62457,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62458,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62459,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62460,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":62463,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, -{"id":62464,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, -{"id":62465,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, -{"id":62466,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, -{"id":62467,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, -{"id":62468,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, -{"id":62469,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, -{"id":62470,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, -{"id":62471,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, -{"id":62472,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, -{"id":62473,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":62474,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":62475,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":62476,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":62477,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":62478,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":62479,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":63039,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, +{"id":62454,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62455,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62456,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62457,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62458,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62459,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62460,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":62463,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62464,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62465,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62466,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62467,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, +{"id":62468,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62469,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62470,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62471,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62472,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":62473,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62474,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62475,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62476,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62477,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62478,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":62479,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":63039,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, {"id":63040,"sources":[{"drop":{"difficulty":1,"zoneId":5035,"otherName":"Altairus"}}]}, {"id":63041,"sources":[{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":63043,"sources":[{"drop":{"difficulty":1,"zoneId":5088,"otherName":"Slabhide"}}]}, {"id":63044,"sources":[{"rep":{"repFactionId":1173,"repLevel":8}}]}, {"id":63045,"sources":[{"rep":{"repFactionId":1173,"repLevel":8}}]}, -{"id":63141,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}]}, -{"id":63144,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}]}, -{"id":63145,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}]}, -{"id":63355,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}]}, -{"id":63376,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, -{"id":63377,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":63378,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}]}, -{"id":63379,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}]}, -{"id":63391,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}]}, +{"id":63141,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":63144,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}],"factionRestriction":1}, +{"id":63145,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}],"factionRestriction":1}, +{"id":63355,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":63376,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, +{"id":63377,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":63378,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":63379,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":63391,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}],"factionRestriction":1}, {"id":63433,"sources":[{"drop":{"difficulty":2,"zoneId":209,"otherName":"Baron Ashbury"}}]}, {"id":63434,"sources":[{"drop":{"difficulty":2,"zoneId":209,"otherName":"Baron Ashbury"}}]}, {"id":63435,"sources":[{"drop":{"difficulty":2,"zoneId":209,"otherName":"Baron Ashbury"}}]}, @@ -11974,8 +11974,8 @@ {"id":63505,"sources":[{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":63506,"sources":[{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":63507,"sources":[{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, -{"id":63517,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}]}, -{"id":63518,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}]}, +{"id":63517,"sources":[{"rep":{"repFactionId":1177,"repLevel":5,"factionId":1}}],"factionRestriction":1}, +{"id":63518,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}],"factionRestriction":2}, {"id":63531,"sources":[{"drop":{"difficulty":5,"zoneId":5334,"otherName":"Theralion and Valiona"}}]}, {"id":63532,"sources":[{"drop":{"difficulty":5,"zoneId":5334,"otherName":"Theralion and Valiona"}}]}, {"id":63533,"sources":[{"drop":{"difficulty":5,"zoneId":5334,"otherName":"Theralion and Valiona"}}]}, @@ -11991,13 +11991,13 @@ {"id":64314,"sources":[{"drop":{"difficulty":5,"zoneId":5334,"otherName":"Cho'gall"}},{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":64315,"sources":[{"drop":{"difficulty":5,"zoneId":5334,"otherName":"Cho'gall"}},{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":64316,"sources":[{"drop":{"difficulty":5,"zoneId":5334,"otherName":"Cho'gall"}},{"drop":{"difficulty":5,"zoneId":5638,"otherName":"Al'Akir"}}]}, -{"id":64993,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}]}, -{"id":64994,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}]}, -{"id":64995,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}]}, -{"id":64996,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}]}, -{"id":64997,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}]}, -{"id":64998,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}]}, -{"id":64999,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, +{"id":64993,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}],"factionRestriction":2}, +{"id":64994,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}],"factionRestriction":2}, +{"id":64995,"sources":[{"rep":{"repFactionId":1178,"repLevel":5,"factionId":2}}],"factionRestriction":2}, +{"id":64996,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":64997,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}],"factionRestriction":2}, +{"id":64998,"sources":[{"rep":{"repFactionId":1177,"repLevel":8,"factionId":1}}],"factionRestriction":1}, +{"id":64999,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, {"id":65000,"sources":[{"drop":{"difficulty":6,"zoneId":5094,"otherName":"Nefarian's End"}},{"drop":{"difficulty":6,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":65001,"sources":[{"drop":{"difficulty":6,"zoneId":5094,"otherName":"Nefarian's End"}},{"drop":{"difficulty":6,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":65002,"sources":[{"drop":{"difficulty":6,"zoneId":5094,"otherName":"Nefarian's End"}},{"drop":{"difficulty":6,"zoneId":5638,"otherName":"Al'Akir"}}]}, @@ -12137,11 +12137,11 @@ {"id":65172,"sources":[{"drop":{"difficulty":2,"zoneId":1581,"otherName":"\\\"Captain\\\" Cookie"}}]}, {"id":65173,"sources":[{"drop":{"difficulty":2,"zoneId":1581,"otherName":"\\\"Captain\\\" Cookie"}}]}, {"id":65174,"sources":[{"drop":{"difficulty":2,"zoneId":1581,"otherName":"\\\"Captain\\\" Cookie"}}]}, -{"id":65175,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}]}, -{"id":65176,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}]}, +{"id":65175,"sources":[{"rep":{"repFactionId":1177,"repLevel":6,"factionId":1}}],"factionRestriction":1}, +{"id":65176,"sources":[{"rep":{"repFactionId":1178,"repLevel":6,"factionId":2}}],"factionRestriction":2}, {"id":65177,"sources":[{"drop":{"difficulty":2,"zoneId":1581,"otherName":"\\\"Captain\\\" Cookie"}}]}, {"id":65178,"sources":[{"drop":{"difficulty":2,"zoneId":1581,"otherName":"Vanessa VanCleef"}}]}, -{"id":65356,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}]}, +{"id":65356,"sources":[{"rep":{"repFactionId":1178,"repLevel":8,"factionId":2}}],"factionRestriction":2}, {"id":65367,"sources":[{"drop":{"difficulty":6,"zoneId":5638,"otherName":"The Conclave of Wind"}}]}, {"id":65368,"sources":[{"drop":{"difficulty":6,"zoneId":5638,"otherName":"The Conclave of Wind"}}]}, {"id":65369,"sources":[{"drop":{"difficulty":6,"zoneId":5638,"otherName":"The Conclave of Wind"}}]}, @@ -12166,8 +12166,8 @@ {"id":65905,"sources":[{"rep":{"repFactionId":1135,"repLevel":5}}]}, {"id":65906,"sources":[{"rep":{"repFactionId":1158,"repLevel":5}}]}, {"id":65907,"sources":[{"rep":{"repFactionId":1171,"repLevel":5}}]}, -{"id":65908,"sources":[{"rep":{"repFactionId":1174,"repLevel":5,"factionId":1}}]}, -{"id":65909,"sources":[{"rep":{"repFactionId":1172,"repLevel":5,"factionId":2}}]}, +{"id":65908,"sources":[{"rep":{"repFactionId":1174,"repLevel":5,"factionId":1}}],"factionRestriction":1}, +{"id":65909,"sources":[{"rep":{"repFactionId":1172,"repLevel":5,"factionId":2}}],"factionRestriction":2}, {"id":66998,"sources":[{"drop":{"difficulty":6,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":67423,"sources":[{"drop":{"difficulty":6,"zoneId":5334,"otherName":"Halfus Wyrmbreaker"}}]}, {"id":67424,"sources":[{"drop":{"difficulty":6,"zoneId":5334,"otherName":"Halfus Wyrmbreaker"}}]}, @@ -12185,8 +12185,8 @@ {"id":68131,"sources":[{"drop":{"difficulty":6,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":68132,"sources":[{"drop":{"difficulty":6,"zoneId":5638,"otherName":"Al'Akir"}}]}, {"id":68600,"sources":[{"drop":{"difficulty":6,"zoneId":5334,"otherName":"Cho'gall"}}]}, -{"id":68739,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}]}, -{"id":68740,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}]}, +{"id":68739,"sources":[{"rep":{"repFactionId":1177,"repLevel":7,"factionId":1}}],"factionRestriction":1}, +{"id":68740,"sources":[{"rep":{"repFactionId":1178,"repLevel":7,"factionId":2}}],"factionRestriction":2}, {"id":68925,"sources":[{"drop":{"difficulty":5,"zoneId":5723,"otherName":"Ragnaros"}}]}, {"id":68926,"sources":[{"drop":{"difficulty":5,"zoneId":5723,"otherName":"Majordomo Staghelm"}}]}, {"id":68927,"sources":[{"drop":{"difficulty":5,"zoneId":5723,"otherName":"Majordomo Staghelm"}}]}, diff --git a/sim/warlock/demon_soul.go b/sim/warlock/demon_soul.go index e397ea4523..9f231b0bd9 100644 --- a/sim/warlock/demon_soul.go +++ b/sim/warlock/demon_soul.go @@ -105,6 +105,9 @@ func (warlock *Warlock) registerDemonSoulSpell() { Timer: warlock.NewTimer(), Duration: time.Minute * 2, }, + DefaultCast: core.Cast{ + NonEmpty: true, + }, }, ApplyEffects: func(sim *core.Simulation, target *core.Unit, spell *core.Spell) { diff --git a/tools/database/atlasloot.go b/tools/database/atlasloot.go index d7bbd405e6..ea5f92edd1 100644 --- a/tools/database/atlasloot.go +++ b/tools/database/atlasloot.go @@ -241,7 +241,7 @@ func readAtlasLootFactionData(db *WowDatabase, srcUrl string) { RepLevel: repLevel, } - item := &proto.UIItem{Id: int32(itemID), Sources: []*proto.UIItemSource{{ + item := &proto.UIItem{Id: int32(itemID), FactionRestriction: AtlasLootFactionRestrictions[faction], Sources: []*proto.UIItemSource{{ Source: &proto.UIItemSource_Rep{ Rep: factionSource, }, @@ -352,6 +352,11 @@ var AtlasLootFactions = map[string]proto.Faction{ "FACTIONS_ALLI_CONTENT": proto.Faction_Alliance, "FACTIONS_HORDE_CONTENT": proto.Faction_Horde, } +var AtlasLootFactionRestrictions = map[proto.Faction]proto.UIItem_FactionRestriction{ + proto.Faction_Unknown: proto.UIItem_FACTION_RESTRICTION_UNSPECIFIED, + proto.Faction_Alliance: proto.UIItem_FACTION_RESTRICTION_ALLIANCE_ONLY, + proto.Faction_Horde: proto.UIItem_FACTION_RESTRICTION_HORDE_ONLY, +} var AtlasLootRepLevel = map[string]proto.RepLevel{ "Exalted": proto.RepLevel_RepLevelExalted, "Revered": proto.RepLevel_RepLevelRevered, diff --git a/ui/core/components/gear_picker/gear_picker.tsx b/ui/core/components/gear_picker/gear_picker.tsx index 069443461d..6acdf82779 100644 --- a/ui/core/components/gear_picker/gear_picker.tsx +++ b/ui/core/components/gear_picker/gear_picker.tsx @@ -11,7 +11,7 @@ import { ActionId } from '../../proto_utils/action_id'; import { getEnchantDescription, getUniqueEnchantString } from '../../proto_utils/enchants'; import { EquippedItem } from '../../proto_utils/equipped_item'; import { gemMatchesSocket, getEmptyGemSocketIconUrl } from '../../proto_utils/gems'; -import { difficultyNames, professionNames, REP_FACTION_NAMES, REP_LEVEL_NAMES, shortSecondaryStatNames, slotNames } from '../../proto_utils/names'; +import { difficultyNames, professionNames, REP_FACTION_NAMES, REP_FACTION_QUARTERMASTERS, REP_LEVEL_NAMES, shortSecondaryStatNames, slotNames } from '../../proto_utils/names'; import { Stats } from '../../proto_utils/stats'; import { getPVPSeasonFromItem, isPVPItem } from '../../proto_utils/utils'; import { Sim } from '../../sim'; @@ -1637,8 +1637,9 @@ export class ItemList { source.source.oneofKind == 'rep' ? REP_FACTION_NAMES[source.source.rep.repFactionId] : REP_FACTION_NAMES[RepFaction.RepFactionUnknown], ); const src = source.source.rep; + const npcId = REP_FACTION_QUARTERMASTERS[src.repFactionId] return makeAnchor( - ActionId.makeItemUrl(item.id), + ActionId.makeNpcUrl(npcId), <> {factionNames.map(name => ( diff --git a/ui/core/proto_utils/names.ts b/ui/core/proto_utils/names.ts index 2d91a8cb29..a0cb7e9770 100644 --- a/ui/core/proto_utils/names.ts +++ b/ui/core/proto_utils/names.ts @@ -344,6 +344,19 @@ export const REP_FACTION_NAMES: Record = { [RepFaction.RepFactionAvengersOfHyjal]: 'Avengers of Hyjal', }; +export const REP_FACTION_QUARTERMASTERS: Record = { + [RepFaction.RepFactionUnknown]: 0, + [RepFaction.RepFactionTheEarthenRing]: 50324, + [RepFaction.RepFactionGuardiansOfHyjal]: 50314, + [RepFaction.RepFactionTherazane]: 45408, + [RepFaction.RepFactionDragonmawClan]: 49387, + [RepFaction.RepFactionRamkahen]: 48617, + [RepFaction.RepFactionWildhammerClan]: 49386, + [RepFaction.RepFactionBaradinsWardens]: 47328, + [RepFaction.RepFactionHellscreamsReach]: 48531, + [RepFaction.RepFactionAvengersOfHyjal]: 54401, +} + export const masterySpellNames: Map = new Map([ [Spec.SpecAssassinationRogue, 'Potent Poisons'], [Spec.SpecCombatRogue, 'Main Gauche'],