Merge branch 'main' of https://github.com/HasangerGames/suroi-wiki

app/(wiki)/perks/[item]/page.tsx

@@ -0,0 +1,13 @@
+import GenericArticlePage from "@/components/generics/GenericArticlePage";
+import PerkSidebar from "@/components/sidebars/PerkSidebar";
+import { Perks } from "@/vendor/suroi/common/src/definitions/perks";
+
+const toExport = GenericArticlePage({
+  items: Perks.definitions,
+  path: "perks",
+  Sidebar: PerkSidebar,
+  combinedArticles: []
+});
+
+export const { generateMetadata, generateStaticParams } = toExport;
+export default toExport.default;

app/(wiki)/perks/page.tsx

@@ -0,0 +1,18 @@
+import GenericListingPageFactory from "@/components/layouts/GenericListingPageFactory";
+import { PerkCategories, PerkQualities, Perks } from "@/vendor/suroi/common/src/definitions/perks";
+
+const perkDefs = Perks.definitions;
+const normalPerks = perkDefs.filter(perk => perk.categories[0] === PerkCategories.Normal);
+const halloweenPerks = perkDefs.filter(perk => perk.categories[0] === PerkCategories.Halloween);
+const halloweenPerkCountOfType = (type: PerkQualities): number => halloweenPerks.filter(perk => perk.type === type).length;
+
+export default GenericListingPageFactory(
+  perkDefs,
+  "Perks",
+  "/perks",
+  `There are currently ${perkDefs.length} perks in the game.
+   ${normalPerks.length} of these are normal perks, and ${halloweenPerks.length} are Halloween perks.
+   All normal perks are positive.
+   Of the Halloween perks, ${halloweenPerkCountOfType(PerkQualities.Positive)} are positive, ${halloweenPerkCountOfType(PerkQualities.Neutral)} are neutral, and ${halloweenPerkCountOfType(PerkQualities.Negative)} are negative.
+  `
+);

app/page.tsx

@@ -73,7 +73,7 @@ export default async function Home() {
       <div>
         <h1 className="text-xl font-bold text-center mb-4">Wiki Pages</h1>
         <GridTable>
-          {wikiPages.map(page => (
+          {wikiPages.filter(page => page.name !== "Home").map(page => (
             <PageCard
               key={page.url}
               title={page.name}

components/sidebars/PerkSidebar.tsx

@@ -0,0 +1,103 @@
+import {
+  getSuroiImageLink
+} from "@/lib/util/suroi";
+import GenericSidebar from "./utils/GenericSidebar";
+import InfoboxColumn from "./utils/InfoboxColumn";
+import InfoboxHeader from "./utils/InfoboxHeader";
+import InfoboxRow from "./utils/InfoboxRow";
+import { PerkCategories, PerkDefinition, PerkQualities } from "@/vendor/suroi/common/src/definitions/perks";
+
+export default function PerkSidebar({
+  item
+}: {
+  item: PerkDefinition
+}) {
+  let category;
+  switch (item.categories[0]) {
+    case PerkCategories.Normal:
+      category = "Normal";
+      break;
+    case PerkCategories.Halloween:
+      category = "Halloween";
+      break;
+  }
+
+  let type;
+  switch (item.type) {
+    case PerkQualities.Positive:
+      type = "Positive";
+      break;
+    case PerkQualities.Neutral:
+      type = "Neutral";
+      break;
+    case PerkQualities.Negative:
+      type = "Negative";
+      break;
+  }
+
+  const modifiers = Object.entries({
+    updateInterval: "Update Interval",
+    cutoff: "Cutoff",
+    split: "Split",
+    deviation: "Deviation",
+    damageMod: "Damage Modifier",
+    rangeMod: "Range Modifier",
+    speedMod: "Speed Modifier",
+    spreadMod: "Spread Modifier",
+    reloadMod: "Reload Speed Modifier",
+    usageMod: "Usage Speed Modifier",
+    explosionMod: "Explosion Modifier",
+    sizeMod: "Size Modifier",
+    healthMod: "Health Modifier",
+    hpMod: "Health Modifier",
+    tracerLengthMod: "Tracer Length Modifier",
+    waterSpeedMod: "Water Speed Modifier",
+    smokeSpeedMod: "Smoke Speed Modifier",
+    airdropCallerLimit: "Radio Use Limit",
+    regenRate: "Regen Rate",
+    speedBoostDuration: "Speed Boost Duration",
+    healthLoss: "Health Loss",
+    adrenLoss: "Adrenaline Loss",
+    healBonus: "Heal Bonus",
+    adrenalineBonus: "Adrenaline Bonus",
+    adrenDecay: "Adrenaline Decay Modifier",
+    adrenSet: "Adrenaline Value",
+    killsLimit: "Kills Limit",
+    dropCount: "Drop Count",
+    healDmgRate: "Heal Damage Rate",
+    lowerHpLimit: "Minimum Health"
+  });
+
+  return (
+    <GenericSidebar
+      title={item.name}
+      image={getSuroiImageLink(item)}
+    >
+      <InfoboxHeader>Basic Info</InfoboxHeader>
+      <InfoboxRow>
+        <InfoboxColumn title="Category">{category}</InfoboxColumn>
+        <InfoboxColumn title="Type">{type}</InfoboxColumn>
+      </InfoboxRow>
+      <InfoboxRow>
+        <InfoboxColumn title="Droppable?">{item.noDrop ? "No" : "Yes"}</InfoboxColumn>
+        <InfoboxColumn title="Swappable?">{item.noSwap ? "No" : "Yes"}</InfoboxColumn>
+      </InfoboxRow>
+
+      {modifiers.some(([prop]) => prop in item) && (
+        <>
+          <InfoboxHeader>Stats & Modifiers</InfoboxHeader>
+          <InfoboxRow>
+            {modifiers.map(([prop, name]) => prop in item && <InfoboxColumn title={name}>{Math.round(item[prop as keyof PerkDefinition] as number * 100) / 100}{prop === "updateInterval" || prop === "speedBoostDuration" ? "ms" : ""}</InfoboxColumn>)}
+          </InfoboxRow>
+        </>
+      )}
+
+      <InfoboxHeader>Advanced Stats</InfoboxHeader>
+      <InfoboxRow>
+        <InfoboxColumn title="Internal ID">
+          <span className="font-mono">{item.idString}</span>
+        </InfoboxColumn>
+      </InfoboxRow>
+    </GenericSidebar>
+  );
+}

lib/util/search.ts

@@ -1,13 +1,14 @@
+import { Armors, Backpacks, Buildings, HealingItems } from "@/vendor/suroi/common/src/definitions";
 import { Guns } from "@/vendor/suroi/common/src/definitions/guns";
 import { Melees } from "@/vendor/suroi/common/src/definitions/melees";
 import { Obstacles } from "@/vendor/suroi/common/src/definitions/obstacles";
+import { Perks } from "@/vendor/suroi/common/src/definitions/perks";
 import {
   ObjectDefinition,
   ObjectDefinitions
 } from "@/vendor/suroi/common/src/utils/objectDefinitions";
 import {
-  LootTables,
-  LootTiers
+  LootTables
 } from "@/vendor/suroi/server/src/data/lootTables";
 import {
   IMAGE_BASE_URL,
@@ -73,6 +74,12 @@ export const wikiPages: SearchItem[] = [
     description: "List of buildings",
     image: getSuroiImageLink(getSuroiBuilding("red_house"))
   },
+  {
+    name: "Perks",
+    url: "/perks",
+    description: "List of perks",
+    image: getSuroiImageLink(getSuroiItem("advanced_athletics"))
+  },
   {
     name: "Skins",
     url: "/skins",
@@ -113,7 +120,12 @@ export const SearchItems: SearchItem[] = [
   ...wikiPages,
   ...generateItemsFromDefinitions(Guns, "/weapons/guns/"),
   ...generateItemsFromDefinitions(Melees, "/weapons/melee/"),
+  ...generateItemsFromDefinitions(HealingItems, "/healing/"),
+  ...generateItemsFromDefinitions(Armors, "/equipment/armor/"),
+  ...generateItemsFromDefinitions(Backpacks, "/equipment/backpacks/"),
   ...generateItemsFromDefinitions(Obstacles, "/obstacles/"),
+  ...generateItemsFromDefinitions(Buildings, "/buildings/"),
+  ...generateItemsFromDefinitions(Perks, "/perks/"),
   ...Object.entries(LootTables).map(([k]) => ({
     name: `Loot Table ${k}`,
     url: `/loot#${k}`

lib/util/suroi.ts

@@ -50,6 +50,7 @@ export const IMAGE_BASE_URLS = {
   Scope: "game/loot",
   Skin: "game/skins",
   ThrowableProjectile: "game/projectiles/throwables",
+  Perk: "game/perks",
 
   // Objects
   Player: "",