Fixed bugs, added features (27 DEC 21)

Fixed behaviour when cop cars are added as variations
Fixed news chopper appearing at wanted level 3
Added ini option ChangeCarGenerators
Added ini option LoadAllVehicles

Author: ViperJohnGR

ModelVariations/ModelVariations.cpp

@@ -61,6 +61,7 @@ std::map<short, std::vector<short>> vehPassengers;
 std::array<std::vector<short>, 16> vehWantedVariations[212];
 
 std::vector<short> vehCurrentVariations[212];
+std::vector<short> vehCarGenExclude;
 
 std::map<short, BYTE> pedWepVariationTypes;
 
@@ -69,9 +70,34 @@ std::stack<CPed*> pedStack;
 BYTE dealersFixed = 0;
 short modelIndex = -1;
 
+int changeCarGenerators = 0;
 bool isPlayerInTaxi = false;
 bool enableSideMissions = false;
 int enableVehicles = 0;
+int loadAllVehicles = 0;
+
+bool isGameModelPolice(int model)
+{
+    switch (model)
+    {
+        case 427: //Enforcer
+        case 430: //Predator
+        case 432: //Rhino
+        case 433: //Barracks
+        case 470: //Patriot
+        case 490: //FBI Rancher
+        case 496: //Police Maverick
+        case 523: //HPV1000
+        case 528: //FBI Truck
+        case 596: //Police LS
+        case 597: //Police SF
+        case 598: //Police LV
+        case 599: //Police Ranger
+        case 601: //S.W.A.T.
+            return true;
+    }
+    return false;
+}
 
 void vectorUnion(std::vector<short> &vec1, std::vector<short> &vec2, std::vector<short> &dest)
 {
@@ -158,10 +184,14 @@ std::vector<short> iniLineParser(eVariationType type, int section, const char ke
     if (ini == NULL)
         return retVector;
 
-    std::string sectionString = std::to_string(section);
+    std::string sectionString;
+    if (type == MODEL_SETTINGS)
+        sectionString = (char*)section;
+    else
+        sectionString = std::to_string(section);
 
     std::string keyString;
-    if (type == PED_VARIATION || type == VEHICLE_VARIATION) 
+    if (type == PED_VARIATION || type == VEHICLE_VARIATION || type == MODEL_SETTINGS) 
         keyString = key;
     else
         keyString = std::to_string((int)(key));
@@ -309,7 +339,7 @@ class ModelVariations {
 
                 if (!vec.empty()) //if veh id 'j+400' has variations in zone 'i'
                     for (auto& k : vec) //for every variation 'k' of veh id 'j+400' in zone 'i'
-                        if (j + 400 != k)
+                        if (j + 400 != k && !(isGameModelPolice(j+400) && isGameModelPolice(k)))
                             vehOriginalModels.insert({k, j+400});
             }
         }
@@ -417,6 +447,10 @@ class ModelVariations {
 
         Events::initScriptsEvent += []
         {
+            if (loadAllVehicles)
+                for (int i = 400; i < 612; i++)
+                    CStreaming::RequestModel(i, KEEP_IN_MEMORY);
+
             dealersFixed = 0;
         };
 

ModelVariations/Vehicles.cpp

@@ -204,7 +204,8 @@ void readVehicleIni()
 
         for (int j = 0; j < 16; j++)
             for (int k = 0; k < (int)(vehVariations[i-400][j].size()); k++)
-                if (vehVariations[i-400][j][k] > 0 && vehVariations[i-400][j][k] < 30000  && vehVariations[i-400][j][k] != i)
+                if (vehVariations[i-400][j][k] > 0 && vehVariations[i-400][j][k] < 30000  && vehVariations[i-400][j][k] != i && 
+                    !(isGameModelPolice(i) && isGameModelPolice(vehVariations[i - 400][j][k])))
                     vehOriginalModels.insert({ vehVariations[i - 400][j][k], i });
     }
 
@@ -218,6 +219,10 @@ void readVehicleIni()
         if (!vec.empty())
             vehPassengers.insert({ i, vec });
     }
+
+    changeCarGenerators = iniVeh.ReadInteger("Settings", "ChangeCarGenerators", 0);
+    vehCarGenExclude = iniLineParser(MODEL_SETTINGS, (int)"Settings", "ExcludeCarGeneratorVehicles", &iniVeh);
+    loadAllVehicles = iniVeh.ReadInteger("Settings", "LoadAllVehicles", 0);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -303,6 +308,21 @@ void __fastcall DoInternalProcessingHooked(CCarGenerator* park) //for non-random
     if (park != NULL)
     {
         int model = park->m_nModelId;
+        if (changeCarGenerators == 1)
+        {
+            if (!vehCarGenExclude.empty())
+                if (std::find(vehCarGenExclude.begin(), vehCarGenExclude.end(), model) != vehCarGenExclude.end())
+                {
+                    park->DoInternalProcessing();
+                    return;
+                }
+
+            park->m_nModelId = getRandomVariation(park->m_nModelId);
+            park->DoInternalProcessing();
+            park->m_nModelId = model;
+            return;
+        }
+
         switch (park->m_nModelId)
         {
             case 416: //Ambulance
@@ -528,6 +548,9 @@ void __cdecl SetUpDriverAndPassengersForVehicleHooked(CVehicle* car, int a3, int
 
 CHeli* __cdecl GenerateHeliHooked(CPed* ped, char newsHeli)
 {
+    if (FindPlayerWanted(-1)->m_nWantedLevel < 4)
+        return CHeli::GenerateHeli(ped, 0);
+
     if (CHeli::pHelis)
     {
         CStreaming::RequestModel(488, 2);

ModelVariations/Vehicles.h

@@ -17,12 +17,16 @@ extern std::map<short, std::vector<short>> vehPassengers;
 
 extern std::vector<short> vehCurrentVariations[212];
 extern std::map<short, short> vehOriginalModels;
+extern std::vector<short> vehCarGenExclude;
+extern int loadAllVehicles;
 
+extern int changeCarGenerators;
 extern bool isPlayerInTaxi;
 extern bool enableSideMissions;
 
 extern std::vector<short> iniLineParser(eVariationType type, int section, const char key[12], CIniReader* ini);
 extern void vectorUnion(std::vector<short>& vec1, std::vector<short>& vec2, std::vector<short>& dest);
+extern bool isGameModelPolice(int model);
 
 void installVehicleHooks();
 void readVehicleIni();

ModelVariations/commonDef.h

@@ -14,5 +14,6 @@ enum eVariationType
 {
     PED_VARIATION,
     VEHICLE_VARIATION,
-    PED_WEAPON_VARIATION
+    PED_WEAPON_VARIATION,
+    MODEL_SETTINGS
 };