--- ../../1.6.2/GilesTrinity.cs 2012-10-09 02:59:30.000000000 -0700
+++ GilesTrinity.cs 2012-10-09 09:28:24.510146000 -0700
@@ -30,7 +30,7 @@
{
public Version Version { get { return new Version(1, 6, 2); } }
public string Author { get { return "GilesSmith"; } }
- public string Description { get { return "GilesTrinity version " + Version; } }
+ public string Description { get { return "GilesTrinity version " + Version + "+beardi"; } }
public string Name { get { return "GilesTrinity"; } }
public bool Equals(IPlugin other) { return (other.Name == Name) && (other.Version == Version); }
@@ -184,7 +184,7 @@
// Wood wraiths all this line (495 & 496 & 6572 & 139454 & 139456 & 170324 & 170325)
{495, 901}, {496, 901}, {6572, 901}, {139454, 901}, {139456, 901}, {170324, 901}, {170325, 901},
// Fallen Shaman prophets goblin Summoners (365 & 4100)
- {365, 1901}, {4100, 1901},
+ //{365, 1901}, {4100, 1901},
// The annoying grunts summoned by the above
{4084, -401},
// Wretched mothers that summon zombies in act 1 (6639)
@@ -232,7 +232,9 @@
// A list of ranged mobs that should be attacked even if they are outside of the routines current kill radius
//365, 4100 = fallen; 4300, 4304 = goat shaman; 4738 = pestilence; 4299 = goat ranged; 62736, 130794 = demon flyer; 5508 = succubus
private static readonly HashSet<int> hashActorSNORanged = new HashSet<int> {
- 365, 4100, 4304, 4300, 4738, 4299, 62736, 130794, 5508,
+ // 365, 4100,
+ 4304, 4300, 4738, 4299, 62736,
+ // 130794, 5508,
};
// A list of bosses in the game, just to make CERTAIN they are treated as elites
private static readonly HashSet<int> hashBossSNO = new HashSet<int> {
@@ -5984,12 +5986,12 @@
{SNOPower.Wizard_Blizzard, 6000}, // Effect lasts for 6 seconds, actual cooldown is 0...
{SNOPower.Wizard_IceArmor, 115000},
{SNOPower.Wizard_StormArmor, 115000},
- {SNOPower.Wizard_MagicWeapon, 60000},
+ {SNOPower.Wizard_MagicWeapon, 180000},
{SNOPower.Wizard_Familiar, 60000},
- {SNOPower.Wizard_EnergyArmor, 115000},
+ {SNOPower.Wizard_EnergyArmor, 6000},
{SNOPower.Wizard_ExplosiveBlast, 6000},
{SNOPower.Wizard_MirrorImage, 5000},
- {SNOPower.Wizard_Archon, 100000}, // Actually 120 seconds, but 100 seconds with a rune
+ {SNOPower.Wizard_Archon, 30000}, // Actually 120 seconds, but 100 seconds with a rune
{SNOPower.Wizard_Archon_ArcaneBlast, 5000},
{SNOPower.Wizard_Archon_ArcaneStrike, 200},
{SNOPower.Wizard_Archon_DisintegrationWave, 5},
@@ -7064,7 +7066,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] >= 1 || ((targetCurrent.bThisEliteRareUnique || targetCurrent.bThisBoss) && targetCurrent.fRadiusDistance <= 30f)) &&
playerStatus.dCurrentEnergy >= 25 && playerStatus.dCurrentHealthPct >= 0.10 &&
(GilesUseTimer(SNOPower.Wizard_Archon) ||
(settings.bEnableCriticalMass && DateTime.Now.Subtract(dictAbilityLastUse[SNOPower.Wizard_Archon]).TotalMilliseconds >= 20000)) &&
@@ -7205,7 +7207,7 @@
{
// Archon form
// Archon Slow Time for in combat
- if (!bOOCBuff && !playerStatus.bIsIncapacitated &&
+ if (!bOOCBuff &&
(iElitesWithinRange[RANGE_25] > 0 || iAnythingWithinRange[RANGE_25] > 1 || playerStatus.dCurrentHealthPct <= 0.7 || ((targetCurrent.bThisEliteRareUnique || targetCurrent.bThisTreasureGoblin || targetCurrent.bThisBoss) && targetCurrent.fRadiusDistance <= 35f)) &&
hashPowerHotbarAbilities.Contains(SNOPower.Wizard_Archon_SlowTime) &&
GilesUseTimer(SNOPower.Wizard_Archon_SlowTime, true) && PowerManager.CanCast(SNOPower.Wizard_Archon_SlowTime))
@@ -7222,7 +7224,7 @@
return new GilesPower(SNOPower.Wizard_Archon_Teleport, 35f, vNewTarget, iCurrentWorldID, -1, 1, 1, USE_SLOWLY);
}
// Arcane Blast
- if (!bOOCBuff && !playerStatus.bIsIncapacitated &&
+ if (!bOOCBuff &&
(iElitesWithinRange[RANGE_15] >= 1 || iAnythingWithinRange[RANGE_15] >= 1 ||
((targetCurrent.bThisEliteRareUnique || targetCurrent.bThisBoss) && targetCurrent.fRadiusDistance <= 15f)) &&
GilesUseTimer(SNOPower.Wizard_Archon_ArcaneBlast) && PowerManager.CanCast(SNOPower.Wizard_Archon_ArcaneBlast))
@@ -7230,10 +7232,10 @@
return new GilesPower(SNOPower.Wizard_Archon_ArcaneBlast, 0f, vNullLocation, iCurrentWorldID, -1, 0, 0, USE_SLOWLY);
}
// Arcane Strike (Arcane Strike) Rapid Spam at close-range only
- if (!bOOCBuff && !playerStatus.bIsIncapacitated && targetCurrent.fRadiusDistance <= 13f &&
+ if (!bOOCBuff && targetCurrent.fRadiusDistance <= 13f &&
(targetCurrent.bThisEliteRareUnique || targetCurrent.bThisBoss))
{
- return new GilesPower(SNOPower.Wizard_Archon_ArcaneStrike, 11f, vNullLocation, -1, targetCurrent.iThisACDGUID, 0, 0, USE_SLOWLY);
+ return new GilesPower(SNOPower.Wizard_Archon_ArcaneStrike, 10f, vNullLocation, -1, targetCurrent.iThisACDGUID, 0, 0, USE_SLOWLY);
}
// Disintegrate
if (!bOOCBuff && !bCurrentlyAvoiding && !playerStatus.bIsIncapacitated)