Merge pull request #2498 from Mailaender/volkov

make Volkov a true Cyborg

AUTHORS

@@ -15,6 +15,7 @@ Also thanks to:
 	* Barnaby Smith		(mvi)
 	* Bellator
 	* Christer Ulfsparre	(Holloweye)
+	* Cody Brittain		(Generalcamo)
 	* Daniel Derejvanik     (Harisson)
 	* Erasmus Schroder	(rasco)
 	* Igor Popov		(ihptru)

mods/ra/rules/infantry.yaml

@@ -251,16 +251,17 @@ E8:
 		Cost: 1800
 	Tooltip:
 		Name: Volkov
-		Description: Elite commando infantry, armed with \nmodular cannons and grenade launcher.\n  Strong vs Vehicles, Infantry\n  Weak vs Aircraft
+		Description: Elite commando cyborg, armed with \nmodular cannons and grenade launcher.\n  Strong vs Vehicles, Infantry\n  Weak vs Aircraft
 	Selectable:
 		Voice: VolkovVoice
 		Bounds: 12,17,0,-9
 	Health:
-		HP: 150
+		HP: 200
 	Armor:
-		Type: Heavy
+		Type: Cybernetic
 	Mobile:
 		Speed: 5
+		Crushes: atmine, crate
 	RevealsShroud:
 		Range: 4
 	Passenger:
@@ -272,7 +273,11 @@ E8:
 	-RenderInfantry:
 	RenderInfantryProne:
 		IdleAnimations: idle1
-	-CrushableInfantry:
+	CrushableInfantry:
+		CrushSound: crunchy2.aud
+	RepairableNear:
+		Buildings: fix
+		CloseEnough: 1
 
 MEDI:
 	Inherits: ^Infantry

mods/ra/sequences.yaml

@@ -2243,6 +2243,7 @@ overlay:
 	target-invalid:
 		Start: 1
 
+#Volkov
 e8:
 	stand:
 		Start: 0
@@ -2293,6 +2294,10 @@ e8:
 	die6: electro
 		Start: 0
 		Length: *
+	die-crushed: botwreck1
+		Start: 0
+		Length: 6
+		Tick: 1600
 
 dtrk:
 	idle:

mods/ra/voices.yaml

@@ -95,4 +95,4 @@ VolkovVoice:
 		Select: iromsec,iromsee
 		Move: irommoc,irommoe,irommod
 		Attack: iromata,iromatb,iromatc,iromatd,iromate
-		Die: dedman1,dedman2,dedman3,dedman4,dedman5,dedman6,dedman7,dedman8,dedman10
+		Die: dedbot1,dedbot2,dedbot3,dedbot4,dedbot5,dedbot6,dedbot7,dedbot8,dedbot10

mods/ra/weapons.yaml

@@ -10,6 +10,7 @@ Colt45:
 			Wood: 5%
 			Light: 5%
 			Heavy: 5%
+			Cybernetic: 5%
 			Concrete: 5%
 		Explosion: piff
 		InfDeath: 2
@@ -45,6 +46,7 @@ Vulcan:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -55,6 +57,7 @@ Vulcan:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -66,6 +69,7 @@ Vulcan:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -77,6 +81,7 @@ Vulcan:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -88,6 +93,7 @@ Vulcan:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -99,6 +105,7 @@ Vulcan:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -131,6 +138,7 @@ Maverick:
 			None: 30%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 70%
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
@@ -153,6 +161,7 @@ FireballLauncher:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 30%
 			Concrete: 50%
 		Explosion: napalm
 		WaterExplosion: napalm
@@ -179,6 +188,7 @@ Flamer:
 			Wood: 100%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 50%
 		Explosion: small_napalm
 		WaterExplosion: small_napalm
@@ -201,6 +211,7 @@ ChainGun:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		WaterExplosion: small_splash
@@ -221,6 +232,7 @@ ChainGun.Yak:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		WaterExplosion: small_splash
@@ -239,6 +251,7 @@ Pistol:
 			Wood: 50%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 25%
 			Concrete: 25%
 		Explosion: piffs
 		InfDeath: 2
@@ -256,6 +269,7 @@ M1Carbine:
 			Wood: 25%
 			Light: 30%
 			Heavy: 10%
+			Cybernetic: 30%
 			Concrete: 10%
 		Explosion: piffs
 		InfDeath: 2
@@ -284,6 +298,7 @@ Dragon:
 			None: 10%
 			Wood: 75%
 			Light: 35%
+			Cybernetic: 50%
 			Concrete: 20%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
@@ -317,6 +332,7 @@ HellfireAG:
 			None: 30%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 75%
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
@@ -373,6 +389,7 @@ Grenade:
 			Wood: 100%
 			Light: 25%
 			Heavy: 5%
+			Cybernetic: 10%
 		Explosion: med_explosion
 		WaterExplosion: small_splash
 		InfDeath: 3
@@ -393,6 +410,7 @@ Grenade:
 			None: 30%
 			Wood: 40%
 			Heavy: 40%
+			Cybernetic: 40%
 			Concrete: 30%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
@@ -413,6 +431,7 @@ Grenade:
 			None: 20%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 40%
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
@@ -435,6 +454,7 @@ Grenade:
 			None: 20%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 60%
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
@@ -456,6 +476,7 @@ Grenade:
 			None: 20%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 70%
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
@@ -476,6 +497,7 @@ TurretGun:
 			None: 20%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 50%
 			Concrete: 50%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
@@ -508,6 +530,7 @@ MammothTusk:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
 		InfDeath: 3
@@ -533,6 +556,7 @@ MammothTusk:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 30%
 			Concrete: 50%
 		Explosion: large_explosion
 		WaterExplosion: med_splash
@@ -553,6 +577,7 @@ M60mg:
 			Wood: 10%
 			Light: 30%
 			Heavy: 10%
+			Cybernetic: 60%
 			Concrete: 10%
 		Explosion: piffs
 		WaterExplosion: small_splash
@@ -574,6 +599,7 @@ Napalm:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 70%
 			Concrete: 50%
 		Explosion: napalm
 		WaterExplosion: med_splash
@@ -589,6 +615,7 @@ CrateNapalm:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 70%
 			Concrete: 50%
 		Explosion: napalm
 		WaterExplosion: napalm
@@ -606,6 +633,7 @@ CrateExplosion:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 30%
 		Explosion: self_destruct
 		WaterExplosion: self_destruct
 		InfDeath: 4
@@ -620,6 +648,7 @@ CrateNuke:
 			None: 90%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 30%
 			Concrete: 50%
 		Explosion: nuke
 		WaterExplosion: nuke
@@ -640,7 +669,6 @@ CrateNuke:
 		InfDeath: 5
 		ImpactSound: kaboom22
 
-		
 TeslaZap:
 	ROF: 3
 	Charges: true
@@ -729,6 +757,7 @@ RedEye:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 30%
 		Explosion: large_explosion
 		WaterExplosion: large_splash
 		InfDeath: 3
@@ -757,6 +786,7 @@ SubMissile:
 			None: 40%,
 			Light: 30%
 			Heavy: 30%
+			Cybernetic: 35%
 		Explosion: large_explosion
 		WaterExplosion: large_splash
 		InfDeath: 3
@@ -790,6 +820,7 @@ Stinger:
 			None: 30%
 			Wood: 75%
 			Light: 75%
+			Cybernetic: 40%
 			Concrete: 50%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
@@ -838,6 +869,7 @@ TorpTube:
 			Wood: 75%
 			Light: 75%
 			Concrete: 50%
+			Cybernetic: 60%
 		Explosion: small_explosion
 		WaterExplosion: med_splash
 		InfDeath: 4
@@ -879,6 +911,7 @@ ParaBomb:
 			Wood: 75%
 			Light: 75%
 			Concrete: 50%
+			Cybernetic: 40%
 		Explosion: self_destruct
 		WaterExplosion: small_splash
 		InfDeath: 4
@@ -897,6 +930,7 @@ DogJaw:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
+			Cybernetic: 0%
 		InfDeath: 1
 		Damage: 100
 
@@ -913,6 +947,7 @@ Heal:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
+			Cybernetic: 0%
 		InfDeath: 1
 		Damage: -50
 
@@ -929,6 +964,7 @@ SilencedPPK:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
+			Cybernetic: 90%
 		Explosion: piffs
 		InfDeath: 2
 		Damage: 150
@@ -955,6 +991,7 @@ SCUD:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 30%
 		Explosion: napalm
 		WaterExplosion: large_splash
 		InfDeath: 3
@@ -973,6 +1010,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Explosion: nuke
 		WaterExplosion: nuke
 		InfDeath: 5
@@ -987,6 +1025,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 5
 		InfDeath: 5
 		ImpactSound: kaboom22
@@ -1000,6 +1039,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 10
 		InfDeath: 5
 	Warhead@areanuke3:
@@ -1012,6 +1052,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 15
 		InfDeath: 5
 	Warhead@areanuke4:
@@ -1025,6 +1066,7 @@ Atomic:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 20
 		InfDeath: 5
 
@@ -1038,6 +1080,7 @@ MiniNuke:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Explosion: nuke
 		WaterExplosion: nuke
 		InfDeath: 5
@@ -1052,6 +1095,7 @@ MiniNuke:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 5
 		InfDeath: 5
 		ImpactSound: kaboom22
@@ -1065,6 +1109,7 @@ MiniNuke:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 10
 		InfDeath: 5
 	Warhead@areanuke3:
@@ -1078,6 +1123,7 @@ MiniNuke:
 			Light: 60%
 			Heavy: 25%
 			Concrete: 50%
+			Cybernetic: 40%
 		Delay: 15
 		InfDeath: 5
 
@@ -1090,6 +1136,7 @@ UnitExplode:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 60%
 		Explosion: self_destruct
 		WaterExplosion: large_splash
 		InfDeath: 4
@@ -1104,6 +1151,7 @@ UnitExplodeSmall:
 			Wood: 75%
 			Light: 60%
 			Heavy: 25%
+			Cybernetic: 50%
 		Explosion: large_explosion
 		InfDeath: 4
 		ImpactSound: kaboom15
@@ -1118,6 +1166,7 @@ BarrelExplode:
 			Light: 50%
 			Heavy: 25%
 			Concrete: 10%
+			Cybernetic: 30%
 		Explosion: napalm
 		InfDeath: 4
 		ImpactSound: firebl3
@@ -1137,6 +1186,7 @@ ATMine:
 			None: 0%
 			Wood: 0%
 			Concrete: 0%
+			Cybernetic: 60%
 		ImpactSound: mineblo1
 		Explosion: large_explosion
 
@@ -1148,6 +1198,7 @@ APMine:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
+			Cybernetic: 0%
 		ImpactSound: mine1
 		InfDeath: 3
 		Explosion: napalm
@@ -1196,6 +1247,7 @@ FLAK-23:
 			Light: 60%
 			Heavy: 10%
 			Concrete: 20%
+			Cybernetic: 20%
 		Explosion: med_explosion
 		Damage: 20
 
@@ -1216,6 +1268,7 @@ VolkAT:
 			Light: 75%
 			Heavy: 90%
 			Concrete: 50%
+			Cybernetic: 0%
 		Explosion: small_explosion
 		WaterExplosion: small_splash
 		InfDeath: 3
@@ -1240,6 +1293,7 @@ VolkNapalm:
 			Light: 0%
 			Heavy: 0%
 			Concrete: 0%
+			Cybernetic: 70%
 		Explosion: napalm
 		WaterExplosion: small_napalm
 		InfDeath: 4
@@ -1261,6 +1315,7 @@ Sniper:
 			Wood: 5%
 			Light: 5%
 			Heavy: 5%
+			Cybernetic: 10%
 		InfDeath: 2
 
 ChronoTusk:
@@ -1287,6 +1342,7 @@ ChronoTusk:
 			Wood: 75%
 			Light: 75%
 			Concrete: 50%
+			Cybernetic: 30%
 		Explosion: med_explosion
 		WaterExplosion: med_splash
 		InfDeath: 4