From b02b1a34d041cbff142e73f2d5a4664f00f94a3a Mon Sep 17 00:00:00 2001
From: AIZAWA Hina <hina@fetus.jp>
Date: Fri, 17 Nov 2023 20:21:32 +0900
Subject: [PATCH] Special Weapons sorted by their "rank"

---
 actions/api/info/Weapon3Action.php | 16 +++++-----------
 views/api-info/weapon3/special.php |  7 ++++++-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/actions/api/info/Weapon3Action.php b/actions/api/info/Weapon3Action.php
index 9a8ff919f..02a5d03af 100644
--- a/actions/api/info/Weapon3Action.php
+++ b/actions/api/info/Weapon3Action.php
@@ -29,6 +29,7 @@
 use function strnatcasecmp;
 use function version_compare;
 
+use const SORT_ASC;
 use const SORT_DESC;
 
 final class Weapon3Action extends Action
@@ -67,17 +68,10 @@ private function getLangs(): array
 
     private function getSpecials(): array
     {
-        return ArrayHelper::sort(
-            Special3::find()->with(['special3Aliases'])->all(),
-            function (Special3 $a, Special3 $b): int {
-                $aN = Yii::t('app-special3', $a->name);
-                $bN = Yii::t('app-special3', $b->name);
-                return strnatcasecmp($aN, $bN)
-                    ?: strcmp($aN, $bN)
-                    ?: strnatcasecmp($a->name, $b->name)
-                    ?: strcmp($a->name, $b->name);
-            },
-        );
+        return Special3::find()
+            ->with(['special3Aliases'])
+            ->orderBy(['rank' => SORT_ASC])
+            ->all();
     }
 
     private function getSubweapons(): array
diff --git a/views/api-info/weapon3/special.php b/views/api-info/weapon3/special.php
index ff7ddd208..551fbf42b 100644
--- a/views/api-info/weapon3/special.php
+++ b/views/api-info/weapon3/special.php
@@ -28,7 +28,7 @@
   <table class="table table-striped table-condensed table-sortable">
     <thead>
       <tr>
-        <th></th>
+        <th data-sort="int" data-sort-onload="yes"></th>
         <th data-sort="string"><code>key</code></th>
         <th data-sort="string"><?= Html::encode(Yii::t('app', 'Aliases')) ?></th>
 <?php foreach ($langs as $i => $lang) { ?>
@@ -48,6 +48,11 @@
         <?= Html::tag(
           'td',
           Icon::s3Special($sp),
+          [
+            'data' => [
+              'sort-value' => $sp->rank,
+            ],
+          ],
         ) . "\n" ?>
         <?= Html::tag(
           'td',