Merge pull request #9706 from reaperrr/block-height

Add Height property to BlocksProjectiles
2015-10-29 23:51:14 -05:00
parent a1f27c6133 f7b8eaf1ac
commit 168dab9707
8 changed files with 29 additions and 4 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -546,6 +546,7 @@

 ^Wall:
 	Inherits@1: ^SpriteActor
+	CombatDebugOverlay:
 	AppearsOnRadar:
 	Building:
 		Dimensions: 1,1
--- a/mods/d2k/rules/structures.yaml
+++ b/mods/d2k/rules/structures.yaml
@@ -503,6 +503,7 @@ starport:

 wall:
 	Inherits@1: ^SpriteActor
+	CombatDebugOverlay:
 	HiddenUnderShroud:
 	Buildable:
 		Queue: Building
--- a/mods/ts/rules/defaults.yaml
+++ b/mods/ts/rules/defaults.yaml
@@ -177,6 +177,7 @@

 ^Wall:
 	Inherits@1: ^SpriteActor
+	CombatDebugOverlay:
 	HiddenUnderShroud:
 	AppearsOnRadar:
 	Building:
--- a/mods/ts/rules/gdi-support.yaml
+++ b/mods/ts/rules/gdi-support.yaml
@@ -19,6 +19,7 @@ GAWALL:
 	Armor:
 		Type: Concrete
 	BlocksProjectiles:
+		Height: 640
 	Crushable:
 		CrushClasses: heavywall
 	LineBuild:
@@ -46,6 +47,8 @@ GACTWR:
 		HP: 500
 	Armor:
 		Type: Light
+	BlocksProjectiles:
+		Height: 768
 	BodyOrientation:
 		QuantizedFacings: 32
 	DetectCloaked:
--- a/mods/ts/rules/nod-support.yaml
+++ b/mods/ts/rules/nod-support.yaml
@@ -19,6 +19,7 @@ NAWALL:
 	Armor:
 		Type: Concrete
 	BlocksProjectiles:
+		Height: 640
 	Crushable:
 		CrushClasses: heavywall
 	LineBuild:
--- a/mods/ts/weapons/largeguns.yaml
+++ b/mods/ts/weapons/largeguns.yaml
@@ -6,7 +6,7 @@
 		Speed: 682
 		Image: 120mm
 		Shadow: true
-		Angle: 62
+		Angle: 75
 		Palette: ra
 	Warhead@1Dam: SpreadDamage
 		Spread: 128