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,13 +1,40 @@
{ {
"All": "Big Smoke": {
{ "smoke1a": "0",
"smoke1b": "0",
"smoke2a": "0",
"smoke2b": "0",
"smoke3a": "0",
"smoke4a": "0"
},
"Catalina": {
"cat_2": "0",
"cat_3": "0",
"cat_4": "0"
},
"Cesar Vialpando": {
"bcesa4w": "0", "bcesa4w": "0",
"bcesa5w": "0", "bcesa5w": "0",
"bcesar2": "2", "bcesar2": "2",
"bcesar4": "0", "bcesar4": "0",
"bcesar5": "0", "bcesar5": "0",
"bcras1" : "0", "cesar1a": "0"
"bcras2" : "0", },
"Dates": {
"date1a": "10",
"date3a": "4",
"date3b": "4",
"date5a": "6",
"date5b": "6",
"date2a": "9",
"date2b": "9",
"date4a": "5",
"date4b": "5",
"date1b": "5",
"date6a": "5",
"date6b": "17"
},
"Misc": {
"bhill1": "0", "bhill1": "0",
"bhill2": "5", "bhill2": "5",
"bhill3a": "5", "bhill3a": "5",
@ -29,27 +56,6 @@
"cas_7b": "11", "cas_7b": "11",
"cas_9a1": "2", "cas_9a1": "2",
"cas_9a2": "0", "cas_9a2": "0",
"cat_2" : "0",
"cat_3" : "0",
"cat_4" : "0",
"cesar1a" : "0",
"crash1a" : "17",
"crash3a" : "0",
"crashv1" : "0",
"d10_alt" : "0",
"d8_alt" : "0",
"date1a" : "10",
"date3a" : "4",
"date3b" : "4",
"date5a" : "6",
"date5b" : "6",
"date2a" : "9",
"date2b" : "9",
"date4a" : "5",
"date4b" : "5",
"date1b" : "5",
"date6a" : "5",
"date6b" : "17",
"desert1": "0", "desert1": "0",
"desert2": "0", "desert2": "0",
"desert3": "0", "desert3": "0",
@ -96,27 +102,31 @@
"riot_4b": "0", "riot_4b": "0",
"riot_4c": "2", "riot_4c": "2",
"riot_4d": "2", "riot_4d": "2",
"ryder1a" : "0",
"ryder2a" : "0",
"ryder3a" : "2",
"scrash1" : "1",
"scrash2" : "1",
"smoke1a" : "0",
"smoke1b" : "0",
"smoke2a" : "0",
"smoke2b" : "0",
"smoke3a" : "0",
"smoke4a" : "0",
"steal_1": "1", "steal_1": "1",
"steal_2": "1", "steal_2": "1",
"steal_4": "1", "steal_4": "1",
"steal_5": "1", "steal_5": "1",
"strp4b1": "3",
"strp4b2": "0",
"synd_2a": "1",
"synd_2b": "3",
"synd_3a": "0",
"synd_4a": "1",
"synd_4b": "0",
"synd_7": "1"
},
"Pizza Guy": {
"strap1a": "0", "strap1a": "0",
"strap2a": "10", "strap2a": "10",
"strap3a": "10", "strap3a": "10",
"strap4a" : "0", "strap4a": "0"
"strp4b1" : "3", },
"strp4b2" : "0", "Ryder": {
"ryder1a": "0",
"ryder2a": "0",
"ryder3a": "2"
},
"Sweet": {
"sweet1a": "0", "sweet1a": "0",
"sweet1b": "1", "sweet1b": "1",
"sweet1c": "3", "sweet1c": "3",
@ -128,20 +138,31 @@
"sweet5a": "1", "sweet5a": "1",
"sweet6a": "1", "sweet6a": "1",
"sweet6b": "0", "sweet6b": "0",
"sweet7a" : "0", "sweet7a": "0"
"synd_2a" : "1", },
"synd_2b" : "3", "Tenpenny": {
"synd_3a" : "0", "bcras1": "0",
"synd_4a" : "1", "bcras2": "0",
"synd_4b" : "0", "crash1a": "17",
"synd_7" : "1", "crash3a": "0",
"crashv1": "0",
"scrash1": "1",
"scrash2": "1"
},
"The Truth": {
"truth_1": "12", "truth_1": "12",
"truth_2": "0", "truth_2": "0",
"w2_alt" : "1", "d10_alt": "0",
"d8_alt": "0"
},
"Woozie": {
"woozi1a": "1", "woozi1a": "1",
"woozi1b": "1", "woozi1b": "1",
"woozie2": "1", "woozie2": "1",
"woozie4": "1", "woozie4": "1",
"w2_alt": "1"
},
"Zero": {
"zero_1": "6", "zero_1": "6",
"zero_2": "6", "zero_2": "6",
"zero_4": "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);