General: Update for Contract DLC

* Props and Weapon Models from latest DLC have not yet been
  added. (Likely 2.1.1)

Author: Parik27

build-count.txt

@@ -1 +1 @@
-514
+518

data/CutsceneModelsPeds.txt

@@ -179,4 +179,21 @@ csb_moodyman_02
 csb_sessanta
 player_zero
 player_one
-player_two
+player_two
+cs_lamardavis_02
+csb_ary_02
+csb_ballas_leader
+csb_billionaire
+csb_golfer_a
+csb_golfer_b
+csb_imani
+csb_jio_02
+csb_johnny_guns
+csb_mjo_02
+csb_musician_00
+csb_party_promo
+csb_req_officer
+csb_security_a
+csb_soundeng_00
+csb_vagos_leader
+csb_vernon

data/VoiceLines.txt

@@ -29358,7 +29358,23 @@ TNSS_AMAC tnssaud TUN_SESSANTA TNSS_PB_GC1_5
 TNSS_AMAD tnssaud TUN_SESSANTA TNSS_PB_GC1_7
 TNSS_AMAE tnssaud TUN_SESSANTA TNSS_PB_GC1_9
 TNSS_AMAF tnssaud TUN_SESSANTA TNSS_PB_GC1_11
-FXIG_DVAA fxigaud FIX_FRANKLIN FXIG_AY5_1A
+FXIM_BLAA fximaud FIX_IMANI FXIM_PM_8A
+FXFR_FGAA fxfraud FIX_FRANKLIN FXFR_PM_10
+FXFR_FEAA fxfraud FIX_FRANKLIN FXFR_PM_8
+FXFR_EZAA fxfraud FIX_FRANKLIN FXFR_PM_3
+FXFR_FAAA fxfraud FIX_FRANKLIN FXFR_PM_4
+FXFR_FBAA fxfraud FIX_FRANKLIN FXFR_PM_5
+FXFR_FCAA fxfraud FIX_FRANKLIN FXFR_PM_6
+FXFR_FFAA fxfraud FIX_FRANKLIN FXFR_PM_9
+FXIM_BJAA fximaud FIX_IMANI FXIM_PM_7A
+FXIM_BBAA fximaud FIX_IMANI FXIM_PM_3A
+FXIM_BHAA fximaud FIX_IMANI FXIM_PM_6A
+FXIM_BDAA fximaud FIX_IMANI FXIM_PM_4A
+FXFR_FDAA fxfraud FIX_FRANKLIN FXFR_PM_7
+FXIM_AZAA fximaud FIX_IMANI FXIM_PM_2A
+FXFR_EYAA fxfraud FIX_FRANKLIN FXFR_PM_2
+FXFR_EXAA fxfraud FIX_FRANKLIN FXFR_PM_1
+FXIM_AXAA fximaud FIX_IMANI FXIM_PM_1A
 FXIG_DIAA fxigaud FIX_FRANKLIN FXIG_WR1_1A_2
 FXIG_DIAB fxigaud FIX_LAMAR FXIG_WR1_1A_4
 FXIG_DIAT fxigaud FIX_LAMAR FXIG_WR1_1A_5
@@ -29562,6 +29578,7 @@ FXIG_DTAH fxigaud FIX_FRANKLIN FXIG_WR12_1A_16
 FXIG_DTAI fxigaud FIX_LAMAR FXIG_WR12_1A_18
 FXIG_DTAJ fxigaud FIX_LAMAR FXIG_WR12_1A_20
 FXIG_DTAK fxigaud FIX_FRANKLIN FXIG_WR12_1A_22
+FXIG_DVAA fxigaud FIX_FRANKLIN FXIG_AY5_1A
 FXFR_AAAA fxfraud FIX_FRANKLIN FXFR_FOC_1_1
 FXFR_AAAB fxfraud FIX_FRANKLIN FXFR_FOC_1_3
 FXFR_AAAE fxfraud FIX_FRANKLIN FXFR_FOC_1_5
@@ -30251,3 +30268,161 @@ FXIM_ANAF fximaud FIX_IMANI FXIM_SU_7_10
 FXIM_BNAA fximaud FIX_FRANKLIN FXIM_SU_10_1
 FXIM_AOAA fximaud FIX_IMANI FXIM_SU_8_1
 FXIM_AOAB fximaud FIX_FRANKLIN FXIM_SU_8_3
+FXIG_BKAA fxigaud FIX_GOLF1 FXIG_GF2_5A_2
+FXIG_BKAB fxigaud FIX_GOLF1 FXIG_GF2_5A_3
+FXIG_BKAC fxigaud FIX_GOLF1 FXIG_GF2_5A_4
+FXIG_BJAA fxigaud FIX_GOLF1 FXIG_GF2_5B_1
+FXIG_BJAB fxigaud FIX_GOLF1 FXIG_GF2_5B_2
+FXIG_EAAA fxigaud FIX_FRANKLIN FXIG_GF2_3A_2
+FXIG_EBAA fxigaud FIX_FRANKLIN FXIG_GF2_3B_2
+FXIG_EBAB fxigaud FIX_GOLF1 FXIG_GF2_3B_3
+FXIG_ECAA fxigaud FIX_FRANKLIN FXIG_GF2_3C_2
+FXIG_ECAB fxigaud FIX_GOLF1 FXIG_GF2_3C_4
+FXIG_EDAA fxigaud FIX_FRANKLIN FXIG_GF2_3D_1
+FXIG_EDAB fxigaud FIX_GOLF1 FXIG_GF2_3D_3
+FXIG_BIAB fxigaud FIX_GOLF1 FXIG_GF2_2A_1
+FXIG_BIAA fxigaud FIX_FRANKLIN FXIG_GF2_2A_3
+FXIG_DYAR fxigaud FIX_GOLF1 FXIG_GF2_2B_1
+FXIG_DYAS fxigaud FIX_FRANKLIN FXIG_GF2_2B_3
+FXIG_DZAA fxigaud FIX_GOLF1 FXIG_GF2_2C_1
+FXIG_DZAB fxigaud FIX_FRANKLIN FXIG_GF2_2C_3
+FXIG_BLAA fxigaud FIX_FRANKLIN FXIG_GF2_4A_2
+FXIG_BPAB fxigaud FIX_GOLF1 FXIG_GF2_4B_1
+FXIG_BPAA fxigaud FIX_FRANKLIN FXIG_GF2_4B_3
+FXIG_BQAB fxigaud FIX_GOLF1 FXIG_GF2_4C_1
+FXIG_BQAA fxigaud FIX_FRANKLIN FXIG_GF2_4C_3
+FXIG_BRAB fxigaud FIX_GOLF1 FXIG_GF2_4D_1
+FXIG_BRAA fxigaud FIX_FRANKLIN FXIG_GF2_4D_3
+FXIG_BSAB fxigaud FIX_GOLF1 FXIG_GF2_4E_1
+FXIG_BSAA fxigaud FIX_FRANKLIN FXIG_GF2_4E_3
+FXIG_EOAA fxigaud FIX_LAMAR FXIG_TRI1_2F_2
+FXIG_EOAB fxigaud FIX_LAMAR FXIG_TRI1_2F_3
+FXIG_EOAC fxigaud FIX_LAMAR FXIG_TRI1_2F_5
+FXIG_EPAA fxigaud FIX_LAMAR FXIG_TRI1_2L_2
+FXIG_EPAB fxigaud FIX_LAMAR FXIG_TRI1_2L_3
+FXIG_EPAC fxigaud FIX_LAMAR FXIG_TRI1_2L_5
+FXIG_ENAA fxigaud FIX_LAMAR FXIG_TRI1_1A_2
+FXIG_ENAB fxigaud FIX_FRANKLIN FXIG_TRI1_1A_4
+FXIG_ENAC fxigaud FIX_LAMAR FXIG_TRI1_1A_6
+FXIG_DUAA fxigaud FIX_RICH1 FXIG_BIL2_1A_1
+FXIG_DUAB fxigaud FIX_RICH1 FXIG_BIL2_1A_2
+FXIG_DUAC fxigaud FIX_RICH1 FXIG_BIL2_1A_3
+FXIG_DUAD fxigaud FIX_RICH1 FXIG_BIL2_1A_4
+FXIG_DUAE fxigaud FIX_RICH1 FXIG_BIL2_1A_5
+FXIG_DUAF fxigaud FIX_RICH1 FXIG_BIL2_1A_6
+FXIG_DUAG fxigaud FIX_RICH1 FXIG_BIL2_1A_7
+FXIG_DUAH fxigaud FIX_RICH1 FXIG_BIL2_1A_8
+FXIG_DUAI fxigaud FIX_RICH1 FXIG_BIL2_1A_9
+FXIG_DUAJ fxigaud FIX_RICH1 FXIG_BIL2_1A_10
+FXIG_ACAB fxigaud HS4_PRODUCER FXIG_ST1_1A_1
+FXIG_BVAA fxigaud HS4_PRODUCER FXIG_ST1_1B
+FXIG_BWAA fxigaud HS4_PRODUCER FXIG_ST1_1C
+FXIG_ABAA fxigaud FIX_FRANKLIN FXIG_GF2_1A_2
+FXIG_ABAB fxigaud FIX_GOLF1 FXIG_GF2_1A_3
+FXIG_DWAA fxigaud FIX_FRANKLIN FXIG_GF2_1B_2
+FXIG_DWAB fxigaud FIX_GOLF1 FXIG_GF2_1B_3
+FXIG_DXAA fxigaud FIX_FRANKLIN FXIG_GF2_1C_2
+FXIG_DXAC fxigaud FIX_GOLF1 FXIG_GF2_1C_4
+FXIG_DXAE fxigaud FIX_FRANKLIN FXIG_GF2_1C_5
+FXDL5_ASAA fxdl5au HS4_PRODUCER FXDL5_19_1_1
+FXDL5_ASAB fxdl5au HS4_PRODUCER FXDL5_19_1_3
+FXLM_AAAA fxlmaud FIX_LAMAR FXLM_FL_1_1
+FXLM_AAAB fxlmaud FIX_LAMAR FXLM_FL_1_3
+FXLM_AAAC fxlmaud FIX_LAMAR FXLM_FL_1_5
+FXLM_AAAD fxlmaud FIX_LAMAR FXLM_FL_1_7
+FXLM_AAAE fxlmaud FIX_LAMAR FXLM_FL_1_8
+FXLM_AAAF fxlmaud FIX_LAMAR FXLM_FL_1_10
+FXLM_AAAG fxlmaud FIX_LAMAR FXLM_FL_1_11
+FXFR_ADAA fxfraud FIX_FRANKLIN FXFR_FDI_1_1
+FXFR_ADAB fxfraud FIX_FRANKLIN FXFR_FDI_1_2
+FXFR_ADAC fxfraud FIX_FRANKLIN FXFR_FDI_1_4
+FXFR_ADAD fxfraud FIX_FRANKLIN FXFR_FDI_1_6
+FXFR_ADAE fxfraud FIX_FRANKLIN FXFR_FDI_1_8
+FXFR_ADAF fxfraud FIX_FRANKLIN FXFR_FDI_1_10
+FXFR_AEAA fxfraud FIX_FRANKLIN FXFR_FDI_2_1
+FXFR_AEAB fxfraud FIX_FRANKLIN FXFR_FDI_2_3
+FXFR_AEAC fxfraud FIX_FRANKLIN FXFR_FDI_2_5
+FXFR_AEAD fxfraud FIX_FRANKLIN FXFR_FDI_2_7
+FXFR_AEAE fxfraud FIX_FRANKLIN FXFR_FDI_2_9
+FXFR_AEAF fxfraud FIX_FRANKLIN FXFR_FDI_2_11
+FXFR_AEAG fxfraud FIX_FRANKLIN FXFR_FDI_2_13
+FXIM_ACAA fximaud FIX_IMANI FXIM_FL_3_1
+FXIM_ACAB fximaud FIX_FRANKLIN FXIM_FL_3_3
+FXIM_ACAC fximaud FIX_IMANI FXIM_FL_3_5
+FXIM_ACAD fximaud FIX_IMANI FXIM_FL_3_7
+FXIM_ACAE fximaud FIX_FRANKLIN FXIM_FL_3_9
+FXIM_ACAF fximaud FIX_IMANI FXIM_FL_3_11
+FXIM_ACAG fximaud FIX_FRANKLIN FXIM_FL_3_13
+FXIM_ACAH fximaud FIX_IMANI FXIM_FL_3_15
+FXIM_ACAI fximaud FIX_IMANI FXIM_FL_3_17
+FXFR_FHAK fxfraud FIX_IMANI FXFR_FPP_1_1
+FXFR_FHAM fxfraud FIX_IMANI FXFR_FPP_1_3
+FXFR_FHAT fxfraud FIX_FRANKLIN FXFR_FPP_1_5
+FXFR_AGAA fxfraud FIX_IMANI FXFR_FPP_2_1
+FXFR_AGAB fxfraud FIX_FRANKLIN FXFR_FPP_2_3
+FXFR_AGAC fxfraud FIX_IMANI FXFR_FPP_2_5
+FXFR_AGAD fxfraud FIX_IMANI FXFR_FPP_2_6
+FXFR_AGAE fxfraud FIX_FRANKLIN FXFR_FPP_2_8
+FXFR_AGAF fxfraud FIX_FRANKLIN FXFR_FPP_2_10
+FXFR_AHAQ fxfraud FIX_FRANKLIN FXFR_FBG_1_1
+FXFR_AHAR fxfraud FIX_IMANI FXFR_FBG_1_3
+FXFR_AIAA fxfraud FIX_FRANKLIN FXFR_FBG_2_1
+FXFR_AIAB fxfraud FIX_IMANI FXFR_FBG_2_3
+FXFR_AIAC fxfraud FIX_FRANKLIN FXFR_FBG_2_5
+FXFR_AIAD fxfraud FIX_IMANI FXFR_FBG_2_7
+FXFR_AIAE fxfraud FIX_FRANKLIN FXFR_FBG_2_9
+FXFR_AIAF fxfraud FIX_FRANKLIN FXFR_FBG_2_11
+FXFR_AIAG fxfraud FIX_FRANKLIN FXFR_FBG_2_13
+FXFR_AJAA fxfraud FIX_FRANKLIN FXFR_FHP_1_1
+FXFR_AJAB fxfraud FIX_FRANKLIN FXFR_FHP_1_3
+FXFR_AJAC fxfraud FIX_FRANKLIN FXFR_FHP_1_5
+FXFR_AKAA fxfraud FIX_FRANKLIN FXFR_FHP_2_1
+FXFR_AKAB fxfraud FIX_FRANKLIN FXFR_FHP_2_3
+FXFR_AKAC fxfraud FIX_FRANKLIN FXFR_FHP_2_5
+FXFR_AKAD fxfraud FIX_FRANKLIN FXFR_FHP_2_7
+FXFR_AKAE fxfraud FIX_FRANKLIN FXFR_FHP_2_9
+FXFR_ALAA fxfraud FIX_FRANKLIN FXFR_FF2_1_1
+FXFR_ALAB fxfraud FIX_FRANKLIN FXFR_FF2_1_3
+FXFR_ALAC fxfraud FIX_FRANKLIN FXFR_FF2_1_5
+FXFR_ALAD fxfraud FIX_FRANKLIN FXFR_FF2_1_7
+FXFR_ALAE fxfraud FIX_FRANKLIN FXFR_FF2_1_8
+FXFR_ALAF fxfraud FIX_FRANKLIN FXFR_FF2_1_10
+FXFR_AMAA fxfraud FIX_FRANKLIN FXFR_FF2_2_1
+FXFR_AMAB fxfraud FIX_FRANKLIN FXFR_FF2_2_3
+FXFR_AMAC fxfraud FIX_FRANKLIN FXFR_FF2_2_4
+FXFR_AMAD fxfraud FIX_FRANKLIN FXFR_FF2_2_6
+FXFR_AOAA fxfraud FIX_FRANKLIN FXFR_FF2_4_1
+FXFR_AOAB fxfraud FIX_FRANKLIN FXFR_FF2_4_3
+FXFR_AOAC fxfraud FIX_FRANKLIN FXFR_FF2_4_5
+FXFR_APAA fxfraud FIX_FRANKLIN FXFR_FF2_5_1
+FXFR_APAB fxfraud FIX_FRANKLIN FXFR_FF2_5_3
+FXFR_APAC fxfraud FIX_FRANKLIN FXFR_FF2_5_5
+FXFR_APAD fxfraud FIX_FRANKLIN FXFR_FF2_5_7
+FXFR_APAE fxfraud FIX_FRANKLIN FXFR_FF2_5_8
+FXFR_FQAA fxfraud HS4_PRODUCER FXFR_DRE_3A_1
+FXFR_FQAB fxfraud HS4_PRODUCER FXFR_DRE_3A_2
+FXFR_FQAC fxfraud HS4_PRODUCER FXFR_DRE_3A_3
+FXFR_FLAA fxfraud HS4_PRODUCER FXFR_DRE_1A_1
+FXFR_FLAB fxfraud HS4_PRODUCER FXFR_DRE_1A_2
+FXFR_FLAC fxfraud HS4_PRODUCER FXFR_DRE_1A_4
+FXFR_EKAA fxfraud FIX_FRANKLIN FXFR_PUF_1_1
+FXFR_EKAB fxfraud FIX_FRANKLIN FXFR_PUF_1_3
+FXFR_EKAE fxfraud FIX_FRANKLIN FXFR_PUF_1_5
+FXFR_EKAC fxfraud FIX_FRANKLIN FXFR_PUF_1_7
+FXFR_EKAD fxfraud FIX_FRANKLIN FXFR_PUF_1_8
+FXFR_FWAA fxfraud FIX_FRANKLIN FXFR_ST_1_1
+FXFR_FWAB fxfraud FIX_FRANKLIN FXFR_ST_1_2
+FXFR_FWAC fxfraud FIX_FRANKLIN FXFR_ST_1_3
+FXFR_FWAD fxfraud FIX_FRANKLIN FXFR_ST_1_5
+FXFR_FWAE fxfraud FIX_FRANKLIN FXFR_ST_1_7
+FXFR_FWAF fxfraud FIX_FRANKLIN FXFR_ST_1_9
+FXFR_FWAG fxfraud FIX_FRANKLIN FXFR_ST_1_11
+FXFR_EUAA fxfraud FIX_FRANKLIN FXFR_PFT_1_1
+FXFR_EUAB fxfraud FIX_FRANKLIN FXFR_PFT_1_3
+FXFR_EUAC fxfraud FIX_FRANKLIN FXFR_PFT_1_5
+FXFR_EUAD fxfraud FIX_FRANKLIN FXFR_PFT_1_6
+FXFR_EVAA fxfraud FIX_FRANKLIN FXFR_PFT_2_1
+FXFR_EVAB fxfraud FIX_FRANKLIN FXFR_PFT_2_3
+FXFR_EVAC fxfraud FIX_FRANKLIN FXFR_PFT_2_5
+FXFR_EVAD fxfraud FIX_FRANKLIN FXFR_PFT_2_6
+FXFR_EVAE fxfraud FIX_FRANKLIN FXFR_PFT_2_7

src/common/logger.cc

@@ -8,8 +8,8 @@
 #ifndef NDEBUG
 #define RAINBOMIZER_BUILD "Debug Build: " __DATE__ " " __TIME__
 #else
-#define RAINBOMIZER_BUILD "Release v2.0: " __DATE__ " " __TIME__
-#define RAINBOMIZER_BUILD_SHORT "Release v2.0"
+#define RAINBOMIZER_BUILD "Release v2.1: " __DATE__ " " __TIME__
+#define RAINBOMIZER_BUILD_SHORT "Release v2.1"
 #endif
 
 constexpr int RAINBOMIZER_BUILD_NUMBER =

src/vehicles/vehicle_common.cc

@@ -102,7 +102,7 @@ VehicleRandomizerHelper::InitialiseDLCDespawnFix ()
         if (!ops.IsAnyOf ("shop_controller"_joaat))
             return false;
 
-        ops.Init ("2d 01 08 00 ? 38 00 5d ? ? ? 06 56 ? ? 2e 01 00");
+        ops.Init ("2d ? ? 00 ? 38 00 5d ? ? ? 06 56 ? ? 2e 01 00");
         ops.NOP (/*Offset=*/12, 3);
 
         return true;