Implement PickupsRandomizer

Author: Parik27

config.toml

@@ -84,6 +84,7 @@ Patterns = [
 	{ thread = "finalec", ped = 0, weapon = 28, allowed = ["slot"]},
 	{ thread = "drugs1", weapon = 28, allowed = ["slot"]},
 	{ weapon = 43, allowed = [43]},
+	{ weapon = 44, allowed = [44, 45]},
 	{ thread = "sweet1", weapon = 41, allowed = [41]},
 	{ thread = "heist5", weapon = 38, allowed = ["slot"]},
 	{ thread = "zero1", weapon = 38, allowed = ["slot"]},
@@ -96,6 +97,12 @@ Patterns = [
 	{ thread = "casino9", weapon = 22, allowed = [22, 23, 24]}
 ]
 
+#######################################################
+[PickupsRandomizer]
+
+Enabled = true
+ReplaceWithWeaponsOnly = true # Does nothing yet
+
 #######################################################
 [ParkedCarRandomizer]
 
@@ -114,6 +121,8 @@ Enabled = true
 Enabled = true
 MatchSubtitles = true
 AudioEventsFile = "data/AudioEvents.txt" # Relative to game directory
+ForceAudioLineEnabled = false
+ForceAudioLine = 0
 
 #######################################################
 [ScriptVehicleRandomizer]

include/config.hh

@@ -112,14 +112,22 @@ struct HandlingConfig : public BaseConfig
 /*******************************************************/
 struct WeaponConfig : public BaseConfig
 {
-    bool                       enabled             = false;
+    bool                       enabled             = true;
     bool                       playerRandomization = true;
     bool                       skipChecks          = false;
     std::vector<WeaponPattern> patterns            = {};
 
     void Read (std::shared_ptr<cpptoml::table> table);
 };
 
+/*******************************************************/
+struct PickupsConfig : public BaseConfig
+{
+    bool sameType = false;
+
+    void Read (std::shared_ptr<cpptoml::table> table);
+};
+
 /*******************************************************/
 struct ParkedCarConfig : public BaseConfig
 {
@@ -139,8 +147,10 @@ struct LicensePlateConfig : public BaseConfig
 struct SoundsConfig : public BaseConfig
 {
 
-    bool        matchSubtitles  = true;
-    std::string audioEventsFile = "data/AudioEvents.txt";
+    bool        matchSubtitles    = true;
+    std::string audioEventsFile   = "data/AudioEvents.txt";
+    bool        forceAudioEnabled = false;
+    int         forceAudioID      = -1;
 
     void Read (std::shared_ptr<cpptoml::table> table);
 };
@@ -162,6 +172,7 @@ struct Configs
     CheatConfig         cheat;
     HandlingConfig      handling;
     WeaponConfig        weapon;
+    PickupsConfig       pickups;
     ParkedCarConfig     parkedCar;
     LicensePlateConfig  licensePlate;
     SoundsConfig        sounds;

include/config_default.hh

@@ -280,6 +280,14 @@ struct CPed
     void *CCopPed__CCopPed (int type);
 };
 
+struct CPickups
+{
+    static int GenerateNewOne (float x, float y, float z, unsigned int modelId,
+                               char pickupType, int ammo,
+                               unsigned int moneyPerDay, char isEmpty,
+                               char *message);
+};
+
 struct CBaseModelInfo
 {
 public:

include/functions.hh

@@ -0,0 +1,17 @@
+
+#pragma once
+
+class PickupsRandomizer
+{
+    static PickupsRandomizer *mInstance;
+
+    PickupsRandomizer (){};
+    static void DestroyInstance ();
+
+public:
+    /// Returns the static instance for PickupsRandomizer.
+    static PickupsRandomizer *GetInstance ();
+
+    /// Initialises Hooks/etc.
+    void Initialise ();
+};

include/pickups.hh

@@ -2,6 +2,8 @@
 
 struct CPed;
 
+int *GetWeaponInfo (int weaponId, char skill);
+
 class WeaponRandomizer
 {
     static WeaponRandomizer *mInstance;

include/weapons.hh

@@ -193,6 +193,20 @@ ParkedCarConfig::Read (std::shared_ptr<cpptoml::table> table)
     CONFIG (table, randomizeRandomSpawns, "RandomizeRandomSpawns", bool);
 }
 
+/*******************************************************/
+void
+PickupsConfig::Read (std::shared_ptr<cpptoml::table> table)
+{
+    if (!table)
+        return;
+
+    BaseConfig::Read (table);
+
+    puts ("Reading Pickups");
+
+    CONFIG (table, sameType, "ReplaceWithWeaponsOnly", bool);
+}
+
 /*******************************************************/
 void
 SoundsConfig::Read (std::shared_ptr<cpptoml::table> table)
@@ -204,6 +218,8 @@ SoundsConfig::Read (std::shared_ptr<cpptoml::table> table)
 
     CONFIG (table, matchSubtitles, "MatchSubtitles", bool);
     CONFIG (table, audioEventsFile, "AudioEventsFile", std::string);
+    CONFIG (table, forceAudioEnabled, "ForceAudioLineEnabled", bool);
+    CONFIG (table, forceAudioID, "ForceAudioLine", int);
 }
 
 /*******************************************************/
@@ -278,6 +294,7 @@ ConfigManager::Initialise (const std::string &file)
     mConfigs.handling.Read (config->get_table ("HandlingRandomizer"));
     mConfigs.weapon.Read (config->get_table ("WeaponRandomizer"));
     mConfigs.parkedCar.Read (config->get_table ("ParkedCarRandomizer"));
+    mConfigs.pickups.Read (config->get_table ("PickupsRandomizer"));
     mConfigs.licensePlate.Read (config->get_table ("LicensePlateRandomizer"));
     mConfigs.sounds.Read (config->get_table ("SoundsRandomizer"));
     mConfigs.scriptVehicle.Read (config->get_table ("ScriptVehicleRandomizer"));

src/config.cc

@@ -322,6 +322,16 @@ CRunningScript::GetPointerToScriptVariable (int a2)
     return CallMethodAndReturn<char *, 0x464790> (this, a2);
 }
 
+/*******************************************************/
+int
+CPickups::GenerateNewOne (float x, float y, float z, unsigned int modelId,
+                          char pickupType, int ammo, unsigned int moneyPerDay,
+                          char isEmpty, char *message)
+{
+    return CallAndReturn<int, 0x456F20> (x, y, z, modelId, pickupType, ammo,
+                                         moneyPerDay, isEmpty, message);
+}
+
 /*******************************************************/
 void *
 CPool::GetAt (int handle, int size)

src/functions.cc

@@ -33,6 +33,7 @@
 #include "weapons.hh"
 #include "config.hh"
 #include "autosave.hh"
+#include "pickups.hh"
 
 ///////////////////////////////////////////////
 //  _ ____  _____           _           _    //
@@ -74,6 +75,7 @@ class Rainbomizer
         HandlingRandomizer::GetInstance ()->Initialise ();
         CheatRandomizer::GetInstance ()->Initialise ();
         WeaponRandomizer::GetInstance ()->Initialise ();
+        PickupsRandomizer::GetInstance ()->Initialise ();
         AutoSave::GetInstance ()->Initialise ();
     }
 

src/main.cc

@@ -0,0 +1,71 @@
+#include "pickups.hh"
+#include <cstdlib>
+#include "logger.hh"
+#include "base.hh"
+#include "functions.hh"
+#include "config.hh"
+#include "weapons.hh"
+#include <injector/injector.hpp>
+
+PickupsRandomizer *PickupsRandomizer::mInstance = nullptr;
+
+/*******************************************************/
+int
+RandomizePickup (float x, float y, float z, unsigned int modelId,
+                 char pickupType, int ammo, unsigned int moneyPerDay,
+                 char isEmpty, char *message)
+{
+    auto config = ConfigManager::GetInstance ()->GetConfigs ().pickups;
+
+    printf ("%05d %05d\r", modelId, ammo);
+    if (ammo && modelId != 1212 && modelId != 367)
+        {
+            modelId
+                = WeaponRandomizer::GetInstance ()->GetRandomWeapon (nullptr,
+                                                                     0);
+            modelId = GetWeaponInfo (modelId, 1)[3];
+        }
+
+    return CPickups::GenerateNewOne (x, y, z, modelId, pickupType, ammo,
+                                     moneyPerDay, isEmpty, message);
+}
+
+/*******************************************************/
+void
+PickupsRandomizer::Initialise ()
+{
+    auto config = ConfigManager::GetInstance ()->GetConfigs ().pickups;
+
+    if (!config.enabled)
+        return;
+
+    for (int address :
+         {0x00445098, 0x00445AFD, 0x004573C2, 0x00458A58, 0x00477983,
+          0x0047E636, 0x480658, 0x00481744, 0x0048B243, 0x48CEB9, 0x00592103,
+          0x005B49C6, 0x0067B6DE})
+        {
+            injector::MakeCALL (address, (void *) &RandomizePickup);
+        }
+
+    Logger::GetLogger ()->LogMessage ("Intialised PickupsRandomizer");
+}
+
+/*******************************************************/
+void
+PickupsRandomizer::DestroyInstance ()
+{
+    if (PickupsRandomizer::mInstance)
+        delete PickupsRandomizer::mInstance;
+}
+
+/*******************************************************/
+PickupsRandomizer *
+PickupsRandomizer::GetInstance ()
+{
+    if (!PickupsRandomizer::mInstance)
+        {
+            PickupsRandomizer::mInstance = new PickupsRandomizer ();
+            atexit (&PickupsRandomizer::DestroyInstance);
+        }
+    return PickupsRandomizer::mInstance;
+}