diff --git a/OpenRA.Mods.CA/Traits/Upgradeable.cs b/OpenRA.Mods.CA/Traits/Upgradeable.cs index df7b88f75f..6aa21c0270 100644 --- a/OpenRA.Mods.CA/Traits/Upgradeable.cs +++ b/OpenRA.Mods.CA/Traits/Upgradeable.cs @@ -52,12 +52,15 @@ public class UpgradeableInfo : ConditionalTraitInfo [Desc("Voice to use on upgrade completion.")] public readonly string UpgradeCompleteSpeechNotification = "UpgradeComplete"; + [Desc("Sound to play on upgrade completion.")] + public readonly string UpgradeSound = "voveupgr.aud"; + [ActorReference] [Desc("If set, must upgrade near one of these actors.")] public readonly HashSet UpgradeAtActors = new HashSet { }; [Desc("If UpgradeAtActors are set, defines the max distance to upgrade.")] - public readonly WDist UpgradeAtRange = WDist.FromCells(10); + public readonly WDist UpgradeAtRange = WDist.FromCells(3); [Desc("Color to use for the target line.")] public readonly Color TargetLineColor = Color.Cyan; @@ -170,6 +173,7 @@ public void Unlock() public void Complete() { upgraded = true; + Game.Sound.Play(SoundType.World, Info.UpgradeSound, self.CenterPosition); } public void UpdateManager() diff --git a/mods/ca/bits/audio/icivatta.aud b/mods/ca/bits/audio/icivatta.aud new file mode 100644 index 0000000000..75f75f8f81 Binary files /dev/null and b/mods/ca/bits/audio/icivatta.aud differ diff --git a/mods/ca/bits/audio/icivattb.aud b/mods/ca/bits/audio/icivattb.aud new file mode 100644 index 0000000000..a7c0cc8d84 Binary files /dev/null and b/mods/ca/bits/audio/icivattb.aud differ diff --git a/mods/ca/bits/audio/vblediea.aud b/mods/ca/bits/audio/vblediea.aud new file mode 100644 index 0000000000..9b808d3b68 Binary files /dev/null and b/mods/ca/bits/audio/vblediea.aud differ diff --git a/mods/ca/bits/audio/vbledieb.aud b/mods/ca/bits/audio/vbledieb.aud new file mode 100644 index 0000000000..825e60781f Binary files /dev/null and b/mods/ca/bits/audio/vbledieb.aud differ diff --git a/mods/ca/bits/audio/vblelo1a.aud b/mods/ca/bits/audio/vblelo1a.aud new file mode 100644 index 0000000000..e4295f21f2 Binary files /dev/null and b/mods/ca/bits/audio/vblelo1a.aud differ diff --git a/mods/ca/bits/audio/vblelo3.aud b/mods/ca/bits/audio/vblelo3.aud new file mode 100644 index 0000000000..1d89f31ade Binary files /dev/null and b/mods/ca/bits/audio/vblelo3.aud differ diff --git a/mods/ca/bits/audio/vifvtran.aud b/mods/ca/bits/audio/vifvtran.aud new file mode 100644 index 0000000000..51726bdf9b Binary files /dev/null and b/mods/ca/bits/audio/vifvtran.aud differ diff --git a/mods/ca/bits/audio/vintdiea.aud b/mods/ca/bits/audio/vintdiea.aud new file mode 100644 index 0000000000..5ef2ce10f6 Binary files /dev/null and b/mods/ca/bits/audio/vintdiea.aud differ diff --git a/mods/ca/bits/audio/vintdieb.aud b/mods/ca/bits/audio/vintdieb.aud new file mode 100644 index 0000000000..d786c33451 Binary files /dev/null and b/mods/ca/bits/audio/vintdieb.aud differ diff --git a/mods/ca/bits/audio/vintdna.aud b/mods/ca/bits/audio/vintdna.aud new file mode 100644 index 0000000000..e1ad232d15 Binary files /dev/null and b/mods/ca/bits/audio/vintdna.aud differ diff --git a/mods/ca/bits/audio/vintupa.aud b/mods/ca/bits/audio/vintupa.aud new file mode 100644 index 0000000000..c6c4993ae9 Binary files /dev/null and b/mods/ca/bits/audio/vintupa.aud differ diff --git a/mods/ca/bits/audio/vosplana.aud b/mods/ca/bits/audio/vosplana.aud new file mode 100644 index 0000000000..9b03651a06 Binary files /dev/null and b/mods/ca/bits/audio/vosplana.aud differ diff --git a/mods/ca/bits/audio/vospstaa.aud b/mods/ca/bits/audio/vospstaa.aud new file mode 100644 index 0000000000..dd30c1a676 Binary files /dev/null and b/mods/ca/bits/audio/vospstaa.aud differ diff --git a/mods/ca/bits/audio/voveupgr.aud b/mods/ca/bits/audio/voveupgr.aud new file mode 100644 index 0000000000..8ebb1ed255 Binary files /dev/null and b/mods/ca/bits/audio/voveupgr.aud differ diff --git a/mods/ca/bits/audio/vtitupg1.aud b/mods/ca/bits/audio/vtitupg1.aud new file mode 100644 index 0000000000..5fd8f953ee Binary files /dev/null and b/mods/ca/bits/audio/vtitupg1.aud differ diff --git a/mods/ca/bits/pip-cmsr.shp b/mods/ca/bits/pip-cmsr.shp index 83e16c2a83..c4eee1e665 100644 Binary files a/mods/ca/bits/pip-cmsr.shp and b/mods/ca/bits/pip-cmsr.shp differ diff --git a/mods/ca/bits/ussrstar.shp b/mods/ca/bits/ussrstar.shp new file mode 100644 index 0000000000..cf0697c922 Binary files /dev/null and b/mods/ca/bits/ussrstar.shp differ diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml index dd21fd3e83..deb4fe43d8 100644 --- a/mods/ca/rules/aircraft.yaml +++ b/mods/ca/rules/aircraft.yaml @@ -874,8 +874,8 @@ NHAW: TurnSpeed: 20 Speed: 155 AltitudeVelocity: 0c58 - TakeoffSounds: htoff1.aud - LandingSounds: hland1.aud + TakeoffSounds: vospstaa.aud + LandingSounds: vosplana.aud Voice: Move WithIdleOverlay@ROTOR1AIR: Offset: 237,0,263 @@ -2620,7 +2620,7 @@ KIRO: AmbientSoundCA: SoundFiles: vkirlo2a.aud, vkirlo2b.aud, vkirlo2c.aud Interval: 2 - VolumeMultiplier: 0.05 + VolumeMultiplier: 0.08 -RangeMultiplier@SEEK: -RangeMultiplier@SEEK2: -RangeMultiplier@SEEK3: @@ -2905,11 +2905,13 @@ HARR: RepulsionSpeed: 40 MaximumPitch: 56 CanHover: False - TakeoffSounds: mtoff1.aud, mtoff2.aud - LandingSounds: mland1.aud, mland2.aud + TakeoffSounds: vintupa.aud + LandingSounds: vintdna.aud Voice: Move CanSlide: False AltitudeVelocity: 0c200 + SoundOnDamageTransition: + DestroyedSounds: vintdiea.aud, vintdieb.aud AutoTarget: InitialStance: HoldFire InitialStanceAI: AttackAnything @@ -3759,10 +3761,12 @@ BEAG: RepulsionSpeed: 40 MaximumPitch: 56 CanHover: False - TakeoffSounds: mtoff1.aud, mtoff2.aud - LandingSounds: mland1.aud, mland2.aud + TakeoffSounds: vblelo1a.aud + LandingSounds: vblelo3.aud CanSlide: False AltitudeVelocity: 0c200 + SoundOnDamageTransition: + DestroyedSounds: vblediea.aud, vbledieb.aud AutoTarget: InitialStance: HoldFire InitialStanceAI: AttackAnything @@ -3880,8 +3884,8 @@ KAMV: Aircraft: TurnSpeed: 16 Speed: 112 - TakeoffSounds: htoff1.aud - LandingSounds: hland1.aud + TakeoffSounds: vospstaa.aud + LandingSounds: vosplana.aud AutoTarget: InitialStance: HoldFire InitialStanceAI: AttackAnything @@ -4437,7 +4441,7 @@ DISC: AmbientSoundCA: SoundFiles: diskmolp2a.aud, diskmolp2b.aud Interval: 15 - VolumeMultiplier: 0.1 + VolumeMultiplier: 0.08 -RangeMultiplier@SEEK: -RangeMultiplier@SEEK2: -RangeMultiplier@SEEK3: diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml index 43c9674c13..1453e670c1 100644 --- a/mods/ca/rules/defaults.yaml +++ b/mods/ca/rules/defaults.yaml @@ -425,6 +425,11 @@ SpeedMultiplier@Inspiration: RequiresCondition: inspiration Modifier: 150 + WithIdleOverlay@Inspiration: + Image: ussrstar + Sequence: idle-overlay + Palette: effect + RequiresCondition: inspiration ^Chronoshiftable: ChronoshiftableCA: diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml index 2add93a53d..784b40ad48 100644 --- a/mods/ca/rules/infantry.yaml +++ b/mods/ca/rules/infantry.yaml @@ -723,6 +723,11 @@ SPY: Position: TopLeft ValidRelationships: Ally, Enemy, Neutral RequiresCondition: cmsr-disguise + WithIdleOverlay@Inspiration: + Image: ussrstar + Sequence: idle-overlay + Palette: effect + RequiresCondition: cmsr-disguise AttackMove: Voice: Move Voiced: @@ -4314,6 +4319,10 @@ CMSR: Palette: effect Position: TopLeft ValidRelationships: Ally, Enemy, Neutral + WithIdleOverlay@Inspiration: + Image: ussrstar + Sequence: idle-overlay + Palette: effect WithRadiatingCircle: EndRadius: 7c0 Interval: 25 diff --git a/mods/ca/rules/upgrades.yaml b/mods/ca/rules/upgrades.yaml index 48b83070d5..268501e48a 100644 --- a/mods/ca/rules/upgrades.yaml +++ b/mods/ca/rules/upgrades.yaml @@ -444,6 +444,9 @@ railgun.upgrade: Strengths: + Increased range\n+ Damages targets in a line Valued: Cost: 1000 + AnnounceOnCreation: + SoundNotification: UPG-Railguns + Delay: 60 RenderSprites: Image: railgun.upgrade diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml index 282e29c6e8..d2ad673d97 100644 --- a/mods/ca/rules/vehicles.yaml +++ b/mods/ca/rules/vehicles.yaml @@ -5835,10 +5835,20 @@ TITN: Actors: titn.rail Upgradeable@RAILGUN: Type: railgun.upgrade + UpgradingCondition: upgrading Actor: titn.rail UpgradeAtActors: fix, rep, srep BuildDuration: 100 RequiresCondition: !mindcontrolled + WithDecoration@Upgradeable: + Image: upgrade + Palette: chrome + Sequence: upgrade + Position: Center + RequiresCondition: upgrading + BlinkInterval: 5 + BlinkPattern: on + ValidRelationships: Ally, Neutral TITN.RAIL: Inherits: TITN @@ -5860,6 +5870,7 @@ TITN.RAIL: Actor: TITN.RAIL.Husk -ReplacedInQueue: -Upgradeable@RAILGUN: + -WithDecoration@Upgradeable: JUGG: Inherits: ^TankTD diff --git a/mods/ca/sequences/misc.yaml b/mods/ca/sequences/misc.yaml index 824b3971ee..8114c9f389 100644 --- a/mods/ca/sequences/misc.yaml +++ b/mods/ca/sequences/misc.yaml @@ -1166,6 +1166,12 @@ poweron: Tick: 160 ZOffset: 2047 +upgrade: + upgrade: + Filename: upgradecursor.shp + Start: 0 + Length: 3 + nosignal: offline: Filename: nosig.shp @@ -3016,3 +3022,13 @@ veilblast: Filename: veilblast.shp Alpha: 0.8 idle: + +ussrstar: + Defaults: + Length: * + ZOffset: -32 + IgnoreWorldTint: true + idle-overlay: + Filename: ussrstar.shp + Alpha: 0.6 + ZOffset: -32 diff --git a/mods/ca/weapons/ballistics.yaml b/mods/ca/weapons/ballistics.yaml index 6cf05cd3e4..265e399e7e 100644 --- a/mods/ca/weapons/ballistics.yaml +++ b/mods/ca/weapons/ballistics.yaml @@ -20,7 +20,7 @@ SmudgeType: Crater InvalidTargets: Vehicle, Structure, Wall, Husk, Trees Warhead@3Eff: CreateEffect - Explosions: small_explosion + Explosions: small_explosion_alt1, small_explosion_alt2, small_explosion_alt3 ImpactSounds: kaboom12.aud ValidTargets: Ground, Ship, Trees Warhead@4EffWater: CreateEffect diff --git a/mods/ca/weapons/explosions.yaml b/mods/ca/weapons/explosions.yaml index 163e80d7d1..4ad6b75dc1 100644 --- a/mods/ca/weapons/explosions.yaml +++ b/mods/ca/weapons/explosions.yaml @@ -78,6 +78,8 @@ UnitExplodePlaneLight: Inherits: UnitExplodePlane Warhead@1Dam: SpreadDamage Damage: 3000 + Warhead@2Eff: CreateEffect + Explosions: napalm UnitExplodePlaneEmpty: Inherits: UnitExplode @@ -92,12 +94,14 @@ UnitExplodeHeli: None: 30 Light: 30 Warhead@2Eff: CreateEffect - Explosions: napalm + Explosions: large_napalm UnitExplodeHeliEmpty: Inherits: UnitExplodeHeli Warhead@1Dam: SpreadDamage Damage: 2000 + Warhead@2Eff: CreateEffect + Explosions: napalm UnitExplodeDrone: Inherits: UnitExplodeHeli @@ -108,7 +112,7 @@ UnitExplodeDrone: Light: 30 UnitExplodeDroneEmpty: - Inherits: UnitExplodeHeli + Inherits: UnitExplodeHeliEmpty Warhead@1Dam: SpreadDamage Damage: 1000 diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml index 089cb4aaa1..15e52daf33 100644 --- a/mods/ca/weapons/other.yaml +++ b/mods/ca/weapons/other.yaml @@ -2616,6 +2616,7 @@ JDAM: Explosions: fuelbomb1, fuelbomb2 ImpactSounds: xplobig4.aud Warhead@Flames: FireCluster + InvalidTargets: Water Weapon: BurnFx RandomClusterCount: 3 Dimensions: 3,3 @@ -2630,10 +2631,10 @@ JDAM: Intensity: 1 Multiplier: 0.5,0.5 Warhead@Shrap: FireShrapnel - Weapon: SmallDebris - Amount: 5 + Weapon: TinyDebris + Amount: 10 AimChance: 0 - ValidTargets: Ground, Water, Infantry, Vehicle + ValidTargets: Ground, Infantry, Vehicle ThrowWithoutTarget: true HarvSwap: @@ -2728,6 +2729,7 @@ AttachShadowBeacon: TinyDebris: Inherits: ^Debris + ValidTargets: Ground, Trees Projectile: Bullet Image: dirt Palette: terrain @@ -3044,7 +3046,7 @@ PeacemakerBombs: Weapon: TinyDebris Amount: 10 AimChance: 0 - ValidTargets: Ground, Water, Infantry, Vehicle + ValidTargets: Ground, Infantry, Vehicle ThrowWithoutTarget: true TibSurgeTargeter: @@ -3069,7 +3071,6 @@ FloatingDiscLaser: SecondaryBeamColor: eb39d340 Warhead@1Dam: SpreadDamage ValidTargets: Ground, Water, Air, AirSmall - InvalidTargets: PowerDrainable, ResourceDrainable Damage: 13000 Versus: None: 100 diff --git a/mods/ca/weapons/smallcaliber.yaml b/mods/ca/weapons/smallcaliber.yaml index 6b2c26fbb2..a124fa5aff 100644 --- a/mods/ca/weapons/smallcaliber.yaml +++ b/mods/ca/weapons/smallcaliber.yaml @@ -127,8 +127,10 @@ Gatt: Range: 0, 0c64, 0c256, 1c768 Falloff: 100, 70, 30, 10 Warhead@2Eff: CreateEffect + Explosions: piff ValidTargets: Air, AirSmall, ICBM - ImpactSoundChance: 20 + ImpactSounds: sirodefa.aud, sirodefb.aud, sirodefc.aud, sirodefd + ImpactSoundChance: 60 MGatt: Inherits: ^AACannon @@ -457,6 +459,7 @@ PistolTD: CommissarPistol: Inherits: Pistol + Report: icivattb.aud, icivatta.aud Range: 6c0 Warhead@1Dam: SpreadDamage Damage: 900