Commit fe26de67 authored by Excelsior's avatar Excelsior

Tame the Beast can no longer convert Wargs and Warg Riders but instead grant experience to them.

parent 74cc899f
......@@ -215,7 +215,10 @@ Dwarves
Isengard
- Sharku's Tame the Beast special ability can now convert Dire Wolves and Wolf Riders.
- Sharku:
--- Tame the Beast:
--- can no longer convert Wargs and Warg Riders but instead grant experience to them.
--- now uses a new button icon.
- Uruk Pikemen now have a new attack animation.
- Battle Tower now shares the FortressExpansionArmor with all other towers.
- Wall now has 1% armour against crush damage.
......
......@@ -11763,12 +11763,12 @@ End
CommandButton Command_SpecialAbilityTameTheBeast
Command = SPECIAL_POWER
SpecialPower = SpecialAbilityTameTheBeast
Options = NEED_TARGET_ENEMY_OBJECT NEED_TARGET_NEUTRAL_OBJECT ;;,;; NEED_TARGET_POS CONTEXTMODE_COMMAND
Options = NEED_TARGET_POS CONTEXTMODE_COMMAND ;,; NEED_TARGET_ENEMY_OBJECT NEED_TARGET_NEUTRAL_OBJECT ;;,;; NEED_TARGET_POS CONTEXTMODE_COMMAND
TextLabel = CONTROLBAR:TameTheBeast
ButtonImage = HSSharkuTameBeastWarg ;,; HSSharkuTameBeast
;;,;; RadiusCursorType = DominateRadiusCursor
CursorName = EvilAbilityObj ;;,;; added
InvalidCursorName = GenericInvalid ;;,;; added
RadiusCursorType = KingsFavorRadiusCursor ;,; DominateRadiusCursor ;,; Uncommented
;,; CursorName = EvilAbilityObj ;;,;; added
;,; InvalidCursorName = GenericInvalid ;;,;; added
ButtonBorderType = ACTION
DescriptLabel = CONTROLBAR:ToolTipTameTheBeast
InPalantir = Yes
......
......@@ -709,40 +709,76 @@ Object IsengardSharku
;//----------------------Tame The Beast Ability-----------------------------------------------
Behavior = UnpauseSpecialPowerUpgrade ModuleTag_DominateEnabler
SpecialPowerTemplate = SpecialAbilityTameTheBeast
TriggeredBy = Upgrade_SharkuTameTheBeast
End
Behavior = SpecialPowerModule ModuleTag_DominateEnemySpecialPowerModule
SpecialPowerTemplate = SpecialAbilityTameTheBeast
StartsPaused = Yes
UpdateModuleStartsAttack = Yes
InitiateSound = SharkuVoiceAttack
; AttributeModifierAffects = NONE +IsengardWargRiderHorde +NeutralWarg ;;,;; Removed for v2.3
End
Behavior = DominateEnemySpecialPower ModuleTag_DominateEnemySpecialPower
SpecialPowerTemplate = SpecialAbilityTameTheBeast
UnpackingVariation = 1
StartAbilityRange = 200.0
DominateRadius = 60 ;
DominatedFX = FX_SarumanDominateTargets
TriggerFX = FX_SarumanDominateTrigger
UnpackTime = 2000
PreparationTime = 1
;;,;; AttributeModifierAffects = NONE +IsengardWargRiderHorde +NeutralWarg +IsengardWargPack +IsengardWargPackHorde
AttributeModifierAffects = NONE +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner +NeutralWarg +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;,; Added +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;;,;;
FreezeAfterTriggerDuration = 2500 ; Hold AI for this long after we fire.
PermanentlyConvert = Yes ;;,;; Added for 2.3
End
;,; Behavior = UnpauseSpecialPowerUpgrade ModuleTag_DominateEnabler
;,; SpecialPowerTemplate = SpecialAbilityTameTheBeast
;,; TriggeredBy = Upgrade_SharkuTameTheBeast
;,; End
;,; Behavior = SpecialPowerModule ModuleTag_DominateEnemySpecialPowerModule
;,; SpecialPowerTemplate = SpecialAbilityTameTheBeast
;,; StartsPaused = Yes
;,; UpdateModuleStartsAttack = Yes
;,; InitiateSound = SharkuVoiceAttack
;,;; AttributeModifierAffects = NONE +IsengardWargRiderHorde +NeutralWarg ;;,;; Removed for v2.3
;,; End
;,; Behavior = DominateEnemySpecialPower ModuleTag_DominateEnemySpecialPower
;,; SpecialPowerTemplate = SpecialAbilityTameTheBeast
;,; UnpackingVariation = 1
;,; StartAbilityRange = 200.0
;,; DominateRadius = 60 ;
;,; DominatedFX = FX_SarumanDominateTargets
;,; TriggerFX = FX_SarumanDominateTrigger
;,; UnpackTime = 2000
;,; PreparationTime = 1
;,; ;;,;; AttributeModifierAffects = NONE +IsengardWargRiderHorde +NeutralWarg +IsengardWargPack +IsengardWargPackHorde
;,; AttributeModifierAffects = NONE +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner +NeutralWarg +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;,; Added +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;;,;;
;,; FreezeAfterTriggerDuration = 2500 ; Hold AI for this long after we fire.
;,; PermanentlyConvert = Yes ;;,;; Added for 2.3
;,; End
Behavior = AutoAbilityBehavior ModuleTag_DominateEnemyAutoAbility ;;,;;
SpecialAbility = SpecialAbilityTameTheBeast
ForbiddenStatus = INSIDE_GARRISON ;;,;; This seems to prevent the ability from being used inside a tower. Not that it matters with Sharku
MaxScanRange = 200
Query = 8 NONE ENEMIES +IsengardWargRider +IsengardWargPack +AngmarDireWolf +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;,; +AngmarDireWolf +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;;,;; 10 ANY +IsengardWargRider +IsengardWargPack ;;,;; Changed for v3.0.2
End
;,; Behavior = AutoAbilityBehavior ModuleTag_DominateEnemyAutoAbility ;;,;;
;,; SpecialAbility = SpecialAbilityTameTheBeast
;,; ForbiddenStatus = INSIDE_GARRISON ;;,;; This seems to prevent the ability from being used inside a tower. Not that it matters with Sharku
;,; MaxScanRange = 200
;,; Query = 8 NONE ENEMIES +IsengardWargRider +IsengardWargPack +AngmarDireWolf +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;,; +AngmarDireWolf +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;;,;; 10 ANY +IsengardWargRider +IsengardWargPack ;;,;; Changed for v3.0.2
;,; End
;//---------------------- Train Wargs Ability ---------------------- ;,;
Behavior = UnpauseSpecialPowerUpgrade ModuleTag_TrainWargsEnabler
SpecialPowerTemplate = SpecialAbilityTameTheBeast
TriggeredBy = Upgrade_SharkuTameTheBeast
End
Behavior = SpecialPowerModule ModuleTag_TrainWargsSpecialPowerModule
SpecialPowerTemplate = SpecialAbilityTameTheBeast
StartsPaused = Yes
UpdateModuleStartsAttack = Yes
InitiateSound = SharkuVoiceTrain
End
Behavior = LevelGrantSpecialPower ModuleTag_TrainWargs
SpecialPowerTemplate = SpecialAbilityTameTheBeast
UnpackingVariation = 1
StartAbilityRange = 200.0
LevelFX = FX_LevelUp
Experience = 100
RadiusEffect = 150
AcceptanceFilter = NONE +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner
UnpackTime = 2000
PreparationTime = 0
FreezeAfterTriggerDuration = 2000 ; Hold AI for this long after we fire.
End
Behavior = AutoAbilityBehavior ModuleTag_TrainWargsAutoAbility
SpecialAbility = SpecialAbilityTameTheBeast
ForbiddenStatus = INSIDE_GARRISON ;;,;; This seems to prevent the ability from being used inside a tower
MaxScanRange = 200
Query = 10 ANY +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner
End
;//----------------------Man Eater-----------------------------------------------
......@@ -852,7 +888,7 @@ Object IsengardSharku
Behavior = AISpecialPowerUpdate TameAI
CommandButtonName = Command_SpecialAbilityTameTheBeast
SpecialPowerAIType = AI_SPECIAL_POWER_TAME_THE_BEAST
SpecialPowerAIType = AI_SPECIAL_POWER_GIVEXP_AOE ;,; AI_SPECIAL_POWER_TAME_THE_BEAST
SpecialPowerRadius = 50 ;;,;; 200 ;;,;; Changed for 3.0.1, note: never seen used ingame, maybe is not working
End
......
......@@ -2276,10 +2276,12 @@ End
;------------------------------------------------------------------------------
SpecialPower SpecialAbilityTameTheBeast
Enum = SPECIAL_AT_VISIBLE_OBJECT ;;,;; SPECIAL_DOMINATE_ENEMY
ObjectFilter = NONE +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner +NeutralWarg +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;;,;; Added ;,; Added +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders
Enum = SPECIAL_KINGS_FAVOR ;,; SPECIAL_AT_VISIBLE_OBJECT ;;,;; SPECIAL_DOMINATE_ENEMY
;,; ObjectFilter = NONE +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner +NeutralWarg +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders ;;,;; Added ;,; Added +AngmarDireWolf +AngmarDireWolf_Slaved +AngmarDireWolfHorde +AngmarWolfRider +AngmarWolfRiders
ObjectFilter = NONE +IsengardWargPack +IsengardWargRider +IsengardWargPackBanner +IsengardWargRiderBanner ;,;
Flags = NEEDS_OBJECT_FILTER ;,;
ReloadTime = 120000 ; This value MUST be greater than the DefectDuration in the Behavior
RadiusCursorRadius = 60.0 ;100.0 ;150.0
RadiusCursorRadius = 150.0 ;,; 60.0 ;100.0 ;150.0
End
;------------------------------------------------------------------------------
......
......@@ -22417,6 +22417,15 @@ AudioEvent SharkuVoiceSelectBattle
SubmixSlider = voice
End
AudioEvent SharkuVoiceTrain ;,;
Sounds = EUShark_voiattc EUShark_voiattf EUShark_voiattj
Volume = #ADD( UNIT_RESPONSE_VOLUME 0 )
MinVolume = #ADD( UNIT_RESPONSE_MINVOLUME 0 )
Priority = high
Type = world player voice
SubmixSlider = voice
End
Multisound SharkuVoiceAttackTrampleMS
Subsounds = SharkuVoiceAttackTrampleOwner SharkuVoiceAttackTrampleOther
End
......@@ -54999,7 +54999,7 @@ CONTROLBAR:ToolTipTameTheBeast
//"Requires Level 9 \n Target monster or cavalry battalion comes under Sharku's control \n Left click icon then left click on target"
//"Target Wargs or Warg Riders come under Sharku's control \n Left click icon then left click on target"
//"Requires Level 5 \n Target Wargs or Warg Riders come under Sharku's control \n Left click icon then left click on target"
"Requires Level 5 \n Target Wargs or Warg Riders and Dire Wolves or Wolf Riders come under Sharku's control \n Left click icon then left click on target"
"Requires Level 5 \n Targeted Wargs and Warg Riders gain excellent experience \n Left click icon then left click on target units"
END
CONTROLBAR:TooltipElrondAthelas
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment