Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR - /MaxAggro for nukes & a bit of cleanup of ini files. #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions e3 Includes/e3_Assists.inc
Original file line number Diff line number Diff line change
Expand Up @@ -446,6 +446,13 @@ SUB check_Nukes
/goto :skipCast
}
}
|only cast if my aggro is less than MaxAggro, else skip the spell
/if (${Nukes2D[${castIndex},${iMaxAggro}]}) {
/if (${Me.PctAggro} > ${Nukes2D[${castIndex},${iMaxAggro}]}) {
/if (${Debug} || ${Debug_Assists}) /echo \ay skipping cast of ${Nukes2D[${castIndex},${iCastName}]}, my aggro ${Me.PctAggro} is > MaxAggro ${Nukes2D[${castIndex},${iMaxAggro}]}
/goto :skipCast
}
}
|only cast if my aggro is greater than PctAggro and the target is a Named
/if (${Nukes2D[${castIndex},${iPctAggro}]} > 0) {
/if (${Me.PctAggro} < ${Nukes2D[${castIndex},${iPctAggro}]} || !${Target.Named}) {
Expand Down
41 changes: 27 additions & 14 deletions e3 Includes/e3_Utilities.inc
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ SUB ListToArray(ArrayName, Data, delimiter)
SUB BuildSpellArray(ArrayName, NewArrayName)
|/echo Array ${ArrayName} ${NewArrayName}
/if (!${Defined[SpellProp]}) {
/declare SpellProp[38] string outer 0
/declare SpellProp[39] string outer 0
/varset SpellProp[1] CastName
/varset SpellProp[2] CastType
/varset SpellProp[3] TargetType
Expand Down Expand Up @@ -222,13 +222,14 @@ SUB BuildSpellArray(ArrayName, NewArrayName)
/varset SpellProp[29] CastInvis
/varset SpellProp[30] SpellType
/varset SpellProp[31] CastTarget
/varset SpellProp[32] GiftOfMana
/varset SpellProp[33] CheckForID
/varset SpellProp[34] SpellID
/varset SpellProp[32] GiftOfMana
/varset SpellProp[33] CheckForID
/varset SpellProp[34] SpellID
/varset SpellProp[35] PctAggro
/varset SpellProp[36] Zone
/varset SpellProp[37] MinSick
/varset SpellProp[38] Ifs
/varset SpellProp[37] MinSick
/varset SpellProp[38] Ifs
/varset SpellProp[39] iMaxAggro
}

/if (${Defined[${NewArrayName}]}) /deletevar ${NewArrayName}
Expand Down Expand Up @@ -260,20 +261,21 @@ SUB BuildSpellArray(ArrayName, NewArrayName)
/if (!${Defined[iNoBurn]}) /declare iNoBurn int outer 22
/if (!${Defined[iNoAggro]}) /declare iNoAggro int outer 23
/if (!${Defined[iMode]}) /declare iMode int outer 24
/if (!${Defined[iRotate]}) /declare iRotate int outer 25
/if (!${Defined[iRotate]}) /declare iRotate int outer 25
/if (!${Defined[iDelay]}) /declare iDelay int outer 26
/if (!${Defined[iCastID]}) /declare iCastID int outer 27
/if (!${Defined[iMinEnd]}) /declare iMinEnd int outer 28
/if (!${Defined[iCastInvis]}) /declare iCastInvis int outer 29
/if (!${Defined[iSpellType]}) /declare iSpellType int outer 30
/if (!${Defined[iCastTarget]}) /declare iCastTarget int outer 31
/if (!${Defined[iGiftOfMana]}) /declare iGiftOfMana int outer 32
/if (!${Defined[iCheckForID]}) /declare iCheckForID int outer 33
/if (!${Defined[iSpellID]}) /declare iSpellID int outer 34
/if (!${Defined[iPctAggro]}) /declare iPctAggro int outer 35
/if (!${Defined[iZone]}) /declare iZone int outer 36
/if (!${Defined[iMinSick]}) /declare iMinSick int outer 37
/if (!${Defined[iIfs]}) /declare iIfs int outer 38
/if (!${Defined[iGiftOfMana]}) /declare iGiftOfMana int outer 32
/if (!${Defined[iCheckForID]}) /declare iCheckForID int outer 33
/if (!${Defined[iSpellID]}) /declare iSpellID int outer 34
/if (!${Defined[iPctAggro]}) /declare iPctAggro int outer 35
/if (!${Defined[iZone]}) /declare iZone int outer 36
/if (!${Defined[iMinSick]}) /declare iMinSick int outer 37
/if (!${Defined[iIfs]}) /declare iIfs int outer 38
/if (!${Defined[iMaxAggro]}) /declare iMaxAggro int outer 39

/declare i int local
/declare printAll bool local FALSE
Expand Down Expand Up @@ -658,6 +660,17 @@ SUB BuildSpellArray(ArrayName, NewArrayName)
/varset ${NewArrayName}[${i},${iIfs}] TRUE
/if (${printAll}) /echo Ifs TRUE
}

| get iMaxAggro
/if (${${ArrayName}[${i}].Find[/MaxAggro|]}) {
/call argueString MaxAggro| "${${ArrayName}[${i}]}"
/varset ${NewArrayName}[${i},${iMaxAggro}] ${c_argueString}
} else {
|default MaxAggro to 200, cast even when having aggro
/varset ${NewArrayName}[${i},${iMaxAggro}] 200
}
/if (${printAll}) /echo MaxAggro ${${NewArrayName}[${i},${iMaxAggro}]}

|default casting while invis to 0 which impies no casting while invis
/varset ${NewArrayName}[${i},${iCastInvis}] 0
/if (${printAll}) /echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion e3 Macro Inis/General Settings.ini
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ Short Term Debuff Recast(s)=5
[Corpse Summoning]
Loot After Summoning (On/Off)=Off
[Loot]
Loot Link Channel=gu
Loot Link Channel=say
Corpse Seek Radius=125
Loot In Combat=TRUE
[Sell]
Expand Down
Loading