Commit 4c8d3525 authored by Excelsior's avatar Excelsior Committed by brabox

(!511) Fix for AI Cloud Break not triggering healing & horde replenishment. Stunned...

parent 9aefb2c1
- AI Cloud Break now triggers healing and horde replenishment for all allied units.
- Units stunned by Cloud Break no longer regain motor function prematurely.
......@@ -10969,6 +10969,11 @@ CommandButton Command_SpellBookMenOfDaleAllies
InvalidCursorName = GenericInvalid
End
CommandButton Command_SpellBookCloudBreak_Rays ;,;
Command = SPECIAL_POWER
SpecialPower = SpellBookCloudBreak_Rays
End
CommandButton Command_SpellBookCloudBreak
Command = SPELL_BOOK
TextLabel = CONTROLBAR:CloudBreak
......@@ -10976,13 +10981,13 @@ CommandButton Command_SpellBookCloudBreak
SpecialPower = SpellBookCloudBreak
ButtonImage = SBGood_CloudBreak
DescriptLabel = CONTROLBAR:TooltipCloudBreak
CommandTrigger = Command_SpellBookCloudBreak_Healing ;,;
CommandTrigger = Command_SpellBookCloudBreak_Rays ;,; Command_SpellBookCloudBreak_Healing
End
CommandButton Command_SpellBookCloudBreak_Healing ;,;
Command = SPECIAL_POWER
SpecialPower = SpellBookCloudBreak_Healing
End
;,; CommandButton Command_SpellBookCloudBreak_Healing ;,;
;,; Command = SPECIAL_POWER
;,; SpecialPower = SpellBookCloudBreak_Healing
;,; End
CommandButton Command_SpellBookRohanAllies
Command = SPELL_BOOK
......
......@@ -16628,6 +16628,53 @@ FXParticleSystem CloudBreakRays
End
End
FXParticleSystem CloudBreakRays_2 ;,;
System
Priority = ALWAYS_RENDER
Shader = W3D_EMISSIVE
Type = DRAWABLE
ParticleName = EXCldBrkRays.W3D
Lifetime = 250 250
SystemLifetime = 200
Size = 0.1 0.1
BurstDelay = 20 90
BurstCount = 0 2
InitialDelay = 150 150
End
Color = DefaultColor
Color1 = R:164 G:140 B:104 0
Color2 = R:0 G:0 B:0 300
End
Alpha = DefaultAlpha
Alpha2 = 0.05 0.08 50
Alpha3 = 0 0 300
End
Update = RenderObjectUpdate
StartSizeX = 0.3 0.3
StartSizeY = 0.3 0.3
StartSizeZ = 1 1
SizeRateX = 0.01 0.01
SizeRateY = 0.01 0.01
SizeDampingX = 0.99 0.99
SizeDampingY = 0.99 0.99
SizeDampingZ = 0.98 0.98
AngleZ = -5 5
AngularRateZ = -0.01 0.01
AngularDamping = 0.99 0.99
Rotation = ROTATE_Z
End
Physics = DefaultPhysics
VelocityDamping = 1 1
End
EmissionVelocity = OrthoEmissionVelocity
End
EmissionVolume = BoxEmissionVolume
HalfSize = X:100 Y:100 Z:0
End
Draw = RenderObjectDraw
End
End
FXParticleSystem cloudPuffPixey
System
Priority = HIGH_OR_ABOVE
......@@ -101,6 +101,7 @@
#define GENERIC_FACTION_SLAUGHTERABLE ANY +INFANTRY +CAVALRY +MordorWorker -HERO -DOZER -SUMMONED ;,; Added +MordorWorker in v5.1
#define GENERIC_BUFF_RECIPIENT_OBJECT_FILTER ANY +INFANTRY +CAVALRY -MONSTER -SIEGEENGINE -MACHINE -IMMOBILE -DOZER -HERO -STRUCTURE -BASE_FOUNDATION -HORDE -SHIP -DwarvenBattleWagon -RohanOathbreaker -MordorRamCrew +MordorWorker -IsengardRamCrew -IsengardBeserker -DwarvenZerker -DwarvenZerkerHorde -NoldorWarrior -NoldorWarriorHorde -GondorKnightsofDol -GondorKnightsofDolHorde -WildBabyDrake -WildBabyDrakeHorde -MordorBlackRider -MordorBlackRiderHorde -IsengardFanatic -IsengardBerserkerHorde -IsengardExplosiveMine -IsengardDeployedExplosiveMine -WildSpiderling_Slaved -AngmarDireWolf_Slaved -IsengardWarg_Slaved ;;,;; removed WargSentries, Fortress Spiderlings/Wolves, SIEGEENGINE and MONSTER (3.0.1 - experimental); added Mines; Added -SHIP for v3.0.3 ship balance
#define MINI_HERO_OBJECT_FILTER NONE +IsengardBeserker +DwarvenZerker +DwarvenZerkerHorde +NoldorWarrior +NoldorWarriorHorde +GondorKnightsofDol +GondorKnightsofDolHorde +WildBabyDrake +WildBabyDrakeHorde +MordorBlackRider +MordorBlackRiderHorde +IsengardFanatic +IsengardBerserkerHorde ;,;
#define CLOUD_BREAK_STUN_OBJECT_FILTER ANY +INFANTRY +CAVALRY +MONSTER +IsengardBeserker +DwarvenZerker +DwarvenZerkerHorde +NoldorWarrior +NoldorWarriorHorde +GondorKnightsofDol +GondorKnightsofDolHorde +WildBabyDrake +WildBabyDrakeHorde +MordorBlackRider +MordorBlackRiderHorde +IsengardFanatic +IsengardBerserkerHorde -HERO ENEMIES ;,;
; Afraid of objects must be SCARY kindof as well.
#define EMOTION_AFRAIDOF_OBJECTFILTER NONE +GondorGwaihir +RohanTreeBerd +RohanEntFir +RohanEntAsh +RohanEntOak +RohanEntBirch +RohanEntOak +MordorBalrog +MordorFellBeast +AngmarWitchking +MordorWitchKingOnFellBeast +MordorCaveTroll +MordorMountainTroll +MordorDrummerTroll +MordorMumakil +BarrowWight +NecromancerStatue +GoblinCaveTroll +SpellBookArrowVolley +TomBombadil +TomBombadil_Summoned +GoblinCaveTroll_FromTrollLair +CaveTroll_Slaved +ElvenVigilantEnt +RohanGenericEnt +RohanEntFir_Summoned +RohanEntBirch_Summoned +RohanEntOak_Summoned +EvilMenBlackRider +CreateAHero +KhamulFellBeast +MorgomirFellBeast +MordorGateWatchersFearCreator +MordorBlackRider ;,; Added +RohanEntOak ;;,;; added +KhamulFellBeast +MorgomirFellBeast for 2.02e, Removed +MordorGateWatchersExpansion, Added +MordorGateWatchersFearCreator for 2.1, Added +MordorBlackRider for 3.0.0
......
......@@ -167,6 +167,7 @@ Object CloudBreakSunbeam
DefaultModelConditionState
Model = None
ParticleSysBone = None CloudBreakRays
ParticleSysBone = None CloudBreakRays_2 ;,;
End
; IdleAnimationState
; EnteringStateFX = FX_CloudBreakRays
......@@ -196,30 +197,30 @@ Object CloudBreakSunbeam
; the following two modules control death fade -- uses alpha for now
Behavior = LifetimeUpdate ModuleTag_02
MinLifetime = 5000 ; min lifetime in msec
MaxLifetime = 7000 ; max lifetime in msec
MinLifetime = 10000 ;,; 5000 ; min lifetime in msec
MaxLifetime = 12000 ;,; 7000 ; max lifetime in msec
End
Behavior = FireWeaponUpdate ModuleTag_KillAllCurrentWeather ;;,;; added for 2.02e
FireWeaponNugget
WeaponName = WeatherKiller
Offset = X:0 Y:0 Z:0
FireDelay = 0
OneShot = Yes
End
End
;,; Behavior = FireWeaponUpdate ModuleTag_KillAllCurrentWeather ;;,;; added for 2.02e
;,; FireWeaponNugget
;,; WeaponName = WeatherKiller
;,; Offset = X:0 Y:0 Z:0
;,; FireDelay = 0
;,; OneShot = Yes
;,; End
;,; End
Behavior = FireWeaponUpdate ModuleTag_DamageHandler ;;,;;
FireWeaponNugget
WeaponName = CloudBreakWeapon
FireDelay = 0
OneShot = Yes ;// Alternative is to fire as often as the reload time of this weapon allows
End
End
Behavior = AIUpdateInterface ModuleTag_03
AILuaEventsList = SunbeamFunctions
End
;,; Behavior = FireWeaponUpdate ModuleTag_DamageHandler ;;,;;
;,; FireWeaponNugget
;,; WeaponName = CloudBreakWeapon
;,; FireDelay = 0
;,; OneShot = Yes ;// Alternative is to fire as often as the reload time of this weapon allows
;,; End
;,; End
;,; Behavior = AIUpdateInterface ModuleTag_03
;,; AILuaEventsList = SunbeamFunctions
;,; End
Geometry = BOX
GeometryMajorRadius = 50.0
......
......@@ -1107,29 +1107,51 @@ Object GoodSpellBook
RequirementsFilterStrategic = SPELL_BOOK_REQUIREMENTS_FILTER_STRATEGIC
End
Behavior = CloudBreakSpecialPower ModuleTag_CloudBreak
SpecialPowerTemplate = SpellBookCloudBreak
SunbeamObject = CloudBreakSunbeam
ObjectSpacing = 300
AttributeModifierAffects = ANY +INFANTRY +CAVALRY +MONSTER -HERO ENEMIES
ReEnableAntiCategory = Yes ; cancel negative effects on good guys
AttributeModifierWeatherBased = Yes
WeatherDuration = SPELL_CLOUDBREAK_DURATION
ChangeWeather = SUNNY
AvailableAtStart = No
RequirementsFilterMPSkirmish = SPELL_BOOK_REQUIREMENTS_FILTER
RequirementsFilterStrategic = SPELL_BOOK_REQUIREMENTS_FILTER_STRATEGIC
End
;,; Behavior = CloudBreakSpecialPower ModuleTag_CloudBreak
;,; SpecialPowerTemplate = SpellBookCloudBreak
;,; SunbeamObject = CloudBreakSunbeam
;,; ObjectSpacing = 300
;,; AttributeModifierAffects = ANY +INFANTRY +CAVALRY +MONSTER -HERO ENEMIES
;,; ReEnableAntiCategory = Yes ; cancel negative effects on good guys
;,; AttributeModifierWeatherBased = Yes
;,; WeatherDuration = SPELL_CLOUDBREAK_DURATION
;,; ChangeWeather = SUNNY
;,; AvailableAtStart = No
;,; RequirementsFilterMPSkirmish = SPELL_BOOK_REQUIREMENTS_FILTER
;,; RequirementsFilterStrategic = SPELL_BOOK_REQUIREMENTS_FILTER_STRATEGIC
;,; End
Behavior = OCLSpecialPower ModuleTag_CloudBreakNew ;,; Added in v5.1
SpecialPowerTemplate = SpellBookCloudBreak_Healing
;,; Behavior = OCLSpecialPower ModuleTag_CloudBreakNew ;,; Added in v5.1
;,; SpecialPowerTemplate = SpellBookCloudBreak_Healing
;,; OCL = OCL_CloudBreak_Healing
;,; CreateLocation = CREATE_AT_LOCATION
;,; AvailableAtStart = No
;,; RequirementsFilterMPSkirmish = SPELL_BOOK_REQUIREMENTS_FILTER
;,; RequirementsFilterStrategic = SPELL_BOOK_REQUIREMENTS_FILTER_STRATEGIC
;,; End
Behavior = OCLSpecialPower ModuleTag_CloudBreak ;,;
SpecialPowerTemplate = SpellBookCloudBreak
OCL = OCL_CloudBreak_Healing
CreateLocation = CREATE_AT_LOCATION
CreateLocation = USE_SECONDARY_OBJECT_LOCATION
NearestSecondaryObjectFilter = NONE SAME_PLAYER +CASTLE_KEEP
AttributeModifierWeatherBased = Yes
WeatherDuration = SPELL_CLOUDBREAK_DURATION
ChangeWeather = SUNNY
AvailableAtStart = No
RequirementsFilterMPSkirmish = SPELL_BOOK_REQUIREMENTS_FILTER
RequirementsFilterStrategic = SPELL_BOOK_REQUIREMENTS_FILTER_STRATEGIC
End
Behavior = CloudBreakSpecialPower ModuleTag_CloudBreakRays ;,;
SpecialPowerTemplate = SpellBookCloudBreak_Rays
SunbeamObject = CloudBreakSunbeam
ObjectSpacing = 300
AvailableAtStart = No
RequirementsFilterMPSkirmish = SPELL_BOOK_REQUIREMENTS_FILTER
RequirementsFilterStrategic = SPELL_BOOK_REQUIREMENTS_FILTER_STRATEGIC
End
Behavior = OCLSpecialPower ModuleTag_SummonRohan
SpecialPowerTemplate = SpellBookRohanAllies
OCL = OCL_SpawnRohanRohirrimEgg
......@@ -5187,6 +5209,8 @@ Object CloudBreak_Healing
Draw = W3DScriptedModelDraw ModuleTag_Draw
DefaultModelConditionState
Model = None
ParticleSysBone = None CloudBreakRays ;,;
ParticleSysBone None CloudBreakRays_2 ;,;
End
End
......@@ -5214,6 +5238,23 @@ Object CloudBreak_Healing
MinLifetime = 15000
MaxLifetime = 15000
End
Behavior = FireWeaponUpdate ModuleTag_KillAllCurrentWeather ;,;
FireWeaponNugget
WeaponName = WeatherKiller
Offset = X:0 Y:0 Z:0
FireDelay = 0
OneShot = Yes
End
End
Behavior = FireWeaponUpdate ModuleTag_DamageHandler ;,;
FireWeaponNugget
WeaponName = CloudBreakWeapon
FireDelay = 0
OneShot = Yes ;// Alternative is to fire as often as the reload time of this weapon allows
End
End
Behavior = AutoHealBehavior ModuleTag_HealUpdate
StartsActive = Yes
......@@ -5229,6 +5270,15 @@ Object CloudBreak_Healing
ReplenishAllNearbyHordes = Yes
ScanHordeDistance = 9999999
UnitSpawnFX = FX_BannerCarrierSpawnUnit ; name of particle FX to use when the BannerCarrier spawns a new unit
End
Behavior = RadiateFearUpdate ModuleTag_CloudBreakStun ;,;
EmotionPulseRadius = 9999999
EmotionPulseInterval = 1000
GenerateUncontrollableFear = Yes
InitiallyActive = Yes
VictimFilter = CLOUD_BREAK_STUN_OBJECT_FILTER
End
Behavior = AIUpdateInterface ModuleTag_03
......
......@@ -1550,7 +1550,7 @@ SpecialPower SpellBookCloudBreak
End
;------------------------------------------------------------------------------ ;,; Added in v5.1
SpecialPower SpellBookCloudBreak_Healing
SpecialPower SpellBookCloudBreak_Rays ;,; SpellBookCloudBreak_Healing
Enum = SPECIAL_GENERAL_TARGETLESS
ReloadTime = 3600
RadiusCursorRadius = 120.0
......
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