Introduce Weapon.TargetActorCenter and adapt projectiles

This also fixes issues with attackers that don't have their own Attack trait.
2017-06-18 22:27:27 +02:00
parent 6b3c04a584
commit edffaa4987
15 changed files with 20 additions and 31 deletions
--- a/mods/cnc/weapons/ballistics.yaml
+++ b/mods/cnc/weapons/ballistics.yaml
@@ -64,6 +64,7 @@ ArtilleryShell:
 	Range: 11c0
 	MinRange: 3c0
 	Report: tnkfire2.aud
+	TargetActorCenter: true
 	Projectile: Bullet
 		Speed: 204
 		Blockable: false
--- a/mods/cnc/weapons/missiles.yaml
+++ b/mods/cnc/weapons/missiles.yaml
@@ -142,6 +142,7 @@ MammothMissiles:
 	BurstDelay: 4
 	Report: rocket1.aud
 	ValidTargets: Ground
+	TargetActorCenter: true
 	Projectile: Bullet
 		Inaccuracy: 853
 		LaunchAngle: 62
--- a/mods/ra/weapons/ballistics.yaml
+++ b/mods/ra/weapons/ballistics.yaml
@@ -106,6 +106,7 @@ TurretGun:
 	Inherits: ^Artillery
 	MinRange: 3c0
 	Report: tank5.aud
+	TargetActorCenter: true
 	Projectile: Bullet
 		ContrailLength: 30

@@ -116,6 +117,7 @@ TurretGun:
 	Range: 16c0
 	Burst: 2
 	Report: turret1.aud
+	TargetActorCenter: true
 	Projectile: Bullet
 		Inaccuracy: 2c938
 		ContrailLength: 30
--- a/mods/ra/weapons/missiles.yaml
+++ b/mods/ra/weapons/missiles.yaml
@@ -295,6 +295,7 @@ TorpTube:
 SubMissile:
 	Inherits: ^SubMissileDefault
 	Range: 16c0
+	TargetActorCenter: true
 	-Projectile:
 	Projectile: Bullet
 		Speed: 162
--- a/mods/ts/weapons/ballisticweapons.yaml
+++ b/mods/ts/weapons/ballisticweapons.yaml
@@ -98,6 +98,7 @@ RPGTower:
 	Inherits: ^ArtilleryWeapon
 	ReloadDelay: 110
 	Range: 18c0
+	TargetActorCenter: true
 	Projectile: Bullet
 		Speed: 384
 		LaunchAngle: 165
@@ -117,6 +118,7 @@ Jugg90mm:
 	BurstDelay: 3
 	-Report:
 	StartBurstReport: jugger1.aud
+	TargetActorCenter: true
 	Projectile: Bullet
 		Speed: 384
 		LaunchAngle: 165
--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -200,8 +200,8 @@ TurretLaserFire:
 		Damage: 30

 LaserFence:
+	TargetActorCenter: true
 	Projectile: InstantHit
-		TargetCenterPosition: true
 	Warhead@1Dam: TargetDamage
 		DebugOverlayColor: FF0000
 		Damage: 99999
--- a/mods/ts/weapons/healweapons.yaml
+++ b/mods/ts/weapons/healweapons.yaml
@@ -3,8 +3,8 @@
 	Range: 2c849
 	Report: healer1.aud
 	ValidTargets: Infantry
+	TargetActorCenter: true
 	Projectile: InstantHit
-		TargetCenterPosition: true
 	Warhead@1Dam: TargetDamage
 		DebugOverlayColor: 00FF00
 		Damage: -50
--- a/mods/ts/weapons/otherweapons.yaml
+++ b/mods/ts/weapons/otherweapons.yaml
@@ -28,6 +28,7 @@ Bomb:
 	Burst: 5
 	BurstDelay: 6
 	Range: 2c512
+	TargetActorCenter: true
 	Projectile: GravityBomb
 		Velocity: 72, 0, -90
 		Acceleration: 0, 0, -8