Ped Randomizer: Add config option for controller player model odds

Parik27 · Jul 30, 2021 · 5e74764 · 5e74764
1 parent 78a4f66
commit 5e74764
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 21 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+patreon: parik
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,6 +24,9 @@ jobs:
         mkdir output/rainbomizer
         cp rainbomizer.asi output/V.Rainbomizer.asi
         cp -r ../data output/rainbomizer/data/
+        rm output/rainbomizer/data/update.sh
+        rm output/rainbomizer/data/README.md
+        cp ../config.toml output/rainbomizer/
         
     - name: Upload
       uses: actions/upload-artifact@v1

diff --git a/build-count.txt b/build-count.txt
@@ -1 +1 @@
-471
+473
diff --git a/config.toml b/config.toml
@@ -98,4 +98,8 @@ EnableNoLowBudget = true
 
 # This option makes it so enemy blips are always visible. This helps when the enemies are
 # randomized into a small animal that's difficult to locate
-EnableBlipsAlwaysVisible = true
+EnableBlipsAlwaysVisible = true
+
+# Reduce the odds of the player models being considered to spawn
+# (from 0 (no player models) to 100 (some player models))
+OddsOfPlayerModels = 20
diff --git a/lib/CTheScripts.hh b/lib/CTheScripts.hh
@@ -76,7 +76,7 @@ public:
     static inline void
     InvokeNative (uint32_t hash, scrThread::Info *info)
     {
-        if (!m_ScriptHookInfo.bAvailable)
+        if (!IsScriptHookAvailable ())
             return;
 
         m_ScriptHookInfo.mNatives.at (hash).func (info);
@@ -88,6 +88,12 @@ public:
         return m_ScriptHookInfo.mNatives.count (hash);
     }
 
+    static bool
+    IsScriptHookAvailable ()
+    {
+        return m_ScriptHookInfo.bAvailable;
+    }
+
     template <typename Ret, typename... Args>
     static Ret
     InvokeNative (uint32_t hash, Args... args)

diff --git a/src/common/configDefault.hh b/src/common/configDefault.hh
@@ -20,6 +20,7 @@ const char configDefault[] = R"(
 #######################################################
 
 # General Configuration
+# Refer to the readme to get the description of all the randomizers.
 [Randomizers]
 
 RainbomizerNews = true
@@ -99,4 +100,8 @@ EnableNoLowBudget = true
 # This option makes it so enemy blips are always visible. This helps when the enemies are
 # randomized into a small animal that's difficult to locate
 EnableBlipsAlwaysVisible = true
+
+# Reduce the odds of the player models being considered to spawn
+# (from 0 (no player models) to 100 (some player models))
+OddsOfPlayerModels = 20
 )";
diff --git a/src/misc/colours.cc b/src/misc/colours.cc
@@ -49,16 +49,12 @@ class ColoursRandomizer
     static void
     RestoreVehicleColourData (CCustomShaderEffectVehicle *shader, CVehicle *veh)
     {
-        try
+        if (auto *data = LookupMap (mColourData, veh))
             {
-                auto & data    = mColourData.at (veh);
                 CARGB *colours = shader->GetColours ();
 
                 for (int i = 0; i < 4; i++)
-                    colours[i] = data.OriginalColours[i];
-            }
-        catch (...)
-            {
+                    colours[i] = data->OriginalColours[i];
             }
     }
 

diff --git a/src/peds/peds.cc b/src/peds/peds.cc
@@ -10,6 +10,7 @@
 #include <scrThread.hh>
 
 #include "CModelInfo.hh"
+#include "Utils.hh"
 #include "common/logger.hh"
 
 #include <CStreaming.hh>
@@ -92,7 +93,8 @@ class PedRandomizer
 
         // Random Ped
         uint32_t randomPed = PedRandomizer_Streaming::GetRandomLoadedPed (
-            PR::Config ().EnableNSFWModels);
+            PR::Config ().EnableNSFWModels,
+            RandomInt (100) < PR::Config ().OddsOfPlayerModels);
 
         if (randomPed != -1u)
             return randomPed;
@@ -175,7 +177,8 @@ class PedRandomizer
                 OPTION (IncludeUnusedAbilities),
                 OPTION (EnableAnimalMotionFixes), OPTION (EnableAnimalFixes),
                 OPTION (EnablePlayerFixes), OPTION (EnableMainFixes),
-                OPTION (EnableNoLowBudget), OPTION (EnableBlipsAlwaysVisible)))
+                OPTION (EnableNoLowBudget), OPTION (EnableBlipsAlwaysVisible),
+                OPTION (OddsOfPlayerModels)))
             return;
 
         if (PR::Config ().ForcedPed.size ())

diff --git a/src/peds/peds.hh b/src/peds/peds.hh
@@ -34,7 +34,7 @@ public:
             bool        EnableMainFixes          = true;
             bool        EnableNoLowBudget        = true;
             bool        EnableBlipsAlwaysVisible = true;
-
+            int         OddsOfPlayerModels       = 20;
         } m_Config;
 
         return m_Config;

diff --git a/src/peds/peds_Streaming.hh b/src/peds/peds_Streaming.hh
@@ -85,7 +85,8 @@ class PedRandomizer_Streaming
 
     /*******************************************************/
     static void
-    PopulateLoadedPedsSet (std::set<uint32_t> &peds, bool includeNsfw)
+    PopulateLoadedPedsSet (std::set<uint32_t> &peds, bool includeNsfw,
+                           bool includePlayers = true)
     {
         auto groups = CStreaming::sm_Instance;
 
@@ -107,7 +108,7 @@ class PedRandomizer_Streaming
              {"player_one"_joaat, "player_zero"_joaat, "player_two"_joaat})
             {
                 auto index = CStreaming::GetModelIndex (hash);
-                if (CStreaming::HasModelLoaded (index))
+                if (includePlayers && CStreaming::HasModelLoaded (index))
                     peds.insert (index);
             }
 
@@ -186,10 +187,10 @@ public:
 
     /*******************************************************/
     static uint32_t
-    GetRandomLoadedPed (bool includeNsfw = false)
+    GetRandomLoadedPed (bool includeNsfw = false, bool includePlayer = true)
     {
         std::set<uint32_t> peds;
-        PopulateLoadedPedsSet (peds, includeNsfw);
+        PopulateLoadedPedsSet (peds, includeNsfw, includePlayer);
 
         if (peds.size () < 1)
             return -1;

diff --git a/src/peds/peds_Swapper.hh b/src/peds/peds_Swapper.hh
@@ -38,11 +38,6 @@ class PedRandomizer_ModelSwapper
         SWAP_FIELD (GetInitInfo ().m_nDecisionMakerName);
         SWAP_FIELD (GetInitInfo ().m_nNavCapabilitiesName);
 
-#ifdef FLYING_BIRDS
-        SWAP_FIELD (m_nMovementClipSet);
-        SWAP_FIELD (GetInitInfo ().m_nMotionTaskDataSetName);
-#endif
-
 #undef SWAP_FIELD
     }