Add cutscene player categories

This commit is contained in:
Grinch_ 2021-07-20 19:00:24 +06:00
parent acedf1a14c
commit 19a269863e
2 changed files with 168 additions and 158 deletions

View File

@ -1,149 +1,170 @@
{ {
"All": "Big Smoke": {
{ "smoke1a": "0",
"bcesa4w" : "0", "smoke1b": "0",
"bcesa5w" : "0", "smoke2a": "0",
"bcesar2" : "2", "smoke2b": "0",
"bcesar4" : "0", "smoke3a": "0",
"bcesar5" : "0", "smoke4a": "0"
"bcras1" : "0", },
"bcras2" : "0", "Catalina": {
"bhill1" : "0", "cat_2": "0",
"bhill2" : "5", "cat_3": "0",
"bhill3a" : "5", "cat_4": "0"
"bhill3b" : "0", },
"bhill3c" : "0", "Cesar Vialpando": {
"bhill5a" : "5", "bcesa4w": "0",
"bhill5b" : "3", "bcesa5w": "0",
"cas6b_1" : "1", "bcesar2": "2",
"cas6b_2" : "1", "bcesar4": "0",
"cas_11a" : "2", "bcesar5": "0",
"cas_1a" : "11", "cesar1a": "0"
"cas_2" : "0", },
"cas_3" : "11", "Dates": {
"cas_4a" : "0", "date1a": "10",
"cas_4b" : "0", "date3a": "4",
"cas_4c" : "2", "date3b": "4",
"cas_5a" : "2", "date5a": "6",
"cas_6a" : "2", "date5b": "6",
"cas_7b" : "11", "date2a": "9",
"cas_9a1" : "2", "date2b": "9",
"cas_9a2" : "0", "date4a": "5",
"cat_2" : "0", "date4b": "5",
"cat_3" : "0", "date1b": "5",
"cat_4" : "0", "date6a": "5",
"cesar1a" : "0", "date6b": "17"
"crash1a" : "17", },
"crash3a" : "0", "Misc": {
"crashv1" : "0", "bhill1": "0",
"d10_alt" : "0", "bhill2": "5",
"d8_alt" : "0", "bhill3a": "5",
"date1a" : "10", "bhill3b": "0",
"date3a" : "4", "bhill3c": "0",
"date3b" : "4", "bhill5a": "5",
"date5a" : "6", "bhill5b": "3",
"date5b" : "6", "cas6b_1": "1",
"date2a" : "9", "cas6b_2": "1",
"date2b" : "9", "cas_11a": "2",
"date4a" : "5", "cas_1a": "11",
"date4b" : "5", "cas_2": "0",
"date1b" : "5", "cas_3": "11",
"date6a" : "5", "cas_4a": "0",
"date6b" : "17", "cas_4b": "0",
"desert1" : "0", "cas_4c": "2",
"desert2" : "0", "cas_5a": "2",
"desert3" : "0", "cas_6a": "2",
"desert4" : "0", "cas_7b": "11",
"desert6" : "0", "cas_9a1": "2",
"desert8" : "0", "cas_9a2": "0",
"desert9" : "0", "desert1": "0",
"des_10a" : "0", "desert2": "0",
"des_10b" : "0", "desert3": "0",
"doc_2" : "0", "desert4": "0",
"epilog" : "3", "desert6": "0",
"farl_2a" : "3", "desert8": "0",
"farl_3a" : "3", "desert9": "0",
"farl_3b" : "0", "des_10a": "0",
"farl_4a" : "1", "des_10b": "0",
"farl_5a" : "1", "doc_2": "0",
"final1a" : "1", "epilog": "3",
"final2a" : "1", "farl_2a": "3",
"final2b" : "0", "farl_3a": "3",
"garag1b" : "1", "farl_3b": "0",
"garag1c" : "1", "farl_4a": "1",
"garag3a" : "1", "farl_5a": "1",
"grove1a" : "3", "final1a": "1",
"grove1b" : "3", "final2a": "1",
"grove1c" : "2", "final2b": "0",
"grove2" : "1", "garag1b": "1",
"heist1a" : "10", "garag1c": "1",
"heist2a" : "10", "garag3a": "1",
"heist4a" : "10", "grove1a": "3",
"heist5a" : "10", "grove1b": "3",
"heist6a" : "10", "grove1c": "2",
"heist8a" : "0", "grove2": "1",
"intro1a" : "3", "heist1a": "10",
"intro1b" : "0", "heist2a": "10",
"intro2a" : "2", "heist4a": "10",
"prolog1" : "14", "heist5a": "10",
"prolog3" : "0", "heist6a": "10",
"riot4e1" : "0", "heist8a": "0",
"riot4e2" : "0", "intro1a": "3",
"riot_1a" : "5", "intro1b": "0",
"riot_1b" : "5", "intro2a": "2",
"riot_2" : "1", "prolog1": "14",
"riot_4a" : "1", "prolog3": "0",
"riot_4b" : "0", "riot4e1": "0",
"riot_4c" : "2", "riot4e2": "0",
"riot_4d" : "2", "riot_1a": "5",
"ryder1a" : "0", "riot_1b": "5",
"ryder2a" : "0", "riot_2": "1",
"ryder3a" : "2", "riot_4a": "1",
"scrash1" : "1", "riot_4b": "0",
"scrash2" : "1", "riot_4c": "2",
"smoke1a" : "0", "riot_4d": "2",
"smoke1b" : "0", "steal_1": "1",
"smoke2a" : "0", "steal_2": "1",
"smoke2b" : "0", "steal_4": "1",
"smoke3a" : "0", "steal_5": "1",
"smoke4a" : "0", "strp4b1": "3",
"steal_1" : "1", "strp4b2": "0",
"steal_2" : "1", "synd_2a": "1",
"steal_4" : "1", "synd_2b": "3",
"steal_5" : "1", "synd_3a": "0",
"strap1a" : "0", "synd_4a": "1",
"strap2a" : "10", "synd_4b": "0",
"strap3a" : "10", "synd_7": "1"
"strap4a" : "0", },
"strp4b1" : "3", "Pizza Guy": {
"strp4b2" : "0", "strap1a": "0",
"sweet1a" : "0", "strap2a": "10",
"sweet1b" : "1", "strap3a": "10",
"sweet1c" : "3", "strap4a": "0"
"sweet2a" : "0", },
"sweet2b" : "0", "Ryder": {
"sweet3a" : "1", "ryder1a": "0",
"sweet3b" : "0", "ryder2a": "0",
"sweet4a" : "0", "ryder3a": "2"
"sweet5a" : "1", },
"sweet6a" : "1", "Sweet": {
"sweet6b" : "0", "sweet1a": "0",
"sweet7a" : "0", "sweet1b": "1",
"synd_2a" : "1", "sweet1c": "3",
"synd_2b" : "3", "sweet2a": "0",
"synd_3a" : "0", "sweet2b": "0",
"synd_4a" : "1", "sweet3a": "1",
"synd_4b" : "0", "sweet3b": "0",
"synd_7" : "1", "sweet4a": "0",
"truth_1" : "12", "sweet5a": "1",
"truth_2" : "0", "sweet6a": "1",
"w2_alt" : "1", "sweet6b": "0",
"woozi1a" : "1", "sweet7a": "0"
"woozi1b" : "1", },
"woozie2" : "1", "Tenpenny": {
"woozie4" : "1", "bcras1": "0",
"zero_1" : "6", "bcras2": "0",
"zero_2" : "6", "crash1a": "17",
"zero_4" : "6" "crash3a": "0",
} "crashv1": "0",
"scrash1": "1",
"scrash2": "1"
},
"The Truth": {
"truth_1": "12",
"truth_2": "0",
"d10_alt": "0",
"d8_alt": "0"
},
"Woozie": {
"woozi1a": "1",
"woozi1b": "1",
"woozie2": "1",
"woozie4": "1",
"w2_alt": "1"
},
"Zero": {
"zero_1": "6",
"zero_2": "6",
"zero_4": "6"
}
} }

View File

@ -247,17 +247,6 @@ void Util::RainbowValues(int& r, int& g, int& b, float speed)
b = sin(timer * speed + 4) * 127 + 128; b = sin(timer * speed + 4) * 127 + 128;
} }
RwTexture* CreateRwTextureFromRwImage(RwImage* image)
{
RwInt32 width, height, depth, flags;
RwImageFindRasterFormat(image, 4, &width, &height, &depth, &flags);
RwRaster* raster = RwRasterCreate(width, height, depth, flags);
RwRasterSetFromImage(raster, image);
RwImageDestroy(image);
RwTexture* texture = RwTextureCreate(raster);
return texture;
}
void Util::GetCPUUsageInit() void Util::GetCPUUsageInit()
{ {
PdhOpenQuery(nullptr, NULL, &cpuQuery); PdhOpenQuery(nullptr, NULL, &cpuQuery);