diff --git a/mods/cnc/bits/apctur.shp b/mods/cnc/bits/apctur.shp index d051f62f3d..47227334e6 100644 Binary files a/mods/cnc/bits/apctur.shp and b/mods/cnc/bits/apctur.shp differ diff --git a/mods/cnc/bits/apctur2.shp b/mods/cnc/bits/apctur2.shp deleted file mode 100644 index 6aefbb5fed..0000000000 Binary files a/mods/cnc/bits/apctur2.shp and /dev/null differ diff --git a/mods/cnc/rules/vehicles.yaml b/mods/cnc/rules/vehicles.yaml index aa6a07e92f..f6a5584cfb 100644 --- a/mods/cnc/rules/vehicles.yaml +++ b/mods/cnc/rules/vehicles.yaml @@ -129,20 +129,33 @@ APC: TurnSpeed: 10 Armament@PRIMARY: Weapon: APCGun - Recoil: 96 + Recoil: 48 RecoilRecovery: 18 - LocalOffset: 85,85,299, 85,-85,299 + LocalOffset: 255,100,189, 255,-100,189 MuzzleSequence: muzzle + PauseOnCondition: reload-air + ReloadingCondition: reload-ground Armament@SECONDARY: Name: secondary Weapon: APCGun.AA - Recoil: 96 + Recoil: 48 RecoilRecovery: 18 - LocalOffset: 85,85,299, 85,-85,299 - MuzzleSequence: muzzle + LocalOffset: 175,100,299, 175,-100,299 + MuzzleSequence: muzzle-air + PauseOnCondition: reload-ground + ReloadingCondition: reload-air + GrantConditionOnAttack: + Condition: attack-ground + RevokeDelay: 18 + RevokeOnNewTarget: False + RevokeAll: True AttackTurreted: WithMuzzleOverlay: WithSpriteTurret: + RequiresCondition: attack-ground + WithSpriteTurret@AIR: + Sequence: turret-air + RequiresCondition: !attack-ground Cargo: Types: Infantry MaxWeight: 5 diff --git a/mods/cnc/sequences/vehicles.yaml b/mods/cnc/sequences/vehicles.yaml index ff5f21d848..9a07cb0ec7 100644 --- a/mods/cnc/sequences/vehicles.yaml +++ b/mods/cnc/sequences/vehicles.yaml @@ -312,7 +312,13 @@ apc: UseClassicFacings: True turret: apctur Facings: 32 - muzzle: apcmuz + turret-air: apctur + Start: 32 + Facings: 32 + muzzle: minigun + Length: 6 + Facings: 8 + muzzle-air: apcmuz Length: 3 Stride: 6 Facings: 8