Skip to content

Commit

Permalink
Updates.
Browse files Browse the repository at this point in the history
- Sniper/Desolator uses % damage to one-shot any infantry.
- Adjusted SEAL firing sound to prevent overlap.
- Added healing cooldown to infantry with 15k HP or more.
- Yaml fixes.
- Typo fix.
  • Loading branch information
darkademic committed Feb 25, 2024
1 parent f9a090f commit 99c6d10
Show file tree
Hide file tree
Showing 9 changed files with 42 additions and 24 deletions.
12 changes: 6 additions & 6 deletions OpenRA.Mods.CA/Projectiles/ProjectileHusk.cs
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 6 additions & 7 deletions OpenRA.Mods.CA/Traits/Sound/WithCargoSounds.cs
Original file line number Diff line number Diff line change
@@ -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

Expand Down
13 changes: 6 additions & 7 deletions OpenRA.Mods.CA/Traits/SpawnHuskEffectOnDeath.cs
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion mod.config
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Binary file modified mods/ca/bits/audio/iseaatta.aud
Binary file not shown.
Binary file modified mods/ca/bits/audio/iseaattb.aud
Binary file not shown.
8 changes: 8 additions & 0 deletions mods/ca/rules/infantry.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,7 @@ N5:
Inherits: ^Cyborg
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@BERSERK: ^Berserk
Inherits@HEALINGCOOLDOWN: ^HealingCooldown
Buildable:
Queue: InfantrySQ, InfantryMQ, CyborgMQ
BuildAtProductionType: Cyborg
Expand Down Expand Up @@ -2410,6 +2411,7 @@ ACOL:

TPLR:
Inherits: ACOL
Inherits@HEALINGCOOLDOWN: ^HealingCooldown
Tooltip:
Name: Templar
Valued:
Expand Down Expand Up @@ -2730,6 +2732,7 @@ E8:
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@BERSERK: ^Berserk
Inherits@Inspirable: ^Inspirable
Inherits@HEALINGCOOLDOWN: ^HealingCooldown
Buildable:
Queue: InfantrySQ, InfantryMQ
BuildAtProductionType: Soldier
Expand Down Expand Up @@ -2849,6 +2852,7 @@ N1C:
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@BOTHELPER: ^BotCaptureHelper
Inherits@BERSERK: ^Berserk
Inherits@HEALINGCOOLDOWN: ^HealingCooldown
RenderSprites:
Buildable:
Queue: InfantrySQ, InfantryMQ, CyborgMQ
Expand Down Expand Up @@ -3162,6 +3166,7 @@ IVAN:
BRUT:
Inherits: ^Soldier
Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
Inherits@HEALINGCOOLDOWN: ^HealingCooldown
AutoTarget:
ScanRadius: 4
InitialStance: AttackAnything
Expand Down Expand Up @@ -3814,6 +3819,7 @@ SEAL:
Voice: Move
AttackMove:
Voice: Move
-AssaultMoveCondition:
RevealsShroud:
Range: 6c0
Buildable:
Expand Down Expand Up @@ -3939,6 +3945,8 @@ SEAL:
DeathSequence: splash
WithDecoration@COMMANDOSKULL:
Sequence: pip-seal
AutoTarget:
-AttackAnythingCondition:
-AutoTargetPriority@ATTACKANYTHING:
-Targetable@HERO:

Expand Down
12 changes: 9 additions & 3 deletions mods/ca/weapons/other.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -2769,7 +2775,7 @@ BrassDebris:
BrassDebrisAir:
Inherits: BrassDebris
ReloadDelay: 10
Projectile: ProjetcileHusk
Projectile: ProjectileHusk
Velocity: 50, 0, 10
VelocityRandomFactor: 0, 15, 30

Expand Down
6 changes: 6 additions & 0 deletions mods/ca/weapons/smallcaliber.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 99c6d10

Please sign in to comment.