fix charv crash, battlemaster is now a voxel unit

patrickwieth · Jan 9, 2024 · dd41979 · dd41979
1 parent 43a57cb
commit dd41979
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 21 deletions.
diff --git 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
diff --git a/mods/ca/bits/china/battlemaster.vxl b/mods/ca/bits/china/battlemaster.vxl
diff --git a/mods/ca/bits/china/battlemastertur.hva b/mods/ca/bits/china/battlemastertur.hva
diff --git a/mods/ca/bits/china/battlemastertur.vxl b/mods/ca/bits/china/battlemastertur.vxl
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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