Align D2k weapons to better match original

Based on OpenRA#20021 . Changes are inline with OpenRA#17972
Porenutak · Jul 21, 2022 · d46e72e · d46e72e
1 parent 804bff1
commit d46e72e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 33 deletions.
diff --git a/mods/d2k/weapons/largeguns.yaml b/mods/d2k/weapons/largeguns.yaml
@@ -4,15 +4,15 @@
 	Report: MEDTANK1.WAV
 	Projectile: Bullet
 		Speed: 562
-		Inaccuracy: 128
+		Inaccuracy: 135
 		InaccuracyType: PerCellIncrement
 		Image: 120mm
 	Warhead@1Dam: SpreadDamage
 		Damage: 2700
-		Spread: 512
+		Spread: 756
 		Falloff: 100, 0
 		Versus:
-			none: 20
+			none: 30
 			wall: 50
 			building: 50
 			wood: 60
@@ -65,7 +65,7 @@ DevBullet:
 	Warhead@1Dam: SpreadDamage
 		Damage: 6500
 		Versus:
-			none: 50
+			none: 65
 			wall: 100
 			building: 75
 			wood: 60
@@ -93,7 +93,7 @@ DevBullet:
 		Image: 155mm
 	Warhead@1Dam: SpreadDamage
 		Damage: 4500
-		Spread: 1c0
+		Spread: 2c0
 		Versus:
 			none: 125
 			wall: 100
@@ -104,7 +104,11 @@ DevBullet:
 			invulnerable: 0
 			cy: 20
 			harvester: 25
-		DamageTypes: Prone50Percent, TriggerProne, ExplosionDeath
+		DamageTypes: Prone50Percent, ExplosionDeath
+	Warhead@proneeffect: TargetDamage
+		DamageTypes: TriggerProne
+		Damage: 1
+		Spread: 1c512
 	Warhead@4Concrete: DamagesConcrete
 		Damage: 5625
 	Warhead@3Eff: CreateEffect

diff --git a/mods/d2k/weapons/missiles.yaml b/mods/d2k/weapons/missiles.yaml
@@ -5,18 +5,18 @@
 	Projectile: Bullet
 		Blockable: false
 		Speed: 281
-		Inaccuracy: 128
+		Inaccuracy: 140
 		InaccuracyType: PerCellIncrement
 		Image: RPG
 		TrailImage: bazooka_trail2
 		TrailPalette: effect75alpha
 		TrailInterval: 1
 	Warhead@1Dam: SpreadDamage
 		Damage: 3000
-		Spread: 512
+		Spread: 700
 		Falloff: 100, 0
 		Versus:
-			none: 8
+			none: 15
 			wall: 75
 			building: 40
 			wood: 45
@@ -54,6 +54,7 @@
 		Speed: 288
 	Warhead@1Dam: SpreadDamage
 		Damage: 4800
+		Spread: 960
 		Versus:
 			none: 15
 			wall: 75
@@ -64,6 +65,11 @@
 			invulnerable: 0
 			cy: 30
 			harvester: 50
+		DamageTypes: Prone50Percent, SmallExplosionDeath
+	Warhead@proneeffect: TargetDamage
+		Damage: 1
+		Spread: 600
+		DamageTypes: TriggerProne
 	Warhead@4Concrete: DamagesConcrete
 		Damage: 720
 	Warhead@3Eff: CreateEffect

diff --git a/mods/d2k/weapons/other.yaml b/mods/d2k/weapons/other.yaml
@@ -8,35 +8,18 @@ Sound:
 		InaccuracyType: PerCellIncrement
 		Duration: 4 # Has a length of 0c512
 		DamageInterval: 3 # Travels 0c384 between impacts, will hit a target roughly three times
-		Width: 0c512
+		Width: 0c756 # orig d2k width is 2c0 but 100% dmg is only at center and fade out lineary to the edges
 		Shape: Flat
-		Falloff: 100, 100, 50
-		Range: 0, 6c0, 11c0
+		Falloff: 0, 0, 100, 0
+		Range: 0,0c450, 4c0, 8c0
 		BeyondTargetRange: 1c0
 		Color: 00FFFFC8
 	Warhead@1Dam: SpreadDamage
 		Range: 0, 32
 		Falloff: 100, 100
 		Damage: 860
 		AffectsParent: false
-		ValidRelationships: Neutral, Enemy
-		Versus:
-			none: 200
-			wall: 50
-			building: 60
-			wood: 110
-			light: 110
-			heavy: 60
-			invulnerable: 0
-			cy: 20
-			harvester: 50
-		DamageTypes: Prone50Percent, TriggerProne, SoundDeath
-	Warhead@2Dam: SpreadDamage
-		Range: 0, 32
-		Falloff: 100, 100
-		Damage: 430 # Only does half damage to friendly units
-		AffectsParent: false
-		ValidRelationships: Ally
+		ValidRelationships: Neutral, Enemy, Ally
 		Versus:
 			none: 200
 			wall: 50

diff --git a/mods/d2k/weapons/smallguns.yaml b/mods/d2k/weapons/smallguns.yaml
@@ -3,18 +3,19 @@
 	Range: 2c512
 	Report: MGUN2.WAV
 	Projectile: InstantHit
-		Inaccuracy: 128
+		Inaccuracy: 135
 		InaccuracyType: PerCellIncrement
 	Warhead@1Dam: SpreadDamage
 		Damage: 1250
-		Spread: 480
+		Spread: 650
 		Falloff: 100, 0
 		Versus:
+			none: 110
 			wall: 10
 			building: 25
 			wood: 75
 			light: 40
-			heavy: 20
+			heavy: 18
 			invulnerable: 0
 			cy: 20
 			harvester: 25