Merge remote-tracking branch 'darkademic/dev'

Inq8 · Feb 10, 2024 · 5ec9708 · 5ec9708
2 parents 30af1b0 + e3011df
commit 5ec9708
Show file tree

Hide file tree

Showing 21 changed files with 73 additions and 44 deletions.
diff --git a/OpenRA.Mods.CA/Activities/BallisticMissileFly.cs b/OpenRA.Mods.CA/Activities/BallisticMissileFly.cs
@@ -72,7 +72,7 @@ public override bool Tick(Actor self)
 			var move = sbm.FlyStep(sbm.Facing);
 
 			// Destruct so that Explodes will be called
-			if (d.HorizontalLengthSquared < move.HorizontalLengthSquared)
+			if (d.HorizontalLengthSquared < move.HorizontalLengthSquared || self.CenterPosition.Z <= 0)
 			{
 				Queue(new CallFunc(() => self.Kill(self)));
 				return true;

diff --git a/OpenRA.Mods.CA/Activities/CruiseMissileFly.cs b/OpenRA.Mods.CA/Activities/CruiseMissileFly.cs
@@ -102,7 +102,7 @@ public override bool Tick(Actor self)
 			var move = cm.FlyStep(cm.Facing);
 
 			// Destruct so that Explodes will be called
-			if (d.HorizontalLengthSquared < move.HorizontalLengthSquared)
+			if (d.HorizontalLengthSquared < move.HorizontalLengthSquared || currentPos.Z <= 0)
 			{
 				Queue(new CallFunc(() => self.Kill(self)));
 				return true;

diff --git a/OpenRA.Mods.CA/Projectiles/RailgunCA.cs b/OpenRA.Mods.CA/Projectiles/RailgunCA.cs
@@ -10,6 +10,7 @@
 #endregion
 
 using System.Collections.Generic;
+using System.Linq;
 using OpenRA.GameRules;
 using OpenRA.Graphics;
 using OpenRA.Mods.Common.Graphics;
@@ -117,6 +118,7 @@ public class RailgunCA : IProjectile, ISync
 		readonly Animation hitanim;
 		public readonly Color BeamColor;
 		public readonly Color HelixColor;
+		readonly IEnumerable<int> rangeModifiers;
 
 		int ticks;
 		bool animationComplete;
@@ -142,6 +144,8 @@ public RailgunCA(ProjectileArgs args, RailgunCAInfo info, Color beamColor, Color
 			BeamColor = beamColor;
 			HelixColor = helixColor;
 
+			rangeModifiers = args.SourceActor.TraitsImplementing<IRangeModifier>().ToArray().Select(m => m.GetRangeModifier());
+
 			if (info.Inaccuracy.Length > 0)
 			{
 				var maxInaccuracyOffset = Util.GetProjectileInaccuracy(info.Inaccuracy.Length, info.InaccuracyType, args);
@@ -158,7 +162,8 @@ void CalculateVectors()
 		{
 			if (info.PassthroughToMaxRange && (info.PassthroughMinDistance.Length == 0 || (target - args.Source).Length >= info.PassthroughMinDistance.Length))
 			{
-				var speed = new WVec(0, -args.Weapon.Range.Length, 0);
+			 	var weaponRange = new WDist(Util.ApplyPercentageModifiers(args.Weapon.Range.Length, rangeModifiers));
+				var speed = new WVec(0, -weaponRange.Length, 0);
 
 				if (info.PassthroughParallelToMuzzleOffset)
 				{

diff --git a/OpenRA.Mods.CA/Traits/ChronoshiftableCA.cs b/OpenRA.Mods.CA/Traits/ChronoshiftableCA.cs
@@ -80,7 +80,7 @@ public class ChronoshiftableCAInfo : ConditionalTraitInfo
 		public readonly PlayerRelationship ReturnToAvoidDeathRelationships = PlayerRelationship.Ally | PlayerRelationship.Neutral | PlayerRelationship.Enemy;
 
 		[Desc("If ReturnToAvoidDeath is true the amount of HP restored on return.")]
-		public readonly int ReturnToAvoidDeathHealthPercent = 20;
+		public readonly int ReturnToAvoidDeathHealthPercent = 10;
 
 		[Desc("If ReturnToAvoidDeath is true, the actor to replace the normal husk with.")]
 		public readonly string ReturnToAvoidDeathHuskActor = "camera.dummy";

diff --git a/OpenRA.Mods.CA/Traits/Render/LeavesTrailsCA.cs b/OpenRA.Mods.CA/Traits/Render/LeavesTrailsCA.cs
@@ -117,11 +117,10 @@ void ITick.Tick(Actor self)
 			{
 				var spawnCell = Info.SpawnAtLastPosition ? self.World.Map.CellContaining(cachedPosition) : self.World.Map.CellContaining(self.CenterPosition);
 
-				/* ---- removed for CA version for V3/ICBM
-				if (!self.World.Map.Contains(spawnCell))
-					return;
-				*/
-				var type = self.World.Map.GetTerrainInfo(spawnCell).Type;
+				// For CA shootable missiles, allow for cells not contained by map
+				var type = "Invalid";
+				if (self.World.Map.Contains(spawnCell))
+					type = self.World.Map.GetTerrainInfo(spawnCell).Type;
 
 				if (++offset >= Info.Offsets.Length)
 					offset = 0;

diff --git a/mods/ca/audio/notifications.yaml b/mods/ca/audio/notifications.yaml
@@ -169,6 +169,7 @@ Speech:
 		AtomicBombReady: atmbombrdy1
 		AtomicShellsReady: atmshelrdy1
 		CarpetBombReady: carpetrdy1
+		ChaosBombsReady: chaosbombsrdy1
 		GeneticMutationBombReady: gmutrdy1
 
 		DropPodsAvailable: dpodrdy1

diff --git a/mods/ca/bits/audio/r2_chaosbombsrdy1.aud b/mods/ca/bits/audio/r2_chaosbombsrdy1.aud
diff --git a/mods/ca/bits/audio/r_chaosbombsrdy1.aud b/mods/ca/bits/audio/r_chaosbombsrdy1.aud
diff --git a/mods/ca/rules/ai.yaml b/mods/ca/rules/ai.yaml
@@ -2401,6 +2401,8 @@ Player:
 			cv: 4
 			jjet: 8
 			bjet: 8
+			v3rl: 3
+			thwk: 3
 			kiro: 3
 			disc: 3
 			deva: 3
@@ -2642,6 +2644,8 @@ Player:
 			cv: 4
 			jjet: 8
 			bjet: 8
+			v3rl: 2
+			thwk: 2
 			kiro: 2
 			disc: 2
 			deva: 2
@@ -2883,6 +2887,8 @@ Player:
 			cv: 4
 			jjet: 8
 			bjet: 8
+			v3rl: 1
+			thwk: 1
 			kiro: 1
 			disc: 1
 			deva: 1

diff --git a/mods/ca/rules/aircraft.yaml b/mods/ca/rules/aircraft.yaml
@@ -655,6 +655,7 @@ P51:
 TRAN:
 	Inherits: ^Helicopter
 	Inherits@TRANSPORT: ^Transport
+	Inherits@SELECTION: ^SelectableSupportUnit
 	RenderSprites:
 		Image: tran3
 	Buildable:
@@ -841,6 +842,7 @@ NHAW:
 	Inherits: ^Helicopter
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@TRANSPORT: ^Transport
+	Inherits@SELECTION: ^SelectableSupportUnit
 	RenderSprites:
 		Image: nhaw
 	Buildable:
@@ -2621,6 +2623,7 @@ KIRO:
 
 OCAR:
 	Inherits: ^HelicopterTD
+	Inherits@SELECTION: ^SelectableSupportUnit
 	RenderSprites:
 		Image: orcaca
 	Valued:

diff --git a/mods/ca/rules/custom/two-tone-nod.yaml b/mods/ca/rules/custom/two-tone-nod.yaml
@@ -89,3 +89,19 @@ TRAN:
 SCRN:
 	RenderSprites:
 		PlayerPalette: playertd
+
+BEAG:
+	RenderSprites:
+		PlayerPalette: player-twotonenod
+
+KAMV:
+	RenderSprites:
+		PlayerPalette: player-twotonenod
+
+RECK:
+	RenderSprites:
+		PlayerPalette: player-twotonenod
+
+3TNK.RHINO:
+	RenderSprites:
+		PlayerPalette: player-twotonenod
diff --git a/mods/ca/rules/powers.yaml b/mods/ca/rules/powers.yaml
@@ -568,7 +568,7 @@
 		Description: \nCalls in a Badger bomber which drops parachuted\n    chaos bombs on your target.
 		SelectTargetSpeechNotification: SelectTarget
 		SelectTargetTextNotification: Select target.
-		EndChargeSpeechNotification: ParabombsReady
+		EndChargeSpeechNotification: ChaosBombsReady
 		EndChargeTextNotification: Chaos bombs ready.
 		CameraActor: camera.paradrop
 		CameraRemoveDelay: 150
@@ -1722,9 +1722,9 @@
 		Icon: fleetrecall
 		IconPalette: chromes
 		ChargeInterval: 5250
-		Name: Recall
+		Name: Fleet Recall
 		KeepFormation: true
-		Description: ok
+		Description: \nRecalls all selected Scrin fleet vessels back\n    to the Signal Transmitter.\n\nApplies to: Mothership, Planetary Assault Carrier, Devastator
 		SelectTargetSpeechNotification: SelectTarget
 		SelectTargetTextNotification: Select target.
 		InsufficientPowerSpeechNotification: InsufficientPower

diff --git a/mods/ca/rules/scrin.yaml b/mods/ca/rules/scrin.yaml
@@ -2156,7 +2156,6 @@ STMR:
 	Inherits@HULLREGEN: ^HullRegen
 	Inherits@SHIELDS: ^ScrinShields
 	Inherits@SCRINVEHICLEVOICE: ^ScrinVehicleVoice
-	Inherits@FleetRecallable: ^FleetRecallable
 	Buildable:
 		Queue: AircraftSQ, AircraftMQ
 		BuildPaletteOrder: 90
@@ -2286,7 +2285,6 @@ ENRV:
 	Inherits@HULLREGEN: ^HullRegen
 	Inherits@SHIELDS: ^ScrinShields
 	Inherits@SCRINVEHICLEVOICE: ^ScrinVehicleVoice
-	Inherits@FleetRecallable: ^FleetRecallable
 	Buildable:
 		Queue: AircraftSQ, AircraftMQ
 		BuildPaletteOrder: 170
@@ -2563,7 +2561,7 @@ PAC:
 	Voiced:
 		VoiceSet: PlanetaryAssaultCarrierVoice
 	Valued:
-		Cost: 3000
+		Cost: 2800
 	Tooltip:
 		Name: Planetary Assault Carrier
 		GenericName: Aircraft

diff --git a/mods/ca/rules/structures.yaml b/mods/ca/rules/structures.yaml
@@ -5536,7 +5536,7 @@ TMPP:
 		NoCashAudio: InsufficientFunds
 		BlockedAudio: OnHold
 		CostDifferenceRequired: true
-		BuildDurationModifier: 35
+		BuildDurationModifier: 45
 		OverrideUnitBuildDurationModifier: true
 		EjectOnDeploy: true
 		ConvertingCondition: converting

diff --git a/mods/ca/rules/upgrades.yaml b/mods/ca/rules/upgrades.yaml
@@ -836,7 +836,7 @@ optics.upgrade:
 		Name: Research: Advanced Optics
 	Buildable:
 		BuildPaletteOrder: 20
-		Prerequisites: ~player.allies, atek, ~techlevel.high
+		Prerequisites: ~player.allies, anyradar, ~techlevel.medium
 		Description: Equips rangers with advanced optics which temporarily extends their vision.\n\nUpgrades: Ranger
 	TooltipExtras:
 		Strengths: + Rangers can temporarily increase their vision range

diff --git a/mods/ca/rules/vehicles.yaml b/mods/ca/rules/vehicles.yaml
@@ -5327,6 +5327,12 @@ IFV:
 	GrantConditionOnAttackCA:
 		Condition: attacking
 		RevokeDelay: 3
+	ChronoshiftableCA:
+		RequiresCondition: !ivanturr && !being-warped
+	ChronoshiftableCA@Ivan:
+		Image: chrono
+		ExplodeInstead: true
+		RequiresCondition: ivanturr && !being-warped
 
 IFV.AI:
 	Inherits: ^Tank
@@ -5696,7 +5702,7 @@ JUGG:
 		Bounds: 1280, 1706
 		DecorationBounds: 1280, 1706, 0, -100
 	Valued:
-		Cost: 1500
+		Cost: 2000
 	QuantizeFacingsFromSequence:
 		Sequence: stand
 	WithFacingSpriteBody:
@@ -5746,7 +5752,7 @@ JUGG:
 		Offset: -20,0,20
 		TurnSpeed: 12
 	Health:
-		HP: 50000
+		HP: 62000
 	Armor:
 		Type: Heavy
 	Passenger:
@@ -5770,6 +5776,10 @@ JUGG:
 	GrantConditionOnMovement@MOVING:
 		ValidMovementTypes: Horizontal, Vertical, Turn
 		Condition: moving
+	RangeMultiplier@GYRO:
+		Modifier: 150
+	ReloadDelayMultiplier@GYRO:
+		Modifier: 150
 	Carryable:
 		LocalOffset: 0,0,700
 	-Crushable:
@@ -6694,7 +6704,11 @@ BATF:
 			yuri: loaded-cmdo
 			acol: loaded
 			tplr: loaded
+			cscr: loaded
+			mort.cryo: loaded
+			mort.sonic: loaded
 			mort.chem: loaded
+			cmsr: loaded
 			spy: loaded-spy
 			snip: loaded
 			shok: loaded

diff --git a/mods/ca/weapons/ballistics.yaml b/mods/ca/weapons/ballistics.yaml
@@ -551,21 +551,23 @@ TitanGun:
 
 JuggernautGun:
 	Inherits: ^Artillery
-	MinRange: 2c0
-	ReloadDelay: 120
-	Range: 10c0
+	MinRange: 3c0
+	ReloadDelay: 110
+	Range: 13c0
 	Burst: 3
 	StartBurstReport: jugger1.aud
 	TargetActorCenter: true
 	Projectile: Bullet
 		Inaccuracy: 1c138
 	Warhead@1Dam: SpreadDamage
 		Spread: 348
-		Damage: 1300
+		Damage: 1125
 		Falloff: 800, 368, 135, 50, 18, 7, 0
 		Versus:
-			None: 90
+			None: 100
+			Wood: 75
 			Heavy: 35
+			Light: 65
 			Concrete: 45
 	Warhead@4EffWater: CreateEffect
 		Explosions: large_splash

diff --git a/mods/ca/weapons/explosions.yaml b/mods/ca/weapons/explosions.yaml
@@ -228,7 +228,7 @@ V2Explode:
 V3ExplodeAirborne:
 	Inherits: ^Explosion
 	Warhead@1Dam: SpreadDamage
-		Range: 0, 2c0, 3c0
+		Range: 0, 1c768, 2c768
 		Falloff: 100, 100, 0
 		Damage: 5000
 		Versus:
@@ -243,22 +243,7 @@ V3ExplodeAirborne:
 		ImpactSounds: kaboom15.aud
 
 THExplodeAirborne:
-	Inherits: ^Explosion
-	Warhead@1Dam: SpreadDamage
-		Range: 0, 4c0, 5c0
-		Falloff: 100, 100, 0
-		Damage: 6750
-		ValidTargets: Ground, Water, Trees
-		Versus:
-			None: 10
-			Wood: 55
-			Light: 30
-			Heavy: 20
-			Concrete: 100
-		DamageTypes: Prone50Percent, TriggerProne, SmallExplosionDeath
-	Warhead@2Eff: CreateEffect
-		Explosions: artillery_explosion
-		ImpactSounds: kaboom15.aud
+	Inherits: V3ExplodeAirborne
 
 BuildingExplode:
 	Warhead@2Eff: CreateEffect

diff --git a/mods/ca/weapons/missiles.yaml b/mods/ca/weapons/missiles.yaml
@@ -2143,4 +2143,4 @@ RocketShells:
 		Gravity: 0
 		CruiseAltitude: 2c0
 		Inaccuracy: 128
-		AllowSnapping: true
+		AllowSnapping: true
diff --git a/mods/ca/weapons/other.yaml b/mods/ca/weapons/other.yaml
@@ -1975,7 +1975,7 @@ MicrowaveZap:
 	ValidTargets: Ground, Water
 	InvalidTargets: Air
 	TargetActorCenter: true
-	ReloadDelay: 180
+	ReloadDelay: 170
 	Range: 7c0
 	Report: corefir1.aud
 	Projectile: Railgun

diff --git a/mods/ca/weapons/smallcaliber.yaml b/mods/ca/weapons/smallcaliber.yaml
@@ -606,7 +606,7 @@ M60mgMD:
 	ReloadDelay: 40
 
 M60mgMD.Attached:
-	Range: 4c768
+	Range: 5c256
 	Inherits: M60mgMD
 
 MGattG: