Skip to content

Commit 3ffde76

Browse files
authored
Merge pull request #330 from CnCNet/feature/elo-support-for-red-alert-1
ELO ranking support for RA1.
2 parents a7f37c9 + d23146f commit 3ffde76

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

cncnet-api/app/Http/Controllers/RankingController.php

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class RankingController extends Controller
1212
{
1313
public function getIndex(Request $request)
1414
{
15-
$gameModes = ["Blitz", "Blitz 2v2", "Red Alert 2", "Yuri's Revenge"];
15+
$gameModes = ["Blitz", "Blitz 2v2", "Red Alert", "Red Alert 2", "Yuri's Revenge"];
1616

1717
$players = ["Active", "New", "All time best", "All players" ];
1818
$upsets = ["All time", "Last 12 month", "Last 30 days"];
@@ -21,8 +21,9 @@ public function getIndex(Request $request)
2121
$gameModesShort = [
2222
GameHelper::$GAME_BLITZ,
2323
GameHelper::$GAME_BLITZ . "-2v2",
24+
GameHelper::$GAME_RA,
2425
GameHelper::$GAME_RA2,
25-
GameHelper::$GAME_YR
26+
GameHelper::$GAME_YR,
2627
];
2728

2829
$gameMode = isset($request->mode) ? strval($request->mode) : "blitz";
@@ -62,7 +63,13 @@ public function getIndex(Request $request)
6263

6364
$dateLastUpdated = Carbon::createFromTimestamp(Storage::disk("rating")->lastModified($jsonPath));
6465

65-
$mixedFactionImage = ($gameMode == GameHelper::$GAME_YR) ? "resources/images/games/yr/allfactions.png" : "resources/images/games/ra2/ra2-icon.png";
66+
if ($gameMode == GameHelper::$GAME_YR) {
67+
$mixedFactionImage = "resources/images/games/yr/allfactions.png";
68+
} elseif ($gameMode == GameHelper::$GAME_RA) {
69+
$mixedFactionImage = "resources/images/games/ra/ra_factions.png";
70+
} else {
71+
$mixedFactionImage = "resources/images/games/ra2/ra2-icon.png";
72+
}
6673

6774
# Make sure to have a fallback for specialized game modes (e.g, blitz-2v2 or ra2-new-maps).
6875
# Prefer custom logo, but use standard logo if it does not exists.
@@ -79,6 +86,9 @@ public function getIndex(Request $request)
7986
}
8087
}
8188

89+
$alliedImage = "resources/images/game-icons/allied" . (($gameMode == GameHelper::$GAME_RA) ? "_ra" : "") . ".png";
90+
$sovietImage = "resources/images/game-icons/" . (($gameMode == GameHelper::$GAME_RA) ? "soviet_ra.png" : "ra2.png");
91+
8292
return view(
8393
"ranking.index",
8494
[
@@ -92,8 +102,8 @@ public function getIndex(Request $request)
92102
"index" => $index,
93103
"columns" => $jsonData["columns"],
94104
"description" => $jsonData["description"],
95-
"factionImages" => array("all" => "resources/images/game-icons/allied.png",
96-
"sov" => "resources/images/game-icons/ra2.png",
105+
"factionImages" => array("all" => $alliedImage,
106+
"sov" => $sovietImage,
97107
"mix" => $mixedFactionImage,
98108
"yur" => "resources/images/games/yr/yr-icon.png"),
99109
"dateLastUpdated" => $dateLastUpdated,
21.2 KB
Loading

0 commit comments

Comments
 (0)