Use a consistent sort order for skills.

GitOrigin-RevId: 0a44628893431e14428ded65bf153e5de7a9c482

athena/info/Skill.tsx

@@ -70,8 +70,6 @@ export const Skills = new Set<Skill>([
   Skill.UnitRailDefenseIncreasePowerAttackIncrease,
   Skill.Sabotage,
   Skill.VampireHeal,
-  Skill.Shield,
-  Skill.Charge,
   Skill.RecoverAirUnits,
   Skill.BuyUnitBrute,
   Skill.BuyUnitSuperAPU,
@@ -90,10 +88,12 @@ export const Skills = new Set<Skill>([
   Skill.BuyUnitAIU,
   Skill.UnlockZombie,
   Skill.UnlockPowerStation,
+  Skill.Shield,
+  Skill.Charge,
+  Skill.SpawnUnitInfernoJetpack,
   Skill.AttackAndDefenseDecreaseEasy,
   Skill.AttackAndDefenseIncreaseHard,
   Skill.NoUnitRestrictions,
-  Skill.SpawnUnitInfernoJetpack,
 ]);
 
 const skillConfig: Record<

hera/hooks/useSkills.tsx

@@ -0,0 +1,12 @@
+import { Skills } from '@deities/athena/info/Skill.tsx';
+import { useMemo } from 'react';
+
+export default function useSkills(
+  skills: ReadonlyArray<number> | null | undefined,
+) {
+  return useMemo(() => {
+    const currentSkills = new Set(skills);
+    // Skills should always be sorted by the internal sort order.
+    return new Set([...Skills].filter((skill) => currentSkills.has(skill)));
+  }, [skills]);
+}

hera/ui/SkillDialog.tsx

@@ -1,11 +1,6 @@
-import {
-  Skills as AllSkills,
-  getSkillConfig,
-  Skill,
-} from '@deities/athena/info/Skill.tsx';
+import { getSkillConfig, Skill } from '@deities/athena/info/Skill.tsx';
 import { TileSize } from '@deities/athena/map/Configuration.tsx';
 import groupBy from '@deities/hephaestus/groupBy.tsx';
-import sortBy from '@deities/hephaestus/sortBy.tsx';
 import AudioPlayer from '@deities/ui/AudioPlayer.tsx';
 import Breakpoints from '@deities/ui/Breakpoints.tsx';
 import { ButtonStyle, SquareButtonStyle } from '@deities/ui/Button.tsx';
@@ -263,18 +258,14 @@ export function SkillContainer({
   toggleBlocklist?: boolean;
 }) {
   const hasAction = onAction && actionName && currentSkill;
-  const partition = groupBy(
-    availableSkills === AllSkills
-      ? availableSkills
-      : sortBy([...availableSkills], (skill) => skill),
-    (skill) =>
-      selectedSkills?.has(skill)
-        ? 'selected'
-        : !blocklistedAreDisabled &&
-            !toggleBlocklist &&
-            initialBlocklistedSkills?.has(skill)
-          ? 'disabled'
-          : 'enabled',
+  const partition = groupBy(availableSkills, (skill) =>
+    selectedSkills?.has(skill)
+      ? 'selected'
+      : !blocklistedAreDisabled &&
+          !toggleBlocklist &&
+          initialBlocklistedSkills?.has(skill)
+        ? 'disabled'
+        : 'enabled',
   );
   const enabledSkills = partition.get('enabled');
   const disabledSkills = partition.get('disabled');