update aetherRange

BotLib/hero_abyssal_underlord.lua

@@ -122,8 +122,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	aetherRange = J.GetBonusCastRange( bot )
+
 
     castQDesire, castQLocation, sMotive = X.ConsiderQ()
     if ( castQDesire > 0 ) then

BotLib/hero_alchemist.lua

@@ -110,8 +110,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
     castW2Desire, castW2Target, sMotive = X.ConsiderW2()
 	if ( castW2Desire > 0 ) then

BotLib/hero_axe.lua

@@ -168,7 +168,7 @@ function X.SkillsComplement()
 
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
+	
 	if aether ~= nil then aetherRange = 225 end
 	
 	castRDesire, castRTarget, sMotive = X.ConsiderR()

BotLib/hero_bane.lua

@@ -195,8 +195,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent4:IsTrained() then aetherRange = aetherRange + talent4:GetSpecialValueInt( "value" ) end
 	if talent7:IsTrained() then talent7Damage = talent7:GetSpecialValueInt( "value" ) end
 

BotLib/hero_bounty_hunter.lua

@@ -172,8 +172,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 	if talent3:IsTrained() then talent3Damage = talent3:GetSpecialValueInt( "value" ) end
 
 

BotLib/hero_centaur.lua

@@ -105,8 +105,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
     castQDesire, sMotive = X.ConsiderQ()
     if ( castQDesire > 0 ) then

BotLib/hero_clinkz.lua

@@ -149,8 +149,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	castEDesire, sMotive = X.ConsiderE()
 	if ( castEDesire > 0 )

BotLib/hero_crystal_maiden.lua

@@ -167,7 +167,7 @@ function X.SkillsComplement()
 	nHP = bot:GetHealth()/bot:GetMaxHealth()
 	nLV = bot:GetLevel()
 	local aether = J.IsItemAvailable( 'item_aether_lens' )
-	if aether ~= nil then aetherRange = 250 end
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent2:IsTrained() then aetherRange = aetherRange + talent2:GetSpecialValueInt( 'value' ) end
 
 

BotLib/hero_dazzle.lua

@@ -180,7 +180,7 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
+	
 	if aether ~= nil then aetherRange = 225 end
 
 

BotLib/hero_death_prophet.lua

@@ -187,8 +187,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent4:IsTrained() then aetherRange = aetherRange + talent4:GetSpecialValueInt( "value" ) end
 
 	castWDesire, castWLocation, sMotive = X.ConsiderW()

BotLib/hero_disruptor.lua

@@ -164,8 +164,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castWDesire, castWTarget, sMotive = X.ConsiderW()

BotLib/hero_huskar.lua

@@ -160,8 +160,8 @@ function X.SkillsComplement()
 	abilityH = J.IsItemAvailable( "item_hurricane_pike" )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent6:IsTrained() then talent6Range = talent6:GetSpecialValueInt( "value" ) end
 
 

BotLib/hero_jakiro.lua

@@ -185,8 +185,8 @@ function X.SkillsComplement()
 	hEnemyHeroList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castWDesire, castWLocation = X.ConsiderW()

BotLib/hero_juggernaut.lua

@@ -160,8 +160,8 @@ function X.SkillsComplement()
 
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castDDesire, castDTarget, sMotive = X.ConsiderD()

BotLib/hero_legion_commander.lua

@@ -172,8 +172,8 @@ function X.SkillsComplement()
 
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	
 	castRDesire, castRTarget, sMotive = X.ConsiderR()

BotLib/hero_lich.lua

@@ -196,8 +196,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1200 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent1:IsTrained() then aetherRange = aetherRange + talent1:GetSpecialValueInt( "value" ) end
 
 

BotLib/hero_life_stealer.lua

@@ -112,8 +112,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
     castQDesire, sMotive = X.ConsiderQ()
     if ( castQDesire > 0 ) then

BotLib/hero_lina.lua

@@ -186,8 +186,8 @@ function X.SkillsComplement()
 
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent2:IsTrained() then aetherRange = aetherRange + talent2:GetSpecialValueInt( "value" ) end
 	if talent4:IsTrained() then talent4Damage = talent4Damage + talent4:GetSpecialValueInt( "value" ) end
 

BotLib/hero_lion.lua

@@ -185,8 +185,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent4:IsTrained() then aetherRange = aetherRange + talent4:GetSpecialValueInt( "value" ) end
 	
 

BotLib/hero_luna.lua

@@ -157,8 +157,8 @@ function X.SkillsComplement()
 	nHP = bot:GetHealth()/bot:GetMaxHealth()
 	nLV = bot:GetLevel()
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 --	if talent2:IsTrained() then aetherRange = aetherRange + talent2:GetSpecialValueInt( "value" ) end
 	if talent6:IsTrained() then talent6BonusDamage = talent6:GetSpecialValueInt( "value" ) end

BotLib/hero_mirana.lua

@@ -149,7 +149,7 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc(bot:GetLocation(), 1600);
 	
 	local aether = J.IsItemAvailable("item_aether_lens");
-	if aether ~= nil then aetherRange = 250 end	
+	aetherRange = J.GetBonusCastRange( bot )	
 	
 	
 	castQDesire, castQTarget, sMotive = X.ConsiderQ();

BotLib/hero_muerta.lua

@@ -144,8 +144,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	--无论如何，大招期间绝不逃跑
 	if bot:HasModifier('modifier_muerta_pierce_the_veil_buff') and not bot:IsDisarmed() then

BotLib/hero_naga_siren.lua

@@ -156,7 +156,7 @@ function X.SkillsComplement()
 	
 	
 	local aether = J.IsItemAvailable("item_aether_lens");
-	if aether ~= nil then aetherRange = 250 end	
+	aetherRange = J.GetBonusCastRange( bot )	
 	
 	
 	castQDesire, castQTarget, sMotive = X.ConsiderQ();

BotLib/hero_ogre_magi.lua

@@ -220,8 +220,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent2:IsTrained() then aetherRange = aetherRange + talent2:GetSpecialValueInt( "value" ) end
 	if talent8:IsTrained() then talent8Damage = talent8Damage + talent8:GetSpecialValueInt( "value" ) end
 

BotLib/hero_omniknight.lua

@@ -177,8 +177,8 @@ function X.SkillsComplement()
 
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	
 	castRDesire, castRTarget, sMotive = X.ConsiderR()

BotLib/hero_oracle.lua

@@ -171,8 +171,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent3:IsTrained() then aetherRange = aetherRange + talent3:GetSpecialValueInt( "value" ) end
 
 	castRDesire, castRTarget, sMotive = X.ConsiderR()
@@ -536,6 +536,7 @@ function X.ConsiderR()
 			end
 
 			if J.IsGoingOnSomeone( ally ) and J.GetHP( ally ) < 0.3
+				and not J.HasForbiddenModifier( ally )
 			then
 				local allyTarget = J.GetProperTarget( ally )
 				if J.IsValidHero( allyTarget )

BotLib/hero_phantom_lancer.lua

@@ -167,8 +167,8 @@ function X.SkillsComplement()
 	if abilityE:IsTrained() then boostRange = abilityE:GetSpecialValueInt( "max_distance" ) end
 --	if talent4:IsTrained() then talent4Damage = talent4:GetSpecialValueInt( "value" ) end
 	if talent5:IsTrained() then boostRange = boostRange + talent5:GetSpecialValueInt( "value" ) end
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castQDesire, castQTarget, sMotive = X.ConsiderQ()

BotLib/hero_pugna.lua

@@ -178,8 +178,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 	if talent7:IsTrained() then talent7Damage = talent7:GetSpecialValueInt( "value" ) end
 
 

BotLib/hero_queenofpain.lua

@@ -173,7 +173,7 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc(bot:GetLocation(), 1600);
 	
 	local aether = J.IsItemAvailable("item_aether_lens");
-	if aether ~= nil then aetherRange = 250 end	
+	aetherRange = J.GetBonusCastRange( bot )	
 	
 	
 	castRDesire, castRTarget, sMotive = X.ConsiderR();

BotLib/hero_razor.lua

@@ -172,8 +172,8 @@ function X.SkillsComplement()
 	botTarget = J.GetProperTarget( bot )
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 	if #hEnemyList <= 1 then aetherRange = aetherRange + 200 end
 
 

BotLib/hero_riki.lua

@@ -143,8 +143,8 @@ function X.SkillsComplement()
 	nAttackPoint = bot:GetSecondsPerAttack()
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	castQDesire, castQTarget, sMotive = X.ConsiderQ()
 	if ( castQDesire > 0 )

BotLib/hero_sand_king.lua

@@ -167,8 +167,8 @@ function X.SkillsComplement()
 	hEnemyList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	castQDesire, castQTarget, sMotive = X.ConsiderQ()
 	if ( castQDesire > 0 )

BotLib/hero_shadow_shaman.lua

@@ -184,8 +184,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 --	if talent3:IsTrained() then aetherRange = aetherRange + talent3:GetSpecialValueInt( "value" ) end
 	if talent7:IsTrained() then talent7Damage = talent7:GetSpecialValueInt( "value" ) end
 

BotLib/hero_silencer.lua

@@ -169,8 +169,8 @@ function X.SkillsComplement()
 	hEnemyHeroList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 
 	--计算天赋可能带来的变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castRDesire			 = X.ConsiderR()

BotLib/hero_skywrath_mage.lua

@@ -179,8 +179,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1600 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castEDesire, castETarget, sMotive = X.ConsiderE()

BotLib/hero_tidehunter.lua

@@ -159,8 +159,8 @@ function X.SkillsComplement()
 
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	
 	castRDesire, sMotive = X.ConsiderR()

BotLib/hero_warlock.lua

@@ -207,8 +207,8 @@ function X.SkillsComplement()
 
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 
 	castRFRDesire, castRFRLocation = X.ConsiderRFR()

BotLib/hero_windrunner.lua

@@ -194,8 +194,8 @@ function X.SkillsComplement()
 
 
 	--计算天赋可能带来的通用变化
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	castQDesire, castQTarget, sMotive = X.ConsiderQ()
 	if castQDesire > 0

BotLib/hero_witch_doctor.lua

@@ -185,8 +185,8 @@ function X.SkillsComplement()
 	hAllyList = J.GetAlliesNearLoc( bot:GetLocation(), 1200 )
 
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 
 	
 	castASDesire, sMotive = X.ConsiderAS()

BotLib/hero_zuus.lua

@@ -177,8 +177,8 @@ function X.SkillsComplement()
 	nHealthPercentage = bot:GetHealth()/bot:GetMaxHealth()
 	hEnemyHeroList = bot:GetNearbyHeroes( 1600, true, BOT_MODE_NONE )
 
-	local aether = J.IsItemAvailable( "item_aether_lens" )
-	if aether ~= nil then aetherRange = 250 end
+	
+	aetherRange = J.GetBonusCastRange( bot )
 	if abilityAS:IsTrained() then abilityASBonus = 0.09 end
 	if talent8:IsTrained() then talentDamage = talentDamage + talent8:GetSpecialValueInt( "value" ) end
 

FunLib/aba_buff.lua

@@ -22,6 +22,7 @@ Buff["enemy_is_immune"] = {
 "modifier_winter_wyvern_winters_curse_aura", --冰龙大
 "modifier_troll_warlord_battle_trance", --巨魔大
 "modifier_naga_siren_song_of_the_siren",--娜迦大
+"modifier_skeleton_king_reincarnation_scepter_active",--骷髅王A杖
 --"modifier_modifier_dazzle_shallow_grave",
 --"modifier_oracle_false_promise_timer",
 --"modifier_item_blade_mail_reflect",
@@ -34,7 +35,7 @@ Buff["enemy_is_undead"] = {
 "modifier_dazzle_shallow_grave",
 "modifier_oracle_false_promise_timer",
 "modifier_abaddon_borrowed_time",
-
+"modifier_skeleton_king_reincarnation_scepter_active",
 }
 
 Buff["enemy_not_illusion"] = {