Merge pull request #9006 from reaperrr/remove-cantarget

Remove legacy 0% = not targetable assumption
2015-08-25 20:03:31 +03:00
parent 1ddab69025 aff1e5afe7
commit d5e0bf2169
15 changed files with 54 additions and 111 deletions
--- a/mods/cnc/rules/defaults.yaml
+++ b/mods/cnc/rules/defaults.yaml
@@ -117,7 +117,7 @@
 		UseLocation: yes
 	TargetableAircraft:
 		TargetTypes: Air
-		GroundedTargetTypes: Ground
+		GroundedTargetTypes: Ground, Vehicle
 	SelectionDecorations:
 	Selectable:
 		Bounds: 24,24
@@ -299,7 +299,7 @@
 	Selectable:
 		Bounds: 24,24
 	TargetableUnit:
-		TargetTypes: Ground, Infantry
+		TargetTypes: Ground
 	HiddenUnderFog:
 	WithInfantryBody:
 		AttackSequence: attack
@@ -639,7 +639,7 @@
 		Interval: 2
 	TargetableUnit:
 		RequiresForceFire: yes
-		TargetTypes: Ground
+		TargetTypes: Ground, Husk
 	Capturable:
 		Type: husk
 		AllowAllies: yes
--- a/mods/cnc/weapons/smallcaliber.yaml
+++ b/mods/cnc/weapons/smallcaliber.yaml
@@ -1,6 +1,7 @@
 Sniper:
 	Report: RAMGUN2.AUD
-	ValidTargets: Infantry
+	ValidTargets: Ground, Infantry
+	InvalidTargets: Vehicle, Water, Structure, Wall, Husk
 	ReloadDelay: 40
 	Range: 6c0
 	Projectile: Bullet