Skip to content

Commit

Permalink
- Removed a bunch of duplicate mage downtime entries
Browse files Browse the repository at this point in the history
  • Loading branch information
@DerpleMQ2
DerpleMQ2 committed Mar 9, 2024
1 parent 7cdf41b commit a560aa5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 175 deletions.
176 changes: 2 additions & 174 deletions class_configs/mag_class_config.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1686,180 +1686,8 @@ _ClassConfig = {
return RGMercUtils.SelfBuffPetCheck(mq.TLO.Spell(aaName)) and RGMercUtils.IsModeActive("PetTank") and RGMercUtils.AAReady(aaName)
end,
},
{
name = "Elemental Conversion",
type = "AA",
cond = function(self, aaName)
return mq.TLO.Me.PctMana() <= RGMercUtils.GetSetting('GatherManaPct') and RGMercUtils.AAReady(aaName) and mq.TLO.Me.Pet.ID() > 0
end,
},
{
name = "Forceful Rejuvenation",
type = "AA",
cond = function(self, aaName)
return mq.TLO.Me.PctMana() <= RGMercUtils.GetSetting('GatherManaPct') and not mq.TLO.Me.SpellReady(self.ResolvedActionMap['GatherMana'] or "")() and
RGMercUtils.AAReady(aaName) and mq.TLO.Me.Pet.ID() > 0
end,
},
{
name = "ManaRodSummon",
type = "Spell",
cond = function(self, spell)
local modRodSpell = self.ResolvedActionMap['ManaRodSummon']
if not modRodSpell or not modRodSpell() then return false end
self.TempSettings.GroupModRod = mq.TLO.FindItem(modRodSpell.RankName.Base(1)()).Name()
return RGMercUtils.GetSetting('SummonModRods') and (mq.TLO.Me.AltAbility("Summon Modulation Shard").ID() or 0) == 0 and
mq.TLO.FindItemCount(self.TempSettings.GroupModRod) == 0 and
(mq.TLO.Cursor.ID() or 0) == 0
end,
},
{
name = "Summon Modulation Shard",
type = "AA",
cond = function(self, aaName)
local modRodSpell = mq.TLO.Spell(aaName)
if not modRodSpell or not modRodSpell() then return false end
self.TempSettings.GroupModRod = mq.TLO.FindItem(modRodSpell.RankName.Base(1)()).Name()
return RGMercUtils.GetSetting('SummonModRods') and
mq.TLO.FindItemCount(self.TempSettings.GroupModRod) == 0 and
(mq.TLO.Cursor.ID() or 0) == 0 and RGMercUtils.AAReady(aaName)
end,
},
{
name = "SelfManaRodSummon",
type = "Spell",
cond = function(self, spell)
return mq.TLO.FindItemCount(spell.RankName.Base(1)() or "") == 0 and (mq.TLO.Cursor.ID() or 0) == 0
end,
},
{
name = "GatherMana",
type = "Spell",
cond = function(self, spell)
return spell and spell() and mq.TLO.Me.PctMana() <= RGMercUtils.GetSetting('GatherManaPct') and RGMercUtils.PCSpellReady(spell) and
mq.TLO.Me.SpellReady(spell.Name() or "")
end,
},
{
name = "ManaRegenBuff",
type = "Spell",
cond = function(self, spell)
return RGMercUtils.SelfBuffCheck(spell)
end,
},
{
name = "SelfShield",
type = "Spell",
cond = function(self, spell)
return RGMercUtils.SelfBuffCheck(spell)
end,
},
{
name = "Thaumaturge's Unity",
type = "AA",
cond = function(self, aaName)
return RGMercUtils.SelfBuffAACheck(aaName) and RGMercUtils.AAReady(aaName)
end,
},
{
name = "FireOrbSummon",
type = "Spell",
cond = function(self, spell)
return mq.TLO.FindItemCount(spell.RankName.Base(1)() or "") == 0
end,
},
{
name = "EarthPetItemSummon",
type = "Spell",
cond = function(self, spell)
return mq.TLO.FindItemCount(spell.RankName.Base(1)() or "") == 0
end,
},
{
name = "FirePetItemSummon",
type = "Spell",
cond = function(self, spell)
return mq.TLO.FindItemCount(spell.RankName.Base(1)() or "") == 0
end,
},
{
name = "LongDurDmgShield",
type = "Spell",
cond = function(self, spell)
return RGMercUtils.SelfBuffCheck(spell)
end,
},
{
name = "PetManaConv",
type = "Spell",
cond = function(self, spell)
return not RGMercUtils.BuffActiveByName(mq.TLO.Spell(spell.AutoCast() or "").Name() or "") and mq.TLO.Me.Pet.ID() > 0
end,
},
{
name = "Elemental Form",
type = "AA",
cond = function(self, aaName)
return RGMercUtils.SelfBuffAACheck(aaName) and RGMercUtils.AAReady(aaName)
end,
},
{
name = "Epic",
type = "Item",
cond = function(self, itemName)
return not mq.TLO.Me.PetBuff("Primal Fusion")() and not mq.TLO.Me.PetBuff("Elemental Conjuction")() and mq.TLO.FindItem(itemName).TimerReady() and
mq.TLO.Me.Pet.ID() > 0
end,
},
{
name = "PetIceFlame",
type = "Spell",
cond = function(self, spell)
return RGMercUtils.SelfBuffPetCheck(spell)
end,
},
{
name = "PetHaste",
type = "Spell",
cond = function(self, spell)
return RGMercUtils.SelfBuffPetCheck(spell)
end,
},
{
name = "LongDurDmgShield",
type = "Spell",
cond = function(self, spell)
return RGMercUtils.SelfBuffPetCheck(spell) and mq.TLO.Me.AltAbility("Companions Discipline")
end,
},
{
name = "Second Wind Ward",
type = "AA",
cond = function(self, aaName)
return RGMercUtils.SelfBuffPetCheck(mq.TLO.Spell(aaName)) and RGMercUtils.AAReady(aaName)
end,
},
{
name = "Host in the Shell",
type = "AA",
cond = function(self, aaName)
return RGMercUtils.SelfBuffPetCheck(mq.TLO.Spell(aaName)) and RGMercUtils.IsModeActive("PetTank") and RGMercUtils.AAReady(aaName)
end,
},
{
name = "Companion's Aegis",
type = "AA",
cond = function(self, aaName)
return RGMercUtils.SelfBuffPetCheck(mq.TLO.Spell(aaName)) and RGMercUtils.IsModeActive("PetTank") and RGMercUtils.AAReady(aaName)
end,
},
{
name = "Companion's Intervening Divine Aura",
type = "AA",
cond = function(self, aaName)
return RGMercUtils.SelfBuffPetCheck(mq.TLO.Spell(aaName)) and RGMercUtils.IsModeActive("PetTank") and RGMercUtils.AAReady(aaName)
end,
},


},
},
['Spells'] = {
Expand Down
2 changes: 1 addition & 1 deletion extras/version.lua
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
return { commitId = '4b35407 2024-03-08' }
return { commitId = '7cdf41b 2024-03-08' }

0 comments on commit a560aa5

Please sign in to comment.