diff --git a/OpenRA.Mods.CA/Projectiles/ProjectileHusk.cs b/OpenRA.Mods.CA/Projectiles/ProjectileHusk.cs index ff0cbc3aee..834029724e 100644 --- a/OpenRA.Mods.CA/Projectiles/ProjectileHusk.cs +++ b/OpenRA.Mods.CA/Projectiles/ProjectileHusk.cs @@ -1,10 +1,10 @@ #region Copyright & License Information -/* - * 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. +/** + * Copyright (c) The OpenRA Combined Arms Developers (see CREDITS). + * This file is part of OpenRA Combined Arms, 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 diff --git a/OpenRA.Mods.CA/Traits/Sound/WithCargoSounds.cs b/OpenRA.Mods.CA/Traits/Sound/WithCargoSounds.cs index 30176c9d06..6024e4edf3 100644 --- a/OpenRA.Mods.CA/Traits/Sound/WithCargoSounds.cs +++ b/OpenRA.Mods.CA/Traits/Sound/WithCargoSounds.cs @@ -1,11 +1,10 @@ #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. +/** + * Copyright (c) The OpenRA Combined Arms Developers (see CREDITS). + * This file is part of OpenRA Combined Arms, 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 diff --git a/OpenRA.Mods.CA/Traits/SpawnHuskEffectOnDeath.cs b/OpenRA.Mods.CA/Traits/SpawnHuskEffectOnDeath.cs index aa87432f6e..40ff038dc0 100644 --- a/OpenRA.Mods.CA/Traits/SpawnHuskEffectOnDeath.cs +++ b/OpenRA.Mods.CA/Traits/SpawnHuskEffectOnDeath.cs @@ -1,11 +1,10 @@ #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. +/** + * Copyright (c) The OpenRA Combined Arms Developers (see CREDITS). + * This file is part of OpenRA Combined Arms, 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 diff --git a/mod.config b/mod.config index 4ab632ab38..4964dd4bb2 100644 --- a/mod.config +++ b/mod.config @@ -102,7 +102,7 @@ PACKAGING_OVERWRITE_MOD_VERSION="True" AUTOMATIC_ENGINE_MANAGEMENT="True" # The URL to download the engine files from when AUTOMATIC_ENGINE_MANAGEMENT is enabled. -AUTOMATIC_ENGINE_SOURCE="https://github.com/darkademic/OpenRA/archive/refs/heads/${ENGINE_VERSION}.zip" +AUTOMATIC_ENGINE_SOURCE="https://github.com/Inq8/OpenRA/archive/refs/heads/${ENGINE_VERSION}.zip" # Temporary file/directory names used by automatic engine management. # Paths outside the SDK directory are not officially supported. diff --git a/mods/ca/bits/audio/iseaatta.aud b/mods/ca/bits/audio/iseaatta.aud index a514bc1eb0..b90d6781e0 100644 Binary files a/mods/ca/bits/audio/iseaatta.aud and b/mods/ca/bits/audio/iseaatta.aud differ diff --git a/mods/ca/bits/audio/iseaattb.aud b/mods/ca/bits/audio/iseaattb.aud index e5fd420271..6864a29c99 100644 Binary files a/mods/ca/bits/audio/iseaattb.aud and b/mods/ca/bits/audio/iseaattb.aud differ diff --git a/mods/ca/rules/infantry.yaml b/mods/ca/rules/infantry.yaml index 5a63b21660..94d871e42e 100644 --- a/mods/ca/rules/infantry.yaml +++ b/mods/ca/rules/infantry.yaml @@ -1737,6 +1737,7 @@ N5: Inherits: ^Cyborg Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@BERSERK: ^Berserk + Inherits@HEALINGCOOLDOWN: ^HealingCooldown Buildable: Queue: InfantrySQ, InfantryMQ, CyborgMQ BuildAtProductionType: Cyborg @@ -2410,6 +2411,7 @@ ACOL: TPLR: Inherits: ACOL + Inherits@HEALINGCOOLDOWN: ^HealingCooldown Tooltip: Name: Templar Valued: @@ -2730,6 +2732,7 @@ E8: Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@BERSERK: ^Berserk Inherits@Inspirable: ^Inspirable + Inherits@HEALINGCOOLDOWN: ^HealingCooldown Buildable: Queue: InfantrySQ, InfantryMQ BuildAtProductionType: Soldier @@ -2849,6 +2852,7 @@ N1C: Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove Inherits@BOTHELPER: ^BotCaptureHelper Inherits@BERSERK: ^Berserk + Inherits@HEALINGCOOLDOWN: ^HealingCooldown RenderSprites: Buildable: Queue: InfantrySQ, InfantryMQ, CyborgMQ @@ -3162,6 +3166,7 @@ IVAN: BRUT: Inherits: ^Soldier Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove + Inherits@HEALINGCOOLDOWN: ^HealingCooldown AutoTarget: ScanRadius: 4 InitialStance: AttackAnything @@ -3814,6 +3819,7 @@ SEAL: Voice: Move AttackMove: Voice: Move + -AssaultMoveCondition: RevealsShroud: Range: 6c0 Buildable: @@ -3939,6 +3945,8 @@ SEAL: DeathSequence: splash WithDecoration@COMMANDOSKULL: Sequence: pip-seal + AutoTarget: + -AttackAnythingCondition: -AutoTargetPriority@ATTACKANYTHING: -Targetable@HERO: diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml index 5c421d817b..3d65507416 100644 --- a/mods/ca/weapons/other.yaml +++ b/mods/ca/weapons/other.yaml @@ -2239,7 +2239,12 @@ RadBeamWeapon: WaveLength: 384 Thickness: 32 ZOffset: 512 - Warhead@1Dam: SpreadDamage + Warhead@1Dam: HealthPercentageDamage + Spread: 42 + Damage: 150 + ValidTargets: Infantry + DamageTypes: Prone50Percent, TriggerProne, RadiationDeath + Warhead@2Dam: SpreadDamage Spread: 42 Damage: 16000 Versus: @@ -2250,7 +2255,8 @@ RadBeamWeapon: Concrete: 12 Brick: 0 DamageTypes: Prone50Percent, TriggerProne, RadiationDeath - Warhead@2Dam: SpreadDamage + InvalidTargets: Infantry + Warhead@3Dam: SpreadDamage Spread: 256 Damage: 3750 Falloff: 100, 37, 25, 15, 0 diff --git a/mods/ca/weapons/smallcaliber.yaml b/mods/ca/weapons/smallcaliber.yaml index eb41ddacb8..fa341c59ff 100644 --- a/mods/ca/weapons/smallcaliber.yaml +++ b/mods/ca/weapons/smallcaliber.yaml @@ -771,6 +771,12 @@ SNIPER: Heavy: 2 Light: 2 DamageTypes: Prone50Percent, TriggerProne, BulletDeath + InvalidTargets: Infantry + Warhead@2Dam: HealthPercentageDamage + Spread: 42 + Damage: 150 + ValidTargets: Infantry + DamageTypes: Prone50Percent, TriggerProne, BulletDeath Warhead@2Eff: CreateEffect Explosions: piff ValidTargets: Ground, Ship, Air, AirSmall, Trees