desolator, mortar

AUTHORS

@@ -1,16 +1,23 @@
-The YMCA OpenRA mod has grown from a personal Combined Arms fork
-modding project, to a small, but passionate community. We are very thankful
-for the inspiration Combined Arms has given us, so that we even copied the first sentence
-of the text you just read.
-There are still many things from Combined Arms left in this mod and we do not intend
-to steal any of their original creations. If you find assets that are still in this
-mod but are taken without consent, please let us know, we will remove that.
+The YMCA OpenRA mod has grown from a personal
+Combined Arms fork modding project, to a small,
+but passionate community. We are very thankful
+for the inspiration Combined Arms has given us,
+so that we even copied this text you just read.
+
+There are still many things from Combined Arms
+left in this mod and we do not intend to steal
+any of their original creations. If you find
+assets that are still in this mod but are taken
+without consent, please let us know, we will
+remove those.
 If you like this mod and don't know Combined
-Arms (unlikely) please go and try out their mod as well. It might also be very
-enjoyable for you (https://discord.gg/CxFYWEJ).
-Another big thanks goes to ppmsite or ppmforums.com. What these guys have done for
-the C&C modding community is insane and their endurance doing this for decades is
-unparalleled.
+Arms (unlikely) please go and try out their mod
+as well. It might also be very enjoyable for you
+(https://discord.gg/CxFYWEJ).
+Another big thanks goes to ppmsite or ppmforums.com.
+What these guys have done for the C&C modding
+community is insane and their endurance doing this
+for decades is unparalleled.
 
 In this sense, big thanks go to
 YMCA developers:
@@ -41,15 +48,14 @@ Contributors & special thanks to:
 	* Nyerguds (Cameos)
 	* Allen262 (Beta Ships)
 	* Kilkakon (Fuel truck)
-
 	* Katzsmile (UAV)
 	* KylieAdams (YF-23)
 	* 206UE (F-22)
 	* CombinE (0tnk Beam Cannon)
 	* TeleVisor (Orca v2, Orca Bomber, Orca Warship, Banshee, Harpy)
 	* Arikado (Kirov, Kirov Carrier)
 	* Siopee (Harrier)
-	* ElPollo/The Commando (New Scrin Units, old are Darkademic - to be replaced)
+	* ElPollo/The Commando315 (New Scrin Units, old are Darkademic - to be replaced, Mortar)
 	* Hassan_2030 (Venom)
 	* sayedmamdouh (Rebel Leader)
 	* ra2killer (Hornet)
@@ -88,7 +94,7 @@ Contributors & special thanks to:
 	* Augusto (Red Guard, Minigunner, Tank Hunter)
 	* DarkStar (snct.shp/SonicTurret)
 	* Conman (Bi Xi Dragon)
-	* Medalmonkey/DerekPlus (Obelisktrooper, Mirage Trooper/Saboteur, Mercenary, Stormtrooper, Shock Trooper, Railgunner/Parasite, Cryotrooper, Sniper)
+	* Medalmonkey/DerekPlus (Obelisktrooper, Mirage Trooper/Saboteur, Mercenary, Stormtrooper, Shock Trooper, Railgunner/Parasite, Cryotrooper, Sniper, Desolator/Viper)
 	* m7 (Microwave Tank)
 	* Merophage/RAPD (conscript, light infantry, engineer/mechanic)
 	* unknown_men (Crazy Ivan)
@@ -106,7 +112,7 @@ Contributors & special thanks to:
 	* taboam (superspy/Hacker)
 	* MDR (Swiss Bank)
 	* Raminator (Grenadier)
-	* LaoTze (Desolator)
+	* LaoTze (Desolator2)
 	* Oldfaq (Cyborg Elite/psuit)
 	* August (KGB)
 

mods/ca/rules/ai/easy.yaml

@@ -225,7 +225,7 @@ Player:
 			dog: 2
 			sab: 2
 			shok: 15
-			e8: 15
+			desolator: 15
 			snip: 15
 			jumpjet: 15
 			obelisk_trooper: 15

mods/ca/rules/ai/hard.yaml

@@ -234,7 +234,7 @@ Player:
 			dog: 2
 			sab: 2
 			shok: 15
-			e8: 15
+			desolator: 15
 			snip: 15
 			jumpjet: 15
 			obelisk_trooper: 15

mods/ca/rules/ai/normal.yaml

@@ -226,7 +226,7 @@ Player:
 			dog: 2
 			sab: 2
 			shok: 15
-			e8: 15
+			desolator: 15
 			snip: 15
 			jumpjet: 15
 			obelisk_trooper: 15

mods/ca/rules/china/aircraft.yaml

@@ -437,7 +437,7 @@ chhelix.MortarBunker:
 		Weaknesses: • Weak vs Anti-Air
 		Attributes: • Garrisoned Infantry can shoot from inside
 	Cargo:
-		InitialUnits: mortar.china, mortar.china, mortar.china, mortar.china
+		InitialUnits: mortar, mortar, mortar, mortar
 
 chhelix.Torpedo:
 	Inherits: chhelix

mods/ca/rules/china/infantry.yaml

@@ -146,12 +146,39 @@ CHE3:
 	RenderSprites:
 		Image: che3
 
-Mortar.China:
-	Inherits: Mortar
-	Inherits@horde: ^HordeBonus
+Mortar:
+	Inherits: ^Soldier
+	Inherits: ^InfantryRA2Sprite
+	Inherits: ^HordeBonus
+	Inherits: ^PrioArtillery
 	Buildable:
+		Queue: Infantry
+		BuildAtProductionType: Soldier
 		BuildPaletteOrder: 21
 		Prerequisites: barracks, radar, ~infantry.china, ~commander_tree.advanced_infantry_training
+		Description: Artillery Infantry armed with a Mortar.
+	TooltipExtras:
+		Strengths: • Strong vs Buildings, Infantry
+		Weaknesses: • Weak vs Tanks, Aircraft
+		Attributes: • Long range
+	Valued:
+		Cost: 150
+	Tooltip:
+		Name: Mortar
+	Health:
+		HP: 2500
+	Armament@PRIMARY:
+		Weapon: mortar
+		LocalOffset: 0,0,155
+		FireDelay: 15
+	Armament@Garrison:
+		Name: mounted
+		Weapon: mortarE
+		LocalOffset: 0,0,155
+		FireDelay: 15
+	AttackFrontal:
+		PauseOnCondition: being-warped
+		FacingTolerance: 0
 
 CHHACKER:
 	Inherits: ^Soldier

mods/ca/rules/china/structures.yaml

@@ -370,7 +370,7 @@ chbunker.advinf:
 	Valued:
 		Cost: 1500
 	Cargo:
-		InitialUnits: che3, che3, che3, mortar.china
+		InitialUnits: che3, che3, che3, mortar
 
 chbunker.ai:
 	Inherits: chbunker
@@ -379,7 +379,7 @@ chbunker.ai:
 	Valued:
 		Cost: 1500
 	Cargo:
-		InitialUnits: che1, che3, che3, che3, mortar.china
+		InitialUnits: che1, che3, che3, che3, mortar
 
 chbunker2:
 	Inherits: chbunker
@@ -413,7 +413,7 @@ chbunker2.advinf:
 	Valued:
 		Cost: 1800
 	Cargo:
-		InitialUnits: minigunner, che3, che3, che3, mortar.china, mortar.china
+		InitialUnits: minigunner, che3, che3, che3, mortar, mortar
 
 chsupply:
 	Inherits: ^BuildingChina

mods/ca/rules/defaults.yaml

@@ -4687,7 +4687,7 @@ PROC.Dummy:
 			rocket_infantry: loaded-air
 			flamethrower: loaded
 			thor: loaded
-			e8: loaded
+			desolator: loaded
 			adept: loaded
 			mercenary: loaded
 			grenadier: loaded

mods/ca/rules/infantry.yaml

@@ -317,154 +317,6 @@ VICE:
 	Targetable:
 		TargetTypes: Ground, Infantry, Creep, ChaosImmune, MindControlImmune
 
-Mortar:
-	Inherits: ^Soldier
-	Inherits: ^PrioArtillery
-	Buildable:
-		Queue: Infantry
-		BuildAtProductionType: Soldier
-		BuildPaletteOrder: 40
-		Prerequisites: ~commander_tree.mortar, ~infantry.soviet
-		Description: Artillery Infantry armed with a Mortar.\n  Strong vs Buildings, Infantry\n  Weak vs Tanks, Aircraft
-	Valued:
-		Cost: 150
-	Tooltip:
-		Name: Mortar
-	UpdatesPlayerStatistics:
-		AddToArmyValue: true
-	Health:
-		HP: 2500
-	Armament@PRIMARY:
-		Weapon: mortar
-		LocalOffset: 0,0,155
-		FireDelay: 15
-	Armament@Garrison:
-		Name: mounted
-		Weapon: mortarE
-		LocalOffset: 0,0,155
-		FireDelay: 15
-	AttackFrontal:
-		PauseOnCondition: being-warped
-		FacingTolerance: 0
-	WithInfantryBody:
-		DefaultAttackSequence: throw
-	Explodes:
-		Weapon: UnitExplodeChemSmall
-		EmptyWeapon: UnitExplodeChemSmall
-		Chance: 33
-		RequiresCondition: !being-warped
-	WithDeathAnimation:
-		DeathSequencePalette: playertd
-
-Mortar.Chemical:
-	Inherits: ^Soldier
-	Inherits: ^PrioArtillery
-	Buildable:
-		Queue: Infantry
-		BuildAtProductionType: Soldier
-		BuildPaletteOrder: 40
-		Prerequisites: ~commander_tree.chemical_mortar, ~infantry.nod
-		Description: Artillery Infantry armed with a Chemical Mortar.\n  Strong vs Buildings, Infantry\n  Weak vs Vehicles, Aircraft
-	Valued:
-		Cost: 150
-	Tooltip:
-		Name: Chemical Mortar
-	UpdatesPlayerStatistics:
-		AddToArmyValue: true
-	Health:
-		HP: 2500
-	Armament@PRIMARY:
-		Weapon: mortar.chemical
-		LocalOffset: 0,0,155
-		FireDelay: 15
-	Armament@Garrison:
-		Name: mounted
-		Weapon: mortarE.chemical
-		LocalOffset: 0,0,155
-		FireDelay: 15
-	AttackFrontal:
-		PauseOnCondition: being-warped
-		FacingTolerance: 0
-	WithInfantryBody:
-		DefaultAttackSequence: throw
-	Explodes:
-		Weapon: UnitExplodeChemSmall
-		EmptyWeapon: UnitExplodeChemSmall
-		Chance: 33
-		RequiresCondition: !being-warped
-	WithDeathAnimation:
-		DeathSequencePalette: playertd
-
-E8:
-	Inherits: ^Soldier
-	Inherits: ^PrioAntiInfantry
-	Buildable:
-		Queue: Infantry
-		BuildAtProductionType: Soldier
-		BuildPaletteOrder: 70
-		Prerequisites: ~infantry.iraq, radar, ~commander_tree.advanced_infantry_training
-		Description: Anti-infantry unit.\n  Strong vs Infantry, Light Armor\n  Weak vs Tanks, Aircraft\n  Special Ability: Desolate Ground\n  Special Ability: Irradiates Vehicles
-	Valued:
-		Cost: 800
-	Tooltip:
-		Name: Desolator
-	UpdatesPlayerStatistics:
-		AddToArmyValue: true
-	Health:
-		HP: 18000
-	Mobile:
-		Voice: Move
-		PauseOnCondition: !undeployed && being-warped
-	RevealsShroud:
-		Range: 5c0
-	Armament@PRIMARY:
-		Weapon: RadBeamWeapon
-		LocalOffset: 427,0,341
-	Armament@Garrison:
-		Name: mounted
-		Weapon: RadBeamWeaponE
-		LocalOffset: 427,0,341
-	TakeCover:
-		ProneOffset: 384,0,-395
-	AttackFrontal:
-		Voice: Attack
-		PauseOnCondition: being-warped || !undeployed
-		FacingTolerance: 0
-	AttackMove:
-		Voice: Move
-	Passenger:
-		Voice: Move
-	Guard:
-		Voice: Move
-	Voiced:
-		VoiceSet: DesVoice
-	-Crushable:
-	PeriodicExplosion:
-		Weapon: RadEruptionWeapon
-		RequiresCondition: deployed
-		InitialDelay: 20
-	GrantConditionOnDeploy:
-		DeployedCondition: deployed
-		UndeployedCondition: undeployed
-		UndeployOnMove: True
-		Facing: 368
-		Voice: Attack
-		PauseOnCondition: being-warped
-	WithInfantryBody:
-		RequiresCondition: !being-warped && undeployed
-	WithSpriteBody@DEPLOYED:
-		Sequence: deployed
-		RequiresCondition: !undeployed
-		Name: deployed
-	WithMakeAnimation:
-		Sequence: deploy
-		BodyNames: deployed
-	-DamagedByTintedCells@RAD:
-	-DamagedByTintedCells@RADHAZMAT:
-	AutoDeployer@AI:
-		DeployChance: 20
-		RequiresCondition: botowner
-
 LEADER:
 	Inherits: ^CivInfantry
 	Inherits: ^ArmedCivilian
@@ -886,6 +738,7 @@ SGLI.discarded:
 
 SEAL:
 	Inherits: RMBO
+	Inherits: ^InfantryTDSprite
 	Valued:
 		Cost: 1000
 	Tooltip:

mods/ca/rules/soviet/ai.yaml

@@ -172,7 +172,7 @@ Player:
 			mortar: 15
 			dog: 2
 			shok: 15
-			e8: 15
+			desolator: 15
 			btr: 20
 			v3rl: 10
 			ttnk: 25