Merge pull request #10148 from pchote/widelines

Rewrite line renderer: Part 1 (improved lasers plus other cleanups)
2015-12-13 20:55:54 +01:00
parent 0bde5bc294 92d0261005
commit 02c5c1bbfb
26 changed files with 332 additions and 181 deletions
--- a/mods/cnc/weapons/other.yaml
+++ b/mods/cnc/weapons/other.yaml
@@ -123,7 +123,7 @@ Laser:
 	Charges: true
 	Report: OBELRAY1.AUD
 	Projectile: LaserZap
-		BeamWidth: 2
+		Width: 85
 		HitAnim: laserfire
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
--- a/mods/d2k/weapons.yaml
+++ b/mods/d2k/weapons.yaml
@@ -535,6 +535,7 @@ Sound:
 		Duration: 4 # Has a length of 0c512
 		DamageInterval: 3 # Travels 0c384 between impacts, will hit a target roughly three times
 		Width: 0c512
+		Shape: Flat
 		Falloff: 100, 100, 50
 		Range: 0, 6c0, 11c0
 		BeyondTargetRange: 1c0
--- a/mods/ts/rules/shared-vehicles.yaml
+++ b/mods/ts/rules/shared-vehicles.yaml
@@ -146,5 +146,5 @@ LPST:
 		UpgradeMinEnabledLevel: 1
 		Range: 18c0
 	RenderDetectionCircle:
-		DrawUpdateLine: true
+		TrailCount: 3

--- a/mods/ts/weapons/energyweapons.yaml
+++ b/mods/ts/weapons/energyweapons.yaml
@@ -74,6 +74,7 @@ SonicZap:
 		Duration: 90
 		DamageInterval: 5 # Roughly 18 impacts.
 		Width: 0c384
+		Shape: Flat
 		BeyondTargetRange: 0c256
 		Blockable: true
 		Color: 00FFFFC8
@@ -174,7 +175,7 @@ ObeliskLaserFire:
 	Charges: true
 	Report: OBELRAY1.AUD
 	Projectile: LaserZap
-		BeamWidth: 4
+		Width: 170
 	Warhead@1Dam: SpreadDamage
 		Spread: 42
 		Damage: 250
@@ -185,7 +186,7 @@ TurretLaserFire:
 	Range: 5c512
 	Report: LASTUR1.AUD
 	Projectile: LaserZap
-		BeamWidth: 2
+		Width: 85
 		BeamDuration: 5
 	Warhead@1Dam: SpreadDamage
 		Spread: 42