From f14d3985a0631515b97edbf13f1df8debe274466 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 12 Oct 2019 11:13:33 +0100 Subject: [PATCH] Allow carryall pickup orders on deployed vehicles. --- mods/ts/rules/gdi-vehicles.yaml | 3 +-- mods/ts/rules/nod-vehicles.yaml | 6 ++---- mods/ts/rules/shared-vehicles.yaml | 3 +-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/mods/ts/rules/gdi-vehicles.yaml b/mods/ts/rules/gdi-vehicles.yaml index af646319d2..9f685e4d4c 100644 --- a/mods/ts/rules/gdi-vehicles.yaml +++ b/mods/ts/rules/gdi-vehicles.yaml @@ -354,6 +354,7 @@ JUGG: DeployedCondition: deployed UndeployedCondition: undeployed UndeployOnMove: true + UndeployOnPickup: true Facing: 96 AllowedTerrainTypes: Clear, Road, DirtRoad, Rough DeploySounds: place2.aud @@ -405,8 +406,6 @@ JUGG: MuzzleSequence: muzzle MuzzlePalette: effect-ignore-lighting WithMuzzleOverlay: - Carryable: - RequiresCondition: undeployed RevealOnFire: ArmamentNames: deployed SelectionDecorations: diff --git a/mods/ts/rules/nod-vehicles.yaml b/mods/ts/rules/nod-vehicles.yaml index 3915b5f40e..6985174602 100644 --- a/mods/ts/rules/nod-vehicles.yaml +++ b/mods/ts/rules/nod-vehicles.yaml @@ -135,6 +135,7 @@ TTNK: DeployedCondition: deployed UndeployedCondition: undeployed UndeployOnMove: true + UndeployOnPickup: true Facing: 160 AllowedTerrainTypes: Clear, Road, DirtRoad, Rough DeploySounds: place2.aud @@ -199,8 +200,6 @@ TTNK: Range: 1c768 RequiresCondition: rank-elite RenderDetectionCircle: - Carryable: - RequiresCondition: undeployed RevealOnFire: ArmamentNames: primary, deployed RenderVoxels: @@ -248,6 +247,7 @@ ART2: DeployedCondition: deployed UndeployedCondition: undeployed UndeployOnMove: true + UndeployOnPickup: true Facing: 96 AllowedTerrainTypes: Clear, Road, DirtRoad, Rough DeploySounds: place2.aud @@ -297,8 +297,6 @@ ART2: MuzzleSequence: muzzle MuzzlePalette: effect-ignore-lighting WithMuzzleOverlay: - Carryable: - RequiresCondition: undeployed RevealOnFire: ArmamentNames: deployed diff --git a/mods/ts/rules/shared-vehicles.yaml b/mods/ts/rules/shared-vehicles.yaml index cee6051c06..58bff0d37e 100644 --- a/mods/ts/rules/shared-vehicles.yaml +++ b/mods/ts/rules/shared-vehicles.yaml @@ -149,6 +149,7 @@ LPST: DeployedCondition: deployed UndeployedCondition: undeployed UndeployOnMove: true + UndeployOnPickup: true Facing: 160 AllowedTerrainTypes: Clear, Road, DirtRoad, Rough DeploySounds: place2.aud @@ -169,7 +170,5 @@ LPST: Range: 18c0 RenderDetectionCircle: TrailCount: 3 - Carryable: - RequiresCondition: undeployed RenderVoxels: Scale: 11.5