Skip to content

Commit

Permalink
Cayo Perico Heist Update
Browse files Browse the repository at this point in the history
  • Loading branch information
BuildTools committed Dec 16, 2020
1 parent 7c4bcf0 commit 9a2fbae
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 0 deletions.
2 changes: 2 additions & 0 deletions Solution/source/Memory/GTAmemory.cpp
View file
Expand Up @@ -1634,6 +1634,8 @@ void GeneralGlobalHax::EnableBlockedMpVehiclesInSp(bool uSure)
case eGameVersion::VER_1_0_2060_0_NOSTEAM: case eGameVersion::VER_1_0_2060_0_STEAM:
case eGameVersion::VER_1_0_2060_1_NOSTEAM: case eGameVersion::VER_1_0_2060_1_STEAM:
*GTAmemory::GetGlobalPtr<INT32>(4268340) = uSure ? 1 : 0; break;
case eGameVersion::VER_1_0_2189_0_NOSTEAM: case eGameVersion::VER_1_0_2189_0_STEAM:
*GTAmemory::GetGlobalPtr<INT32>(4269479) = uSure ? 1 : 0; break;
}
}

Expand Down
20 changes: 20 additions & 0 deletions Solution/source/Scripting/WeaponIndivs.cpp
View file
Expand Up @@ -69,6 +69,8 @@ std::map<Hash, std::string> WeaponIndivs::vWeaponLabels
// 1.0.1868.0
{ WEAPON_NAVYREVOLVER, "Navy Revolver" },
{ WEAPON_CERAMICPISTOL, "Ceramic Pistol" },
// 1.0.2189.0
{ WEAPON_GADGETPISTOL, "Perico Pistol"},
//slot Shotgun (9)
{ WEAPON_PUMPSHOTGUN, "Pump Shotgun" },
{ WEAPON_PUMPSHOTGUN_MK2, "Pump Shotgun Mk2" },
Expand All @@ -79,6 +81,8 @@ std::map<Hash, std::string> WeaponIndivs::vWeaponLabels
{ WEAPON_HEAVYSHOTGUN, "Heavy Shotgun" },
{ WEAPON_DBSHOTGUN, "Double-Barrel Shotgun" },
{ WEAPON_AUTOSHOTGUN, "Auto Shotgun" },
// 1.0.2189.0
{ WEAPON_COMBATSHOTGUN, "Combat Shotgun" },
//slot MG (10)
{ WEAPON_MICROSMG, "Micro SMG" },
{ WEAPON_SMG, "SMG" },
Expand All @@ -102,6 +106,8 @@ std::map<Hash, std::string> WeaponIndivs::vWeaponLabels
{ WEAPON_BULLPUPRIFLE_MK2, "Bullpup Rifle Mk2" },
{ WEAPON_COMPACTRIFLE, "Compact Rifle" },
{ WEAPON_RAYCARBINE, "Ray Carbine Rifle" },
// 1.0.2189.0
{ WEAPON_MILITARYRIFLE, "Military Rifle" },
//slot Sniper (5)
{ WEAPON_SNIPERRIFLE, "Sniper Rifle" },
{ WEAPON_HEAVYSNIPER, "Heavy Sniper" },
Expand Down Expand Up @@ -441,6 +447,8 @@ std::vector<WeaponAndComponents> WeaponIndivs::wc_PISTOLS
{ "Extended_Clip", GET_HASH_KEY("COMPONENT_CERAMICPISTOL_CLIP_02") },
{ "Suppressor", GET_HASH_KEY("COMPONENT_CERAMICPISTOL_SUPP") },
}, &WeaponIndivs::vCaptions_Tints },
{ WEAPON_GADGETPISTOL,{
}, &WeaponIndivs::vCaptions_Tints },
};
#pragma endregion
#pragma region submachine guns
Expand Down Expand Up @@ -839,6 +847,14 @@ std::vector<WeaponAndComponents> WeaponIndivs::wc_ASSAULTRIFLES
{ "Extended_Clip", COMPONENT_COMPACTRIFLE_CLIP_02 },
{ "Drum Magazine", COMPONENT_COMPACTRIFLE_CLIP_03 },
}, &WeaponIndivs::vCaptions_Tints },
{ WEAPON_MILITARYRIFLE,{
{ "Standard_Clip", COMPONENT_MILITARYRIFLE_CLIP_01 },
{ "Extended_Clip", COMPONENT_MILITARYRIFLE_CLIP_02 },
{ "Iron Sights", COMPONENT_MILITARYRIFLE_SIGHT_01 },
{ "Scope", COMPONENT_AT_SCOPE_SMALL },
{ "Flashlight", COMPONENT_AT_AR_FLSH },
{ "Suppressor", COMPONENT_AT_AR_SUPP },
}, &WeaponIndivs::vCaptions_Tints },
};
#pragma endregion
#pragma region shotguns
Expand Down Expand Up @@ -920,6 +936,10 @@ std::vector<WeaponAndComponents> WeaponIndivs::wc_SHOTGUNS
{ WEAPON_AUTOSHOTGUN,{
{ "Standard_Clip", COMPONENT_AUTOSHOTGUN_CLIP_01 },
}, &WeaponIndivs::vCaptions_Tints },
{ WEAPON_COMBATSHOTGUN,{
{ "Flashlight", COMPONENT_AT_AR_FLSH },
{ "Suppressor", COMPONENT_AT_AR_SUPP_02 },
}, &WeaponIndivs::vCaptions_Tints },
};
#pragma endregion
#pragma region snipers
Expand Down
7 changes: 7 additions & 0 deletions Solution/source/Scripting/enums.h
View file
Expand Up @@ -673,6 +673,10 @@ enum WeaponHash : DWORD
WEAPON_CERAMICPISTOL = 0x2B5EF5EC,
WEAPON_HAZARDCAN = 0xBA536372,

// 1.0.2189.0
WEAPON_COMBATSHOTGUN = 0x5A96BA4,
WEAPON_GADGETPISTOL = 0x57A4368C,
WEAPON_MILITARYRIFLE = 0x9D1F17E6,
};
enum WeaponComponentHash : DWORD
{
Expand All @@ -692,6 +696,7 @@ enum WeaponComponentHash : DWORD
COMPONENT_CARBINERIFLE_VARMOD_LUXE = 0xD89B9658,
COMPONENT_ADVANCEDRIFLE_CLIP_01 = 0xFA8FA10F,
COMPONENT_ADVANCEDRIFLE_VARMOD_LUXE = 0x377CD377,
COMPONENT_MILITARYRIFLE_CLIP_01 = 0x2D46D83B,
COMPONENT_MG_CLIP_01 = 0xF434EF84,
COMPONENT_MG_VARMOD_LOWRIDER = 0xD6DABABE,
COMPONENT_COMBATMG_CLIP_01 = 0xE1FFB34A,
Expand Down Expand Up @@ -745,6 +750,7 @@ enum WeaponComponentHash : DWORD
COMPONENT_AT_SCOPE_MEDIUM = 0xA0D89C42,
COMPONENT_AT_SCOPE_LARGE = 0xD2443DDC,
COMPONENT_AT_SCOPE_MAX = 0xBC54DA77,
COMPONENT_MILITARYRIFLE_SIGHT_01 = 0x6B82F395,
COMPONENT_AT_PI_SUPP = 0xC304849A,
COMPONENT_AT_PI_SUPP_02 = 0x65EA7EBB,
COMPONENT_AT_AR_SUPP = 0x837445AA,
Expand All @@ -762,6 +768,7 @@ enum WeaponComponentHash : DWORD
COMPONENT_ASSAULTRIFLE_CLIP_02 = 0xB1214F9B,
COMPONENT_CARBINERIFLE_CLIP_02 = 0x91109691,
COMPONENT_ADVANCEDRIFLE_CLIP_02 = 0x8EC1C979,
COMPONENT_MILITARYRIFLE_CLIP_02 = 0x684ACE42,
COMPONENT_MG_CLIP_02 = 0x82158B47,
COMPONENT_COMBATPDW_CLIP_02 = 0x334A5203,
COMPONENT_COMBATMG_CLIP_02 = 0xD6C59CD6,
Expand Down
21 changes: 21 additions & 0 deletions Solution/source/_Build/bin/Release/menyooStuff/VehicleList.xml
View file
Expand Up @@ -103,6 +103,7 @@
<Vehicle name="IMORGON" />
<Vehicle name="ISSI7" /><!-- Issi Sport -->
<Vehicle name="ITALIGTO" />
<Vehicle name="ITALIRSX" /><!-- Grotti Itali RSX -->
<Vehicle name="JESTER" />
<Vehicle name="JESTER2" /><!-- Jester (Racecar) -->
<Vehicle name="JESTER3" /><!-- Jester Classic -->
Expand Down Expand Up @@ -147,6 +148,8 @@
<Vehicle name="TROPOS" />
<Vehicle name="VSTR" /><!-- V-STR -->
<Vehicle name="VERLIERER2" />
<Vehicle name="VETO" /><!-- Dinka Veto Classic -->
<Vehicle name="VETO2" /><!-- Dinka Veto Modern -->
</Category>
<Category name="Muscle">
<Vehicle name="DOMINATOR4" /><!-- Apocalypse Dominator -->
Expand Down Expand Up @@ -263,6 +266,7 @@
<Vehicle name="TORNADO5" /><!-- Tornado Custom -->
<Vehicle name="TORNADO6" /><!-- Tornado Rat Rod -->
<Vehicle name="TURISMO2" /><!-- Turismo Classic -->
<Vehicle name="TOREADOR" /><!-- Pegassi Toreador -->
<Vehicle name="VISERIS" />
<Vehicle name="ZTYPE" />
<Vehicle name="ZION3" /><!-- Zion Classic -->
Expand Down Expand Up @@ -390,6 +394,8 @@
<Vehicle name="TECHNICAL3" /><!-- Technical Custom -->
<Vehicle name="TROPHYTRUCK" />
<Vehicle name="VAGRANT" />
<Vehicle name="VERUS" /><!-- Dinka Verus -->
<Vehicle name="WINKY" /><!-- Vapid Winky -->
<Vehicle name="YOSEMITE3" /><!-- Yosemite Rancher -->
<Vehicle name="ZHABA" />
</Category>
Expand Down Expand Up @@ -424,6 +430,7 @@
<Vehicle name="SEMINOLE" />
<Vehicle name="SEMINOLE2" /><!-- Seminole Frontier -->
<Vehicle name="SERRANO" />
<Vehicle name="SQUADDIE" /><!-- Mammoth Squaddie -->
<Vehicle name="TOROS" />
<Vehicle name="XLS" />
<Vehicle name="XLS2" /><!-- XLS (Armored) -->
Expand All @@ -434,6 +441,7 @@
<Vehicle name="BLISTA" />
<Vehicle name="KANJO" /><!-- Blista Kanjo -->
<Vehicle name="BRIOSO" />
<Vehicle name="BRIOSO2" />
<Vehicle name="CLUB" />
<Vehicle name="DILETTANTE" />
<Vehicle name="DILETTANTE2" /><!-- Merryweather Dilettante -->
Expand All @@ -444,6 +452,7 @@
<Vehicle name="PANTO" />
<Vehicle name="PRAIRIE" />
<Vehicle name="RHAPSODY" />
<Vehicle name="WEEVIL" /><!-- BF Weevil -->
</Category>
<Category name="Pickup">
<Vehicle name="BISON" />
Expand Down Expand Up @@ -519,6 +528,7 @@
<Vehicle name="SADLER" />
<Vehicle name="SADLER2" /><!-- Sadler North Yankton variant -->
<Vehicle name="SCRAP" />
<Vehicle name="SLAMTRUCK" /><!-- Vapid Slamtruck -->
<Vehicle name="TAXI" />
<Vehicle name="TOURBUS" />
<Vehicle name="TOWTRUCK2" /><!-- Tow Truck Slamvan variant -->
Expand Down Expand Up @@ -601,6 +611,7 @@
<Vehicle name="THRUSTER" />
<Vehicle name="KHANJALI" /><!-- TM-02 Khanjali -->
<Vehicle name="POLICE4" /><!-- Unmarked Cruiser -->
<Vehicle name="VETIR" />
</Category>
<Category name="Motorcycle">
<Vehicle name="AKUMA" />
Expand Down Expand Up @@ -634,6 +645,7 @@
<Vehicle name="INNOVATION" />
<Vehicle name="LECTRO" />
<Vehicle name="MANCHEZ" />
<Vehicle name="MANCHEZ2" /><!-- Maibatsu Manchez Scout -->
<Vehicle name="NEMESIS" />
<Vehicle name="NIGHTBLADE" />
<Vehicle name="DEATHBIKE3" /><!-- Nightmare Deathbike -->
Expand Down Expand Up @@ -694,6 +706,7 @@
<Vehicle name="PYRO" />
<Vehicle name="BOMBUSHKA" /><!-- RM-10 Bombushka -->
<Vehicle name="ROGUE" />
<Vehicle name="ALKONOST" /><!-- RO-86 Alkonost -->
<Vehicle name="SEABREEZE" />
<Vehicle name="SHAMAL" />
<Vehicle name="TITAN" />
Expand All @@ -709,6 +722,7 @@
<Category name="Helicopter">
<Vehicle name="AKULA" />
<Vehicle name="ANNIHILATOR" />
<Vehicle name="ANNIHILATOR2" /><!-- Annihilator Stealth -->
<Vehicle name="BUZZARD2" /><!-- Buzzard -->
<Vehicle name="BUZZARD" /><!-- Buzzard Attack Chopper -->
<Vehicle name="CARGOBOB" /><!-- Military Cargobob -->
Expand All @@ -723,6 +737,8 @@
<Vehicle name="POLMAV" />
<Vehicle name="SAVAGE" />
<Vehicle name="SEASPARROW" />
<Vehicle name="SEASPARROW2" />
<Vehicle name="SEASPARROW3" />
<Vehicle name="SKYLIFT" />
<Vehicle name="SUPERVOLITO" />
<Vehicle name="SUPERVOLITO2" /><!-- SuperVolito Carbon -->
Expand All @@ -733,14 +749,19 @@
<Vehicle name="VOLATUS" />
</Category>
<Category name="Boat">
<Vehicle name="AVISA" /><!-- Kraken Avisa -->
<Vehicle name="DINGHY" />
<Vehicle name="DINGHY2" /><!-- Dinghy 2-seater variant -->
<Vehicle name="DINGHY3" /><!-- Dinghy heist variant -->
<Vehicle name="DINGHY4" /><!-- Dinghy yacht variant -->
<Vehicle name="DINGHY5" /><!-- Dinghy weaponized variant -->
<Vehicle name="JETMAX" />
<Vehicle name="KOSATKA" />
<Vehicle name="LONGFIN" /><!-- Shitzu Longfin -->
<Vehicle name="SUBMERSIBLE2" /><!-- Kraken -->
<Vehicle name="MARQUIS" />
<Vehicle name="PREDATOR" />
<Vehicle name="PATROLBOAT" /><!-- Kurtz 31 Patrol Boat -->
<Vehicle name="SEASHARK" />
<Vehicle name="SEASHARK2" /><!-- Lifeguard Seashark -->
<Vehicle name="SEASHARK3" /><!-- Seashark yacht variant -->
Expand Down
3 changes: 3 additions & 0 deletions Solution/source/main.h
View file
Expand Up @@ -228,6 +228,9 @@ enum eGameVersion : int

VER_1_0_2060_1_STEAM,
VER_1_0_2060_1_NOSTEAM,

VER_1_0_2189_0_STEAM,
VER_1_0_2189_0_NOSTEAM,

VER_SIZE,
VER_UNK = -1
Expand Down

0 comments on commit 9a2fbae

Please sign in to comment.