Fix lint warnings and spain missile limit problem

OpenRA · Jul 13, 2018 · 729412e · 729412e
1 parent 954d371
commit 729412e
Show file tree

Hide file tree

Showing 7 changed files with 101 additions and 43 deletions.
diff --git a/mods/raclassic/rules/aircraft.yaml b/mods/raclassic/rules/aircraft.yaml
@@ -253,9 +253,6 @@ TRAN:
 HELI:
 	Inherits: ^Helicopter
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	RangeMultiplier@Spain:
-		RequiresCondition: spain
-		Modifier: 125
 	Buildable:
 		Queue: Aircraft
 		BuildAtProductionType: Helicopter
@@ -275,6 +272,12 @@ HELI:
 		Weapon: Hellfire
 		LocalOffset: 0,-213,-85, 0,213,-85
 		PauseOnCondition: !ammo
+		RequiresCondition: !spain
+	Armament@SPAIN:
+		Weapon: Hellfire.spain
+		LocalOffset: 0,-213,-85, 0,213,-85
+		PauseOnCondition: !ammo
+		RequiresCondition: spain
 	AttackHeli:
 		FacingTolerance: 20
 	Aircraft:

diff --git a/mods/raclassic/rules/defaults.yaml b/mods/raclassic/rules/defaults.yaml
@@ -53,6 +53,9 @@
 	SpeedMultiplier@Ukraine:
 		RequiresCondition: ukraine
 		Modifier: 110
+	RangeMultiplier@Spain:
+		RequiresCondition: spain
+		Modifier: 100
 	GrantConditionOnPrerequisite@England:
 		Condition: england
 		Prerequisites: player.england
@@ -65,9 +68,6 @@
 	GrantConditionOnPrerequisite@Spain:
 		Condition: spain
 		Prerequisites: player.spain
-	GrantConditionOnPrerequisite@Greece:
-		Condition: greece
-		Prerequisites: player.greece
 	GrantConditionOnPrerequisite@Ukraine:
 		Condition: ukraine
 		Prerequisites: player.ukraine

diff --git a/mods/raclassic/rules/misc.yaml b/mods/raclassic/rules/misc.yaml
@@ -414,29 +414,29 @@ powerproxy.sonarpulse.crate:
 		EffectImage: moveflsh
 		EffectPalette: moveflash
 
-powerproxy.abomb:
-	AlwaysVisible:
-	NukePower:
-		Cursor: nuke
-		Icon: abomb
-		ChargeInterval: 19500
-		Description: Atom Bomb
-		LongDesc: Launches a devastating atomic bomb\nat a target location.
-		OneShot: true
-		AllowMultiple: true
-		SelectTargetSpeechNotification: SelectTarget
-		IncomingSpeechNotification: AbombLaunchDetected
-		SkipAscent: true
-		MissileWeapon: atomic
-		DisplayBeacon: True
-		DisplayRadarPing: True
-		BeaconPoster: atomicon
-		FlashType: Nuke
-		CameraRange: 10c0
-		ArrowSequence: arrow
-		ClockSequence: clock
-		CircleSequence: circles
-	WithNukeLaunchAnimation:
+# powerproxy.abomb:
+#	AlwaysVisible:
+#	NukePower:
+#		Cursor: nuke
+#		Icon: abomb
+#		ChargeInterval: 19500
+#		Description: Atom Bomb
+#		LongDesc: Launches a devastating atomic bomb\nat a target location.
+#		OneShot: true
+#		AllowMultiple: true
+#		SelectTargetSpeechNotification: SelectTarget
+#		IncomingSpeechNotification: AbombLaunchDetected
+#		SkipAscent: true
+#		MissileWeapon: atomic
+#		DisplayBeacon: True
+#		DisplayRadarPing: True
+#		BeaconPoster: atomicon
+#		FlashType: Nuke
+#		CameraRange: 10c0
+#		ArrowSequence: arrow
+#		ClockSequence: clock
+#		CircleSequence: circles
+#	WithNukeLaunchAnimation:
 
 powerproxy.paratroopers:
 	AlwaysVisible:

diff --git a/mods/raclassic/rules/ships.yaml b/mods/raclassic/rules/ships.yaml
@@ -71,9 +71,6 @@ SS:
 MSUB:
 	Inherits: ^Ship
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	RangeMultiplier@Spain:
-		RequiresCondition: spain
-		Modifier: 107
 	Buildable:
 		Queue: Ship
 		BuildAtProductionType: Submarine
@@ -115,6 +112,12 @@ MSUB:
 		Weapon: SubSCUD
 		LocalOffset: 0,-171,0, 0,171,0
 		FireDelay: 2
+		RequiresCondition: !spain
+	Armament@SPAIN:
+		Weapon: SubSCUD.spain
+		LocalOffset: 0,-171,0, 0,171,0
+		FireDelay: 2
+		RequiresCondition: spain
 	AttackFrontal:
 	SelectionDecorations:
 	AutoTarget:

diff --git a/mods/raclassic/rules/structures.yaml b/mods/raclassic/rules/structures.yaml
@@ -703,9 +703,6 @@ SAM:
 		Type: Rectangle
 			TopLeft: -768,-512
 			BottomRight: 768,512
-	RangeMultiplier@Spain:
-		RequiresCondition: spain
-		Modifier: 113
 	Buildable:
 		Queue: Building
 		BuildDuration: 750
@@ -734,6 +731,12 @@ SAM:
 		Weapon: Nike
 		LocalOffset: 0,0,320
 		MuzzleSequence: muzzle
+		RequiresCondition: !spain
+	Armament@SPAIN:
+		Weapon: Nike.spain
+		LocalOffset: 0,0,320
+		MuzzleSequence: muzzle
+		RequiresCondition: spain
 	AttackTurreted:
 	WithMuzzleOverlay:
 	RenderRangeCircle:

diff --git a/mods/raclassic/rules/vehicles.yaml b/mods/raclassic/rules/vehicles.yaml
@@ -727,9 +727,6 @@ CTNK:
 	Inherits@TRACK: ^TrackedVehicle
 	Inherits@CRUSH: ^CrusherVehicle
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	RangeMultiplier@Spain:
-		RequiresCondition: spain
-		Modifier: 114
 	Buildable:
 		Queue: Vehicle
 		BuildDuration: 2400
@@ -753,10 +750,22 @@ CTNK:
 		Weapon: APTusk
 		LocalOffset: -160,-276,232
 		LocalYaw: 60
+		RequiresCondition: !spain
 	Armament@SECONDARY:
 		Weapon: APTusk
 		LocalOffset: -160,276,232
 		LocalYaw: -60
+		RequiresCondition: !spain
+	Armament@PRIMARY_SPAIN:
+		Weapon: APTusk.spain
+		LocalOffset: -160,-276,232
+		LocalYaw: 60
+		RequiresCondition: spain
+	Armament@SECONDARY_SPAIN:
+		Weapon: APTusk.spain
+		LocalOffset: -160,276,232
+		LocalYaw: -60
+		RequiresCondition: spain
 	AttackFrontal:
 	PortableChrono:
 		ChargeDelay: 300
@@ -811,9 +820,6 @@ STNK:
 	Inherits@TRACK: ^TrackedVehicle
 	Inherits@CRUSH: ^CrusherVehicle
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
-	RangeMultiplier@Spain:
-		RequiresCondition: spain
-		Modifier: 114
 	Buildable:
 		Queue: Vehicle
 		BuildDuration: 800
@@ -844,6 +850,11 @@ STNK:
 	Armament:
 		Weapon: APTusk
 		LocalOffset: 192,0,176
+		RequiresCondition: !spain
+	Armament@SPAIN:
+		Weapon: APTusk.spain
+		LocalOffset: 192,0,176
+		RequiresCondition: spain
 	Turreted:
 		TurnSpeed: 5
 	AttackTurreted:

diff --git a/mods/raclassic/weapons/missiles.yaml b/mods/raclassic/weapons/missiles.yaml
@@ -68,6 +68,8 @@ Dragon:
 
 Dragon.spain:
 	Inherits: Dragon
+	Projectile: Missile
+		RangeLimit: 7c0
 	Range: 6c0
 
 Hellfire:
@@ -88,6 +90,12 @@ Hellfire:
 			Light: 75
 			Concrete: 50
 
+Hellfire.spain:
+	Inherits: Hellfire
+	Projectile: Missile
+		RangeLimit: 6c512
+	Range: 5c0
+
 MammothTusk:
 	Inherits: ^AntiGroundMissile
 	ReloadDelay: 80
@@ -119,6 +127,8 @@ MammothTusk:
 
 MammothTusk.spain:
 	Inherits: MammothTusk
+	Projectile: Missile
+		RangeLimit: 10c614
 	Range: 6c0
 
 Nike:
@@ -145,13 +155,19 @@ Nike:
 		Explosions: med_explosion_air
 		ImpactSounds: kaboom25.aud
 
+Nike.spain:
+	Inherits: Nike
+	Projectile: Missile
+		RangeLimit: 10c0
+	Range: 8c512
+
 RedEye:
 	Inherits: Nike
 	ReloadDelay: 50
 
 RedEye.spain:
-	Inherits: RedEye
-	Range: 8c512
+	Inherits: Nike.spain
+	ReloadDelay: 50
 
 Stinger:
 	Inherits: ^AntiGroundMissile
@@ -177,6 +193,8 @@ Stinger:
 
 Stinger.spain:
 	Inherits: Stinger
+	Projectile: Missile
+		RangeLimit: 10c512
 	Range: 10c0
 
 StingerAA:
@@ -191,6 +209,8 @@ StingerAA:
 
 StingerAA.spain:
 	Inherits: StingerAA
+	Projectile: Missile
+		RangeLimit: 10c512
 	Range: 10c0
 
 APTusk:
@@ -211,6 +231,12 @@ APTusk:
 	Warhead@3Eff: CreateEffect
 		Explosions: building
 
+APTusk.spain:
+	Inherits: APTusk
+	Projectile: Missile
+		RangeLimit: 8c204
+	Range: 6c0
+
 TorpTube:
 	ReloadDelay: 60
 	Range: 9c0
@@ -247,6 +273,12 @@ TorpTube:
 		ValidTargets: Water
 		InvalidTargets: Ship, Structure, Underwater, Bridge
 
+TorpTube.spain:
+	Inherits: TorpTube
+	Projectile: Missile
+		RangeLimit: 11c819
+	Range: 10c0
+
 SubSCUD:
 	Inherits: ^AntiGroundMissile
 	ReloadDelay: 120
@@ -279,6 +311,12 @@ SubSCUD:
 		Explosions: large_splash
 		ImpactSounds: splash9.aud
 
+SubSCUD.spain:
+	Inherits: SubSCUD
+	Projectile: Missile
+		RangeLimit: 16c0
+	Range: 15c0
+
 SCUD:
 	Inherits: ^AntiGroundMissile
 	ReloadDelay: 0