Skip to content

Commit 773e1d8

Browse files
committed
General: Update for Contract DLC
* Props and Weapon Models from latest DLC have not yet been added. (Likely 2.1.1)
1 parent 807d7ed commit 773e1d8

File tree

5 files changed

+198
-6
lines changed

5 files changed

+198
-6
lines changed

build-count.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
514
1+
518

data/CutsceneModelsPeds.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,4 +179,21 @@ csb_moodyman_02
179179
csb_sessanta
180180
player_zero
181181
player_one
182-
player_two
182+
player_two
183+
cs_lamardavis_02
184+
csb_ary_02
185+
csb_ballas_leader
186+
csb_billionaire
187+
csb_golfer_a
188+
csb_golfer_b
189+
csb_imani
190+
csb_jio_02
191+
csb_johnny_guns
192+
csb_mjo_02
193+
csb_musician_00
194+
csb_party_promo
195+
csb_req_officer
196+
csb_security_a
197+
csb_soundeng_00
198+
csb_vagos_leader
199+
csb_vernon

data/VoiceLines.txt

Lines changed: 176 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29358,7 +29358,23 @@ TNSS_AMAC tnssaud TUN_SESSANTA TNSS_PB_GC1_5
2935829358
TNSS_AMAD tnssaud TUN_SESSANTA TNSS_PB_GC1_7
2935929359
TNSS_AMAE tnssaud TUN_SESSANTA TNSS_PB_GC1_9
2936029360
TNSS_AMAF tnssaud TUN_SESSANTA TNSS_PB_GC1_11
29361-
FXIG_DVAA fxigaud FIX_FRANKLIN FXIG_AY5_1A
29361+
FXIM_BLAA fximaud FIX_IMANI FXIM_PM_8A
29362+
FXFR_FGAA fxfraud FIX_FRANKLIN FXFR_PM_10
29363+
FXFR_FEAA fxfraud FIX_FRANKLIN FXFR_PM_8
29364+
FXFR_EZAA fxfraud FIX_FRANKLIN FXFR_PM_3
29365+
FXFR_FAAA fxfraud FIX_FRANKLIN FXFR_PM_4
29366+
FXFR_FBAA fxfraud FIX_FRANKLIN FXFR_PM_5
29367+
FXFR_FCAA fxfraud FIX_FRANKLIN FXFR_PM_6
29368+
FXFR_FFAA fxfraud FIX_FRANKLIN FXFR_PM_9
29369+
FXIM_BJAA fximaud FIX_IMANI FXIM_PM_7A
29370+
FXIM_BBAA fximaud FIX_IMANI FXIM_PM_3A
29371+
FXIM_BHAA fximaud FIX_IMANI FXIM_PM_6A
29372+
FXIM_BDAA fximaud FIX_IMANI FXIM_PM_4A
29373+
FXFR_FDAA fxfraud FIX_FRANKLIN FXFR_PM_7
29374+
FXIM_AZAA fximaud FIX_IMANI FXIM_PM_2A
29375+
FXFR_EYAA fxfraud FIX_FRANKLIN FXFR_PM_2
29376+
FXFR_EXAA fxfraud FIX_FRANKLIN FXFR_PM_1
29377+
FXIM_AXAA fximaud FIX_IMANI FXIM_PM_1A
2936229378
FXIG_DIAA fxigaud FIX_FRANKLIN FXIG_WR1_1A_2
2936329379
FXIG_DIAB fxigaud FIX_LAMAR FXIG_WR1_1A_4
2936429380
FXIG_DIAT fxigaud FIX_LAMAR FXIG_WR1_1A_5
@@ -29562,6 +29578,7 @@ FXIG_DTAH fxigaud FIX_FRANKLIN FXIG_WR12_1A_16
2956229578
FXIG_DTAI fxigaud FIX_LAMAR FXIG_WR12_1A_18
2956329579
FXIG_DTAJ fxigaud FIX_LAMAR FXIG_WR12_1A_20
2956429580
FXIG_DTAK fxigaud FIX_FRANKLIN FXIG_WR12_1A_22
29581+
FXIG_DVAA fxigaud FIX_FRANKLIN FXIG_AY5_1A
2956529582
FXFR_AAAA fxfraud FIX_FRANKLIN FXFR_FOC_1_1
2956629583
FXFR_AAAB fxfraud FIX_FRANKLIN FXFR_FOC_1_3
2956729584
FXFR_AAAE fxfraud FIX_FRANKLIN FXFR_FOC_1_5
@@ -30251,3 +30268,161 @@ FXIM_ANAF fximaud FIX_IMANI FXIM_SU_7_10
3025130268
FXIM_BNAA fximaud FIX_FRANKLIN FXIM_SU_10_1
3025230269
FXIM_AOAA fximaud FIX_IMANI FXIM_SU_8_1
3025330270
FXIM_AOAB fximaud FIX_FRANKLIN FXIM_SU_8_3
30271+
FXIG_BKAA fxigaud FIX_GOLF1 FXIG_GF2_5A_2
30272+
FXIG_BKAB fxigaud FIX_GOLF1 FXIG_GF2_5A_3
30273+
FXIG_BKAC fxigaud FIX_GOLF1 FXIG_GF2_5A_4
30274+
FXIG_BJAA fxigaud FIX_GOLF1 FXIG_GF2_5B_1
30275+
FXIG_BJAB fxigaud FIX_GOLF1 FXIG_GF2_5B_2
30276+
FXIG_EAAA fxigaud FIX_FRANKLIN FXIG_GF2_3A_2
30277+
FXIG_EBAA fxigaud FIX_FRANKLIN FXIG_GF2_3B_2
30278+
FXIG_EBAB fxigaud FIX_GOLF1 FXIG_GF2_3B_3
30279+
FXIG_ECAA fxigaud FIX_FRANKLIN FXIG_GF2_3C_2
30280+
FXIG_ECAB fxigaud FIX_GOLF1 FXIG_GF2_3C_4
30281+
FXIG_EDAA fxigaud FIX_FRANKLIN FXIG_GF2_3D_1
30282+
FXIG_EDAB fxigaud FIX_GOLF1 FXIG_GF2_3D_3
30283+
FXIG_BIAB fxigaud FIX_GOLF1 FXIG_GF2_2A_1
30284+
FXIG_BIAA fxigaud FIX_FRANKLIN FXIG_GF2_2A_3
30285+
FXIG_DYAR fxigaud FIX_GOLF1 FXIG_GF2_2B_1
30286+
FXIG_DYAS fxigaud FIX_FRANKLIN FXIG_GF2_2B_3
30287+
FXIG_DZAA fxigaud FIX_GOLF1 FXIG_GF2_2C_1
30288+
FXIG_DZAB fxigaud FIX_FRANKLIN FXIG_GF2_2C_3
30289+
FXIG_BLAA fxigaud FIX_FRANKLIN FXIG_GF2_4A_2
30290+
FXIG_BPAB fxigaud FIX_GOLF1 FXIG_GF2_4B_1
30291+
FXIG_BPAA fxigaud FIX_FRANKLIN FXIG_GF2_4B_3
30292+
FXIG_BQAB fxigaud FIX_GOLF1 FXIG_GF2_4C_1
30293+
FXIG_BQAA fxigaud FIX_FRANKLIN FXIG_GF2_4C_3
30294+
FXIG_BRAB fxigaud FIX_GOLF1 FXIG_GF2_4D_1
30295+
FXIG_BRAA fxigaud FIX_FRANKLIN FXIG_GF2_4D_3
30296+
FXIG_BSAB fxigaud FIX_GOLF1 FXIG_GF2_4E_1
30297+
FXIG_BSAA fxigaud FIX_FRANKLIN FXIG_GF2_4E_3
30298+
FXIG_EOAA fxigaud FIX_LAMAR FXIG_TRI1_2F_2
30299+
FXIG_EOAB fxigaud FIX_LAMAR FXIG_TRI1_2F_3
30300+
FXIG_EOAC fxigaud FIX_LAMAR FXIG_TRI1_2F_5
30301+
FXIG_EPAA fxigaud FIX_LAMAR FXIG_TRI1_2L_2
30302+
FXIG_EPAB fxigaud FIX_LAMAR FXIG_TRI1_2L_3
30303+
FXIG_EPAC fxigaud FIX_LAMAR FXIG_TRI1_2L_5
30304+
FXIG_ENAA fxigaud FIX_LAMAR FXIG_TRI1_1A_2
30305+
FXIG_ENAB fxigaud FIX_FRANKLIN FXIG_TRI1_1A_4
30306+
FXIG_ENAC fxigaud FIX_LAMAR FXIG_TRI1_1A_6
30307+
FXIG_DUAA fxigaud FIX_RICH1 FXIG_BIL2_1A_1
30308+
FXIG_DUAB fxigaud FIX_RICH1 FXIG_BIL2_1A_2
30309+
FXIG_DUAC fxigaud FIX_RICH1 FXIG_BIL2_1A_3
30310+
FXIG_DUAD fxigaud FIX_RICH1 FXIG_BIL2_1A_4
30311+
FXIG_DUAE fxigaud FIX_RICH1 FXIG_BIL2_1A_5
30312+
FXIG_DUAF fxigaud FIX_RICH1 FXIG_BIL2_1A_6
30313+
FXIG_DUAG fxigaud FIX_RICH1 FXIG_BIL2_1A_7
30314+
FXIG_DUAH fxigaud FIX_RICH1 FXIG_BIL2_1A_8
30315+
FXIG_DUAI fxigaud FIX_RICH1 FXIG_BIL2_1A_9
30316+
FXIG_DUAJ fxigaud FIX_RICH1 FXIG_BIL2_1A_10
30317+
FXIG_ACAB fxigaud HS4_PRODUCER FXIG_ST1_1A_1
30318+
FXIG_BVAA fxigaud HS4_PRODUCER FXIG_ST1_1B
30319+
FXIG_BWAA fxigaud HS4_PRODUCER FXIG_ST1_1C
30320+
FXIG_ABAA fxigaud FIX_FRANKLIN FXIG_GF2_1A_2
30321+
FXIG_ABAB fxigaud FIX_GOLF1 FXIG_GF2_1A_3
30322+
FXIG_DWAA fxigaud FIX_FRANKLIN FXIG_GF2_1B_2
30323+
FXIG_DWAB fxigaud FIX_GOLF1 FXIG_GF2_1B_3
30324+
FXIG_DXAA fxigaud FIX_FRANKLIN FXIG_GF2_1C_2
30325+
FXIG_DXAC fxigaud FIX_GOLF1 FXIG_GF2_1C_4
30326+
FXIG_DXAE fxigaud FIX_FRANKLIN FXIG_GF2_1C_5
30327+
FXDL5_ASAA fxdl5au HS4_PRODUCER FXDL5_19_1_1
30328+
FXDL5_ASAB fxdl5au HS4_PRODUCER FXDL5_19_1_3
30329+
FXLM_AAAA fxlmaud FIX_LAMAR FXLM_FL_1_1
30330+
FXLM_AAAB fxlmaud FIX_LAMAR FXLM_FL_1_3
30331+
FXLM_AAAC fxlmaud FIX_LAMAR FXLM_FL_1_5
30332+
FXLM_AAAD fxlmaud FIX_LAMAR FXLM_FL_1_7
30333+
FXLM_AAAE fxlmaud FIX_LAMAR FXLM_FL_1_8
30334+
FXLM_AAAF fxlmaud FIX_LAMAR FXLM_FL_1_10
30335+
FXLM_AAAG fxlmaud FIX_LAMAR FXLM_FL_1_11
30336+
FXFR_ADAA fxfraud FIX_FRANKLIN FXFR_FDI_1_1
30337+
FXFR_ADAB fxfraud FIX_FRANKLIN FXFR_FDI_1_2
30338+
FXFR_ADAC fxfraud FIX_FRANKLIN FXFR_FDI_1_4
30339+
FXFR_ADAD fxfraud FIX_FRANKLIN FXFR_FDI_1_6
30340+
FXFR_ADAE fxfraud FIX_FRANKLIN FXFR_FDI_1_8
30341+
FXFR_ADAF fxfraud FIX_FRANKLIN FXFR_FDI_1_10
30342+
FXFR_AEAA fxfraud FIX_FRANKLIN FXFR_FDI_2_1
30343+
FXFR_AEAB fxfraud FIX_FRANKLIN FXFR_FDI_2_3
30344+
FXFR_AEAC fxfraud FIX_FRANKLIN FXFR_FDI_2_5
30345+
FXFR_AEAD fxfraud FIX_FRANKLIN FXFR_FDI_2_7
30346+
FXFR_AEAE fxfraud FIX_FRANKLIN FXFR_FDI_2_9
30347+
FXFR_AEAF fxfraud FIX_FRANKLIN FXFR_FDI_2_11
30348+
FXFR_AEAG fxfraud FIX_FRANKLIN FXFR_FDI_2_13
30349+
FXIM_ACAA fximaud FIX_IMANI FXIM_FL_3_1
30350+
FXIM_ACAB fximaud FIX_FRANKLIN FXIM_FL_3_3
30351+
FXIM_ACAC fximaud FIX_IMANI FXIM_FL_3_5
30352+
FXIM_ACAD fximaud FIX_IMANI FXIM_FL_3_7
30353+
FXIM_ACAE fximaud FIX_FRANKLIN FXIM_FL_3_9
30354+
FXIM_ACAF fximaud FIX_IMANI FXIM_FL_3_11
30355+
FXIM_ACAG fximaud FIX_FRANKLIN FXIM_FL_3_13
30356+
FXIM_ACAH fximaud FIX_IMANI FXIM_FL_3_15
30357+
FXIM_ACAI fximaud FIX_IMANI FXIM_FL_3_17
30358+
FXFR_FHAK fxfraud FIX_IMANI FXFR_FPP_1_1
30359+
FXFR_FHAM fxfraud FIX_IMANI FXFR_FPP_1_3
30360+
FXFR_FHAT fxfraud FIX_FRANKLIN FXFR_FPP_1_5
30361+
FXFR_AGAA fxfraud FIX_IMANI FXFR_FPP_2_1
30362+
FXFR_AGAB fxfraud FIX_FRANKLIN FXFR_FPP_2_3
30363+
FXFR_AGAC fxfraud FIX_IMANI FXFR_FPP_2_5
30364+
FXFR_AGAD fxfraud FIX_IMANI FXFR_FPP_2_6
30365+
FXFR_AGAE fxfraud FIX_FRANKLIN FXFR_FPP_2_8
30366+
FXFR_AGAF fxfraud FIX_FRANKLIN FXFR_FPP_2_10
30367+
FXFR_AHAQ fxfraud FIX_FRANKLIN FXFR_FBG_1_1
30368+
FXFR_AHAR fxfraud FIX_IMANI FXFR_FBG_1_3
30369+
FXFR_AIAA fxfraud FIX_FRANKLIN FXFR_FBG_2_1
30370+
FXFR_AIAB fxfraud FIX_IMANI FXFR_FBG_2_3
30371+
FXFR_AIAC fxfraud FIX_FRANKLIN FXFR_FBG_2_5
30372+
FXFR_AIAD fxfraud FIX_IMANI FXFR_FBG_2_7
30373+
FXFR_AIAE fxfraud FIX_FRANKLIN FXFR_FBG_2_9
30374+
FXFR_AIAF fxfraud FIX_FRANKLIN FXFR_FBG_2_11
30375+
FXFR_AIAG fxfraud FIX_FRANKLIN FXFR_FBG_2_13
30376+
FXFR_AJAA fxfraud FIX_FRANKLIN FXFR_FHP_1_1
30377+
FXFR_AJAB fxfraud FIX_FRANKLIN FXFR_FHP_1_3
30378+
FXFR_AJAC fxfraud FIX_FRANKLIN FXFR_FHP_1_5
30379+
FXFR_AKAA fxfraud FIX_FRANKLIN FXFR_FHP_2_1
30380+
FXFR_AKAB fxfraud FIX_FRANKLIN FXFR_FHP_2_3
30381+
FXFR_AKAC fxfraud FIX_FRANKLIN FXFR_FHP_2_5
30382+
FXFR_AKAD fxfraud FIX_FRANKLIN FXFR_FHP_2_7
30383+
FXFR_AKAE fxfraud FIX_FRANKLIN FXFR_FHP_2_9
30384+
FXFR_ALAA fxfraud FIX_FRANKLIN FXFR_FF2_1_1
30385+
FXFR_ALAB fxfraud FIX_FRANKLIN FXFR_FF2_1_3
30386+
FXFR_ALAC fxfraud FIX_FRANKLIN FXFR_FF2_1_5
30387+
FXFR_ALAD fxfraud FIX_FRANKLIN FXFR_FF2_1_7
30388+
FXFR_ALAE fxfraud FIX_FRANKLIN FXFR_FF2_1_8
30389+
FXFR_ALAF fxfraud FIX_FRANKLIN FXFR_FF2_1_10
30390+
FXFR_AMAA fxfraud FIX_FRANKLIN FXFR_FF2_2_1
30391+
FXFR_AMAB fxfraud FIX_FRANKLIN FXFR_FF2_2_3
30392+
FXFR_AMAC fxfraud FIX_FRANKLIN FXFR_FF2_2_4
30393+
FXFR_AMAD fxfraud FIX_FRANKLIN FXFR_FF2_2_6
30394+
FXFR_AOAA fxfraud FIX_FRANKLIN FXFR_FF2_4_1
30395+
FXFR_AOAB fxfraud FIX_FRANKLIN FXFR_FF2_4_3
30396+
FXFR_AOAC fxfraud FIX_FRANKLIN FXFR_FF2_4_5
30397+
FXFR_APAA fxfraud FIX_FRANKLIN FXFR_FF2_5_1
30398+
FXFR_APAB fxfraud FIX_FRANKLIN FXFR_FF2_5_3
30399+
FXFR_APAC fxfraud FIX_FRANKLIN FXFR_FF2_5_5
30400+
FXFR_APAD fxfraud FIX_FRANKLIN FXFR_FF2_5_7
30401+
FXFR_APAE fxfraud FIX_FRANKLIN FXFR_FF2_5_8
30402+
FXFR_FQAA fxfraud HS4_PRODUCER FXFR_DRE_3A_1
30403+
FXFR_FQAB fxfraud HS4_PRODUCER FXFR_DRE_3A_2
30404+
FXFR_FQAC fxfraud HS4_PRODUCER FXFR_DRE_3A_3
30405+
FXFR_FLAA fxfraud HS4_PRODUCER FXFR_DRE_1A_1
30406+
FXFR_FLAB fxfraud HS4_PRODUCER FXFR_DRE_1A_2
30407+
FXFR_FLAC fxfraud HS4_PRODUCER FXFR_DRE_1A_4
30408+
FXFR_EKAA fxfraud FIX_FRANKLIN FXFR_PUF_1_1
30409+
FXFR_EKAB fxfraud FIX_FRANKLIN FXFR_PUF_1_3
30410+
FXFR_EKAE fxfraud FIX_FRANKLIN FXFR_PUF_1_5
30411+
FXFR_EKAC fxfraud FIX_FRANKLIN FXFR_PUF_1_7
30412+
FXFR_EKAD fxfraud FIX_FRANKLIN FXFR_PUF_1_8
30413+
FXFR_FWAA fxfraud FIX_FRANKLIN FXFR_ST_1_1
30414+
FXFR_FWAB fxfraud FIX_FRANKLIN FXFR_ST_1_2
30415+
FXFR_FWAC fxfraud FIX_FRANKLIN FXFR_ST_1_3
30416+
FXFR_FWAD fxfraud FIX_FRANKLIN FXFR_ST_1_5
30417+
FXFR_FWAE fxfraud FIX_FRANKLIN FXFR_ST_1_7
30418+
FXFR_FWAF fxfraud FIX_FRANKLIN FXFR_ST_1_9
30419+
FXFR_FWAG fxfraud FIX_FRANKLIN FXFR_ST_1_11
30420+
FXFR_EUAA fxfraud FIX_FRANKLIN FXFR_PFT_1_1
30421+
FXFR_EUAB fxfraud FIX_FRANKLIN FXFR_PFT_1_3
30422+
FXFR_EUAC fxfraud FIX_FRANKLIN FXFR_PFT_1_5
30423+
FXFR_EUAD fxfraud FIX_FRANKLIN FXFR_PFT_1_6
30424+
FXFR_EVAA fxfraud FIX_FRANKLIN FXFR_PFT_2_1
30425+
FXFR_EVAB fxfraud FIX_FRANKLIN FXFR_PFT_2_3
30426+
FXFR_EVAC fxfraud FIX_FRANKLIN FXFR_PFT_2_5
30427+
FXFR_EVAD fxfraud FIX_FRANKLIN FXFR_PFT_2_6
30428+
FXFR_EVAE fxfraud FIX_FRANKLIN FXFR_PFT_2_7

src/common/logger.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
#ifndef NDEBUG
99
#define RAINBOMIZER_BUILD "Debug Build: " __DATE__ " " __TIME__
1010
#else
11-
#define RAINBOMIZER_BUILD "Release v2.0: " __DATE__ " " __TIME__
12-
#define RAINBOMIZER_BUILD_SHORT "Release v2.0"
11+
#define RAINBOMIZER_BUILD "Release v2.1: " __DATE__ " " __TIME__
12+
#define RAINBOMIZER_BUILD_SHORT "Release v2.1"
1313
#endif
1414

1515
constexpr int RAINBOMIZER_BUILD_NUMBER =

src/vehicles/vehicle_common.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ VehicleRandomizerHelper::InitialiseDLCDespawnFix ()
102102
if (!ops.IsAnyOf ("shop_controller"_joaat))
103103
return false;
104104

105-
ops.Init ("2d 01 08 00 ? 38 00 5d ? ? ? 06 56 ? ? 2e 01 00");
105+
ops.Init ("2d ? ? 00 ? 38 00 5d ? ? ? 06 56 ? ? 2e 01 00");
106106
ops.NOP (/*Offset=*/12, 3);
107107

108108
return true;

0 commit comments

Comments
 (0)