merge

AUTHORS

@@ -94,9 +94,11 @@ Contributors & special thanks to:
 	* Stingerr (Seahawk)
 	* tom2050 (Zombie/Brute)
 	* god_l1ke1 (SpecOps)
+	* Lord Kal (Medic)
 	* machine (Jumpjet)
 	* MadHQ (Ion Turret, Mobile Sensor Array)
 	* Damfoos (Mobile Sensor Array)
+	* taboam (superspy/Hacker)
 
 Of course YMCA wouldn't exist today without OpenRA & the
 hard work of the many OpenRA contributors.

mods/ca/maps/TibLabBrawl/map.yaml

@@ -1587,25 +1587,25 @@ Actors:
 		Location: 56,69
 		SubCell: 3
 		Facing: 92
-	Actor649: medi
+	Actor649: medic
 		Owner: Neutral
 		Location: 69,68
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor654: medi
+	Actor654: medic
 		Owner: Neutral
 		Location: 60,68
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor658: medi
+	Actor658: medic
 		Owner: Neutral
 		Location: 60,61
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor663: medi
+	Actor663: medic
 		Owner: Neutral
 		Location: 69,61
 		SubCell: 3
@@ -1949,25 +1949,25 @@ Actors:
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor715: medi
+	Actor715: medic
 		Owner: Neutral
 		Location: 73,54
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor716: medi
+	Actor716: medic
 		Owner: Neutral
 		Location: 56,55
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor717: medi
+	Actor717: medic
 		Owner: Neutral
 		Location: 55,74
 		SubCell: 1
 		Facing: 92
 		TurretFacing: 92
-	Actor718: medi
+	Actor718: medic
 		Owner: Neutral
 		Location: 73,74
 		SubCell: 2

mods/ca/maps/delirium-shell/map.yaml

@@ -1110,13 +1110,13 @@ Actors:
 		TurretFacing: 384
 		SubCell: 3
 		Location: 78,92
-	Actor391: medi
+	Actor391: medic
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384
 		Location: 88,82
 		SubCell: 3
-	Actor392: medi
+	Actor392: medic
 		Owner: Multi0
 		Facing: 384
 		TurretFacing: 384

mods/ca/maps/island-wars-ii-shell/map.yaml

@@ -710,7 +710,7 @@ Actors:
 		SubCell: 3
 		Facing: 92
 		TurretFacing: 92
-	Actor259: medi
+	Actor259: medic
 		Owner: Multi0
 		Location: 53,67
 		SubCell: 3

mods/ca/rules/ai/easy.yaml

@@ -222,7 +222,7 @@ Player:
 			s6: 5
 			rmbc: 15
 			mort: 15
-			medi: 3
+			medic: 3
 			mech: 3
 			dog: 2
 			sab: 2
@@ -342,7 +342,7 @@ Player:
 			n6: 1
 			s6: 1
 			mech: 1
-			medi: 1
+			medic: 1
 			msub: 4
 			ca: 4
 			isub: 4

mods/ca/rules/ai/hard.yaml

@@ -231,7 +231,7 @@ Player:
 			s6: 5
 			rmbc: 15
 			mort: 15
-			medi: 3
+			medic: 3
 			mech: 3
 			dog: 2
 			sab: 2
@@ -351,7 +351,7 @@ Player:
 			n6: 1
 			s6: 1
 			mech: 1
-			medi: 1
+			medic: 1
 			msub: 4
 			ca: 4
 			isub: 4

mods/ca/rules/ai/normal.yaml

@@ -223,7 +223,7 @@ Player:
 			s6: 5
 			rmbc: 15
 			mort: 15
-			medi: 3
+			medic: 3
 			mech: 3
 			dog: 2
 			sab: 2
@@ -343,7 +343,7 @@ Player:
 			n6: 1
 			s6: 1
 			mech: 1
-			medi: 1
+			medic: 1
 			msub: 4
 			ca: 4
 			isub: 4

mods/ca/rules/allies/ai.yaml

@@ -122,7 +122,7 @@ Player:
 		UnitsToBuild:
 			e7: 15
 			mech: 3
-			medi: 3
+			medic: 3
 			snip: 15
 			apc: 20
 			jeep: 30
@@ -144,7 +144,7 @@ Player:
 			jeep: 2
 			apc: 2
 			mech: 1
-			medi: 1
+			medic: 1
 	SquadManagerBotModuleCA@brutal-vhard:
 		AirSquadTargetTypes:
 			heli: Aircraft, Vehicle

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

@@ -1,3 +1,57 @@
+# vehicles
+
+commander_tree.Prism_Tank:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Prism Tank
+	RenderSprites:
+		Image: prismtank
+	Buildable:
+		BuildPaletteOrder: 9
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england
+		Description: Enables to build the Prism Tank, an energy based weapon with high range.\n  Srong versus light vehicles and infantry.
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.prism
+
+commander_tree.Prism_Cannon:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Prism Cannon
+	RenderSprites:
+		Image: prismcannon
+	Buildable:
+		BuildPaletteOrder: 10
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_blaster, ~!commander_tree.prism_tank, ~!vehicles.france
+		Description: Enables to build the Prism Cannon. \n  Has higher range and more damage than the Prism Tank, but does not split its beam. \n  It is stronger vs. base defenses and single units but less effective against large armies.
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.prism
+
+commander_tree.Prism_Blaster:
+	Inherits: ^default.commander_tree_item
+	Tooltip:
+		Name: Prism Blaster
+	RenderSprites:
+		Image: prismblaster
+	Buildable:
+		BuildPaletteOrder: 11
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_tank, ~!vehicles.germany
+		Description: Enables to build the Prism Blaster. \n  Has less range than the Prism Tank, but does split its beam to more targets. \n  It is stronger vs. large armies and less effective against base defenses and single targets.
+	ProvidesPrerequisite@filler:
+		Prerequisite: filler.prism
+
+hack.cameo_filler.prism:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 12
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled
+
+hack.cameo_filler.prism2:
+	Inherits: ^default.cameo_filler
+	Buildable:
+		BuildPaletteOrder: 12
+		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled, ~filler.prism
+
+
 # Aircraft
 
 commander_tree.Eurofighter:

mods/ca/rules/allies/vehicles.yaml

@@ -12,14 +12,12 @@ Prismtank:
 	Buildable:
 		Queue: Vehicle
 		BuildPaletteOrder: 135
-		IconPalette: chrome
 		Prerequisites: radar, ~commander_tree.prism_tank
 		Description: Long-range artillery with Prism Tower derived weapon.\n  Strong vs Buildings, Infantry, Light Armor\n  Weak vs Tanks, Aircraft
 	Valued:
 		Cost: 1350
 	Tooltip:
 		Name: Prism Tank
-		GenericName: Tank
 	Health:
 		HP: 22000
 	Mobile:
@@ -53,7 +51,6 @@ PBLASTER:
 	Tooltip:
 		Name: Prism Blaster
 	Buildable:
-		IconPalette: chrometd
 		Prerequisites: radar, ~commander_tree.prism_blaster
 		Description: Prism Tower derived weapon hitting many targets on impact.\n  Strong vs Buildings, Infantry, Light Armor\n  Weak vs Tanks, Aircraft
 	Health:
@@ -70,7 +67,6 @@ PCAN:
 	Inherits: ^PrioAntiHeavy
 	Inherits: ^FightingVehicle
 	Buildable:
-		IconPalette: chrome
 		Prerequisites: radar, ~commander_tree.prism_cannon
 		Description: A prototype long range artillery that fires highly focused beams of light.\n  Strong vs Buildings, Vehicles, Infantry\n  Weak vs Tanks, Aircraft
 	Valued:
@@ -90,12 +86,6 @@ PCAN:
 		FireDelay: 10
 		LocalOffset: 600,0,300
 		PauseOnCondition: empdisable || being-warped
-	SpawnActorOnDeath:
-		Actor: Prismtank.Husk
-		RequiresCondition: !being-warped
-	SelectionDecorations:
-	Voiced:
-		VoiceSet: PrismVoice
 
 CTNK:
 	Inherits: ^Tank

mods/ca/rules/commander-tree.yaml

@@ -152,56 +152,6 @@ commander_tree.Spec_Ops:
 		Prerequisites: prerequisite.has_points, ~infantry.allies, commander_tree.advanced_infantry_training, techcenter
 		Description: Marks Vehicles and Buildings with a laser allowing rocket infantry to shoot at these from great distance.\n Can detect other stealthed units.
 
-commander_tree.Prism_Tank:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Prism Tank
-	Buildable:
-		BuildPaletteOrder: 9
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_blaster, ~!vehicles.england
-		Description: Enables to build the Prism Tank, an energy based weapon with high range.\n  Srong versus light vehicles and infantry.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.prism
-
-commander_tree.Prism_Cannon:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Prism Cannon
-	Buildable:
-
-		BuildPaletteOrder: 10
-
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_blaster, ~!commander_tree.prism_tank, ~!vehicles.france
-		Description: Enables to build the Prism Cannon. \n  Has higher range and more damage than the Prism Tank, but does not split its beam. \n  It is stronger vs. base defenses and single units but less effective against large armies.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.prism
-
-commander_tree.Prism_Blaster:
-	Inherits: ^default.commander_tree_item
-	Tooltip:
-		Name: Prism Blaster
-	Buildable:
-
-		IconPalette: chrometd
-		BuildPaletteOrder: 11
-
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, ~!commander_tree.prism_cannon, ~!commander_tree.prism_tank, ~!vehicles.germany
-		Description: Enables to build the Prism Blaster. \n  Has less range than the Prism Tank, but does split its beam to more targets. \n  It is stronger vs. large armies and less effective against base defenses and single targets.
-	ProvidesPrerequisite@filler:
-		Prerequisite: filler.prism
-
-hack.cameo_filler.5:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 12
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled
-
-hack.cameo_filler.6:
-	Inherits: ^default.cameo_filler
-	Buildable:
-		BuildPaletteOrder: 12
-		Prerequisites: prerequisite.has_points, ~vehicles.allies, radar, disabled, ~filler.prism
-
 commander_tree.Scout_Tank_PDL:
 	Inherits: ^default.commander_tree_item
 	Tooltip:

mods/ca/rules/defaults.yaml

@@ -2473,10 +2473,9 @@ PROC.Dummy:
 	WithInfantryBody:
 		RequiresCondition: !being-warped && !onwater
 	WithInfantryBody@Swim:
-		IdleSequences: swimidle1, swimidle2, swimcheer
-		StandSequences: swimidle1, swimidle2
-		-AttackSequences:
-		DefaultAttackSequence: swimattack
+		IdleSequences: swim-idle1, swim-idle2, swim-cheer
+		StandSequences: swim-idle1, swim-idle2
+		DefaultAttackSequence: swim-attack
 		MoveSequence: swim
 		RequiresCondition: !being-warped && onwater
 	WithDeathAnimation:
@@ -2486,7 +2485,8 @@ PROC.Dummy:
 		UseDeathTypeSuffix: False
 		FallbackSequence: splash
 		CrushedSequence: die-crushed
-		DeathSequence: swimdie1
+		DeathSequence: swim-die
+		DeathSequencePalette: playerra2
 
 ^Ship:
 	Inherits@1: ^ExistsInWorld

mods/ca/rules/gdi/vehicles.yaml

@@ -268,12 +268,12 @@ MARV:
 	Inherits: ^ThrowsShrapnel
 	Buildable:
 		Queue: Vehicle
-		BuildPaletteOrder: 0
+		BuildPaletteOrder: 190
 		IconPalette: chrometd
 		Prerequisites: ~vehicles.gdi, ~commander_tree.marv, miss.gdi
 		Description: Enormous slow tank with triple ion blaster cannons. \nMines Tiberium and Ores when driving over.
 	Valued:
-		Cost: 9000
+		Cost: 10000
 	Tooltip:
 		Name: M.A.R.V.
 	Health:

mods/ca/rules/husks.yaml

@@ -1632,19 +1632,6 @@ TTNK.RA2.Husk:
 	RenderSprites:
 		Image: ttnk.ra2.destroyed
 
-GTNK.Husk:
-	Inherits: ^Husk
-	Tooltip:
-		Name: Husk (Grizzly Tank)
-	ThrowsParticle@turret:
-		Anim: turret
-	TransformOnCapture:
-		IntoActor: gtnk
-	InfiltrateForTransform:
-		IntoActor: gtnk
-	RenderSprites:
-		Image: gtnk.destroyed
-
 P51.Husk:
 	Inherits: ^PlaneHusk
 	Tooltip: