merge

AUTHORS

@@ -61,15 +61,15 @@ Contributors & special thanks to:
 	* Bu7loos (Slingshot, Grand Cannon, Cryolauncher/Yuri Chaos Platform, HMLRS, Mobile EMP)
 	* Orac (Chronoharv)
 	* Overwatch (Heavy Flame Tank, V3, XO/Bastion, Support Battlefortress, Peoples Tank)
-	* Midian-P (Battlemaster, Outpost, Dragon Tank, Bulldozer, Supply Truck, Overlord, Helix, Chinese Mig, Centurion/Gene Splicer, ysgen/MSG, Bastion, Chinook, BTR)
+	* Midian-P (Battlemaster, Outpost, Dragon Tank, Bulldozer, Supply Truck, Overlord, Helix, Chinese Mig, Centurion/Gene Splicer, ysgen/MSG, Bastion, Chinook, BTR, Spyplane/Badger)
 	* B.A.Znd (China Nuke Cannon, ISU, Katyusha, BPNE/Rice Cooker, Soviet Miner, Wheel)
 	* G-E (2S3 Akatsiya)
 	* partyzanPaulZy (MARV)
 	* L()KI (Ogunship/Orca.Drone)
 	* 206UE, Slavack, Ackron (Titan)
 	* Kiriha (prmd/Tankd)
 	* Yuriko222 (arty/howi)
-	* atomic noodles (Prismfortress, Battlefortress)
+	* atomic noodles (Prismfortress, Battlefortress, Jumpjet)
 	* cxtian (mini/mgdrone)
 	* MigEater (Aurora, Comanche)
 	* FreisArk01 (Mtank/IFV)
@@ -95,6 +95,8 @@ Contributors & special thanks to:
 	* tom2050 (Zombie/Brute)
 	* god_l1ke1 (SpecOps)
 	* Lord Kal (Medic)
+	* machine (Jumpjet)
+	* MadHQ (Ion Turret)
 
 Of course YMCA wouldn't exist today without OpenRA & the
 hard work of the many OpenRA contributors.

mods/ca/mod.yaml

@@ -47,6 +47,7 @@ Packages:
 	ca|bits/audio
 	ca|uibits
 	ca|bits/scrin
+	ca|bits/yuri
 	ca|bits/scrin/audio
 	ca|bits/newscrin
 	ca|bits/misc
@@ -162,6 +163,7 @@ Sequences:
 	ca|sequences/gdi.yaml
 	ca|sequences/nod.yaml
 	ca|sequences/scrin.yaml
+	ca|sequences/yuri.yaml
 	ca|sequences/china.yaml
 	ca|sequences/soviet.yaml
 	ca|sequences/gla.yaml

mods/ca/rules/ai/brutal.yaml

@@ -58,7 +58,7 @@ Player:
 			ca: 4
 			isub: 4
 			carr: 4
-			jjet: 8
+			jumpjet: 8
 			kiro: 3
 			deva: 3
 			pac: 3
@@ -74,7 +74,7 @@ Player:
 		SquadSize: 22
 		SquadSizeRandomBonus: 9
 		ExcludeFromSquadsTypes: harv, har2, harv.scrin, soviet_miner, harv.chrono, chharv, chnmcv, mcv, mcv.nukular, amcv, amcv.nukular, smcv, smcv.nukular, dog, e6, n6, s6
-		ExcludeFromAirSquadsTypes: deva, pac, jjet, bjet
+		ExcludeFromAirSquadsTypes: deva, pac, jumpjet, bjet
 		NavalUnitsTypes: ss,msub,dd,ca,lst,pt,dd2,pt2,ss2,isub,sb,seas
 		NavalProductionTypes: syrd, spen, syrd.gdi, spen.nod, chsyrd
 		ConstructionYardTypes: fact,afac,sfac,chcommand,fact.nukular,afac.nukular,sfac.nukular,chcommand.nukular

mods/ca/rules/ai/easy.yaml

@@ -229,7 +229,7 @@ Player:
 			shok: 15
 			e8: 15
 			snip: 15
-			jjet: 15
+			jumpjet: 15
 			obelisk_trooper: 15
 			rmbo: 15
 			e7: 15
@@ -347,7 +347,7 @@ Player:
 			ca: 4
 			isub: 4
 			carr: 4
-			jjet: 8
+			jumpjet: 8
 			kiro: 1
 			deva: 1
 			pac: 1
@@ -367,7 +367,7 @@ Player:
 		SquadSize: 14
 		SquadSizeRandomBonus: 5
 		ExcludeFromSquadsTypes: harv, har2, harv.scrin, soviet_miner, harv.chrono, chharv, chnmcv, mcv, mcv.nukular, amcv, amcv.nukular, smcv, smcv.nukular, dog, e6, n6, s6
-		ExcludeFromAirSquadsTypes: deva, pac, jjet, bjet
+		ExcludeFromAirSquadsTypes: deva, pac, jumpjet, bjet
 		NavalUnitsTypes: ss,msub,dd,ca,lst,pt,pt2,ss2,dd2,isub,sb,seas
 		ConstructionYardTypes: fact,afac,sfac,chcommand,fact.nukular,afac.nukular,sfac.nukular,chcommand.nukular
 		StaticAntiAirTypes: agun, sam, nsam, cram, shar, chgatling

mods/ca/rules/ai/hard.yaml

@@ -238,7 +238,7 @@ Player:
 			shok: 15
 			e8: 15
 			snip: 15
-			jjet: 15
+			jumpjet: 15
 			obelisk_trooper: 15
 			rmbo: 15
 			e7: 15
@@ -356,7 +356,7 @@ Player:
 			ca: 4
 			isub: 4
 			carr: 4
-			jjet: 8
+			jumpjet: 8
 			kiro: 3
 			deva: 3
 			pac: 3

mods/ca/rules/ai/naval.yaml

@@ -220,7 +220,7 @@ Player:
 		RequiresCondition: enable-naval-ai
 		SquadSize: 1
 		ExcludeFromSquadsTypes: harv, har2, harv.scrin, soviet_miner, harv.chrono, chharv, chnmcv, mcv, mcv.nukular, amcv, amcv.nukular, smcv, smcv.nukular, dog, e6, n6, s6
-		ExcludeFromAirSquadsTypes: deva, pac, jjet, bjet
+		ExcludeFromAirSquadsTypes: deva, pac, jumpjet, bjet
 		NavalUnitsTypes: ss,msub,dd,ca,lst,pt,pt2,ss2,dd2,isub,sb,seas
 		ConstructionYardTypes: fact,afac,sfac,chcommand,fact.nukular,afac.nukular,sfac.nukular,chcommand.nukular
 		StaticAntiAirTypes: agun, sam, nsam, cram, shar, chgatling

mods/ca/rules/ai/normal.yaml

@@ -230,7 +230,7 @@ Player:
 			shok: 15
 			e8: 15
 			snip: 15
-			jjet: 15
+			jumpjet: 15
 			obelisk_trooper: 15
 			rmbo: 15
 			e7: 15
@@ -348,7 +348,7 @@ Player:
 			ca: 4
 			isub: 4
 			carr: 4
-			jjet: 8
+			jumpjet: 8
 			kiro: 2
 			deva: 2
 			pac: 2
@@ -368,7 +368,7 @@ Player:
 		SquadSize: 18
 		SquadSizeRandomBonus: 8
 		ExcludeFromSquadsTypes: harv, har2, harv.scrin, soviet_miner, harv.chrono, chharv, chnmcv, mcv, mcv.nukular, amcv, amcv.nukular, smcv, smcv.nukular, dog, e6, n6, s6
-		ExcludeFromAirSquadsTypes: deva, pac, jjet, bjet
+		ExcludeFromAirSquadsTypes: deva, pac, jumpjet, bjet
 		NavalUnitsTypes: ss,msub,dd,ca,lst,pt,pt2,ss2,dd2,isub,sb,seas
 		ConstructionYardTypes: fact,afac,sfac,chcommand,fact.nukular,afac.nukular,sfac.nukular,chcommand.nukular
 		StaticAntiAirTypes: agun, sam, nsam, cram, shar, chgatling

mods/ca/rules/aircraft.yaml

@@ -815,129 +815,6 @@ TRAN.paradrop:
 		RequiresSelection: true
 
 
-U2:
-	Inherits: ^NeutralPlane
-	Health:
-		HP: 200000
-	Tooltip:
-		Name: Spy Plane
-	Aircraft:
-		CruiseAltitude: 2560
-		TurnSpeed: 28
-		Speed: 473
-		Repulsable: False
-		MaximumPitch: 56
-	AttackBomber:
-		FacingTolerance: 8
-	-Selectable:
-	Interactable:
-	SelectionDecorations:
-	-Voiced:
-	-Targetable@AIRBORNE:
-	Contrail@1:
-		Offset: -725,683,0
-	Contrail@2:
-		Offset: -725,-683,0
-	Contrail@AB1:
-		Offset: -400,-70,-20
-		StartColorUsePlayerColor: false
-		ZOffset: -512
-		StartColor: cc550080
-		TrailLength: 10
-	Contrail@AB2:
-		Offset: -400,70,-20
-		StartColorUsePlayerColor: false
-		ZOffset: -512
-		StartColor: cc550080
-		TrailLength: 10
-	SpawnActorOnDeath:
-		Actor: U2.Husk
-		RequiresCondition: !empdisable && !being-warped
-	SpawnActorOnDeath@EMP:
-		Actor: U2.Husk.EMP
-		RequiresCondition: empdisable && !being-warped
-	LeavesTrails:
-		Offsets: -1c43,0,0
-		MovingInterval: 2
-		Image: smokey
-		StationaryInterval: 2
-		SpawnAtLastPosition: False
-		TrailWhileStationary: True
-		Type: CenterPosition
-		RequiresCondition: enable-smoke
-	RejectsOrders:
-	-MapEditorData:
-	GrantConditionOnDamageState@SmokeTrail:
-		Condition: enable-smoke
-
-U2.Bomber:
-	Inherits: ^NeutralPlane
-	RenderSprites:
-		Image: U2
-	Health:
-		HP: 30000
-	Tooltip:
-		Name: Supersonic Bomber
-	Aircraft:
-		CruiseAltitude: 2260
-		TurnSpeed: 20
-		Speed: 243
-		Repulsable: True
-		MaximumPitch: 56
-	-Selectable:
-	Interactable:
-	-SelectionDecorations:
-	-Voiced:
-	Contrail@1:
-		Offset: -725,683,0
-	Contrail@2:
-		Offset: -725,-683,0
-	Contrail@AB1:
-		Offset: -400,-70,-20
-		StartColorUsePlayerColor: false
-		ZOffset: -512
-		StartColor: cc550080
-		TrailLength: 10
-	Contrail@AB2:
-		Offset: -400,70,-20
-		StartColorUsePlayerColor: false
-		ZOffset: -512
-		StartColor: cc550080
-		TrailLength: 10
-	AttackAircraft:
-		FacingTolerance: 80
-		PersistentTargeting: false
-		OpportunityFire: false
-	Armament:
-		Weapon: U2Bomb
-	AmmoPool:
-		Ammo: 1
-	AirstrikeSlave:
-		LandingDistance: 1c0
-	SpawnActorOnDeath:
-		Actor: U2.Husk
-		RequiresCondition: !empdisable && !being-warped
-	SpawnActorOnDeath@EMP:
-		Actor: U2.Husk.EMP
-		RequiresCondition: empdisable && !being-warped
-	LeavesTrails:
-		Offsets: -1c43,0,0
-		MovingInterval: 2
-		Image: smokey
-		StationaryInterval: 2
-		SpawnAtLastPosition: False
-		TrailWhileStationary: True
-		Type: CenterPosition
-		RequiresCondition: enable-smoke
-	RejectsOrders:
-	Rearmable:
-		RearmActors: bori
-	GrantConditionOnDamageState@SmokeTrail:
-		Condition: enable-smoke
-	WithAmmoPipsDecoration:
-		Position: BottomLeft
-		RequiresSelection: true
-
 C17:
 	Inherits: ^NeutralPlane
 	RenderSprites:

mods/ca/rules/allies/aircraft.yaml

@@ -497,7 +497,7 @@ HUEY.recon:
 		LocalOffset: 250,0,150
 		RequiresCondition: snipeturr
 	AirstrikeMaster:
-		Actors: U2.Bomber
+		Actors: Borismig
 		SquadSize: 1
 		RespawnTicks: 150
 		InstaRepair: true

mods/ca/rules/allies/commander-tree.yaml

@@ -201,7 +201,6 @@ commander_tree.Huey.Cryo:
 	Tooltip:
 		Name: Cryo Huey Upgrade
 	Buildable:
-		IconPalette: chrometd
 		BuildPaletteOrder: 37
 		Prerequisites: prerequisite.has_points, ~aircraft.allies, ~!commander_tree.huey.grenade, ~!commander_tree.huey.recon
 		Description: Upgrades the attack of the Huey with cryo missiles, slowing down enemies.

mods/ca/rules/allies/husks.yaml

@@ -27,17 +27,15 @@ Seahawk.UPG.Husk.EMP:
 
 HELI.Husk:
 	Inherits: ^VoxelHelicopterHusk
+	Inherits: ^SingleRotor
 	RenderVoxels:
 		Scale: 0.5
 		Image: heli
 	RenderSprites:
 		Image: heli
-		PlayerPalette: overlayplayertd
+		Palette: tsunit
 	Tooltip:
 		Name: Eurocopter
-	WithIdleOverlay:
-		Offset: 0,0,85
-		Sequence: rotor
 
 HELI.Husk.EMP:
 	Inherits: HELI.Husk

mods/ca/rules/allies/structures.yaml

@@ -0,0 +1,55 @@
+Grand_Cannon:
+	Inherits: ^Defense
+	Inherits: ^HighResShadow
+	Inherits: ^AutoTargetGround
+	Inherits: ^DisableOnLowPowerOrPowerDown
+	Inherits: ^2x2Shape
+	Buildable:
+		Queue: Defense
+		BuildPaletteOrder: 100
+		Prerequisites: radar, ~structures.france
+		Description: Artillery base defense.\n  Requires power to operate.\n  Can detect cloaked units.\n  Strong vs Ground Units\n  Weak vs Aircraft
+	Valued:
+		Cost: 1650
+	Tooltip:
+		Name: Grand Cannon
+	Building:
+		Footprint: xx xx
+		Dimensions: 2,2
+	Health:
+		HP: 100000
+	RevealsShroud:
+		MinRange: 6c0
+		Range: 8c0
+		RevealGeneratedShroud: False
+	RevealsShroud@GAPGEN:
+		Range: 6c0
+	Turreted:
+		TurnSpeed: 8
+		InitialFacing: 0
+		RealignDelay: -1
+	-WithSpriteBody:
+	WithEmbeddedTurretSpriteBody:
+		PauseOnCondition: disabled || empdisable || being-warped
+	AttackTurreted:
+		PauseOnCondition: disabled || empdisable || being-warped
+	WithAttackAnimation:
+		Sequence: shoot
+	Armament:
+		Weapon: 203mm
+		FireDelay: 2
+		MuzzleSequence: muzzle
+		LocalOffset: 2100,0,80
+	WithMuzzleOverlay:
+	Power:
+		Amount: -100
+		RequiresCondition: !being-warped
+	BodyOrientation:
+		UseClassicFacings: True
+	Explodes:
+		Weapon: BuildingExplode
+		EmptyWeapon: BuildingExplode
+	WithBuildingBib:
+		HasMinibib: true
+	DetectCloaked:
+		RequiresCondition: !(disabled || empdisable || being-warped)