From dd41979261eadbf6bf96a64f7673e631cd715ad5 Mon Sep 17 00:00:00 2001 From: Patrick Date: Tue, 9 Jan 2024 17:55:53 +0100 Subject: [PATCH] fix charv crash, battlemaster is now a voxel unit --- AUTHORS | 2 +- mods/ca/bits/china/battlemaster.hva | Bin 0 -> 88 bytes mods/ca/bits/china/battlemaster.vxl | Bin 0 -> 104108 bytes mods/ca/bits/china/battlemastertur.hva | Bin 0 -> 88 bytes mods/ca/bits/china/battlemastertur.vxl | Bin 0 -> 50611 bytes mods/ca/rules/china/vehicles.yaml | 19 ++++++++++++------- mods/ca/rules/defaults.yaml | 6 +++++- mods/ca/rules/husks.yaml | 2 +- mods/ca/rules/soviet/aircraft.yaml | 1 + mods/ca/sequences/china.yaml | 8 ++------ mods/ca/sequences/vehicles.yaml | 2 +- mods/ca/sequences/voxels.yaml | 8 ++++---- 12 files changed, 27 insertions(+), 21 deletions(-) create mode 100644 mods/ca/bits/china/battlemaster.hva create mode 100644 mods/ca/bits/china/battlemaster.vxl create mode 100644 mods/ca/bits/china/battlemastertur.hva create mode 100644 mods/ca/bits/china/battlemastertur.vxl diff --git a/AUTHORS b/AUTHORS index 4f9d30eb..f51fea99 100644 --- a/AUTHORS +++ b/AUTHORS @@ -56,7 +56,7 @@ Contributors & special thanks to: * Bu7loos (Slingshot, Grand Cannon, Cryolauncher/Yuri Chaos Platform, Apocalypse) * Orac (Chronoharv) * Overwatch (Heavy Flame Tank, XO/Bastion, Support Battlefortress) - * Midian-P (Centurion/Gene Splicer, ysgen/MSG, Bastion, Chinook) + * Midian-P (Centurion/Gene Splicer, ysgen/MSG, Bastion, Chinook, China Units) * B.A.Znd (ISU, Katyusha, BPNE/Rice Cooker) * G-E (2S3 Akatsiya) * partyzanPaulZy (MARV) diff --git a/mods/ca/bits/china/battlemaster.hva b/mods/ca/bits/china/battlemaster.hva new file mode 100644 index 0000000000000000000000000000000000000000..325d9a8ed098e0fa2796b7aae3cd18c2c2b2a713 GIT binary patch literal 88 UcmZQzKn09IE(l|S276M(06JL$KmY&$ literal 0 HcmV?d00001 diff --git a/mods/ca/bits/china/battlemaster.vxl b/mods/ca/bits/china/battlemaster.vxl new file mode 100644 index 0000000000000000000000000000000000000000..5af636b78f323e1333ea043edd6837c7173e18ab GIT binary patch literal 104108 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 aztQNo|J8C2|Av46bu{|#zyAC4UH<>wA^;-* literal 0 HcmV?d00001 diff --git a/mods/ca/bits/china/battlemastertur.hva b/mods/ca/bits/china/battlemastertur.hva new file mode 100644 index 0000000000000000000000000000000000000000..325d9a8ed098e0fa2796b7aae3cd18c2c2b2a713 GIT binary patch literal 88 UcmZQzKn09IE(l|S276M(06JL$KmY&$ literal 0 HcmV?d00001 diff --git a/mods/ca/bits/china/battlemastertur.vxl b/mods/ca/bits/china/battlemastertur.vxl new file mode 100644 index 0000000000000000000000000000000000000000..c595a918dc0bc1402a5626764e8ab902adbc6393 GIT binary patch literal 50611 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 E2MG?!)&Kwi literal 0 HcmV?d00001 diff --git a/mods/ca/rules/china/vehicles.yaml b/mods/ca/rules/china/vehicles.yaml index 19beb881..929488c0 100644 --- a/mods/ca/rules/china/vehicles.yaml +++ b/mods/ca/rules/china/vehicles.yaml @@ -52,14 +52,20 @@ CHNMCV: chbattle: Inherits: ^Tank Inherits: ^TDVehicleSprite + Inherits: ^VoxelTurretedTank + RenderVoxels: + Scale: 0.7 + Image: chbattle + WithVoxelBody: + ShowShadow: true Inherits: ^BiologicalDriver Inherits: ^PrioAntiHeavy - Inherits@GeneralsVehicle: ^GeneralsVehicle - Inherits@horde: ^HordeBonus - Inherits@atom: ^AtomicTank - Inherits@uran: ^UranShells - Inherits@announce: ^AnnounceOnBuild - Inherits@vo: ^AttackTurretedVoice + Inherits: ^GeneralsVehicle + Inherits: ^HordeBonus + Inherits: ^AtomicTank + Inherits: ^UranShells + Inherits: ^AnnounceOnBuild + Inherits: ^AttackTurretedVoice RenderSprites: Image: chbattle Valued: @@ -91,7 +97,6 @@ chbattle: AttackTurreted: PauseOnCondition: empdisable || being-warped || parachute WithMuzzleOverlay: - WithSpriteTurret: SelectionDecorations: Voiced: VoiceSet: BattlemasterTankVoice diff --git a/mods/ca/rules/defaults.yaml b/mods/ca/rules/defaults.yaml index f3a24c0c..48ecb40c 100644 --- a/mods/ca/rules/defaults.yaml +++ b/mods/ca/rules/defaults.yaml @@ -3837,7 +3837,7 @@ CameraPitch: 130 UseClassicPerspectiveFudge: true RenderVoxels: - Scale: 5.5 + Scale: 1 NormalsPalette: normals PlayerPalette: playerra2 LightYaw: 800 @@ -3869,6 +3869,10 @@ LightPitch: 142 LightYaw: 682 +^VoxelTurretedTank: + Inherits: ^TSRenderVoxel + WithVoxelTurret: + ^VoxelPlane: Inherits: ^Plane Inherits: ^WingContrails diff --git a/mods/ca/rules/husks.yaml b/mods/ca/rules/husks.yaml index bce92771..10686e29 100644 --- a/mods/ca/rules/husks.yaml +++ b/mods/ca/rules/husks.yaml @@ -1501,7 +1501,7 @@ FROG.Husk: Inherits: ^VoxelPlaneHusk RenderVoxels: Scale: 0.6 - Image: frog.husk + Image: frog Tooltip: Name: Frogfoot Attack Plane RenderSprites: diff --git a/mods/ca/rules/soviet/aircraft.yaml b/mods/ca/rules/soviet/aircraft.yaml index c53fc3e7..d934be9e 100644 --- a/mods/ca/rules/soviet/aircraft.yaml +++ b/mods/ca/rules/soviet/aircraft.yaml @@ -3,6 +3,7 @@ FROG: Inherits: ^VoxelPlane RenderVoxels: Scale: 0.6 + Image: frog Inherits: ^BomberPlane Inherits: ^BiologicalPilot Inherits: ^PrioAntiLight diff --git a/mods/ca/sequences/china.yaml b/mods/ca/sequences/china.yaml index e08a5734..05ebe9d5 100644 --- a/mods/ca/sequences/china.yaml +++ b/mods/ca/sequences/china.yaml @@ -511,12 +511,8 @@ chlotus: chbattle: Inherits: ^VehicleOverlays Inherits: ^LowRes - idle: chbattle - Facings: 32 - UseClassicFacings: True - turret: chbattletur - Facings: 32 - UseClassicFacings: True + idle: invisibleitem + turret: invisibleitem muzzle: gunfire2 Length: 5 icon: chbattleicon diff --git a/mods/ca/sequences/vehicles.yaml b/mods/ca/sequences/vehicles.yaml index 37c6c310..c8ce7028 100644 --- a/mods/ca/sequences/vehicles.yaml +++ b/mods/ca/sequences/vehicles.yaml @@ -75,7 +75,7 @@ charv: charv.destroyed: Inherits: ^VehicleOverlays - idle: charv + idle: chronoharv Facings: 32 UseClassicFacings: True ZOffset: -512 diff --git a/mods/ca/sequences/voxels.yaml b/mods/ca/sequences/voxels.yaml index 8b50deea..d6c2f1a7 100644 --- a/mods/ca/sequences/voxels.yaml +++ b/mods/ca/sequences/voxels.yaml @@ -17,10 +17,6 @@ su47.husk: frog: idle: frog -su25.dirty: - Inherits: frog -frog.husk: - Inherits: frog ocar: idle: V22 @@ -68,3 +64,7 @@ huey: idle: huey huey.husk: Inherits: huey + +chbattle: + idle: battlemaster + turret: battlemastertur