Skip to content

Commit 458fc09

Browse files
DAGINATSUKODAGINATSUKO
authored
Merge pull request #150 from FlexBy420/rpcn
RPCN: fix non normalized npwr id check
2 parents 9ef00b6 + dffb496 commit 458fc09

2 files changed

Lines changed: 67 additions & 36 deletions

File tree

‎public_html/lib/module/rpcn/games.json‎

Lines changed: 57 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,13 @@
5959
"title": ["Super Rub'a'Dub"],
6060
"id": ["NPEA00016", "NPUA80063", "NPJA00013"]
6161
},
62+
"NPWR00030_00": {
63+
"title": ["Mahjong Taikai IV"],
64+
"id": ["BLJM60011"]
65+
},
6266
"NPWR00032_00": {
6367
"title": ["Lemmings"],
64-
"id": ["BCES01334", "BCET00025"]
68+
"id": ["BCES01334", "BCET00025", "NPEA00004"]
6569
},
6670
"NPWR00036_00": {
6771
"title": ["SingStar"],
@@ -89,7 +93,7 @@
8993
},
9094
"NPWR00049_00": {
9195
"title": ["Lemmings"],
92-
"id": []
96+
"id": ["NPJA00005"]
9397
},
9498
"NPWR00050_00": {
9599
"title": ["PlayStation Home"],
@@ -141,7 +145,7 @@
141145
},
142146
"NPWR00072_00": {
143147
"title": ["PIYOTAMA"],
144-
"id": ["NPJA00017"]
148+
"id": ["NPJA00017", "NPEA00065"]
145149
},
146150
"NPWR00075_00": {
147151
"title": ["Unknown Game"],
@@ -277,7 +281,7 @@
277281
},
278282
"NPWR00150_00": {
279283
"title": ["Toy Home"],
280-
"id": []
284+
"id": ["NPHA80029"]
281285
},
282286
"NPWR00152_00": {
283287
"title": ["Dark Mist"],
@@ -291,6 +295,10 @@
291295
"title": ["Star Wars: The Force Unleashed"],
292296
"id": ["BLES00678", "BLUS30445", "BLES00262", "BLUS30144"]
293297
},
298+
"NPWR00158_00": {
299+
"title": ["MX vs. ATV: Untamed"],
300+
"id": ["BLES00178"]
301+
},
294302
"NPWR00160_00": {
295303
"title": ["LittleBigPlanet"],
296304
"id": ["BCAS20058", "BCAS20078", "BCES00141", "BCES00611", "BCJS30018", "BCUS98148", "BCUS98208"]
@@ -395,6 +403,10 @@
395403
"title": ["MotorStorm: Pacific Rift"],
396404
"id": ["BCES00129", "BCJS30027", "BCUS98155"]
397405
},
406+
"NPWR00219_00": {
407+
"title": ["The Simpsons Game"],
408+
"id": ["BLUS30065"]
409+
},
398410
"NPWR00221_00": {
399411
"title": ["DiRT"],
400412
"id": ["BLES00095"]
@@ -513,7 +525,7 @@
513525
},
514526
"NPWR00302_00": {
515527
"title": ["SOCOM: U.S. NAVY SEALS CONFRONTATION"],
516-
"id": ["BCES00173"]
528+
"id": ["BCES00173", "BCAS20051"]
517529
},
518530
"NPWR00305_00": {
519531
"title": ["Bionic Commando"],
@@ -729,7 +741,7 @@
729741
},
730742
"NPWR00409_00": {
731743
"title": ["SPELUNKER HD"],
732-
"id": []
744+
"id": ["NPJB00187"]
733745
},
734746
"NPWR00410_00": {
735747
"title": ["Buzz!: Quiz TV"],
@@ -1629,7 +1641,7 @@
16291641
},
16301642
"NPWR00729_00": {
16311643
"title": ["RAYSTORM HD"],
1632-
"id": []
1644+
"id": ["NPJB00034"]
16331645
},
16341646
"NPWR00730_00": {
16351647
"title": ["Peggle"],
@@ -2069,7 +2081,7 @@
20692081
},
20702082
"NPWR00901_00": {
20712083
"title": ["NASCAR The Game 2011"],
2072-
"id": ["BLUS30604"]
2084+
"id": ["BLUS30604", "NPEB00682"]
20732085
},
20742086
"NPWR00905_00": {
20752087
"title": ["Polar Panic"],
@@ -2457,7 +2469,7 @@
24572469
},
24582470
"NPWR01075_00": {
24592471
"title": ["Deadliest Warrior: The Game"],
2460-
"id": []
2472+
"id": ["NPUB30309"]
24612473
},
24622474
"NPWR01076_00": {
24632475
"title": ["MIGHT & MAGIC CLASH OF HEROES"],
@@ -2469,7 +2481,7 @@
24692481
},
24702482
"NPWR01079_00": {
24712483
"title": ["SPELUNKER BLACK"],
2472-
"id": []
2484+
"id": ["NPHB00176"]
24732485
},
24742486
"NPWR01080_00": {
24752487
"title": ["Top Gun"],
@@ -2705,7 +2717,7 @@
27052717
},
27062718
"NPWR01163_00": {
27072719
"title": ["NEOGEO STATION Art Of Fighting"],
2708-
"id": ["NPUB30261"]
2720+
"id": ["NPUB30261", "NPJB70010"]
27092721
},
27102722
"NPWR01173_00": {
27112723
"title": ["Spare Parts"],
@@ -3401,7 +3413,7 @@
34013413
},
34023414
"NPWR01403_00": {
34033415
"title": ["SPELUNKER HD"],
3404-
"id": ["NPUB30152"]
3416+
"id": ["NPUB30152", "NPEB00469"]
34053417
},
34063418
"NPWR01404_00": {
34073419
"title": ["Medal of Honor Frontline"],
@@ -3757,7 +3769,7 @@
37573769
},
37583770
"NPWR01536_00": {
37593771
"title": ["Star Trek"],
3760-
"id": ["BLES01792", "BLUS30935"]
3772+
"id": ["BLES01792", "BLUS30935", "NPEB01294"]
37613773
},
37623774
"NPWR01537_00": {
37633775
"title": ["Borderlands 2"],
@@ -4065,7 +4077,7 @@
40654077
},
40664078
"NPWR01644_00": {
40674079
"title": ["Storm"],
4068-
"id": []
4080+
"id": ["NPUB30210"]
40694081
},
40704082
"NPWR01645_00": {
40714083
"title": ["Dragon's Lair II: Time Warp"],
@@ -4084,8 +4096,8 @@
40844096
"id": ["BLES01195", "BLUS30718"]
40854097
},
40864098
"NPWR01652_00": {
4087-
"title": ["resident evil 4"],
4088-
"id": []
4099+
"title": ["Resident Evil 4"],
4100+
"id": ["NPEB00342", "NPJB00084"]
40894101
},
40904102
"NPWR01653_00": {
40914103
"title": ["ダンシングアイ"],
@@ -4565,11 +4577,11 @@
45654577
},
45664578
"NPWR01816_00": {
45674579
"title": ["Deadliest Warrior: Legends"],
4568-
"id": []
4580+
"id": ["NPUB30490"]
45694581
},
45704582
"NPWR01817_00": {
45714583
"title": ["The Darkness II"],
4572-
"id": ["BLES01389", "BLES01388", "BLES01390", "BLJS10137", "BLUS30743"]
4584+
"id": ["BLES01389", "BLES01388", "BLES01390", "BLJS10137", "BLUS30743", "NPEB00934"]
45734585
},
45744586
"NPWR01818_00": {
45754587
"title": ["Jak and Daxter: The Precursor Legacy"],
@@ -4791,6 +4803,10 @@
47914803
"title": ["激アツ!! パチゲー魂 VOL 2 「ヱヴァンゲリヲン～真実の翼～」"],
47924804
"id": ["BLJM60369"]
47934805
},
4806+
"NPWR01911_00": {
4807+
"title": ["NEOGEO STATION ザ・キング・オブ・ファイターズ'95"],
4808+
"id": ["NPJB70012"]
4809+
},
47944810
"NPWR01913_00": {
47954811
"title": ["BloodRayne: Betrayal"],
47964812
"id": ["NPJB00609"]
@@ -5379,6 +5395,10 @@
53795395
"title": ["Pure Chess"],
53805396
"id": []
53815397
},
5398+
"NPWR02418_00": {
5399+
"title": ["NEOGEO STATION ワールドヒーローズ"],
5400+
"id": ["NPJB70013"]
5401+
},
53825402
"NPWR02426_00": {
53835403
"title": ["マージャン★ドリームクラブ"],
53845404
"id": ["BLJS10149"]
@@ -5497,7 +5517,7 @@
54975517
},
54985518
"NPWR02541_00": {
54995519
"title": ["NASCAR The Game: Inside Line"],
5500-
"id": ["BLUS30932"]
5520+
"id": ["BLUS30932", "NPEB01256"]
55015521
},
55025522
"NPWR02544_00": {
55035523
"title": ["Clan of Champions"],
@@ -5535,6 +5555,10 @@
55355555
"title": ["NEOGEO STATION Metal Slug 2"],
55365556
"id": ["NPJB70016"]
55375557
},
5558+
"NPWR02571_00": {
5559+
"title": ["NEOGEO STATION ザ・キング・オブ・ファイターズ'96"],
5560+
"id": ["NPJB70015"]
5561+
},
55385562
"NPWR02572_00": {
55395563
"title": ["無双OROCHI２"],
55405564
"id": ["BLJM60417"]
@@ -5893,7 +5917,7 @@
58935917
},
58945918
"NPWR02955_00": {
58955919
"title": ["Beer Pong"],
5896-
"id": []
5920+
"id": ["NPUB31227"]
58975921
},
58985922
"NPWR02961_00": {
58995923
"title": ["Wheel of Fortune"],
@@ -5927,6 +5951,10 @@
59275951
"title": ["Syndicate"],
59285952
"id": ["BLES01371", "BLUS30804"]
59295953
},
5954+
"NPWR02995_00": {
5955+
"title": ["Spelunker HD"],
5956+
"id": ["NPJB00187"]
5957+
},
59305958
"NPWR02997_00": {
59315959
"title": ["LEGO Batman 2: DC Super Heroes"],
59325960
"id": ["BLES01613", "BLUS30837"]
@@ -6057,7 +6085,7 @@
60576085
},
60586086
"NPWR03117_00": {
60596087
"title": ["GUILTY GEAR XX ΛCORE PLUS"],
6060-
"id": []
6088+
"id": ["NPJB00241"]
60616089
},
60626090
"NPWR03118_00": {
60636091
"title": ["Mad Riders"],
@@ -6837,7 +6865,7 @@
68376865
},
68386866
"NPWR03789_00": {
68396867
"title": ["When Vikings Attack!"],
6840-
"id": []
6868+
"id": ["NPEA00372"]
68416869
},
68426870
"NPWR03797_00": {
68436871
"title": ["Beyond: Two Souls"],
@@ -6929,7 +6957,7 @@
69296957
},
69306958
"NPWR03868_00": {
69316959
"title": ["Fighting Vipers"],
6932-
"id": []
6960+
"id": ["NPEB01164"]
69336961
},
69346962
"NPWR03869_00": {
69356963
"title": ["Sonic the Fighters"],
@@ -7125,7 +7153,7 @@
71257153
},
71267154
"NPWR04077_00": {
71277155
"title": ["Scourge: Outbreak"],
7128-
"id": []
7156+
"id": ["NPEB01220"]
71297157
},
71307158
"NPWR04081_00": {
71317159
"title": ["American Mensa Academy"],
@@ -7153,7 +7181,7 @@
71537181
},
71547182
"NPWR04103_00": {
71557183
"title": ["Chaos Code"],
7156-
"id": []
7184+
"id": ["NPUB31340"]
71577185
},
71587186
"NPWR04104_00": {
71597187
"title": ["Arcania"],
@@ -7885,7 +7913,7 @@
78857913
},
78867914
"NPWR04780_00": {
78877915
"title": ["Shake Spears!"],
7888-
"id": []
7916+
"id": ["NPUB31270"]
78897917
},
78907918
"NPWR04787_00": {
78917919
"title": ["Assassin's Creed Liberation HD"],
@@ -7897,7 +7925,7 @@
78977925
},
78987926
"NPWR04810_00": {
78997927
"title": ["Divekick"],
7900-
"id": []
7928+
"id": ["NPEB01796"]
79017929
},
79027930
"NPWR04811_00": {
79037931
"title": ["El Chavo Kart"],
@@ -8721,7 +8749,7 @@
87218749
},
87228750
"NPWR06055_00": {
87238751
"title": ["Skullgirls Encore"],
8724-
"id": []
8752+
"id": ["NPJB00628"]
87258753
},
87268754
"NPWR06070_00": {
87278755
"title": ["Ranko Tsukigime's Longest Day"],
@@ -9993,7 +10021,7 @@
999310021
},
999410022
"NPWR08945_00": {
999510023
"title": ["Amplitude"],
9996-
"id": []
10024+
"id": ["NPEB02398"]
999710025
},
999810026
"NPWR08952_00": {
999910027
"title": ["Quiplash"],

‎public_html/lib/module/rpcn/inc-rpcn-stats.php‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -152,13 +152,16 @@ private function processStats(): void {
152152
$comm_id_player_count = 0;
153153

154154
// First try psn_games (comm_id)
155-
if (isset($data['psn_games'][$comm_id])) {
156-
$value = $data['psn_games'][$comm_id];
157-
158-
if (is_array($value) && isset($value[0])) {
159-
$comm_id_player_count += (int) $value[0];
160-
} elseif (is_int($value)) {
161-
$comm_id_player_count += $value;
155+
$normalized_entry_id = $this->normalize_id($comm_id);
156+
if (isset($data['psn_games']) && is_array($data['psn_games'])) {
157+
foreach ($data['psn_games'] as $api_title_id => $value) {
158+
if ($this->normalize_id($api_title_id) === $normalized_entry_id) {
159+
if (is_array($value) && isset($value[0])) {
160+
$comm_id_player_count += (int) $value[0];
161+
} elseif (is_int($value)) {
162+
$comm_id_player_count += $value;
163+
}
164+
}
162165
}
163166
}
164167

0 commit comments

Comments
 (0)