diff --git a/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs b/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs index 923eb436fd..cfff593cc1 100644 --- a/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs +++ b/OpenRA.Mods.CA/Projectiles/PlasmaBeam.cs @@ -360,7 +360,7 @@ public void Tick(World world) CheckBlocked(); CalculateColors(direction); - if (++ticks >= info.Duration) + if (++ticks >= info.Duration || args.SourceActor.IsDead) { world.AddFrameEndTask(w => w.Remove(this)); return; diff --git a/OpenRA.Mods.CA/Traits/Attachable.cs b/OpenRA.Mods.CA/Traits/Attachable.cs index bfc0cf34b9..2f03f56435 100644 --- a/OpenRA.Mods.CA/Traits/Attachable.cs +++ b/OpenRA.Mods.CA/Traits/Attachable.cs @@ -348,7 +348,7 @@ public override bool CanTargetActor(Actor self, Actor target, TargetModifiers mo if (!attachable.Info.ValidRelationships.HasRelationship(stance)) return false; - if (!attachable.Info.Types.Overlaps(target.GetAllTargetTypes())) + if (!attachable.Info.Types.Overlaps(target.GetEnabledTargetTypes())) return false; cursor = target.TraitsImplementing().Any(x => x.CanAttach(attachable)) ? attachable.Info.EnterCursor : attachable.Info.BlockedCursor; diff --git a/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs b/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs index a56440a81b..70f41d4d02 100644 --- a/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs +++ b/OpenRA.Mods.CA/Traits/SupportPowers/GrantExternalConditionPowerCA.cs @@ -36,7 +36,10 @@ public class GrantExternalConditionPowerCAInfo : SupportPowerInfo public readonly string OnFireSound = null; [Desc("Target types that condition can be applied to. Leave empty for all types.")] - public readonly BitSet ValidTargets = default(BitSet); + public readonly BitSet ValidTargets = default; + + [Desc("Target types that condition can be applied to. Leave empty for all types.")] + public readonly BitSet InvalidTargets = default; [Desc("Player relationships which condition can be applied to.")] public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Ally; @@ -197,7 +200,8 @@ private IEnumerable GetTargetsInCircle(CPos xy) .Where(a => a.IsInWorld && !a.IsDead && info.ValidRelationships.HasRelationship(Self.Owner.RelationshipWith(a.Owner)) - && (info.ValidTargets.IsEmpty || info.ValidTargets.Overlaps(a.GetAllTargetTypes())) + && (info.ValidTargets.IsEmpty || info.ValidTargets.Overlaps(a.GetEnabledTargetTypes())) + && (info.InvalidTargets.IsEmpty || !info.InvalidTargets.Overlaps(a.GetEnabledTargetTypes())) && a.TraitsImplementing().Any(t => t.Info.Condition == info.Condition && t.CanGrantCondition(Self)) && (!info.TargetMustBeVisible || Self.Owner.Shroud.IsVisible(a.Location)) && a.CanBeViewedByPlayer(Self.Owner) diff --git a/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs b/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs index 2b2fd7895d..673781c7ae 100644 --- a/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs +++ b/OpenRA.Mods.CA/Traits/SupportPowers/RecallPower.cs @@ -47,6 +47,9 @@ sealed class RecallPowerInfo : SupportPowerInfo [Desc("Target types that cannot be recalled.")] public readonly BitSet InvalidTargetTypes = default(BitSet); + [Desc("Player relationships that can be recalled.")] + public readonly PlayerRelationship ValidRelationships = PlayerRelationship.Ally; + [CursorReference] [Desc("Cursor to display when the targeted area is blocked.")] public readonly string TargetBlockedCursor = "move-blocked"; @@ -178,6 +181,9 @@ public bool IsValidTarget(Actor a) if (a == null || !a.IsInWorld || a.IsDead) return false; + if (!info.ValidRelationships.HasRelationship(Self.Owner.RelationshipWith(a.Owner))) + return false; + var targetTypes = a.GetEnabledTargetTypes(); if (!targetTypes.Overlaps(info.ValidTargetTypes)) diff --git a/OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs b/OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs new file mode 100644 index 0000000000..9d7fe5b6dd --- /dev/null +++ b/OpenRA.Mods.CA/Warheads/GrantExternalConditionCAWarhead.cs @@ -0,0 +1,79 @@ +#region Copyright & License Information +/* + * Copyright (c) The OpenRA Developers and Contributors + * This file is part of OpenRA, which is free software. It is made + * available to you under the terms of the GNU General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. For more + * information, see COPYING. + */ +#endregion + +using System.Linq; +using OpenRA.GameRules; +using OpenRA.Mods.Common.Traits; +using OpenRA.Traits; + +namespace OpenRA.Mods.Common.Warheads +{ + [Desc("Grant an external condition to hit actors.")] + public class GrantExternalConditionCAWarhead : Warhead + { + [FieldLoader.Require] + [Desc("The condition to apply. Must be included in the target actor's ExternalConditions list.")] + public readonly string Condition = null; + + [Desc("Duration of the condition (in ticks). Set to 0 for a permanent condition.")] + public readonly int Duration = 0; + + public readonly WDist Range = WDist.FromCells(1); + + public readonly WDist RangeLimit = WDist.FromCells(2); + + public override void DoImpact(in Target target, WarheadArgs args) + { + var firedBy = args.SourceActor; + + if (target.Type == TargetType.Invalid) + return; + + var rangeLimit = Range > RangeLimit ? Range : RangeLimit; + var actors = firedBy.World.FindActorsInCircle(target.CenterPosition, rangeLimit); + + foreach (var a in actors) + { + if (!IsValidAgainst(a, firedBy)) + continue; + + HitShape closestActiveShape = null; + var closestDistance = int.MaxValue; + + // PERF: Avoid using TraitsImplementing that needs to find the actor in the trait dictionary. + foreach (var targetPos in a.EnabledTargetablePositions) + { + if (targetPos is HitShape hitshape) + { + var distance = hitshape.DistanceFromEdge(a, target.CenterPosition).Length; + if (distance < closestDistance) + { + closestDistance = distance; + closestActiveShape = hitshape; + } + } + } + + // Cannot be damaged without an active HitShape. + if (closestActiveShape == null) + continue; + + // Cannot be damaged if HitShape is outside Spread. + if (closestDistance > Range.Length) + continue; + + a.TraitsImplementing() + .FirstOrDefault(t => t.Info.Condition == Condition && t.CanGrantCondition(firedBy)) + ?.GrantCondition(a, firedBy, Duration); + } + } + } +} diff --git a/mods/ca/bits/gpsdot.shp b/mods/ca/bits/gpsdot.shp index 5ad7b8cd14..a4b9b52776 100644 Binary files a/mods/ca/bits/gpsdot.shp and b/mods/ca/bits/gpsdot.shp differ diff --git a/mods/ca/bits/ifvtur.shp b/mods/ca/bits/ifvtur.shp index 88f7d10807..7b4f538d07 100644 Binary files a/mods/ca/bits/ifvtur.shp and b/mods/ca/bits/ifvtur.shp differ diff --git a/mods/ca/bits/scrin/audio/mshp-stmrcharge.aud b/mods/ca/bits/scrin/audio/mshp-stmrcharge.aud new file mode 100644 index 0000000000..036e86ccff Binary files /dev/null and b/mods/ca/bits/scrin/audio/mshp-stmrcharge.aud differ diff --git a/mods/ca/bits/scrin/scrinmuzz7.shp b/mods/ca/bits/scrin/scrinmuzz7.shp new file mode 100644 index 0000000000..7fb6401616 Binary files /dev/null and b/mods/ca/bits/scrin/scrinmuzz7.shp differ diff --git a/mods/ca/languages/rules/en.ftl b/mods/ca/languages/rules/en.ftl index 449904ae0a..574e77ac2a 100644 --- a/mods/ca/languages/rules/en.ftl +++ b/mods/ca/languages/rules/en.ftl @@ -30,6 +30,10 @@ checkbox-balanced-harvesting = .label = Balanced Harvesting .description = Enables dynamic harvester speed to account for the direction of resources relative to refineries +checkbox-fast-regrowth = + .label = Fast Regrowth + .description = Resources regrow at a faster rate + dropdown-queuetype = .label = Production Type .description = Single-Queue = One queue per production category\n\nMulti-Queue = One queue per production structure\n\nMulti-Queue Scaled = Multi-Queue, but where additional production structures have increased cost,\n which can be reduced via T2/T3 upgrades diff --git a/mods/ca/maps/ca07-subversion/rules.yaml b/mods/ca/maps/ca07-subversion/rules.yaml index 3d66e63355..6e7b16841d 100644 --- a/mods/ca/maps/ca07-subversion/rules.yaml +++ b/mods/ca/maps/ca07-subversion/rules.yaml @@ -63,8 +63,6 @@ HTNK.Drone: PauseOnCondition: empdisable || being-warped Tooltip: GenericVisibility: None - Voiced: - -RequiresCondition: MTNK.Drone: -ExternalCondition@DRONECONTROL: diff --git a/mods/ca/maps/ca07-subversion/weapons.yaml b/mods/ca/maps/ca07-subversion/weapons.yaml index 74db813514..8c283467c2 100644 --- a/mods/ca/maps/ca07-subversion/weapons.yaml +++ b/mods/ca/maps/ca07-subversion/weapons.yaml @@ -1,6 +1,6 @@ Hack: Range: 8c0 - Warhead@immobilise: GrantExternalCondition + Warhead@immobilise: GrantExternalConditionCA Range: 0c511 Duration: 50 Condition: notmobile @@ -25,7 +25,7 @@ IonBolt: Damage: 4000 MEMP: - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Duration: 600 StnkMissile: diff --git a/mods/ca/maps/ca15-domination/weapons.yaml b/mods/ca/maps/ca15-domination/weapons.yaml index 05590178d8..b5b734e1ee 100644 --- a/mods/ca/maps/ca15-domination/weapons.yaml +++ b/mods/ca/maps/ca15-domination/weapons.yaml @@ -2,7 +2,7 @@ MicrowaveZap: Warhead@1Dam: SpreadDamage Versus: None: 25 - Warhead@empdef: GrantExternalCondition + Warhead@empdef: GrantExternalConditionCA Range: 0c511 Duration: 175 diff --git a/mods/ca/maps/ca25-singularity/weapons.yaml b/mods/ca/maps/ca25-singularity/weapons.yaml index 0f94552d4d..9754e182b4 100644 --- a/mods/ca/maps/ca25-singularity/weapons.yaml +++ b/mods/ca/maps/ca25-singularity/weapons.yaml @@ -113,7 +113,7 @@ MothershipExplosion: Spread: 8c0 Damage: 80000 ValidTargets: Wall - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Range: 20c0 Duration: 3000 Condition: empdisable diff --git a/mods/ca/maps/ca30-reckoning/weapons.yaml b/mods/ca/maps/ca30-reckoning/weapons.yaml index 13dc888b3b..e28b99f371 100644 --- a/mods/ca/maps/ca30-reckoning/weapons.yaml +++ b/mods/ca/maps/ca30-reckoning/weapons.yaml @@ -31,11 +31,11 @@ ExterminatorLaserReversed: FollowingOffset: 50,100,0 MicrowaveZap: - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA InvalidTargets: ExterminatorTripod MicrowaveZap.UPG: - Warhead@emp2: GrantExternalCondition + Warhead@emp2: GrantExternalConditionCA Range: 0c511 Duration: 50 Condition: empdisable @@ -50,9 +50,9 @@ C4: ValidTargets: ExterminatorTripod EnlightenedEmp: - Warhead@1Emp: GrantExternalCondition + Warhead@1Emp: GrantExternalConditionCA InvalidTargets: ExterminatorTripod - Warhead@empExterminator: GrantExternalCondition + Warhead@empExterminator: GrantExternalConditionCA Range: 0c896 Duration: 30 Condition: empdisable diff --git a/mods/ca/maps/tfca/tfca-rules-base.yaml b/mods/ca/maps/tfca/tfca-rules-base.yaml index 09c75e7036..cace04622d 100644 --- a/mods/ca/maps/tfca/tfca-rules-base.yaml +++ b/mods/ca/maps/tfca/tfca-rules-base.yaml @@ -95,6 +95,8 @@ Player: Visible: False LobbyPrerequisiteCheckbox@BALANCEDHARVESTING: Visible: False + LobbyPrerequisiteCheckbox@FASTREGROWTH: + Visible: False LobbyPrerequisiteCheckbox@REVEALONFIRE: Enabled: False Locked: True diff --git a/mods/ca/maps/tfca/tfca-weapons.yaml b/mods/ca/maps/tfca/tfca-weapons.yaml index 7d783ae525..b8d16b7385 100644 --- a/mods/ca/maps/tfca/tfca-weapons.yaml +++ b/mods/ca/maps/tfca/tfca-weapons.yaml @@ -100,7 +100,7 @@ Heal: Repair: ReloadDelay: 40 - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA ValidTargets: Structure Warhead@1Dam: SpreadDamage Damage: -3500 diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml index 5c84553389..f6ba8f918b 100644 --- a/mods/ca/rules/aircraft.yaml +++ b/mods/ca/rules/aircraft.yaml @@ -842,7 +842,6 @@ NHAW: Inherits: ^Helicopter Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@TRANSPORT: ^Transport - Inherits@SELECTION: ^SelectableSupportUnit RenderSprites: Image: nhaw Buildable: @@ -955,7 +954,7 @@ NHAW: Count: 2 RequiresCondition: upg-crym AutoTarget: - InitialStance: ReturnFire + InitialStance: Defend InitialStanceAI: AttackAnything HoldFireCondition: stance-holdfire AttackAircraft: diff --git a/mods/ca/rules/custom/campaign-rules.yaml b/mods/ca/rules/custom/campaign-rules.yaml index 324ad19cdc..9c51820b6f 100644 --- a/mods/ca/rules/custom/campaign-rules.yaml +++ b/mods/ca/rules/custom/campaign-rules.yaml @@ -43,6 +43,9 @@ Player: LobbyPrerequisiteCheckbox@BALANCEDHARVESTING: Locked: True Visible: False + LobbyPrerequisiteCheckbox@FASTREGROWTH: + Locked: True + Visible: False LobbyPrerequisiteCheckbox@REVEALONFIRE: Locked: True Visible: False diff --git a/mods/ca/rules/custom/composition-tester.yaml b/mods/ca/rules/custom/composition-tester.yaml index 8253665708..fc60402481 100644 --- a/mods/ca/rules/custom/composition-tester.yaml +++ b/mods/ca/rules/custom/composition-tester.yaml @@ -64,6 +64,9 @@ Player: LobbyPrerequisiteCheckbox@BALANCEDHARVESTING: Enabled: True Visible: False + LobbyPrerequisiteCheckbox@FASTREGROWTH: + Enabled: False + Visible: False LobbyPrerequisiteCheckbox@REVEALONFIRE: Enabled: False Locked: True diff --git a/mods/ca/rules/custom/mastermind-madness.yaml b/mods/ca/rules/custom/mastermind-madness.yaml index 2f763dcbc3..397a470b03 100644 --- a/mods/ca/rules/custom/mastermind-madness.yaml +++ b/mods/ca/rules/custom/mastermind-madness.yaml @@ -60,6 +60,8 @@ Player: Visible: False LobbyPrerequisiteCheckbox@BALANCEDHARVESTING: Visible: False + LobbyPrerequisiteCheckbox@FASTREGROWTH: + Visible: False LobbyPrerequisiteCheckbox@REVEALONFIRE: Enabled: False Locked: True diff --git a/mods/ca/rules/custom/scrinfestation-minigame.yaml b/mods/ca/rules/custom/scrinfestation-minigame.yaml index 08cec64f81..f77bba5925 100644 --- a/mods/ca/rules/custom/scrinfestation-minigame.yaml +++ b/mods/ca/rules/custom/scrinfestation-minigame.yaml @@ -69,6 +69,8 @@ Player: Visible: False LobbyPrerequisiteCheckbox@BALANCEDHARVESTING: Visible: False + LobbyPrerequisiteCheckbox@FASTREGROWTH: + Visible: False LobbyPrerequisiteCheckbox@REVEALONFIRE: Enabled: False Locked: True diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml index ff379509cd..990ef23b49 100644 --- a/mods/ca/rules/defaults.yaml +++ b/mods/ca/rules/defaults.yaml @@ -931,7 +931,7 @@ Step: 500 Delay: 75 StartIfBelow: 100 - DamageCooldown: 200 + DamageCooldown: 100 RequiresCondition: hospitalheal ExternalCondition@HOSPITAL: Condition: hospitalheal @@ -3236,6 +3236,9 @@ Condition: on-tib Range: 4c0 ValidRelationships: Ally, Neutral, Enemy + GrantConditionOnPrerequisite@FastRegrowth: + Condition: fast-regrowth + Prerequisites: global.fastregrowth ^Tree: Inherits@1: ^SpriteActor diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml index af0bbbf3ae..6bffd925e7 100644 --- a/mods/ca/rules/infantry.yaml +++ b/mods/ca/rules/infantry.yaml @@ -496,7 +496,7 @@ U3.squad: Queue: InfantrySQ, InfantryMQ BuildAtProductionType: ParadropInfantry BuildPaletteOrder: 1000 - Prerequisites: dome, ~infantry.usa, ~techlevel.medium + Prerequisites: radaroraircraft, ~infantry.usa, ~techlevel.medium Description: Prepare five Guardian GIs for airdrop. TooltipExtras: Strengths: • Strong vs Heavy Armor, Aircraft, Buildings, Defenses @@ -3774,7 +3774,7 @@ SEAL: Tooltip: Name: Navy SEAL Health: - HP: 18000 + HP: 16000 UpdatesPlayerStatistics: AddToArmyValue: true Buildable: @@ -3844,6 +3844,8 @@ SEAL: WithDecoration@COMMANDOSKULL: Sequence: pip-seal -Targetable@HERO: + -Targetable@MindControlImmune: + -Targetable@ChaosImmune: GrantConditionOnHealingReceived@HEALINGCOOLDOWN: RequiredHealing: 40000 diff --git a/mods/ca/rules/misc.yaml b/mods/ca/rules/misc.yaml index 372ad5d346..f4797c3450 100644 --- a/mods/ca/rules/misc.yaml +++ b/mods/ca/rules/misc.yaml @@ -489,6 +489,10 @@ MINE: Terrain: Ore SeedsResource: Interval: 70 + RequiresCondition: !fast-regrowth + SeedsResource@FastRegrowth: + Interval: 35 + RequiresCondition: fast-regrowth MapEditorData: Categories: Resource spawn RequiresSpecificOwners: @@ -497,6 +501,9 @@ MINE: Condition: on-ore Range: 4c0 ValidRelationships: Ally, Neutral, Enemy + GrantConditionOnPrerequisite@FastRegrowth: + Condition: fast-regrowth + Prerequisites: global.fastregrowth GMINE: Inherits@1: ^SpriteActor @@ -517,6 +524,12 @@ GMINE: Terrain: Gems SeedsResource: ResourceType: Gems + Interval: 65 + RequiresCondition: !fast-regrowth + SeedsResource@FastRegrowth: + ResourceType: Gems + Interval: 35 + RequiresCondition: fast-regrowth MapEditorData: Categories: Resource spawn RequiresSpecificOwners: @@ -525,6 +538,9 @@ GMINE: Condition: on-gems Range: 4c0 ValidRelationships: Ally, Neutral, Enemy + GrantConditionOnPrerequisite@FastRegrowth: + Condition: fast-regrowth + Prerequisites: global.fastregrowth RAILMINE: Inherits@1: ^SpriteActor @@ -945,6 +961,11 @@ SPLIT2: SeedsResource: ResourceType: Tiberium Interval: 70 + RequiresCondition: !fast-regrowth + SeedsResource@FastRegrowth: + ResourceType: Tiberium + Interval: 35 + RequiresCondition: fast-regrowth AppearsOnMapPreview: Terrain: Tiberium MapEditorData: @@ -959,6 +980,8 @@ SPLITBLUE: Image: split3 SeedsResource: ResourceType: BlueTiberium + SeedsResource@FastRegrowth: + ResourceType: BlueTiberium AppearsOnMapPreview: Terrain: BlueTiberium Tooltip: @@ -1056,16 +1079,16 @@ jamming.field: Delay: 225 WithRangeCircle@JAMMER: Type: JammingField - Range: 5c0 + Range: 6c0 Visible: Always ValidRelationships: Ally, Enemy, Neutral Color: c0c0d4AA ProximityExternalCondition@WEAPJAMMER: - Range: 5c0 + Range: 6c0 ValidRelationships: Enemy, Neutral Condition: weapjammed ProximityExternalCondition@JAMMER: - Range: 5c0 + Range: 6c0 ValidRelationships: Enemy, Neutral Condition: jammed Targetable@JFIELD: diff --git a/mods/ca/rules/player.yaml b/mods/ca/rules/player.yaml index c4268bf067..610d37993d 100644 --- a/mods/ca/rules/player.yaml +++ b/mods/ca/rules/player.yaml @@ -150,7 +150,7 @@ Player: DefaultCash: 6000 DefaultCashDropdownDisplayOrder: 1 DeveloperMode: - CheckboxDisplayOrder: 11 + CheckboxDisplayOrder: 14 Shroud: FogCheckboxEnabled: True FogCheckboxLocked: False @@ -189,7 +189,7 @@ Player: Label: checkbox-reveal-on-fire.label Description: checkbox-reveal-on-fire.description Enabled: False - DisplayOrder: 8 + DisplayOrder: 11 Prerequisites: global.revealonfire LobbyPrerequisiteCheckbox@BALANCEDHARVESTING: ID: balancedharvesting @@ -198,6 +198,13 @@ Player: Enabled: True DisplayOrder: 4 Prerequisites: global.balancedharvesting + LobbyPrerequisiteCheckbox@FASTREGROWTH: + ID: fastregrowth + Label: checkbox-fast-regrowth.label + Description: checkbox-fast-regrowth.description + Enabled: False + DisplayOrder: 8 + Prerequisites: global.fastregrowth LobbyPrerequisiteDropdown@QUEUETYPE: ID: queuetype Label: dropdown-queuetype.label diff --git a/mods/ca/rules/powers.yaml b/mods/ca/rules/powers.yaml index 5ab8bf6c7c..b885eaf1cc 100644 --- a/mods/ca/rules/powers.yaml +++ b/mods/ca/rules/powers.yaml @@ -277,7 +277,7 @@ DisplayRadarPing: True Range: 4c512 MaxTargets: 9 - InvalidTargetTypes: Husk + InvalidTargetTypes: Husk, ChronoshiftImmune DisplayTimerRelationships: Ally, Neutral, Enemy SupportPowerPaletteOrder: 20 ShowSelectionBoxes: true @@ -672,6 +672,7 @@ MaxTargets: 5 MinTargets: 0 ValidTargets: Vehicle, Ship, Structure + InvalidTargets: IronCurtainImmune Duration: 600 AllowMultiple: false Description: \nMakes up to 5 selected vehicles or structures\n temporarily immune to damage.\n\nWarning: Harmful to infantry. @@ -1505,6 +1506,8 @@ CameraRemoveDelay: 1 DisplayRadarPing: True SupportPowerPaletteOrder: 50 + TargetCircleRange: 7c511 + TargetCircleColor: b070ff90 ^BuzzerSwarmPower: DetonateWeaponPower@BUZZERSWARM: @@ -1623,6 +1626,8 @@ CameraRemoveDelay: 1 DisplayRadarPing: True SupportPowerPaletteOrder: 40 + TargetCircleRange: 4c512 + TargetCircleColor: ff000099 ^SuppressionPower: DetonateWeaponPower@SUPPRESSION: diff --git a/mods/ca/rules/scrin.yaml b/mods/ca/rules/scrin.yaml index 74c913c5d2..50fbbb33b9 100644 --- a/mods/ca/rules/scrin.yaml +++ b/mods/ca/rules/scrin.yaml @@ -157,6 +157,17 @@ VEHICLES.SCRIN: WithIdleOverlay@TEMPORAL: RequiresCondition: being-warped || shield-warped +^MothershipRearmable: + Targetable@MothershipRearmable: + TargetTypes: MothershipRearmable + RequiresCondition: ammo < 15 + ReloadAmmoPool@MothershipRearmable: + Count: 3 + Delay: 75 + RequiresCondition: mshp-rearm + ExternalCondition@MothershipRearmable: + Condition: mshp-rearm + ^FleetRecallable: Targetable@FleetRecallable: TargetTypes: FleetRecallable @@ -473,7 +484,7 @@ S3: PauseOnCondition: !ammo Armament@BATF: Name: batf - Weapon: DisintegratorBeamE + Weapon: DisintegratorBeamBATF AttackFrontal: PauseOnCondition: being-warped FacingTolerance: 0 @@ -525,7 +536,7 @@ S4: LocalOffset: 150,0,400 Armament@BATF: Name: batf - Weapon: IntruderDiscs + Weapon: IntruderDiscsBATF AttackFrontal: PauseOnCondition: being-warped FacingTolerance: 0 @@ -2155,6 +2166,7 @@ STMR: Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Inherits@HULLREGEN: ^HullRegen Inherits@SHIELDS: ^ScrinShields + Inherits@MothershipRearmable: ^MothershipRearmable Inherits@SCRINVEHICLEVOICE: ^ScrinVehicleVoice Buildable: Queue: AircraftSQ, AircraftMQ @@ -2197,7 +2209,7 @@ STMR: MuzzlePalette: scrin WithMuzzleOverlay: AttackAircraft: - FacingTolerance: 160 + FacingTolerance: 512 PersistentTargeting: false OpportunityFire: true PauseOnCondition: empdisable || being-warped @@ -2284,6 +2296,7 @@ ENRV: Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove Inherits@HULLREGEN: ^HullRegen Inherits@SHIELDS: ^ScrinShields + Inherits@MothershipRearmable: ^MothershipRearmable Inherits@SCRINVEHICLEVOICE: ^ScrinVehicleVoice Buildable: Queue: AircraftSQ, AircraftMQ @@ -2406,6 +2419,10 @@ ENRV: MaxStrength: 5625 GpsRadarDot: Sequence: Plane + Targetable@MothershipRearmable: + RequiresCondition: ammo < 5 + ReloadAmmoPool@MothershipRearmable: + Count: 1 DEVA: Inherits: ^Helicopter @@ -2763,6 +2780,7 @@ INVA: MSHP: Inherits: ^Helicopter Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@GAINSEXPERIENCE: ^GainsExperience Inherits@HULLREGEN: ^HullRegen Inherits@SHIELDS: ^ScrinShields Inherits@FleetRecallable: ^FleetRecallable @@ -2776,7 +2794,7 @@ MSHP: TooltipExtras: Strengths: • Strong vs Buildings, Defenses, Heavy Armor, Light Armor, Infantry Weaknesses: • Cannot attack Aircraft\n• Long charge time before firing anti-structure weapon\n• Cannot move while firing - Attributes: • Maximum 1 can be built\n• Can create wormholes + Attributes: • Maximum 1 can be built\n• Can create wormholes\n• Can recharge nearby Stormriders/Enervators RenderSprites: PlayerPalette: playerscrin Voiced: @@ -2949,6 +2967,11 @@ MSHP: RequiresSelection: true Position: BottomLeft Margin: 4, 3 + PeriodicExplosion: + Weapon: MothershipCharge + LocalOffset: 0,0,256 + Targetable@FleetRecallable: + RequiresCondition: !attacking # # ---- Husks @@ -3856,6 +3879,9 @@ NERV: ProvidesPrerequisite@radarorrepair: Prerequisite: radarorrepair RequiresCondition: !tech-locked + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft + RequiresCondition: !tech-locked ProvidesPrerequisite@scrinrad: Prerequisite: radar.scrin RequiresCondition: !tech-locked @@ -3988,6 +4014,8 @@ GRAV: Prerequisite: aircraft.traveler ProvidesPrerequisite@scrin: Prerequisite: aircraft.scrin + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft SupportPowerChargeBar: Power: Amount: -20 diff --git a/mods/ca/rules/structures.yaml b/mods/ca/rules/structures.yaml index 70f7e85fcf..0b2e3f0ba6 100644 --- a/mods/ca/rules/structures.yaml +++ b/mods/ca/rules/structures.yaml @@ -653,6 +653,9 @@ DOME: ProvidesPrerequisite@radarorrepair: Prerequisite: radarorrepair RequiresCondition: !tech-locked + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft + RequiresCondition: !tech-locked ProvidesPrerequisiteValidatedFaction@allrad: Factions: england, france, germany, usa Prerequisite: radar.allies @@ -1545,6 +1548,8 @@ HPAD: Factions: russia, ukraine, yuri Prerequisite: aircraft.hind ProvidesPrerequisite@buildingname: + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft Targetable@INFILTRATION: RequiresCondition: !being-warped TargetTypes: SpyInfiltrate, SabInfiltrate @@ -1619,10 +1624,12 @@ AFLD: ProvidesPrerequisiteValidatedFaction@kiro: Factions: russia, ukraine, iraq Prerequisite: aircraft.kiro + ProvidesPrerequisite@buildingname: + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft SupportPowerChargeBar: Power: Amount: -20 - ProvidesPrerequisite@buildingname: Targetable@INFILTRATION: RequiresCondition: !being-warped TargetTypes: SpyInfiltrate, SabInfiltrate @@ -2451,6 +2458,14 @@ RADARORREPAIR: Buildable: Description: Radar or Service Depot/Repair Facility +RADARORAIRCRAFT: + AlwaysVisible: + Interactable: + Tooltip: + Name: Radar or Aircraft Production + Buildable: + Description: Radar or Aircraft Production + VEHICLES.MCV: AlwaysVisible: Interactable: @@ -3536,6 +3551,9 @@ HQ: ProvidesPrerequisite@radarorrepair: Prerequisite: radarorrepair RequiresCondition: !tech-locked + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft + RequiresCondition: !tech-locked ProvidesPrerequisiteValidatedFaction@gdirad: Factions: talon, zocom, eagle, arc Prerequisite: radar.gdi @@ -3812,6 +3830,8 @@ HPAD.TD: ProvidesPrerequisite@chinook: Prerequisite: aircraft.chinook ProvidesPrerequisite@buildingname: + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft Targetable@INFILTRATION: RequiresCondition: !being-warped TargetTypes: SpyInfiltrate, SabInfiltrate @@ -4018,10 +4038,12 @@ AFLD.GDI: Prerequisite: aircraft.chinook ProvidesPrerequisite@chinookvisible: Prerequisite: aircraft.chinookvisible + ProvidesPrerequisite@RadarOrAircraft: + Prerequisite: radaroraircraft + ProvidesPrerequisite@buildingname: SupportPowerChargeBar: Power: Amount: -20 - ProvidesPrerequisite@buildingname: Targetable@INFILTRATION: RequiresCondition: !being-warped TargetTypes: SpyInfiltrate, SabInfiltrate diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml index 71a5184abd..90f90b3761 100644 --- a/mods/ca/rules/vehicles.yaml +++ b/mods/ca/rules/vehicles.yaml @@ -291,7 +291,7 @@ GTNK.squad: Queue: VehicleSQ, VehicleMQ BuildAtProductionType: ParadropVehicle BuildPaletteOrder: 440 - Prerequisites: dome, ~vehicles.usa, ~techlevel.medium + Prerequisites: radaroraircraft, ~vehicles.usa, ~techlevel.medium Description: Prepare a pair of Grizzly Tanks for airdrop. TooltipExtras: Strengths: • Strong vs Heavy Armor, Light Armor @@ -451,6 +451,7 @@ GTNK.squad: WithMirageSpriteBody: RequiresCondition: tree && england Name: tree + IsPlayerPalette: false WithFacingSpriteBody: RequiresCondition: !tree WithSpriteTurret: @@ -473,7 +474,7 @@ GTNK.squad: UncloakSound: appear1md.aud UncloakOn: Attack, Unload, Infiltrate, Demolish, Dock, Move, Damage, Heal Palette: player - IsPlayerPalette: true + IsPlayerPalette: false RequiresCondition: england && !cloak-force-disabled && !being-warped && !empdisable && !driver-dead PauseOnCondition: invisibility Cloak@CRATE-CLOAK: @@ -1590,8 +1591,8 @@ HARV: Resources: Tiberium, BlueTiberium, Ore, Gems BaleUnloadDelay: 1 BaleLoadDelay: 4 - SearchFromProcRadius: 15 - SearchFromHarvesterRadius: 8 + SearchFromProcRadius: 8 + SearchFromHarvesterRadius: 6 HarvestFacings: 8 EmptyCondition: no-ore WithHarvesterPipsDecoration: @@ -2199,7 +2200,7 @@ MRJ: Description: Support vehicle that can disrupt enemy targeting systems. TooltipExtras: Weaknesses: • Unarmed - Attributes: • Jamming fields reduce rate of fire and accuracy of enemy vehicles + Attributes: • Jamming fields reduce rate of fire and accuracy of enemy vehicles/defenses Health: HP: 22000 Armor: @@ -3040,6 +3041,12 @@ BGGY: WithPalettedOverlay@Decoy: Palette: decoy ValidRelationships: Ally + Targetable@MindControlImmune: + TargetTypes: MindControlImmune + Targetable@IronCurtainImmune: + TargetTypes: IronCurtainImmune + Targetable@ChronoshiftImmune: + TargetTypes: ChronoshiftImmune FTNK.Decoy: Inherits: FTNK @@ -3057,8 +3064,6 @@ FTNK.Decoy: Weapon: DecoyDespawn EmptyWeapon: DecoyDespawn -RequiresCondition: - Targetable@MindControlImmune: - TargetTypes: MindControlImmune -ActorLostNotification: -Buildable: -ProducibleWithLevel: @@ -3109,8 +3114,6 @@ HFTK.Decoy: Weapon: DecoyDespawn EmptyWeapon: DecoyDespawn -RequiresCondition: - Targetable@MindControlImmune: - TargetTypes: MindControlImmune -ActorLostNotification: -Buildable: -ProducibleWithLevel: @@ -4341,6 +4344,8 @@ STNK.Nod: WithColoredSelectionBox@INVIS: RequiresCondition: invisibility || hidden ColorSource: Player + DamageTypeDamageMultiplier@A2GPROTECTION: + Modifier: 60 BIKE: Inherits: ^VehicleTD @@ -4587,8 +4592,8 @@ HARV.TD: Resources: Tiberium, BlueTiberium, Ore, Gems BaleUnloadDelay: 1 BaleLoadDelay: 4 - SearchFromProcRadius: 15 - SearchFromHarvesterRadius: 8 + SearchFromProcRadius: 8 + SearchFromHarvesterRadius: 6 HarvestFacings: 8 EmptyCondition: no-ore WithHarvesterPipsDecoration: @@ -4819,6 +4824,9 @@ IFV: Tooltip@sharturr: Name: Ravager IFV RequiresCondition: sharturr + Tooltip@ggiturr: + Name: GGI IFV + RequiresCondition: ggiturr Tooltip@psyturr: Name: Psychic IFV RequiresCondition: psyturr @@ -4826,7 +4834,7 @@ IFV: Strengths: • Strong vs Aircraft, Heavy Armor Weaknesses: • Weak vs Infantry Attributes: • Weapon/function changes depending on infantry passenger - RequiresCondition: !full || samturr || nochange + RequiresCondition: !full || samturr || ggiturr || nochange TooltipExtras@gunturr: Strengths: • Strong vs Infantry, Light Armor Weaknesses: • Weak vs Heavy Armor, Defenses\n• Cannot attack Aircraft @@ -4939,21 +4947,21 @@ IFV: Armament@E3: Weapon: IFVRocketsE LocalOffset: 192,100,176, 192,-100,176 - RequiresCondition: samturr && !cryr-upgrade + RequiresCondition: (samturr || ggiturr) && !cryr-upgrade Armament@E3AA: Name: secondary Weapon: IFVRocketsAAE LocalOffset: 192,100,176, 192,-100,176 - RequiresCondition: samturr && !cryr-upgrade + RequiresCondition: (samturr || ggiturr) && !cryr-upgrade Armament@E3CRYO: Weapon: IFVRocketsE.CRYO LocalOffset: 192,100,176, 192,-100,176 - RequiresCondition: samturr && cryr-upgrade + RequiresCondition: (samturr || ggiturr) && cryr-upgrade Armament@E3CRYOAA: Name: secondary Weapon: IFVRocketsAAE.CRYO LocalOffset: 192,100,176, 192,-100,176 - RequiresCondition: samturr && cryr-upgrade + RequiresCondition: (samturr || ggiturr) && cryr-upgrade Armament@E4: Weapon: FireballLauncher Recoil: 85 @@ -5087,12 +5095,15 @@ IFV: PauseOnCondition: empdisable || being-warped RequiresCondition: !spyturr WithMuzzleOverlay: - WithSpriteTurret@samturr: + WithSpriteTurret@defaultturr: RequiresCondition: !full || nochange Sequence: turret - WithSpriteTurret@samturr2: + WithSpriteTurret@samturr: RequiresCondition: samturr Sequence: turret2 + WithSpriteTurret@ggiturr: + RequiresCondition: ggiturr + Sequence: turret18 WithSpriteTurret@gun: RequiresCondition: gunturr Sequence: turret3 @@ -5153,7 +5164,7 @@ IFV: n2: fragturr n3: samturr n3c: samturr - u3: samturr + u3: ggiturr n4: flamturr n5: chemturr e8: desoturr @@ -5255,27 +5266,27 @@ IFV: AutoTargetPriority@DEFAULTAA: ValidTargets: Infantry, Vehicle, Water, Underwater, Air, AirSmall, Defense InvalidTargets: NoAutoTarget - RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr) + RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr || ggiturr) AutoTargetPriority@ATTACKANYTHINGAA: ValidTargets: Infantry, Vehicle, Water, Underwater, Air, AirSmall, Structure, Defense InvalidTargets: NoAutoTarget - RequiresCondition: (stance-attackanything || assault-move) && (!full || samturr) + RequiresCondition: (stance-attackanything || assault-move) && (!full || samturr || ggiturr) AutoTargetPriority@DEFAULTAAPRIO: - RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr) + RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr || ggiturr) ValidTargets: Air, AirSmall InvalidTargets: NoAutoTarget Priority: 10 AutoTargetPriority@ATTACKANYTHINGAAPRIO: - RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr) + RequiresCondition: (!stance-attackanything && !assault-move) && (!full || samturr || ggiturr) ValidTargets: Air, AirSmall InvalidTargets: NoAutoTarget Priority: 10 AutoTargetPriority@DEFAULTG: - RequiresCondition: !stance-attackanything && !assault-move && full && !samturr + RequiresCondition: !stance-attackanything && !assault-move && full && !(samturr || ggiturr) ValidTargets: Infantry, Vehicle, Water, Underwater, Defense InvalidTargets: NoAutoTarget AutoTargetPriority@ATTACKANYTHINGG: - RequiresCondition: (stance-attackanything || assault-move) && full && !samturr + RequiresCondition: (stance-attackanything || assault-move) && full && !(samturr || ggiturr) ValidTargets: Infantry, Vehicle, Water, Underwater, Structure, Defense, Mine InvalidTargets: NoAutoTarget AttackMove: @@ -5317,7 +5328,7 @@ IFV: KeepsDistance: RequiresCondition: engturr || medturr || spyturr DamageTypeDamageMultiplier@A2GPROTECTION: - RequiresCondition: !full || samturr + RequiresCondition: !full || samturr || ggiturr AmbientSoundCA: SoundFiles: flamer-loop1.aud InitialSound: flamer-start1.aud @@ -5333,6 +5344,15 @@ IFV: Image: chrono ExplodeInstead: true RequiresCondition: ivanturr && !being-warped + DamageMultiplier@GGI: + RequiresCondition: ggiturr + Modifier: 80 + FirepowerMultiplier@GGI: + RequiresCondition: ggiturr + Modifier: 105 + RangeMultiplier@GGI: + RequiresCondition: ggiturr + Modifier: 115 IFV.AI: Inherits: ^Tank @@ -5535,6 +5555,8 @@ RECK: Name: Intruder Reckoner Tooltip@sharturr: Name: Ravager Reckoner + Tooltip@ggiturr: + Name: GGI Reckoner Tooltip@psyturr: Name: Psychic Reckoner @@ -6064,6 +6086,7 @@ RTNK: EffectiveOwner: Self WithMirageSpriteBody: RequiresCondition: tree + IsPlayerPalette: false Name: tree UpdatesPlayerStatistics: AddToArmyValue: true @@ -6111,7 +6134,7 @@ RTNK: UncloakSound: appear1md.aud UncloakOn: Attack, Dock, Move, Damage, Heal Palette: player - IsPlayerPalette: true + IsPlayerPalette: false RequiresCondition: !cloak-force-disabled && !being-warped && !empdisable && !driver-dead PauseOnCondition: invisibility Cloak@CRATE-CLOAK: @@ -6130,7 +6153,7 @@ RTNK: WithDecoration@disguise: RequiresCondition: hidden Image: gpsdot - Sequence: Vehicle + Sequence: MirageTank Palette: player IsPlayerPalette: true Position: Center @@ -6697,6 +6720,7 @@ BATF: bh: loaded ivan: loaded shad: loaded + medi: loaded-medic mech: loaded-repair seal: loaded-seal rmbo: loaded-cmdo @@ -6782,6 +6806,20 @@ BATF: Position: TopLeft ValidRelationships: Ally, Enemy, Neutral -Targetable@HERO: + WithIdleOverlay@MEDIC: + Sequence: medic + PauseOnCondition: empdisable || being-warped + RequiresCondition: loaded-medic + Offset: 0,0,250 + ProximityExternalCondition@MEDIC: + RequiresCondition: loaded-medic + Condition: hospitalheal + Range: 4c512 + WithRangeCircle@MEDIC: + Type: IFVHeal + Color: 00FF0080 + Range: 4c512 + RequiresCondition: loaded-medic BATF.AI: Inherits: BATF diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml index 875011e56f..824b3971ee 100644 --- a/mods/ca/sequences/misc.yaml +++ b/mods/ca/sequences/misc.yaml @@ -1675,6 +1675,9 @@ gpsdot: LargeInfantry: Filename: gpsdot.shp Start: 12 + MirageTank: + Filename: gpsdot.shp + Start: 13 icon: abomb: diff --git a/mods/ca/sequences/scrin.yaml b/mods/ca/sequences/scrin.yaml index 351a9901a9..d52f7fb635 100644 --- a/mods/ca/sequences/scrin.yaml +++ b/mods/ca/sequences/scrin.yaml @@ -1331,10 +1331,9 @@ stmr: ZOffset: 1022 BlendMode: Additive muzzle: - Filename: scrinmuzz1.shp + Filename: scrinmuzz7.shp + Length: * BlendMode: Additive - Length: 6 - Facings: 16 icon: Filename: stmricon.shp diff --git a/mods/ca/sequences/vehicles.yaml b/mods/ca/sequences/vehicles.yaml index 6156af8a4d..1449c28355 100644 --- a/mods/ca/sequences/vehicles.yaml +++ b/mods/ca/sequences/vehicles.yaml @@ -1647,7 +1647,7 @@ ifv: Length: 32 psy: Filename: ifvtur.shp - Start: 544 + Start: 576 Length: 1 turret: Filename: ifvtur.shp @@ -1735,6 +1735,11 @@ ifv: Start: 512 Facings: 32 UseClassicFacings: True + turret18: + Filename: ifvtur.shp + Start: 544 + Facings: 32 + UseClassicFacings: True open: Filename: ifv.shp Start: 32 @@ -2094,6 +2099,10 @@ batf: Filename: minigun16.shp Length: 6 Facings: 16 + medic: + Filename: mouse.shp + Start: 194 + Length: 1 icon: Filename: batficon.shp diff --git a/mods/ca/weapons/ballistics.yaml b/mods/ca/weapons/ballistics.yaml index 3c34ca56e1..e809b23324 100644 --- a/mods/ca/weapons/ballistics.yaml +++ b/mods/ca/weapons/ballistics.yaml @@ -488,12 +488,12 @@ TitanGun: Warhead@3Eff: CreateEffect Explosions: large_artillery_explosion ImpactSounds: artyhit.aud, artyhit2.aud, artyhit3.aud - Warhead@Concussion1: GrantExternalCondition + Warhead@Concussion1: GrantExternalConditionCA Range: 0c768 Duration: 150 Condition: concussion ValidTargets: Ground, Infantry, Vehicle, Ship - Warhead@Concussion2: GrantExternalCondition + Warhead@Concussion2: GrantExternalConditionCA Range: 1c768 Duration: 50 Condition: concussion @@ -638,8 +638,8 @@ GrenadeJJ: Falloff: 100, 50, 28, 18, 12, 6, 0 Versus: None: 150 - Wood: 65 - Concrete: 100 + Wood: 80 + Concrete: 80 Heavy: 20 Light: 95 DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath, FlakVestMitigated, AirToGround @@ -652,7 +652,7 @@ EMPGrenade: Versus: Concrete: 85 DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath - Warhead@5emp: GrantExternalCondition + Warhead@5emp: GrantExternalConditionCA Range: 0c768 Duration: 40 Condition: empdisable @@ -753,17 +753,17 @@ CryoMortar: Explosions: cryohit ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryoblast.aud - Warhead@chill1: GrantExternalCondition + Warhead@chill1: GrantExternalConditionCA Condition: chilled Duration: 250 Range: 1c0 ValidRelationships: Enemy, Neutral - Warhead@chill2: GrantExternalCondition + Warhead@chill2: GrantExternalConditionCA Condition: chilled Duration: 200 Range: 2c0 ValidRelationships: Enemy, Neutral - Warhead@chillally: GrantExternalCondition + Warhead@chillally: GrantExternalConditionCA Condition: chilled Duration: 50 Range: 0c682 @@ -784,7 +784,7 @@ SonicMortar: Light: 60 Heavy: 30 Concrete: 100 - Warhead@concussion: GrantExternalCondition + Warhead@concussion: GrantExternalConditionCA Condition: concussion Duration: 75 Range: 1c768 diff --git a/mods/ca/weapons/custom/scrinfestation.yaml b/mods/ca/weapons/custom/scrinfestation.yaml index 442906bf6a..315d121bc8 100644 --- a/mods/ca/weapons/custom/scrinfestation.yaml +++ b/mods/ca/weapons/custom/scrinfestation.yaml @@ -75,9 +75,9 @@ MiniRift: Delay: 75 Versus: None: 35 - Warhead@3Slow: GrantExternalCondition + Warhead@3Slow: GrantExternalConditionCA ValidTargets: Vehicle, Cyborg, Infantry - Warhead@4Slow: GrantExternalCondition + Warhead@4Slow: GrantExternalConditionCA ValidTargets: Vehicle, Cyborg, Infantry GunWalkerZap: diff --git a/mods/ca/weapons/explosions.yaml b/mods/ca/weapons/explosions.yaml index fddd73f912..163e80d7d1 100644 --- a/mods/ca/weapons/explosions.yaml +++ b/mods/ca/weapons/explosions.yaml @@ -797,13 +797,13 @@ MEMP: Warhead@2Eff: CreateEffect ExplosionPalette: tsunit-ignore-lighting-alpha75 Explosions: pulse_explosion3 - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Range: 5c0 Duration: 300 Condition: empdisable ValidTargets: Ground, Vehicle, Air InvalidTargets: Defense - Warhead@empdef: GrantExternalCondition + Warhead@empdef: GrantExternalConditionCA Range: 5c0 Duration: 600 Condition: empdisable @@ -828,7 +828,7 @@ ChaosGas: Explosions: gasring2 ExplosionPalette: caneon-ignore-lighting-alpha75 ImpactSounds: vchaatta.aud - Warhead@chaos: GrantExternalCondition + Warhead@chaos: GrantExternalConditionCA Range: 3c0 Duration: 200 Condition: berserk @@ -849,7 +849,7 @@ ChaosDroneExplodeSmall: ExplosionPalette: caneon ImpactSounds: firebl3.aud ImpactActors: false - Warhead@chaos: GrantExternalCondition + Warhead@chaos: GrantExternalConditionCA Range: 1c512 CryoExplosion: @@ -857,7 +857,7 @@ CryoExplosion: Explosions: cryoblast ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryoblast.aud - Warhead@chill: GrantExternalCondition + Warhead@chill: GrantExternalConditionCA Condition: chilled Duration: 150 Range: 1c768 diff --git a/mods/ca/weapons/missiles.yaml b/mods/ca/weapons/missiles.yaml index b69c9f8ace..b2b3321ec9 100644 --- a/mods/ca/weapons/missiles.yaml +++ b/mods/ca/weapons/missiles.yaml @@ -222,12 +222,12 @@ SeismicMissile: Explosions: med_splash ValidTargets: Water, Underwater InvalidTargets: Ship, Structure, Bridge - Warhead@Concussion1: GrantExternalCondition + Warhead@Concussion1: GrantExternalConditionCA Range: 1c512 Duration: 275 Condition: concussion ValidTargets: Ground, Infantry, Vehicle, Ship - Warhead@Concussion2: GrantExternalCondition + Warhead@Concussion2: GrantExternalConditionCA Range: 3c0 Duration: 175 Condition: concussion @@ -260,7 +260,7 @@ Dragon.CRYO: Explosions: cryohit ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryohit.aud - Warhead@chill: GrantExternalCondition + Warhead@chill: GrantExternalConditionCA Condition: chilled Duration: 60 Range: 0c341 @@ -278,7 +278,7 @@ Dragon.TibCore: ContrailStartColorAlpha: 170 ContrailStartWidth: 0c40 Warhead@1Dam: SpreadDamage - Damage: 7175 + Damage: 5125 Warhead@3Eff: CreateEffect ImpactSounds: tibcorehit1.aud, tibcorehit2.aud, tibcorehit3.aud Warhead@tib: CreateEffect @@ -319,7 +319,7 @@ DragonBATF: Projectile: MissileCA RangeLimit: 7c0 Warhead@1Dam: SpreadDamage - Damage: 3000 + Damage: 3750 DragonBATF.TD: Inherits: DragonBATF @@ -337,7 +337,7 @@ DragonBATF.CRYO: Projectile: MissileCA RangeLimit: 7c0 Warhead@1Dam: SpreadDamage - Damage: 3000 + Damage: 3750 DragonBATF.TibCore: Inherits: Dragon.TibCore @@ -345,13 +345,13 @@ DragonBATF.TibCore: Projectile: MissileCA RangeLimit: 9c0 Warhead@1Dam: SpreadDamage - Damage: 3250 + Damage: 3850 DragonBATF.CYB.TibCore: Inherits: DragonBATF.TibCore Report: itanweaa.aud, itanweab.aud, itanweac.aud Warhead@1Dam: SpreadDamage - Damage: 4400 + Damage: 5400 HellfireAG: Inherits: ^AirToGroundMissile @@ -646,7 +646,7 @@ RedEye.CRYO: Explosions: cryohit ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryoblast.aud - Warhead@chill: GrantExternalCondition + Warhead@chill: GrantExternalConditionCA Condition: chilled Duration: 60 Range: 0c341 @@ -801,7 +801,7 @@ TOW: Range: 5c0 ValidTargets: Vehicle, Structure Report: tow1.aud, tow2.aud - ReloadDelay: 150 + ReloadDelay: 130 Projectile: MissileCA Speed: 180 Inaccuracy: 0 @@ -820,6 +820,7 @@ TOW: Wood: 40 Concrete: 30 Light: 40 + DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, TankBuster EMPRockets: Inherits: ^AntiGroundMissile @@ -845,7 +846,7 @@ EMPRockets: Wood: 40 Concrete: 30 Light: 60 - Warhead@Emp: GrantExternalCondition + Warhead@Emp: GrantExternalConditionCA Range: 0c768 Duration: 40 Condition: empdisable @@ -1386,7 +1387,7 @@ IFVRocketsE.CRYO: Explosions: cryohit ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryohit.aud - Warhead@chill: GrantExternalCondition + Warhead@chill: GrantExternalConditionCA Condition: chilled Duration: 60 Range: 0c341 @@ -1414,7 +1415,7 @@ IFVRocketsAAE.CRYO: Explosions: cryohit ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryoblast.aud - Warhead@chill: GrantExternalCondition + Warhead@chill: GrantExternalConditionCA Condition: chilled Duration: 60 Range: 0c341 @@ -1497,7 +1498,7 @@ IFVRocketsAAE.CRYO: Warhead@4Eff: CreateEffect ImpactSounds: xplobig4.aud Explosions: artillery_explosion - Warhead@Concussion: GrantExternalCondition + Warhead@Concussion: GrantExternalConditionCA Range: 0c768 Duration: 70 Condition: concussion @@ -1853,7 +1854,7 @@ ScrinTorp: Warhead@3Eff: CreateEffect Explosions: large_explosion ImpactSounds: expnew16.aud, expnew17.aud - Warhead@green: GrantExternalCondition + Warhead@green: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: greenhighlight @@ -1877,7 +1878,7 @@ ScrinTorpAA: Damage: 4000 Warhead@3Eff: CreateEffect ImpactSounds: expnew17.aud - Warhead@green: GrantExternalCondition + Warhead@green: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: greenhighlight @@ -1960,17 +1961,17 @@ CryoMissile: Explosions: cryoblast ExplosionPalette: ra2effect-ignore-lighting-alpha75 ImpactSounds: cryoblast.aud - Warhead@chill1: GrantExternalCondition + Warhead@chill1: GrantExternalConditionCA Condition: chilled Duration: 250 Range: 1c0 ValidRelationships: Enemy, Neutral - Warhead@chill2: GrantExternalCondition + Warhead@chill2: GrantExternalConditionCA Condition: chilled Duration: 200 Range: 2c0 ValidRelationships: Enemy, Neutral - Warhead@chillally: GrantExternalCondition + Warhead@chillally: GrantExternalConditionCA Condition: chilled Duration: 50 Range: 0c682 @@ -1995,11 +1996,11 @@ CryoMissileNHAW: LaunchAngle: 3 Warhead@1Dam: SpreadDamage Damage: 1000 - Warhead@chill1: GrantExternalCondition + Warhead@chill1: GrantExternalConditionCA Range: 1c512 - Warhead@chill2: GrantExternalCondition + Warhead@chill2: GrantExternalConditionCA Range: 3c0 - Warhead@chillally: GrantExternalCondition + Warhead@chillally: GrantExternalConditionCA Range: 1c341 Warhead@cryoresidue: CreateTintedCells Level: 200 @@ -2081,7 +2082,7 @@ BlackEagleMissiles: Damage: 22000 Versus: Concrete: 75 - Warhead@VeiledCondition: GrantExternalCondition + Warhead@VeiledCondition: GrantExternalConditionCA Range: 2c512 Duration: 175 Condition: gapveiled @@ -2103,7 +2104,7 @@ BlackEagleMissilesAA: Image: MISSILE Warhead@1Dam: SpreadDamage Damage: 12000 - Warhead@VeiledCondition: GrantExternalCondition + Warhead@VeiledCondition: GrantExternalConditionCA Range: 2c512 Duration: 175 Condition: gapveiled diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml index f0d4cde0e6..10fca348a1 100644 --- a/mods/ca/weapons/other.yaml +++ b/mods/ca/weapons/other.yaml @@ -483,13 +483,13 @@ PortaTeslaCharge: -Report: -Warhead@1Dam: -Warhead@2Smu: - Warhead@charge: GrantExternalCondition + Warhead@charge: GrantExternalConditionCA Range: 42 Duration: 70 Condition: charged ValidRelationships: Ally ValidTargets: TeslaBoost - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: highlight @@ -676,7 +676,7 @@ Repair: -Warhead@2Dam: -Warhead@3Dam: -Warhead@4Dam: - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: highlight @@ -706,7 +706,7 @@ RepairFlash: -Warhead@2Dam: -Warhead@3Dam: -Warhead@4Dam: - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 2c511 Duration: 2 Condition: highlight @@ -714,7 +714,7 @@ RepairFlash: ShieldFlash: Inherits: RepairFlash - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 2c511 Duration: 2 Condition: highlight @@ -748,7 +748,7 @@ PlaceC4: DeathTypes: ExplosionDeath Range: 1 Warhead@TargetValidator: SpreadDamage - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c256 Duration: 2 Condition: highlight @@ -764,7 +764,7 @@ PlaceC4Seal: TriggerTime: 20 Type: c4seal ScaleTriggerTimeWithValue: true - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA ValidTargets: Ground, Structure C4: @@ -820,7 +820,7 @@ Ivanbomb: AttachSounds: icraatta.aud MissWeapon: DelayedTNT Warhead@TargetValidator: SpreadDamage - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c256 Duration: 2 Condition: highlight @@ -881,7 +881,7 @@ DefuseKit: Width: 48 Duration: 4 Color: FFFFFF80 - Warhead@flash: GrantExternalCondition + Warhead@flash: GrantExternalConditionCA Range: 128 Duration: 3 Condition: detach @@ -925,7 +925,7 @@ Hack: Actors: camera.hacker Range: 1 ImpactActors: false - Warhead@green: GrantExternalCondition + Warhead@green: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: greenhighlight @@ -978,7 +978,7 @@ MADTankDetonate: Heavy: 0 Concrete: 100 Brick: 100 - Warhead@Concussion: GrantExternalCondition + Warhead@Concussion: GrantExternalConditionCA Range: 7c0 Duration: 150 Condition: concussion @@ -1213,13 +1213,13 @@ EnlightenedEmp: Jammable: false TrailImage: smokey TrailPalette: scrinplasma - Warhead@1Emp: GrantExternalCondition + Warhead@1Emp: GrantExternalConditionCA Range: 0c896 Duration: 100 Condition: empdisable ValidTargets: Ground, Vehicle InvalidTargets: Cyborg, Defense - Warhead@2Emp: GrantExternalCondition + Warhead@2Emp: GrantExternalConditionCA Range: 0c896 Duration: 50 Condition: empdisable @@ -1249,7 +1249,7 @@ VenomLaser: DamageTypes: Prone50Percent, TriggerProne, FireDeath, AirToGround Versus: None: 250 - Wood: 60 + Wood: 50 Concrete: 40 Light: 95 Heavy: 65 @@ -1270,6 +1270,7 @@ VenomLaser.UPG: Spread: 42 Damage: 6325 Versus: + Wood: 60 Concrete: 55 VenomLaserAA: @@ -1517,12 +1518,12 @@ KirovClusterBomb: Warhead@3Eff: CreateEffect Explosions: large_artillery_explosion ImpactSounds: artyhit.aud, artyhit2.aud, artyhit3.aud - Warhead@Concussion1: GrantExternalCondition + Warhead@Concussion1: GrantExternalConditionCA Range: 0c768 Duration: 125 Condition: concussion ValidTargets: Ground, Infantry, Vehicle, Ship - Warhead@Concussion2: GrantExternalCondition + Warhead@Concussion2: GrantExternalConditionCA Range: 1c768 Duration: 35 Condition: concussion @@ -1654,7 +1655,7 @@ SonicZap.UPG: Color: 00ffcc25 Warhead@1Dam: SpreadDamage Damage: 820 - Warhead@4Conc: GrantExternalCondition + Warhead@4Conc: GrantExternalConditionCA Range: 0c512 Duration: 75 Condition: concussion @@ -1698,7 +1699,7 @@ GapBeam: DistortionAnimation: 64 TrackTarget: true Warhead@1Dum: Dummy - Warhead@Debuff: GrantExternalCondition + Warhead@Debuff: GrantExternalConditionCA Range: 1c512 Duration: 15 Condition: gapveiled @@ -1733,7 +1734,7 @@ VeilSmall: ReloadDelay: 10 Range: 1c0 Projectile: InstantHit - Warhead@Debuff: GrantExternalCondition + Warhead@Debuff: GrantExternalConditionCA Range: 2c512 Duration: 15 Condition: veiled @@ -1746,21 +1747,21 @@ VeilSmall: VeilMedium: Inherits: VeilSmall - Warhead@Debuff: GrantExternalCondition + Warhead@Debuff: GrantExternalConditionCA Range: 4c768 Warhead@Cloud: CreateEffect Inaccuracy: 3c768 VeilLarge: Inherits: VeilSmall - Warhead@Debuff: GrantExternalCondition + Warhead@Debuff: GrantExternalConditionCA Range: 7c0 Warhead@Cloud: CreateEffect Inaccuracy: 6c0 VeilFull: Inherits: VeilSmall - Warhead@Debuff: GrantExternalCondition + Warhead@Debuff: GrantExternalConditionCA Range: 9c256 Warhead@Cloud: CreateEffect Inaccuracy: 7c512 @@ -1959,13 +1960,13 @@ OrcaBomb: Warhead@4Eff: CreateEffect Explosions: artillery_explosion ValidTargets: Ground, Ship, Trees - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Range: 1c512 Duration: 375 Condition: empdisable ValidTargets: Ground, Structure, Vehicle InvalidTargets: Defense - Warhead@empdef: GrantExternalCondition + Warhead@empdef: GrantExternalConditionCA Range: 1c512 Duration: 625 Condition: empdisable @@ -2011,12 +2012,12 @@ MicrowaveZap: Falloff: 100, 37, 14, 0 Damage: 30000 DamageTypes: Prone50Percent, TriggerProne, FireDeath - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Range: 0c511 Duration: 100 Condition: empdisable ValidTargets: Vehicle - Warhead@empdef: GrantExternalCondition + Warhead@empdef: GrantExternalConditionCA Range: 0c511 Duration: 100 Condition: empdisable @@ -2034,12 +2035,12 @@ MicrowaveZap.UPG: InvalidTargets: Infantry, Ship, Structure, Wall, Husk, Air CargoEffect: Kill Range: 0c511 - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Range: 1c0 ValidTargets: Vehicle - Warhead@empdef: GrantExternalCondition + Warhead@empdef: GrantExternalConditionCA Duration: 200 - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: highlight @@ -2129,7 +2130,7 @@ Flare: ZOffset: 4096 Warhead@1Dam: TargetDamage ValidTargets: Structure - Warhead@2Con: GrantExternalCondition + Warhead@2Con: GrantExternalConditionCA ValidTargets: Structure Range: 0c32 Duration: 8 @@ -2167,7 +2168,7 @@ ChaosCloud: Range: 1c0 ValidTargets: Ground, Water Projectile: InstantHit - Warhead@1Cond: GrantExternalCondition + Warhead@1Cond: GrantExternalConditionCA ValidTargets: Ground, Vehicle Range: 1c512 Duration: 50 @@ -2245,7 +2246,7 @@ RadBeamWeapon: Falloff: 100, 37, 25, 15, 0 ValidTargets: Infantry DamageTypes: RadiationDeath - Warhead@2irrad: GrantExternalCondition + Warhead@2irrad: GrantExternalConditionCA Range: 0c256 Duration: 250 Condition: irradiated @@ -2369,7 +2370,7 @@ CyCannon: Warhead@3Eff: CreateEffect Explosions: large_explosion ImpactSounds: expnew16.aud, expnew17.aud - Warhead@green: GrantExternalCondition + Warhead@green: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: greenhighlight @@ -2404,7 +2405,7 @@ NeutronCannonAA: Warhead@ShieldDamage: SpreadDamage Damage: 250 ValidTargets: Shielded - Warhead@ShieldWarp: GrantExternalCondition + Warhead@ShieldWarp: GrantExternalConditionCA Range: 0c512 Duration: 10 Condition: shield-warped @@ -2496,13 +2497,13 @@ SonicPulse.UPG: Explosions: sonicblastupg1, sonicblastupg2 Warhead@3Eff: CreateEffect Explosions: sonicpulseupg1, sonicpulseupg2 - Warhead@ConcussionVehicles: GrantExternalCondition + Warhead@ConcussionVehicles: GrantExternalConditionCA Range: 1c0 Duration: 150 Condition: concussion ValidTargets: Vehicle, Ship ValidRelationships: Enemy, Neutral - Warhead@ConcussionInfantry: GrantExternalCondition + Warhead@ConcussionInfantry: GrantExternalConditionCA Range: 1c0 Duration: 25 Condition: concussion @@ -2557,7 +2558,7 @@ DisruptorPulse.Amp: Warhead@2Eff: CreateFacingEffect Explosions: sonicwaveupg1, sonicwaveupg2 ExplosionPalette: effect - Warhead@4Conc: GrantExternalCondition + Warhead@4Conc: GrantExternalConditionCA Range: 0c768 Duration: 75 Condition: concussion @@ -2619,7 +2620,7 @@ JDAM: RandomClusterCount: 3 Dimensions: 3,3 Footprint: xxx xxx xxx - Warhead@Concussion: GrantExternalCondition + Warhead@Concussion: GrantExternalConditionCA Range: 3c0 Duration: 70 Condition: concussion @@ -2684,7 +2685,7 @@ AttachShadowBeacon: ValidTargets: ShadowBeacon Warhead@TargetValidator: SpreadDamage ValidTargets: ShadowBeacon - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 341 Duration: 2 Condition: redhighlight @@ -2857,7 +2858,7 @@ MineDefuser: Damage: 12000 ValidTargets: Mine Delay: 5 - Warhead@1Def: GrantExternalCondition + Warhead@1Def: GrantExternalConditionCA Condition: defused Range: 0c511 Duration: 25 @@ -2952,13 +2953,13 @@ ShadeEmp: Concrete: 75 Brick: 5 DamageTypes: Prone50Percent, TriggerProne, ElectricityDeath, AirToGround - Warhead@1Emp: GrantExternalCondition + Warhead@1Emp: GrantExternalConditionCA Range: 1c256 Duration: 325 Condition: empdisable ValidTargets: Ground, Vehicle, Defense InvalidTargets: Cyborg - Warhead@2Emp: GrantExternalCondition + Warhead@2Emp: GrantExternalConditionCA Range: 1c256 Duration: 125 Condition: empdisable @@ -3090,7 +3091,7 @@ FloatingDiscLaser: FloatingDiscPowerDrainer: Inherits: ^FloatingDiscDrainer ValidTargets: PowerDrainable - Warhead@PowerDrain: GrantExternalCondition + Warhead@PowerDrain: GrantExternalConditionCA Range: 0c128 Duration: 11 Condition: discpowerdrain @@ -3100,7 +3101,7 @@ FloatingDiscPowerDrainer: FloatingDiscResourceDrainer: Inherits: ^FloatingDiscDrainer ValidTargets: ResourceDrainable - Warhead@ResourceDrain: GrantExternalCondition + Warhead@ResourceDrain: GrantExternalConditionCA Range: 0c128 Duration: 11 Condition: resourcedrain diff --git a/mods/ca/weapons/scrin.yaml b/mods/ca/weapons/scrin.yaml index 32d9d45f93..0ad313fde0 100644 --- a/mods/ca/weapons/scrin.yaml +++ b/mods/ca/weapons/scrin.yaml @@ -27,10 +27,10 @@ DisintegratorBeam: Light: 34 Concrete: 75 -DisintegratorBeamE: +DisintegratorBeamBATF: Inherits: DisintegratorBeam Warhead@1Dam: SpreadDamage - Damage: 1700 + Damage: 2250 DisintegratorBeamAA: Inherits: DisintegratorBeam @@ -219,6 +219,11 @@ IntruderDiscs: Heavy: 90 Concrete: 100 +IntruderDiscsBATF: + Inherits: IntruderDiscs + Warhead@1Dam: SpreadDamage + Damage: 2150 + DevastatorDiscs: Inherits: PlasmaDiscs Range: 16c0 @@ -388,7 +393,7 @@ RiftCannon: Warhead@1Dam: SpreadDamage Spread: 512 Falloff: 100, 37, 23, 10, 0 - Damage: 3500 + Damage: 2500 Versus: None: 15 Light: 75 @@ -425,9 +430,9 @@ MiniRift: Range: 1c0 Projectile: InstantHit Warhead@1Dam: SpreadDamage - Spread: 896 + Spread: 692 Damage: 840 - Falloff: 100, 90, 0 + Falloff: 100, 70, 0 Versus: None: 3 Wood: 30 @@ -438,9 +443,9 @@ MiniRift: DamageTypes: BulletDeath ValidRelationships: Enemy, Neutral Warhead@2Dam: SpreadDamage - Spread: 896 + Spread: 692 Damage: 168 - Falloff: 100, 90, 0 + Falloff: 100, 70, 0 Versus: None: 3 Wood: 30 @@ -450,12 +455,12 @@ MiniRift: Brick: 20 DamageTypes: BulletDeath ValidRelationships: Ally - Warhead@3Slow: GrantExternalCondition + Warhead@3Slow: GrantExternalConditionCA Range: 1c0 Duration: 10 Condition: slowed ValidTargets: Vehicle, Ship, Cyborg - Warhead@4Slow: GrantExternalCondition + Warhead@4Slow: GrantExternalConditionCA Range: 2c0 Duration: 10 Condition: slowed @@ -760,7 +765,7 @@ EnervatorBolts: Heavy: 100 Concrete: 100 DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath, TankBuster, AirToGround - Warhead@2Sup: GrantExternalCondition + Warhead@2Sup: GrantExternalConditionCA Range: 0c768 Duration: 75 Condition: suppression @@ -796,7 +801,7 @@ EnervatorBoltsAA: Falloff: 100, 50, 14, 0 ValidTargets: AirSmall ValidRelationships: Enemy, Neutral - Warhead@2Sup: GrantExternalCondition + Warhead@2Sup: GrantExternalConditionCA ValidTargets: Air, AirSmall InvaderLauncher: @@ -989,7 +994,7 @@ IonCloudChargeZap: -Warhead@1Dam: -Warhead@2Smu: -Warhead@3Eff: - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: highlight @@ -1031,12 +1036,47 @@ GravityStabilizerZap: Width: 32 Warhead@1Dum: Dummy ValidRelationships: Ally - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c511 Duration: 1 Condition: highlight ValidTargets: Resupplying +MothershipCharge: + ReloadDelay: 10 + Warhead@Dummy: Dummy + ValidTargets: Ground, Water, Air + Warhead@Zaps: FireShrapnel + ValidTargets: Ground, Water, Air + Weapon: MothershipChargeZap + Amount: 3 + AimChance: 100 + AllowDirectHit: true + ThrowWithoutTarget: false + AimTargetStances: Ally + ImpactSounds: mshp-stmrcharge.aud + +MothershipChargeZap: + Inherits: GravityStabilizerZap + ValidTargets: MothershipRearmable + Range: 7c0 + Projectile: ElectricBolt + TrackTarget: true + Colors: FFFFFF66, FFFFFF33 + Duration: 3 + Distortion: 160 + DistortionAnimation: 160 + Warhead@1Dum: Dummy + ValidRelationships: Ally + ValidTargets: MothershipRearmable + Warhead@highlight: GrantExternalConditionCA + ValidTargets: MothershipRearmable + Warhead@rearm: GrantExternalConditionCA + Range: 0c511 + Duration: 80 + Condition: mshp-rearm + ValidTargets: MothershipRearmable + ShardLauncher: StartBurstReport: shard-fire1.aud ReloadDelay: 25 @@ -1222,7 +1262,7 @@ SuppressionField: Warhead@1Dam: SpreadDamage Spread: 1c0 Damage: 1 - Warhead@2sup: GrantExternalCondition + Warhead@2sup: GrantExternalConditionCA Range: 3c0 Duration: 600 Condition: suppression @@ -1230,7 +1270,7 @@ SuppressionField: SuppressionSiphonField: Inherits: SuppressionField - Warhead@3siphon: GrantExternalCondition + Warhead@3siphon: GrantExternalConditionCA Range: 3c0 Duration: 600 Condition: suppression-siphon @@ -1325,7 +1365,7 @@ IonSurge: ReloadDelay: 20 Range: 1c0 Projectile: InstantHit - Warhead@surge: GrantExternalCondition + Warhead@surge: GrantExternalConditionCA Range: 6c0 Duration: 375 Condition: ionsurge @@ -1448,12 +1488,12 @@ LeecherBeam: Heavy: 15 Concrete: 15 Brick: 5 - Warhead@DRAIN: GrantExternalCondition + Warhead@DRAIN: GrantExternalConditionCA Range: 1c512 Duration: 100 Condition: powerdrain ValidTargets: PowerDrainable - Warhead@SLOW: GrantExternalCondition + Warhead@SLOW: GrantExternalConditionCA Range: 0c768 Duration: 30 Condition: slowed @@ -1565,7 +1605,7 @@ TiberiumCoalescenceZap: AtomizerBolts: Report: atomizer-fire1.aud ReloadDelay: 150 - Range: 8c0 + Range: 9c0 TargetActorCenter: true MinRange: 1c512 Projectile: Missile @@ -1591,7 +1631,7 @@ AtomizerBolts: Heavy: 100 Concrete: 90 DamageTypes: Prone50Percent, AtomizedDeath - Warhead@atomize: GrantExternalCondition + Warhead@atomize: GrantExternalConditionCA Range: 0c768 Duration: 155 Condition: atomized @@ -1602,7 +1642,7 @@ AtomizerBolts: ExplosionPalette: scrin Image: atmzbolthit ImpactSounds: atomizer-hit1.aud - Warhead@red: GrantExternalCondition + Warhead@red: GrantExternalConditionCA Range: 0c768 Duration: 2 Condition: redhighlight @@ -1625,6 +1665,7 @@ AtomizedEcho: AtomizerBoltsAA: Inherits: AtomizerBolts + Range: 7c512 ValidTargets: Air, AirSmall Projectile: Missile Speed: 225 @@ -1636,12 +1677,12 @@ AtomizerBoltsAA: Light: 100 Concrete: 100 Brick: 100 - Warhead@atomize: GrantExternalCondition + Warhead@atomize: GrantExternalConditionCA ValidTargets: Air, AirSmall Range: 1c512 Warhead@3Eff: CreateEffect ValidTargets: Air, AirSmall - Warhead@red: GrantExternalCondition + Warhead@red: GrantExternalConditionCA ValidTargets: Air, AirSmall Range: 1c512 @@ -1656,7 +1697,7 @@ AtomizeSpreadInit: AtomizeSpread: Range: 1c512 Projectile: InstantHit - Warhead@cond: GrantExternalCondition + Warhead@cond: GrantExternalConditionCA Range: 0c512 Duration: 120 Condition: atomized @@ -1712,7 +1753,7 @@ MindSparkSpawnerMaster: ForceGround: false ValidTargets: Ground, Water, Trees Delay: 8 - Warhead@Suppress: GrantExternalCondition + Warhead@Suppress: GrantExternalConditionCA Range: 2c0 Duration: 325 Condition: suppression @@ -1724,7 +1765,7 @@ MindSparkSpawnerSlave: -Warhead@2Eff: Warhead@Spawn: SpawnActor -Delay: - Warhead@Suppress: GrantExternalCondition + Warhead@Suppress: GrantExternalConditionCA -Delay: MindSparkZap: diff --git a/mods/ca/weapons/smallcaliber.yaml b/mods/ca/weapons/smallcaliber.yaml index 2702791906..d67bc72187 100644 --- a/mods/ca/weapons/smallcaliber.yaml +++ b/mods/ca/weapons/smallcaliber.yaml @@ -507,27 +507,14 @@ M1CarbineBATF: -Report: StartBurstReport: baocatta.aud, baocattb.aud, baocattc.aud ReloadDelay: 10 - Range: 6c0 Warhead@1Dam: SpreadDamage - Damage: 650 - Versus: - None: 100 - Wood: 15 - Concrete: 15 - Light: 25 - Heavy: 5 + Damage: 750 M16CarbineBATF: Inherits: M1CarbineBATF BATFGun: Inherits: M1CarbineBATF - Range: 5c0 - Warhead@1Dam: SpreadDamage - Damage: 1800 - Versus: - Wood: 10 - Concrete: 5 M60mg: Inherits: ^LightMG @@ -809,7 +796,7 @@ SNIPER.vehicle: ImpactSounds: splash9.aud ValidTargets: Water, Underwater InvalidTargets: Ship, Structure, Bridge - Warhead@Concussion: GrantExternalCondition + Warhead@Concussion: GrantExternalConditionCA Range: 0c256 Duration: 75 Condition: concussion @@ -818,7 +805,7 @@ SNIPER.vehicle: SNIPER.vehicleElite: Inherits: SNIPER.vehicle Report: ijarwe2a.aud - Warhead@Concussion: GrantExternalCondition + Warhead@Concussion: GrantExternalConditionCA InvalidTargets: DriverKillLow Warhead@DriverKill: ChangeOwnerToNeutral ValidTargets: DriverKillLow @@ -826,7 +813,7 @@ SNIPER.vehicleElite: ValidRelationships: Enemy CargoEffect: Block Range: 0c511 - Warhead@highlight: GrantExternalCondition + Warhead@highlight: GrantExternalConditionCA Range: 0c511 Duration: 2 Condition: highlight @@ -842,6 +829,10 @@ SNIPERBATF.UPG: SniperIFVGun: Inherits: SNIPER.vehicle + Warhead@1Dam: SpreadDamage + Versus: + Light: 60 + Heavy: 60 CommandoIFVGun: Inherits: SMG diff --git a/mods/ca/weapons/superweapons.yaml b/mods/ca/weapons/superweapons.yaml index 90b0017caa..dde4682700 100644 --- a/mods/ca/weapons/superweapons.yaml +++ b/mods/ca/weapons/superweapons.yaml @@ -196,7 +196,7 @@ GeneticMutationBomb: Velocity: 15, 0, -35 Acceleration: 0, 0, 0 Shadow: true - Warhead@COND: GrantExternalCondition + Warhead@COND: GrantExternalConditionCA Range: 4c0 Duration: 16 Condition: geneticmutation @@ -408,7 +408,7 @@ Empicbm: ExplosionPalette: tseffect-ignore-lighting-alpha75 Explosions: pulse_explosion ImpactSounds: empexpl.aud - Warhead@emp: GrantExternalCondition + Warhead@emp: GrantExternalConditionCA Range: 5c0 Duration: 500 Condition: empdisable @@ -475,12 +475,12 @@ EMPMissileLauncher: ExplosionPalette: tseffect-ignore-lighting-alpha75 Explosions: pulse_explosion ImpactSounds: empexpl.aud - Warhead@emp1: GrantExternalCondition + Warhead@emp1: GrantExternalConditionCA Range: 2c256 Duration: 600 Condition: empdisable ValidTargets: Ground, Vehicle, Air - Warhead@emp2: GrantExternalCondition + Warhead@emp2: GrantExternalConditionCA Range: 4c512 Duration: 300 Condition: empdisable @@ -640,7 +640,7 @@ ForceShield: Warhead@4Eff: CreateEffect ExplosionPalette: effect-ignore-lighting-alpha85 Explosions: forceshield_effect - Warhead@fspower: GrantExternalCondition + Warhead@fspower: GrantExternalConditionCA Range: 15c0 Duration: 500 Condition: forcedisabled