[Minor] Independent SHP Vehicle Turret Files

CREDITS.md

@@ -401,6 +401,7 @@ This page lists all the individual contributions to the project by their author.
   - Fast access structure
   - Iron Curtain/Custom Tint Support for SHP Turreted Vehicles
   - Reactivate unused trigger events 2, 53, and 54
+  - SHP turret vehicles support the use of `*tur.shp` files
 - **NetsuNegi**:
   - Forbidding parallel AI queues by type
   - Jumpjet crash speed fix when crashing onto building

docs/New-or-Enhanced-Logics.md

@@ -2165,6 +2165,13 @@ WaterImage.ConditionRed=              ; VehicleType entry
 Note that the VehicleTypes had to be defined under [VehicleTypes] and use same image type (SHP/VXL) for vanilla/damaged states.
 ```
 
+### Independent SHP Vehicle Turret Files
+
+- SHP turret vehicles support the use of `*tur.shp` files.
+  - If the SHP vehicle has a Shape file named `* tur.shp` when drawing the turret, the start frame becomes 0; Otherwise, it is still `WalkFrames * Facings`.
+  - If you want to split the existing shape file in two, you only need to separate the 32-frame image of the turret and the corresponding 32-frame shadow from the source file and combine them into a new shape file. 
+  - When the turrets of carrier-based vehicles need to be replaced, dividing them into two files can reduce troublesome steps.
+
 ### Jumpjet Tilts While Moving
 
 ![image](_static/images/jumpjet-tilt.gif)

docs/Whats-New.md

@@ -471,6 +471,7 @@ New:
 - AutoDeath upon ownership change (by Ollerus)
 - [Script Action 14004 for forcing all new actions to target only the main owner's enemy](AI-Scripting-and-Mapping.md#force-global-onlytargethouseenemy-value-in-teams-for-new-attack-move-actions-introduced-by-phobos) (by FS-21)
 - [Allow merging AOE damage to buildings into one](New-or-Enhanced-Logics.md#allow-merging-aoe-damage-to-buildings-into-one) (by CrimRecya)
+- SHP turret vehicles support the use of `*tur.shp` files (by FlyStar)
 
 Vanilla fixes:
 - Fixed sidebar not updating queued unit numbers when adding or removing units when the production is on hold (by CrimRecya)

src/Ext/TechnoType/Body.cpp

@@ -1784,6 +1784,8 @@ void TechnoTypeExt::ExtData::Serialize(T& Stm)
 		.Process(this->InfantryAutoDeploy)
 
 		.Process(this->TurretResponse)
+
+		.Process(this->TurretShape)
 		;
 }
 void TechnoTypeExt::ExtData::LoadFromStream(PhobosStreamReader& Stm)

src/Ext/TechnoType/Body.h

@@ -452,6 +452,8 @@ class TechnoTypeExt
 
 		Nullable<bool> TurretResponse;
 
+		SHPStruct* TurretShape;
+
 		ExtData(TechnoTypeClass* OwnerObject) : Extension<TechnoTypeClass>(OwnerObject)
 			, HealthBar_Hide { false }
 			, HealthBar_HidePips { false }
@@ -854,6 +856,8 @@ class TechnoTypeExt
 			, InfantryAutoDeploy {}
 
 			, TurretResponse {}
+
+			, TurretShape { nullptr }
 		{ }
 
 		virtual ~ExtData() = default;

src/Ext/TechnoType/Hooks.cpp

@@ -128,3 +128,30 @@ DEFINE_HOOK(0x71464A, TechnoTypeClass_ReadINI_Speed, 0x7)
 
 	return SkipGameCode;
 }
+
+DEFINE_HOOK(0x747A2E, UnitTypeClass_ReadINI_TurretShape, 0x6)
+{
+	GET(UnitTypeClass*, pType, EDI);
+
+	if (!pType->Voxel && pType->Turret)
+	{
+		char nameBuffer[0x19];
+		char Buffer[260];
+		const auto pArtSection = pType->ImageFile;
+
+		if (Phobos::Config::ArtImageSwap &&
+			CCINIClass::INI_Art.ReadString(pArtSection, "Image", 0, nameBuffer, 0x19) != 0)
+		{
+			_snprintf_s(Buffer, sizeof(Buffer), "%sTUR.SHP", nameBuffer);
+		}
+		else
+		{
+			_snprintf_s(Buffer, sizeof(Buffer), "%sTUR.SHP", pArtSection);
+		}
+
+		if (const auto pShape = FileSystem::LoadSHPFile(Buffer))
+			TechnoTypeExt::ExtMap.Find(pType)->TurretShape = pShape;
+	}
+
+	return 0;
+}

src/Ext/Unit/Hooks.DrawIt.cpp

@@ -29,8 +29,14 @@ DEFINE_HOOK(0x73C7AC, UnitClass_DrawAsSHP_DrawTurret_TintFix, 0x6)
 
 	pThis->Draw_A_SHP(pShape, bodyFrameIdx, &location, &bounds, 0, 256, zAdjust, zGradient, 0, extraLight, 0, 0, 0, 0, 0, 0);
 
+	const auto pTurretShape = TechnoTypeExt::ExtMap.Find(pType)->TurretShape;
+	const int StartFrame = pTurretShape ? 0 : (pType->WalkFrames * pType->Facings);
+
+	if (pTurretShape)
+		pShape = pTurretShape;
+
 	const auto secondaryDir = pThis->SecondaryFacing.Current();
-	const int frameIdx = secondaryDir.GetFacing<32>(4) + pType->WalkFrames * pType->Facings;
+	const int frameIdx = secondaryDir.GetFacing<32>(4) + StartFrame;
 
 	const auto primaryDir = pThis->PrimaryFacing.Current();
 	const double bodyRad = primaryDir.GetRadian<32>();
@@ -50,3 +56,22 @@ DEFINE_HOOK(0x73C7AC, UnitClass_DrawAsSHP_DrawTurret_TintFix, 0x6)
 	Game::bDrawShadow = originalDrawShadow;
 	return SkipDrawCode;
 }
+
+DEFINE_HOOK(0x73CCF4, UnitClass_DrawSHP_FacingsB_TurretShape, 0xA)
+{
+	enum { SkipGameCode = 0x73CD06 };
+
+	GET(UnitClass*, pThis, EBP);
+	GET(UnitTypeClass*, pType, ECX);
+
+	const auto pTurretShape = TechnoTypeExt::ExtMap.Find(pType)->TurretShape;
+	const int StartFrame = pTurretShape ? 0 : (pType->WalkFrames * pType->Facings);
+	const int frameIdx = pThis->SecondaryFacing.Current().GetFacing<32>(4) + StartFrame;
+
+	if (pTurretShape)
+		R->EDI(pTurretShape);
+
+	R->ECX(pThis);
+	R->EAX(frameIdx);
+	return 0x73CD06;
+}