--- GilesTrinity.cs-dist 2012-10-19 10:42:26.000000000 -0700
+++ GilesTrinity.cs 2012-10-30 13:07:31.367118100 -0700
@@ -30,7 +30,7 @@
{
public Version Version { get { return new Version(1, 6, 3, 4); } }
public string Author { get { return "GilesSmith"; } }
- public string Description { get { return "GilesTrinity version " + Version; } }
+ public string Description { get { return "GilesTrinity version " + Version + "-archon"; } }
public string Name { get { return "GilesTrinity"; } }
public bool Equals(IPlugin other) { return (other.Name == Name) && (other.Version == Version); }
@@ -7106,15 +7106,15 @@
// Storm Armor
else if (hashPowerHotbarAbilities.Contains(SNOPower.Wizard_StormArmor))
{
- if (!GilesHasBuff(SNOPower.Wizard_StormArmor) && PowerManager.CanCast(SNOPower.Wizard_StormArmor))
+ if (!GilesHasBuff(SNOPower.Wizard_StormArmor) || ((DateTime.Now.Subtract(dictAbilityLastUse[SNOPower.Wizard_StormArmor]).TotalMilliseconds >= 15000) && PowerManager.CanCast(SNOPower.Wizard_Archon)))
{
return new GilesPower(SNOPower.Wizard_StormArmor, 0f, vNullLocation, iCurrentWorldID, -1, 1, 2, USE_SLOWLY);
}
}
}
// Magic Weapon
- if (!playerStatus.bIsIncapacitated && hashPowerHotbarAbilities.Contains(SNOPower.Wizard_MagicWeapon) &&
- playerStatus.dCurrentEnergy >= 25 && (GilesUseTimer(SNOPower.Wizard_MagicWeapon) || !GilesHasBuff(SNOPower.Wizard_MagicWeapon)))
+ if (!playerStatus.bIsIncapacitated && hashPowerHotbarAbilities.Contains(SNOPower.Wizard_MagicWeapon) && PowerManager.CanCast(SNOPower.Wizard_MagicWeapon) &&
+ (!GilesHasBuff(SNOPower.Wizard_MagicWeapon) || ((DateTime.Now.Subtract(dictAbilityLastUse[SNOPower.Wizard_MagicWeapon]).TotalMilliseconds >= 10000) && PowerManager.CanCast(SNOPower.Wizard_Archon))))
{
return new GilesPower(SNOPower.Wizard_MagicWeapon, 0f, vNullLocation, iCurrentWorldID, -1, 1, 2, USE_SLOWLY);
}
@@ -7153,7 +7153,7 @@
}
// Archon
if (!bOOCBuff && !bCurrentlyAvoiding && hashPowerHotbarAbilities.Contains(SNOPower.Wizard_Archon) &&
- (iElitesWithinRange[RANGE_30] >= 1 || iAnythingWithinRange[RANGE_25] >= 1 || playerStatus.dCurrentHealthPct <= 0.6 || ((targetCurrent.bThisEliteRareUnique || targetCurrent.bThisBoss) && targetCurrent.fRadiusDistance <= 30f)) &&
+ (iElitesWithinRange[RANGE_30] >= 1 || iAnythingWithinRange[RANGE_25] >= 3 || ((targetCurrent.bThisEliteRareUnique || targetCurrent.bThisBoss) && targetCurrent.fRadiusDistance <= 30f)) &&
playerStatus.dCurrentEnergy >= 25 && playerStatus.dCurrentHealthPct >= 0.10 &&
PowerManager.CanCast(SNOPower.Wizard_Archon))
{
@@ -7278,7 +7278,7 @@
// Electrocute
if (!bOOCBuff && !bCurrentlyAvoiding && hashPowerHotbarAbilities.Contains(SNOPower.Wizard_Electrocute))
{
- return new GilesPower(SNOPower.Wizard_Electrocute, 18f, vNullLocation, -1, targetCurrent.iThisACDGUID, 0, 0, USE_SLOWLY);
+ return new GilesPower(SNOPower.Wizard_Electrocute, 40f, vNullLocation, -1, targetCurrent.iThisACDGUID, 0, 0, USE_SLOWLY);
}
// Default attacks
if (!bOOCBuff && !bCurrentlyAvoiding && !playerStatus.bIsIncapacitated)