Lint warning fixes and related bug fixes.

mod.config

@@ -9,7 +9,7 @@
 MOD_ID="rv"
 
 # The OpenRA engine version to use for this project.
-ENGINE_VERSION="370a93e"
+ENGINE_VERSION="400df20"
 
 ##############################################################################
 # Packaging

mods/rv/rules/aircraft.yaml

@@ -198,12 +198,12 @@ shadhusk:
 zep:
 	Inherits: ^Helicopter
 	Inherits@ADVIRRAD: ^AffectedByAdvancedIrradiators
+	Inherits@AI: ^AIControl
 	Inherits@AIRPROP: ^AffectedByAerialPropaganda
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@CHAOS: ^BerserkableVoxelArmed
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@RADBOMBS: ^AffectedByRadioactiveBombs
-	Inherits@AI: ^AIControl
 	AutoTarget:
 		ScanRadius: 5
 		InitialStance: ReturnFire
@@ -415,7 +415,6 @@ zephusk:
 orca:
 	Inherits: ^Plane
 	Inherits@A2A: ^AffectedByA2AMissiles
-	Inherits@AI: ^AIControl
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
 	Inherits@BUILDVOICE: ^WithProductionVoicelines
 	Inherits@CHAOS: ^BerserkableVoxelArmed
@@ -686,7 +685,6 @@ orcahusk.VTOL:
 
 beag:
 	Inherits: ^Plane
-	Inherits@AI: ^AIControl
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@BUILDVOICE: ^WithProductionVoicelines
 	Inherits@CHAOS: ^BerserkableVoxelArmed
@@ -1708,14 +1706,14 @@ spyphusk:
 
 schp:
 	Inherits: ^Helicopter
+	Inherits@AI: ^AIControl
 	Inherits@APBULLETS: ^AffectedByAPBullets
 	Inherits@AUTOTARGET: ^AutoTargetAllAssaultMove
 	Inherits@BUILDVOICE: ^WithProductionVoicelines
 	Inherits@CHAOS: ^BerserkableVoxelArmed
 	Inherits@EXPERIENCE: ^GainsExperience
 	Inherits@MC: ^MindControllable
 	Inherits@RADIATON: ^DamagedByRadiation50PercentAircraft
-	Inherits@AI: ^AIControl
 	AutoTargetPriority@DEFAULT:
 		RequiresCondition: !stance-attackanything && !assault-move && !deployed
 	AutoTargetPriority@ATTACKANYTHING:
@@ -2650,7 +2648,6 @@ hindhusk:
 
 fortress:
 	Inherits: ^Plane
-	Inherits@AI: ^AIControl
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@BUILDVOICE: ^WithProductionVoicelines
 	Inherits@CHAOS: ^BerserkableVoxelArmed
@@ -3680,7 +3677,6 @@ havochusk:
 
 badgr:
 	Inherits: ^Plane
-	Inherits@AI: ^AIControl
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@BUILDVOICE: ^WithProductionVoicelines
 	Inherits@CHAOS: ^BerserkableVoxelArmed
@@ -3810,7 +3806,6 @@ badgr:
 
 badgrhusk:
 	Inherits: ^PlaneHusk
-	Inherits@PAYLOAD: ^AffectedByIncreasedPayload
 	Tooltip:
 		Name: actor-badgr.name
 	Tooltip@NoRow:

mods/rv/rules/allied-infantry.yaml

@@ -182,7 +182,7 @@ dog:
 	Mobile:
 		Speed: 120
 		Locomotor: swimsuit
-		RequiresCondition: !deploying && !deployed && !chronodisable && !webdisable && !dogstun
+		RequiresCondition: !chronodisable && !webdisable && !dogstun # && !deploying && !deployed 
 	Passenger:
 		CargoType: Infantry
 	RevealsShroud:
@@ -196,7 +196,7 @@ dog:
 	AttackLeap:
 		Voice: Attack
 		Speed: 120
-		PauseOnCondition: chronodisable || webdisable || dogstun || deployed || deploying
+		PauseOnCondition: chronodisable || webdisable || dogstun # || deployed || deploying
 	AttackMove:
 		Voice: Move
 	AutoTarget:
@@ -206,20 +206,20 @@ dog:
 		ValidTargets: Infantry
 	WithInfantryBody:
 		DefaultAttackSequence: jump
-		RequiresCondition: !parachute && !webdisable && !attacking && !deployed && !deploying && !swimming
+		RequiresCondition: !parachute && !webdisable && !attacking && !swimming # && !deployed && !deploying
 	WithInfantryBody@Water:
 		-IdleSequences:
 		MoveSequence: swim-run
 		StandSequences: swim-stand
 		DefaultAttackSequence: swim-jump
-		RequiresCondition: !parachute && !webdisable && !attacking && !deployed && !deploying && swimming
+		RequiresCondition: !parachute && !webdisable && !attacking && swimming # && !deployed && !deploying
 	WithFacingSpriteBody:
 		Sequence: shoot
 		RequiresCondition: attacking
-	WithSpriteBody@DEPLOYED:
-		Sequence: deployed
-		Name: deployed
-		RequiresCondition: !parachute && !webdisable && !attacking && (deployed || deploying)
+	# WithSpriteBody@DEPLOYED:
+	#	Sequence: deployed
+	#	Name: deployed
+	#	RequiresCondition: !parachute && !webdisable && !attacking && (deployed || deploying)
 	RenderSprites:
 		Image: adog
 		FactionImages:
@@ -245,9 +245,9 @@ dog:
 	IgnoresDisguise:
 	DetectCloaked:
 		Range: 5c0
-	PeriodicExplosion:
-		Weapon: DogBark
-		RequiresCondition: deployed && !chronodisable && !webdisable && !dogstun
+	# PeriodicExplosion:
+	#	Weapon: DogBark
+	#	RequiresCondition: deployed && !chronodisable && !webdisable && !dogstun
 	# GrantTimedConditionOnDeploy:
 	#	DeployedTicks: 1
 	#	CooldownTicks: 1500
@@ -523,6 +523,7 @@ e1:
 ggi:
 	Inherits: ^Infantry
 	Inherits@ADVTRAINING: ^AffectedByAdvancedTraining
+	Inherits@AI: ^AIControl
 	Inherits@AUTOTARGET: ^AutoTargetGroundAssaultMove
 	Inherits@BOOSTGLIDING: ^AffectedByBoostGlidingSystems
 	Inherits@ENDURANCE: ^AffectedByEnduranceTraining

mods/rv/rules/allied-naval.yaml

@@ -307,9 +307,9 @@ carrier:
 		RequiresSelection: true
 	Armament:
 		Weapon: HornetLauncher
-	GrantConditionOnMovement@MoveStart:
-		Condition: moving
-		ValidMovementTypes: Horizontal, Turn
+	# GrantConditionOnMovement@MoveStart:
+	#	Condition: moving
+	#	ValidMovementTypes: Horizontal, Turn
 	# SoundAnnouncement:
 	#	SoundFiles: vaccstaa.wav, vaccstab.wav
 	#	Volume: 0.5
@@ -357,7 +357,7 @@ adest:
 		Speed: 90
 		TurnSpeed: 16
 		Locomotor: omniamphibious
-		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	SpeedMultiplier:
 		Modifier: 67
 		RequiresCondition: !in_water

mods/rv/rules/allied-vehicles.yaml

@@ -1532,6 +1532,8 @@ bfrt:
 	-Crushable:
 	-Crushable@Cheater:
 	-Crushable@Vengeful:
+	-GrantConditionOnBotOwner@Cheater:
+	-GrantConditionOnBotOwner@Vengeful:
 	RevealsShroud:
 		Range: 6c0
 	# RevealsShroudToIntelligenceOwner:

mods/rv/rules/bakuvian-vehicles.yaml

@@ -346,6 +346,8 @@ qyzyl:
 	-Crushable:
 	-Crushable@Cheater:
 	-Crushable@Vengeful:
+	-GrantConditionOnBotOwner@Cheater:
+	-GrantConditionOnBotOwner@Vengeful:
 	ChangesHealth:
 		PercentageStep: 1
 		Step: 0

mods/rv/rules/civilian-naval.yaml

@@ -111,3 +111,5 @@ vlad:
 		RequiresCondition: loaded == 1
 	-WithVoxelBody@HALF-RADBOMBS:
 	-WithVoxelBody@HALF-RADBOMBS-ORANGE:
+	-GrantConditionOnPrerequisite@RADBOMBS:
+	-GrantConditionOnPrerequisite@ADVIRRAD:

mods/rv/rules/debug-structures.yaml

@@ -23,15 +23,16 @@ cacnst:
 	-ProductionBar@Support.Shared:
 	-ProductionBar@Support:
 	-ProductionBar@SupportFrance:
+	-GrantConditionOnPrerequisite@multiqueue:
 	-MapEditorData:
 	-Transforms:
 	-TransformsIntoMobile:
 	-TransformsIntoRepairable:
 	-TransformsIntoPassenger:
 	-GrantConditionOnPrerequisite@GLOBALFACTUNDEPLOY:
 	-TransferTimedExternalConditionOnTransform@INVULNERABILITY:
-	-TransferTimedExternalConditionOnTransform@INVISIBILITY:
-	-ExternalCondition@INVISIBILITY:
+	# -TransferTimedExternalConditionOnTransform@INVISIBILITY:
+	# -ExternalCondition@INVISIBILITY:
 
 # Allied ConYards
 gacnst.america:

mods/rv/rules/default-naval.yaml

@@ -36,7 +36,7 @@
 		Speed: 120
 		TurnsWhileMoving: true
 		Locomotor: heavyamphibious
-		RequiresCondition: !notmobile && !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !notmobile && !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	Hovers:
 		Ticks: 10
 		BobDistance: -64

mods/rv/rules/default-structures.yaml

@@ -130,10 +130,11 @@
 		PauseOnCondition: build-incomplete || chronodisable
 	TransferTimedExternalConditionOnTransform@INVULNERABILITY:
 		Condition: invulnerability
-	TransferTimedExternalConditionOnTransform@INVISIBILITY:
-		Condition: invisibility
-	ExternalCondition@INVISIBILITY:
-		Condition: invisibility
+	# This doesn't work, so commenting out to keep the lint warnings. This condition is not timed.
+	# TransferTimedExternalConditionOnTransform@INVISIBILITY:
+	#	Condition: invisibility
+	# ExternalCondition@INVISIBILITY:
+	#	Condition: invisibility
 	GrantCondition@IDISABLE:
 		RequiresCondition: emp || infiltrated
 	Targetable:

mods/rv/rules/default-vehicles.yaml

@@ -56,7 +56,7 @@
 		Speed: 90
 		TurnSpeed: 32
 		Locomotor: heavyamphibious
-		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	Crushable:
 		RequiresCondition: !invulnerability && (!in_water || on_dock) && !cheater-ai && !vengeful-ai
 	Crushable@Cheater:
@@ -155,10 +155,12 @@
 		Speed: 90
 		TurnSpeed: 20
 		Locomotor: heavyamphibious
-		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	-Crushable:
 	-Crushable@Cheater:
 	-Crushable@Vengeful:
+	-GrantConditionOnBotOwner@Cheater:
+	-GrantConditionOnBotOwner@Vengeful:
 	Capturable:
 		RequiresCondition: !suddendeath
 	Capturable@PERMAMC:
@@ -277,7 +279,7 @@
 		Locomotor: heavyamphibious
 		TurnsWhileMoving: true
 		TerrainOrientationAdjustmentMargin: -1
-		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	Crushable:
 		RequiresCondition: !invulnerability && (!in_water || on_dock) && !cheater-ai && !vengeful-ai
 	Crushable@Cheater:

mods/rv/rules/defaults.yaml

@@ -722,7 +722,7 @@
 ^AffectedByArmTheMob:
 	# ActorStatValues:
 	#	Upgrades: upgrade.arm_the_mob
-	GrantConditionOnPrerequisite@PROPEFFORT:
+	GrantConditionOnPrerequisite@ARMTHEMOB:
 		Condition: armthemob
 		Prerequisites: upgrade.arm_the_mob
 
@@ -1678,8 +1678,9 @@
 		ValidRelationships: None
 
 ^WithFeedbackVoicelines:
-	GrantRandomCondition@Feedback:
-		Conditions: playfeedback, dontplayfeedback, dontplayfeedback, dontplayfeedback
+	GrantConditionByPercentChance@Feedback:
+		Condition: playfeedback
+		Chance: 25
 	GrantConditionOnDamageState@Feedback:
 		Condition: feedback
 		ValidDamageStates: Critical
@@ -2775,6 +2776,8 @@
 	-Crushable:
 	-Crushable@Cheater:
 	-Crushable@Vengeful:
+	-GrantConditionOnBotOwner@Cheater:
+	-GrantConditionOnBotOwner@Vengeful:
 	-TakeCover:
 	-Targetable:
 	-TurnOnIdle:
@@ -3537,7 +3540,7 @@
 		Voice: Move
 		Locomotor: naval
 		TurnSpeed: 20
-		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	LeavesTrails:
 		Image: wake
 		Palette: effect50alpha

mods/rv/rules/soviet-naval.yaml

@@ -82,7 +82,6 @@ sub:
 		# DetectionTypes: Underwater
 		Range: 6c0
 	RenderDetectionCircle:
-	-MustBeDestroyed:
 	WithVoxelBody:
 		ShowShadow: false
 	RenderSprites:
@@ -498,7 +497,7 @@ sray:
 		Speed: 90
 		TurnSpeed: 32
 		Locomotor: heavyamphibious
-		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected
+		RequiresCondition: !chronodisable && !emp && !magnefreeze && !squid && !beinginfected && !being-captured
 	SpeedMultiplier:
 		Modifier: 84
 		RequiresCondition: !in_water
@@ -559,11 +558,11 @@ sray:
 	Voiced:
 		VoiceSet: StingerVoice
 	HitShape:
-	GrantConditionOnMovement@MoveStart:
-		Condition: moving
-		ValidMovementTypes: Horizontal, Turn
-	GrantConditionOnMovement@walk:
-		Condition: walking
+	# GrantConditionOnMovement@MoveStart:
+	#	Condition: moving
+	#	ValidMovementTypes: Horizontal, Turn
+	# GrantConditionOnMovement@walk:
+	#	Condition: walking
 	# SoundAnnouncement:
 	#	SoundFiles: vstistaa.wav, vstistab.wav, vstistac.wav, vstistad.wav
 	#	Volume: 0.4

mods/rv/rules/soviet-vehicles.yaml

@@ -550,6 +550,8 @@ apoc:
 	-Crushable:
 	-Crushable@Cheater:
 	-Crushable@Vengeful:
+	-GrantConditionOnBotOwner@Cheater:
+	-GrantConditionOnBotOwner@Vengeful:
 	ChangesHealth:
 		PercentageStep: 1
 		Step: 0
@@ -1391,6 +1393,8 @@ deva:
 	-Crushable:
 	-Crushable@Cheater:
 	-Crushable@Vengeful:
+	-GrantConditionOnBotOwner@Cheater:
+	-GrantConditionOnBotOwner@Vengeful:
 	ChangesHealth:
 		PercentageStep: 1
 		Step: 0