From f6a1acdc4c1d3e08297363804802a73dc283796f Mon Sep 17 00:00:00 2001
From: gir489 <100792176+gir489returns@users.noreply.github.com>
Date: Thu, 14 Dec 2023 13:56:12 -0500
Subject: [PATCH] Added new Scrapyard DLC vehicles to
 GetVehicleInfoForClanLogo. (#2547)

---
 src/gta/vehicle_values.hpp | 96 ++++++++++++++++++++++++++++++++++++++
 src/gta/vehicles.hpp       | 31 ++++++++++++
 2 files changed, 127 insertions(+)

diff --git a/src/gta/vehicle_values.hpp b/src/gta/vehicle_values.hpp
index 8579f1a1..de4ea095 100644
--- a/src/gta/vehicle_values.hpp
+++ b/src/gta/vehicle_values.hpp
@@ -3557,6 +3557,102 @@ static bool GetVehicleInfoForClanLogo(Hash vehicleModel, rage::fvector3& x, rage
 		z     = {0.0f, -1.0f, 0.0f};
 		scale = 0.5f;
 		return true;
+	case VEHICLE_DRIFTFR36:
+		x     = {-1.0f, 0.1f, 0.026f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.44f;
+		return true;
+	case VEHICLE_DRIFTYOSEMITE:
+		x     = {-1.0f, 0.252f, 0.201f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.3f;
+		return true;
+	case VEHICLE_DRIFTREMUS:
+		x     = {-1.0f, 0.204f, 0.357f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.35f;
+		return true;
+	case VEHICLE_DRIFTEUROS:
+		x     = {-1.0f, 0.101f, 0.187f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.35f;
+		return true;
+	case VEHICLE_DRIFTFUTO:
+		x     = {-1.0f, 0.318f, -0.013f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.35f;
+		return true;
+	case VEHICLE_DRIFTJESTER:
+		x     = {-1.0f, 0.0f, 0.181f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.35f;
+		return true;
+	case VEHICLE_DRIFTZR350:
+		x     = {0.0f, 1.632f, 1.0f};
+		y     = {0.0f, 0.0f, -1.0f};
+		z     = {-1.0f, 0.0f, 0.0f};
+		scale = 0.19f;
+		return true;
+	case VEHICLE_ALEUTIAN:
+		x     = {0.0f, 2.1f, 1.0f};
+		y     = {0.0f, 0.0f, -1.0f};
+		z     = {-1.0f, 0.0f, 0.0f};
+		scale = 0.35f;
+		return true;
+	case VEHICLE_DOMINATOR9:
+		x     = {-1.0f, 0.0f, 0.295f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.5f;
+		return true;
+	case VEHICLE_FR36:
+		x     = {-1.0f, 0.1f, 0.026f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.44f;
+		return true;
+	case VEHICLE_CAVALCADE3:
+		x     = {-1.6f, 0.585f, 0.3f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.5f;
+		return true;
+	case VEHICLE_IMPALER5:
+		x     = {-1.0f, 0.16f, 0.295f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.43f;
+		return true;
+	case VEHICLE_ASTEROPE2:
+		x     = {-1.0f, 0.15f, 0.075f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.46f;
+		return true;
+	case VEHICLE_DORADO:
+		x     = {-1.0f, 0.229f, 0.37f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.36f;
+		return true;
+	case VEHICLE_IMPALER6:
+		x     = {-1.0f, 0.216f, 0.124f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.41f;
+		return true;
+	case VEHICLE_VIVANITE:
+		x     = {-1.0f, 0.475f, 0.05f};
+		y     = {1.0f, 0.0f, 0.0f};
+		z     = {0.0f, -1.0f, 0.0f};
+		scale = 0.5f;
+		return true;
 	default: return false;
 	}
 }
\ No newline at end of file
diff --git a/src/gta/vehicles.hpp b/src/gta/vehicles.hpp
index 309c4d01..326b91c0 100644
--- a/src/gta/vehicles.hpp
+++ b/src/gta/vehicles.hpp
@@ -932,4 +932,35 @@ enum SanAndreasMercenaries : Hash
 	VEHICLE_SPEEDO4     = RAGE_JOAAT("speedo4"),
 	VEHICLE_STINGERTT   = RAGE_JOAAT("stingertt"),
 	VEHICLE_STREAMER216 = RAGE_JOAAT("streamer216")
+};
+
+enum Scrapyard : Hash
+{
+	VEHICLE_ALEUTIAN      = RAGE_JOAAT("ALEUTIAN"),
+	VEHICLE_ASTEROPE2     = RAGE_JOAAT("ASTEROPE2"),
+	VEHICLE_BALLER8       = RAGE_JOAAT("BALLER8"),
+	VEHICLE_BENSON2       = RAGE_JOAAT("BENSON2"),
+	VEHICLE_BOXVILLE6     = RAGE_JOAAT("BOXVILLE6"),
+	VEHICLE_CAVALCADE3    = RAGE_JOAAT("CAVALCADE3"),
+	VEHICLE_DOMINATOR9    = RAGE_JOAAT("DOMINATOR9"),
+	VEHICLE_DORADO        = RAGE_JOAAT("DORADO"),
+	VEHICLE_DRIFTEUROS    = RAGE_JOAAT("DRIFTEUROS"),
+	VEHICLE_DRIFTFR36     = RAGE_JOAAT("DRIFTFR36"),
+	VEHICLE_DRIFTFUTO     = RAGE_JOAAT("DRIFTFUTO"),
+	VEHICLE_DRIFTJESTER   = RAGE_JOAAT("DRIFTJESTER"),
+	VEHICLE_DRIFTREMUS    = RAGE_JOAAT("DRIFTREMUS"),
+	VEHICLE_DRIFTTAMPA    = RAGE_JOAAT("DRIFTTAMPA"),
+	VEHICLE_DRIFTYOSEMITE = RAGE_JOAAT("DRIFTYOSEMITE"),
+	VEHICLE_DRIFTZR350    = RAGE_JOAAT("DRIFTZR350"),
+	VEHICLE_FR36          = RAGE_JOAAT("FR36"),
+	VEHICLE_IMPALER5      = RAGE_JOAAT("IMPALER5"),
+	VEHICLE_IMPALER6      = RAGE_JOAAT("IMPALER6"),
+	VEHICLE_POLGAUNTLET   = RAGE_JOAAT("POLGAUNTLET"),
+	VEHICLE_POLICE5       = RAGE_JOAAT("POLICE5"),
+	VEHICLE_TERMINUS      = RAGE_JOAAT("TERMINUS"),
+	VEHICLE_TOWTRUCK3     = RAGE_JOAAT("TOWTRUCK3"),
+	VEHICLE_TOWTRUCK4     = RAGE_JOAAT("TOWTRUCK4"),
+	VEHICLE_TURISMO3      = RAGE_JOAAT("TURISMO3"),
+	VEHICLE_VIGERO3       = RAGE_JOAAT("VIGERO3"),
+	VEHICLE_VIVANITE      = RAGE_JOAAT("VIVANITE")
 };
\ No newline at end of file