diff --git a/app/admin/[character]/[page]/page.tsx b/app/admin/[character]/[page]/page.tsx
index cb1bacf..99b0f59 100644
--- a/app/admin/[character]/[page]/page.tsx
+++ b/app/admin/[character]/[page]/page.tsx
@@ -22,5 +22,5 @@ export default async function StructuredEditorPage({ params }: { params: Promise
   const [catalog, content] = await Promise.all([getActiveCatalog(), getPublicGuide(guide.slug)]);
   if (!catalog || !content) notFound();
   const guideCharacter = catalog.characters.find((item) => item.key === guide.characterKey);
-  return <div className="min-h-svh"><AdminHeader /><main className="mx-auto flex w-full max-w-6xl flex-col gap-6 p-4 sm:p-6 lg:p-8"><header className="flex items-center gap-4"><Button variant="outline" size="icon" render={<Link href={`/admin/${character}`} />} nativeButton={false} aria-label="กลับหน้า Guide"><ArrowLeftIcon /></Button><div className="min-w-0"><p className="text-sm text-muted-foreground">{guide.name}</p><h1 className="whitespace-nowrap font-heading text-3xl font-semibold">{guide.sections.find((section) => section.slug === page)?.title ?? page}</h1></div></header><GuideSectionNav characterKey={guide.characterKey} current={page as (typeof sections)[number]} /><GuideSectionEditor section={page as (typeof sections)[number]} guide={guide} weapons={catalog.weapons} artifacts={catalog.artifacts} characters={catalog.characters} catalogConstellations={guideCharacter?.constellations ?? []} catalogTalents={guideCharacter?.talents ?? []} initial={{ sectionNote: guide.sections.find((section) => section.slug === page)?.note ?? null, weapons: content.weapons, artifactGroups: content.artifactGroups.map((group) => ({ id: group.id, name: group.name, rows: group.rows.map((row) => ({ firstArtifactKey: row.firstArtifactKey, secondArtifactKey: row.secondArtifactKey, percent: row.percent, note: row.note })) })), artifactProfile: content.artifactProfile, constellationGroups: content.constellationGroups.map((group) => ({ id: group.id, note: group.note, rows: group.rows })), teams: content.teams.map((team) => ({ id: team.id, title: team.title, rotationSeconds: team.rotationSeconds, combo: team.combo, members: team.members.map((member) => ({ characterKey: member.characterKey, weaponKey: member.weaponKey, artifactKey: member.artifactKey, secondArtifactKey: member.secondArtifactKey, constellation: member.constellation, refinement: member.refinement, damage: member.damage })) })), extras: content.extras.map((section) => ({ title: section.title, rows: section.rows.map((row) => ({ mediaId: row.mediaId, ratio: row.ratio === "1:1" ? "1:1" : "16:9", heading: row.heading, body: row.body, percent: row.percent, imageUrl: row.imageUrl })) })) }} /></main></div>;
+  return <div className="min-h-svh"><AdminHeader /><main className="mx-auto flex w-full max-w-6xl flex-col gap-6 p-4 sm:p-6 lg:p-8"><header className="flex items-center gap-4"><Button variant="outline" size="icon" render={<Link href={`/admin/${character}`} />} nativeButton={false} aria-label="กลับหน้า Guide"><ArrowLeftIcon /></Button><div className="min-w-0"><p className="text-sm text-muted-foreground">{guide.name}</p><h1 className="whitespace-nowrap font-heading text-3xl font-semibold">{guide.sections.find((section) => section.slug === page)?.title ?? page}</h1></div></header><GuideSectionNav characterKey={guide.characterKey} current={page as (typeof sections)[number]} /><GuideSectionEditor section={page as (typeof sections)[number]} guide={guide} weapons={catalog.weapons} artifacts={catalog.artifacts} characters={catalog.characters} catalogConstellations={guideCharacter?.constellations ?? []} catalogTalents={guideCharacter?.talents ?? []} initial={{ sectionNote: guide.sections.find((section) => section.slug === page)?.note ?? null, weaponGroups: content.weaponGroups, artifactGroups: content.artifactGroups.map((group) => ({ id: group.id, name: group.name, rows: group.rows.map((row) => ({ firstArtifactKey: row.firstArtifactKey, secondArtifactKey: row.secondArtifactKey, percent: row.percent, note: row.note })) })), artifactProfile: content.artifactProfile, constellationGroups: content.constellationGroups.map((group) => ({ id: group.id, note: group.note, rows: group.rows })), teams: content.teams.map((team) => ({ id: team.id, title: team.title, rotationSeconds: team.rotationSeconds, combo: team.combo, members: team.members.map((member) => ({ characterKey: member.characterKey, weaponKey: member.weaponKey, artifactKey: member.artifactKey, secondArtifactKey: member.secondArtifactKey, constellation: member.constellation, refinement: member.refinement, damage: member.damage })) })), extras: content.extras.map((section) => ({ title: section.title, rows: section.rows.map((row) => ({ mediaId: row.mediaId, ratio: row.ratio === "1:1" ? "1:1" : "16:9", heading: row.heading, body: row.body, percent: row.percent, imageUrl: row.imageUrl })) })) }} /></main></div>;
 }
diff --git a/components/admin/guide-section-editor.tsx b/components/admin/guide-section-editor.tsx
index df38493..67dc9b0 100644
--- a/components/admin/guide-section-editor.tsx
+++ b/components/admin/guide-section-editor.tsx
@@ -169,6 +169,11 @@ type WeaponValue = {
   note: string | null;
   weapon: CatalogItem;
 };
+type WeaponGroupValue = {
+  id: string;
+  note: string | null;
+  rows: WeaponValue[];
+};
 type ArtifactValue = {
   id: string;
   name: string;
@@ -265,7 +270,7 @@ export interface GuideSectionEditorProps {
   catalogTalents: CatalogTalent[];
   initial: {
     sectionNote: string | null;
-    weapons: WeaponValue[];
+    weaponGroups: WeaponGroupValue[];
     artifactGroups: ArtifactValue[];
     artifactProfile: ArtifactProfile;
     constellationGroups: ConstellationGroupValue[];
@@ -696,26 +701,40 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
     }),
   );
   const [note, setNote] = useState(initial.sectionNote ?? "");
-  const [rows, setRows] = useState(
-    initial.weapons.map((row) => ({
+  const [groups, setGroups] = useState(() => {
+    const source = initial.weaponGroups.length
+      ? initial.weaponGroups
+      : [{ id: "weapon-condition-default", note: null, rows: [] }];
+    return source.map((group) => ({
+      clientId: group.id,
+      note: group.note ?? "",
+      rows: group.rows.map((row) => ({
       clientId: row.id,
       weaponKey: row.weaponKey,
       refinement: row.refinement,
       overallPercent: row.overallPercent ?? "",
       personalPercent: row.personalPercent ?? "",
       note: row.note ?? "",
-    })),
-  );
+      })),
+    }));
+  });
+  const [activeGroupIndex, setActiveGroupIndex] = useState(0);
+  const rows = groups[activeGroupIndex]?.rows ?? [];
+  const setRows = (update: typeof rows | ((current: typeof rows) => typeof rows)) =>
+    setGroups((current) => current.map((group, index) => index === activeGroupIndex
+      ? { ...group, rows: typeof update === "function" ? update(group.rows) : update }
+      : group));
   const value = {
     note: note.trim() || null,
-    rows: rows.map((row) => ({
-      weaponKey: row.weaponKey,
-      refinement: row.refinement,
-      overallPercent:
-        row.overallPercent === "" ? null : Number(row.overallPercent),
-      personalPercent:
-        row.personalPercent === "" ? null : Number(row.personalPercent),
-      note: row.note.trim() || null,
+    groups: groups.map((group) => ({
+      note: group.note.trim() || null,
+      rows: group.rows.map((row) => ({
+        weaponKey: row.weaponKey,
+        refinement: row.refinement,
+        overallPercent: row.overallPercent === "" ? null : Number(row.overallPercent),
+        personalPercent: row.personalPercent === "" ? null : Number(row.personalPercent),
+        note: row.note.trim() || null,
+      })),
     })),
   };
   const validation = weaponSectionSchema.safeParse({
@@ -724,7 +743,7 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
   });
   const weaponIssue = (...path: (string | number)[]) =>
     !validation.success && hasIssuePrefix(validation.error.issues, ...path);
-  const localDraft = { note, rows };
+  const localDraft = { note, groups, activeGroupIndex };
   const autosave = useAutosave({
     value,
     valid: validation.success,
@@ -734,10 +753,11 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
     storageKey: adminDraftKey(guide.id, "weapon"),
     localDraft,
     parseLocalDraft: (candidate) =>
-      parseEditorDraft<typeof localDraft>(candidate, ["rows"], ["note"]),
+      parseEditorDraft<typeof localDraft>(candidate, ["groups"], ["note"]),
     restoreLocalDraft: (draft) => {
       setNote(draft.note);
-      setRows(draft.rows);
+      setGroups(draft.groups);
+      setActiveGroupIndex(draft.activeGroupIndex ?? 0);
     },
   });
   const handleWeaponDragEnd = ({ active, over }: DragEndEvent) => {
@@ -768,6 +788,29 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
             onChange={(event) => setNote(event.target.value)}
           />
         </Field>
+        <div className="flex flex-wrap gap-2">
+          {groups.map((group, index) => (
+            <Button key={group.clientId} type="button" variant={index === activeGroupIndex ? "default" : "outline"} onClick={() => setActiveGroupIndex(index)}>
+              Condition {index + 1}
+            </Button>
+          ))}
+          <Button type="button" variant="outline" disabled={groups.length >= 20} onClick={() => {
+            setGroups([...groups, { clientId: createClientId("weapon-condition"), note: "", rows: [] }]);
+            setActiveGroupIndex(groups.length);
+          }}>
+            <PlusIcon data-icon="inline-start" />เพิ่ม Condition
+          </Button>
+        </div>
+        <Field>
+          <FieldLabel htmlFor={`weapon-condition-note-${groups[activeGroupIndex]?.clientId}`}>
+            Condition note (optional)
+          </FieldLabel>
+          <Textarea
+            id={`weapon-condition-note-${groups[activeGroupIndex]?.clientId}`}
+            value={groups[activeGroupIndex]?.note ?? ""}
+            onChange={(event) => setGroups(groups.map((group, index) => index === activeGroupIndex ? { ...group, note: event.target.value } : group))}
+          />
+        </Field>
         <DndContext
           sensors={weaponSensors}
           collisionDetection={closestCenter}
@@ -835,12 +878,12 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
                         <CardContent>
                           <FieldGroup>
                             <div className="grid grid-cols-[minmax(0,1fr)_auto] items-end gap-4">
-                              <Field className="min-w-0" data-invalid={weaponIssue("rows", rowIndex, "weaponKey")}>
+                              <Field className="min-w-0" data-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex, "weaponKey")}>
                                 <FieldLabel>อาวุธ</FieldLabel>
                                 <CatalogPicker
                                   items={compatibleWeapons}
                                   value={row.weaponKey}
-                                  invalid={weaponIssue("rows", rowIndex, "weaponKey")}
+                                  invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex, "weaponKey")}
                                   placeholder="ค้นหาชื่ออาวุธ…"
                                   rarityBackground
                                   onChange={(weaponKey) =>
@@ -854,7 +897,7 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
                                   }
                                 />
                               </Field>
-                              <Field className="shrink-0" data-invalid={weaponIssue("rows", rowIndex)}>
+                              <Field className="shrink-0" data-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex)}>
                                 <FieldLabel>Refinement</FieldLabel>
                                 <ToggleGroup
                                   variant="outline"
@@ -889,13 +932,13 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
                               </Field>
                             </div>
                             <div className="grid gap-4 sm:grid-cols-2">
-                              <Field data-invalid={weaponIssue("rows", rowIndex)}>
+                              <Field data-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex)}>
                                 <FieldLabel>Overall %</FieldLabel>
                                 <Input
                                   type="text"
                                   inputMode="decimal"
                                   value={row.overallPercent}
-                                  aria-invalid={weaponIssue("rows", rowIndex)}
+                                  aria-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex)}
                                   onChange={(event) =>
                                     setRows(
                                       rows.map((item) =>
@@ -929,13 +972,13 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
                                   }
                                 />
                               </Field>
-                              <Field data-invalid={weaponIssue("rows", rowIndex)}>
+                              <Field data-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex)}>
                                 <FieldLabel>Personal %</FieldLabel>
                                 <Input
                                   type="text"
                                   inputMode="decimal"
                                   value={row.personalPercent}
-                                  aria-invalid={weaponIssue("rows", rowIndex)}
+                                  aria-invalid={weaponIssue("groups", activeGroupIndex, "rows", rowIndex)}
                                   onChange={(event) =>
                                     setRows(
                                       rows.map((item) =>
@@ -1022,6 +1065,15 @@ function WeaponEditor({ guide, weapons, characters, initial }: EditorBase) {
           <PlusIcon data-icon="inline-start" />
           เพิ่มอาวุธ
         </Button>
+        {groups.length > 1 ? (
+          <Button type="button" variant="ghost" onClick={() => {
+            const next = groups.filter((_, index) => index !== activeGroupIndex);
+            setGroups(next);
+            setActiveGroupIndex(Math.min(activeGroupIndex, next.length - 1));
+          }}>
+            <Trash2Icon data-icon="inline-start" />ลบ Condition นี้
+          </Button>
+        ) : null}
         <AutosaveStatus
           state={autosave.state}
           issues={
diff --git a/components/admin/guide-section-nav.tsx b/components/admin/guide-section-nav.tsx
index d132a9b..824f7e6 100644
--- a/components/admin/guide-section-nav.tsx
+++ b/components/admin/guide-section-nav.tsx
@@ -1,5 +1,6 @@
 import Image from "next/image";
 import Link from "next/link";
+import type { MouseEvent } from "react";
 
 import { ScrollableNav } from "@/components/public/scrollable-nav";
 import { navigationIconPath } from "@/lib/navigation";
@@ -20,6 +21,12 @@ export function GuideSectionNav({
   characterKey: string;
   current: "overview" | (typeof sections)[number]["slug"];
 }) {
+  const confirmNavigation = (event: MouseEvent<HTMLAnchorElement>) => {
+    const browserWindow = window as Window & { __guideHasUnsavedChanges?: boolean };
+    if (typeof window !== "undefined" && browserWindow.__guideHasUnsavedChanges && !window.confirm("ข้อมูลยังบันทึกไม่เสร็จหรือไม่ถูกต้อง ต้องการออกจากหน้านี้หรือไม่?")) {
+      event.preventDefault();
+    }
+  };
   return (
     <ScrollableNav
       ariaLabel="เมนูแก้ไข Guide"
@@ -28,6 +35,7 @@ export function GuideSectionNav({
       <Link
         href={`/admin/${characterKey}`}
         prefetch
+        onClick={confirmNavigation}
         className={cn(
           "flex min-h-8 shrink-0 items-center gap-2 rounded-md px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring",
           current === "overview" ? "bg-muted text-foreground" : "text-muted-foreground hover:bg-muted hover:text-foreground",
@@ -43,6 +51,7 @@ export function GuideSectionNav({
             key={section.slug}
             href={`/admin/${characterKey}/${section.slug}`}
             prefetch
+            onClick={confirmNavigation}
             className={cn(
               "flex min-h-8 shrink-0 items-center gap-2 rounded-md px-3 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring",
               current === section.slug ? "bg-muted text-foreground" : "text-muted-foreground hover:bg-muted hover:text-foreground",
diff --git a/components/public/structured-guide.tsx b/components/public/structured-guide.tsx
index 56d573e..2335001 100644
--- a/components/public/structured-guide.tsx
+++ b/components/public/structured-guide.tsx
@@ -28,7 +28,6 @@ import {
   recommendedStatIconName,
   statPriorityColorClass,
   targetStatIconName,
-  targetStatOptions,
 } from "@/lib/guides/stats";
 import {
   normalizeTalentPriorities,
@@ -346,8 +345,12 @@ function WeaponSectionContent({
         ) : null}
         {action}
       </header>
-      <div className="grid gap-3">
-        {guide.weapons.map((row, index) => (
+      {guide.weaponGroups.filter((group) => group.rows.length > 0).map((group, groupIndex, groups) => (
+      <div key={group.id} className="flex flex-col gap-3">
+        {groups.length > 1 ? <h2 className="font-heading text-2xl font-semibold">Condition {groupIndex + 1}</h2> : null}
+        {group.note ? <p className="whitespace-pre-wrap text-muted-foreground">{group.note}</p> : null}
+        <div className="grid gap-3">
+        {group.rows.map((row, index) => (
           <Card key={row.id} size="sm" className="bg-white py-0">
             <CardContent
               className={cn(
@@ -442,6 +445,8 @@ function WeaponSectionContent({
           </Card>
         ))}
       </div>
+      </div>
+      ))}
     </section>
   );
 }
@@ -608,9 +613,9 @@ function ArtifactSectionContent({
                   ))}
                 </CardContent>
               </Card>
-            ))}
-          </div>
+        ))}
         </div>
+      </div>
         {profile ? (
           <div className="flex flex-col gap-5">
             <Card>
@@ -857,9 +862,7 @@ function ArtifactStatValue({
   exporting?: boolean;
 }) {
   const iconName = recommendedStatIconName(value);
-  const hasIcon =
-    iconName &&
-    targetStatOptions.some((stat) => targetStatIconName(stat) === iconName);
+  const hasIcon = Boolean(iconName);
   return (
     <span
       className={cn(
@@ -869,7 +872,7 @@ function ArtifactStatValue({
     >
       {hasIcon ? (
         <Image
-          src={`/icon/stats/${iconName}.webp`}
+          src={`/icon/stats/${iconName}.${iconName === "elemental-bonus" ? "svg" : "webp"}`}
           alt=""
           width={20}
           height={20}
diff --git a/db/schema.ts b/db/schema.ts
index c186c74..ef6fa20 100644
--- a/db/schema.ts
+++ b/db/schema.ts
@@ -523,11 +523,22 @@ export const guideSections = guidesSchema.table(
   ],
 );
 
+export const weaponConditions = guidesSchema.table(
+  "weapon_condition",
+  {
+    id: uuid("id").defaultRandom().primaryKey(),
+    guideId: uuid("guide_id").notNull().references(() => guides.id, { onDelete: "cascade" }),
+    note: text("note"),
+    sortOrder: integer("sort_order").default(0).notNull(),
+  },
+  (table) => [index("weapon_condition_order_idx").on(table.guideId, table.sortOrder)],
+);
+
 export const weaponRecommendations = guidesSchema.table(
   "weapon_recommendation",
   {
     id: uuid("id").defaultRandom().primaryKey(),
-    guideId: uuid("guide_id").notNull().references(() => guides.id, { onDelete: "cascade" }),
+    conditionId: uuid("condition_id").notNull().references(() => weaponConditions.id, { onDelete: "cascade" }),
     weaponKey: varchar("weapon_key", { length: 64 }).notNull(),
     refinement: integer("refinement").notNull(),
     overallPercent: numeric("overall_percent", { precision: 8, scale: 2 }),
@@ -535,7 +546,7 @@ export const weaponRecommendations = guidesSchema.table(
     note: text("note"),
     sortOrder: integer("sort_order").default(0).notNull(),
   },
-  (table) => [index("weapon_recommendation_order_idx").on(table.guideId, table.sortOrder)],
+  (table) => [index("weapon_recommendation_order_idx").on(table.conditionId, table.sortOrder)],
 );
 
 export const artifactGroups = guidesSchema.table(
diff --git a/drizzle/0022_weapon_conditions.sql b/drizzle/0022_weapon_conditions.sql
new file mode 100644
index 0000000..98f7f7c
--- /dev/null
+++ b/drizzle/0022_weapon_conditions.sql
@@ -0,0 +1,28 @@
+CREATE TABLE "guides"."weapon_condition" (
+	"id" uuid PRIMARY KEY DEFAULT gen_random_uuid() NOT NULL,
+	"guide_id" uuid NOT NULL,
+	"note" text,
+	"sort_order" integer DEFAULT 0 NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "guides"."weapon_condition" ADD CONSTRAINT "weapon_condition_guide_id_guide_id_fk" FOREIGN KEY ("guide_id") REFERENCES "guides"."guide"("id") ON DELETE cascade ON UPDATE no action;
+--> statement-breakpoint
+CREATE INDEX "weapon_condition_order_idx" ON "guides"."weapon_condition" USING btree ("guide_id","sort_order");
+--> statement-breakpoint
+ALTER TABLE "guides"."weapon_recommendation" ADD COLUMN "condition_id" uuid;
+--> statement-breakpoint
+INSERT INTO "guides"."weapon_condition" ("guide_id", "sort_order") SELECT DISTINCT "guide_id", 0 FROM "guides"."weapon_recommendation";
+--> statement-breakpoint
+UPDATE "guides"."weapon_recommendation" AS recommendation SET "condition_id" = condition."id" FROM "guides"."weapon_condition" AS condition WHERE condition."guide_id" = recommendation."guide_id";
+--> statement-breakpoint
+ALTER TABLE "guides"."weapon_recommendation" ALTER COLUMN "condition_id" SET NOT NULL;
+--> statement-breakpoint
+ALTER TABLE "guides"."weapon_recommendation" ADD CONSTRAINT "weapon_recommendation_condition_id_weapon_condition_id_fk" FOREIGN KEY ("condition_id") REFERENCES "guides"."weapon_condition"("id") ON DELETE cascade ON UPDATE no action;
+--> statement-breakpoint
+DROP INDEX IF EXISTS "guides"."weapon_recommendation_order_idx";
+--> statement-breakpoint
+CREATE INDEX "weapon_recommendation_order_idx" ON "guides"."weapon_recommendation" USING btree ("condition_id","sort_order");
+--> statement-breakpoint
+ALTER TABLE "guides"."weapon_recommendation" DROP CONSTRAINT IF EXISTS "weapon_recommendation_guide_id_guide_id_fk";
+--> statement-breakpoint
+ALTER TABLE "guides"."weapon_recommendation" DROP COLUMN "guide_id";
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index 35a9553..95f3d72 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -155,6 +155,13 @@
       "when": 1788420000000,
       "tag": "0021_optional_team_rotation",
       "breakpoints": true
+    },
+    {
+      "idx": 22,
+      "version": "7",
+      "when": 1788421000000,
+      "tag": "0022_weapon_conditions",
+      "breakpoints": true
     }
   ]
 }
diff --git a/hooks/use-autosave.ts b/hooks/use-autosave.ts
index e219830..4a269b0 100644
--- a/hooks/use-autosave.ts
+++ b/hooks/use-autosave.ts
@@ -134,6 +134,23 @@ export function useAutosave<Value, Draft = Value>({
   else if (fingerprint !== savedFingerprint) state = "unsaved";
   else state = "saved";
 
+  useEffect(() => {
+    const browserWindow = window as Window & { __guideHasUnsavedChanges?: boolean };
+    browserWindow.__guideHasUnsavedChanges = state !== "saved";
+    if (state === "saved") return () => {
+      browserWindow.__guideHasUnsavedChanges = false;
+    };
+    const warnBeforeLeaving = (event: BeforeUnloadEvent) => {
+      event.preventDefault();
+      event.returnValue = "";
+    };
+    window.addEventListener("beforeunload", warnBeforeLeaving);
+    return () => {
+      window.removeEventListener("beforeunload", warnBeforeLeaving);
+      browserWindow.__guideHasUnsavedChanges = false;
+    };
+  }, [state]);
+
   return {
     state,
     saveNow: () => {
diff --git a/lib/guides/mutations.ts b/lib/guides/mutations.ts
index f5a76ee..310b45f 100644
--- a/lib/guides/mutations.ts
+++ b/lib/guides/mutations.ts
@@ -21,6 +21,7 @@ import {
   teamCompositions,
   teamMembers,
   weaponRecommendations,
+  weaponConditions,
 } from "@/db/schema";
 import {
   artifactSectionSchema,
@@ -105,8 +106,11 @@ export async function saveWeapons(guideId: string, input: unknown) {
   return getDb().transaction(async (tx) => {
     const updated = await advanceGuideVersion(tx, guideId, data.expectedVersion);
     await tx.update(guideSections).set({ note: data.note }).where(and(eq(guideSections.guideId, guideId), eq(guideSections.slug, "weapon")));
-    await tx.delete(weaponRecommendations).where(eq(weaponRecommendations.guideId, guideId));
-    if (data.rows.length) await tx.insert(weaponRecommendations).values(data.rows.map((row, sortOrder) => ({ ...row, overallPercent: row.overallPercent?.toString() ?? null, personalPercent: row.personalPercent?.toString() ?? null, guideId, sortOrder })));
+    await tx.delete(weaponConditions).where(eq(weaponConditions.guideId, guideId));
+    for (const [sortOrder, group] of data.groups.entries()) {
+      const [created] = await tx.insert(weaponConditions).values({ guideId, note: group.note, sortOrder }).returning();
+      if (group.rows.length) await tx.insert(weaponRecommendations).values(group.rows.map((row, rowOrder) => ({ ...row, overallPercent: row.overallPercent?.toString() ?? null, personalPercent: row.personalPercent?.toString() ?? null, conditionId: created.id, sortOrder: rowOrder })));
+    }
     return updated;
   });
 }
diff --git a/lib/guides/queries.ts b/lib/guides/queries.ts
index 53ec007..98c208b 100644
--- a/lib/guides/queries.ts
+++ b/lib/guides/queries.ts
@@ -20,6 +20,7 @@ import {
   teamCompositions,
   teamMembers,
   weaponRecommendations,
+  weaponConditions,
 } from "@/db/schema";
 import { getMediaStorage, publicMediaUrl } from "@/lib/media/storage";
 
@@ -94,15 +95,17 @@ export async function getPublicGuide(slug: string) {
     .where(and(eq(guides.slug, slug), isNull(guides.trashedAt)))
     .limit(1);
   if (!row) return null;
-  const [sections, weaponRows, groups, profile, constellationGroups, teams] = await Promise.all([
+  const [sections, weaponConditionsRows, groups, profile, constellationGroups, teams] = await Promise.all([
     getDb().select().from(guideSections).where(and(eq(guideSections.guideId, row.guide.id), eq(guideSections.enabled, true))).orderBy(asc(guideSections.sortOrder)),
-    getDb().select({ recommendation: weaponRecommendations, weapon: catalogWeapons }).from(weaponRecommendations).innerJoin(catalogWeapons, eq(catalogWeapons.key, weaponRecommendations.weaponKey)).where(eq(weaponRecommendations.guideId, row.guide.id)).orderBy(asc(weaponRecommendations.sortOrder)),
+    getDb().select().from(weaponConditions).where(eq(weaponConditions.guideId, row.guide.id)).orderBy(asc(weaponConditions.sortOrder)),
     getDb().select().from(artifactGroups).where(eq(artifactGroups.guideId, row.guide.id)).orderBy(asc(artifactGroups.sortOrder)),
     getDb().select().from(artifactProfiles).where(eq(artifactProfiles.guideId, row.guide.id)).limit(1),
     getDb().select().from(constellationConditions).where(eq(constellationConditions.guideId, row.guide.id)).orderBy(asc(constellationConditions.sortOrder)),
     getDb().select().from(teamCompositions).where(eq(teamCompositions.guideId, row.guide.id)).orderBy(asc(teamCompositions.sortOrder)),
   ]);
 
+  const weaponRows = weaponConditionsRows.length ? await getDb().select({ recommendation: weaponRecommendations, weapon: catalogWeapons }).from(weaponRecommendations).innerJoin(catalogWeapons, eq(catalogWeapons.key, weaponRecommendations.weaponKey)).where(inArray(weaponRecommendations.conditionId, weaponConditionsRows.map((condition) => condition.id))).orderBy(asc(weaponRecommendations.sortOrder)) : [];
+
   const constellations = constellationGroups.length ? await getDb().select().from(constellationRecommendations).where(inArray(constellationRecommendations.conditionId, constellationGroups.map((group) => group.id))).orderBy(asc(constellationRecommendations.level)) : [];
   const artifactRows = groups.length ? await getDb().select({ recommendation: artifactRecommendations, artifact: catalogArtifacts }).from(artifactRecommendations).innerJoin(catalogArtifacts, eq(catalogArtifacts.key, artifactRecommendations.firstArtifactKey)).where(inArray(artifactRecommendations.groupId, groups.map((group) => group.id))).orderBy(asc(artifactRecommendations.sortOrder)) : [];
   const secondKeys = artifactRows.map(({ recommendation }) => recommendation.secondArtifactKey).filter((key): key is string => Boolean(key));
@@ -123,6 +126,7 @@ export async function getPublicGuide(slug: string) {
     character: catalogCharacterWithUrls(row.character),
     sections,
     weapons: weaponRows.map(({ recommendation, weapon }) => ({ ...recommendation, weapon: { ...weapon, imageUrl: publicMediaUrl(weapon.imageKey) } })),
+    weaponGroups: weaponConditionsRows.map((condition) => ({ ...condition, rows: weaponRows.filter(({ recommendation }) => recommendation.conditionId === condition.id).map(({ recommendation, weapon }) => ({ ...recommendation, weapon: { ...weapon, imageUrl: publicMediaUrl(weapon.imageKey) } })) })),
     artifactGroups: groups.map((group) => ({ ...group, rows: artifactRows.filter(({ recommendation }) => recommendation.groupId === group.id).map(({ recommendation, artifact }) => { const second = secondArtifacts.find((item) => item.key === recommendation.secondArtifactKey); return { ...recommendation, first: { ...artifact, imageUrl: publicMediaUrl(artifact.imageKey) }, second: second ? { ...second, imageUrl: publicMediaUrl(second.imageKey) } : null }; }) })),
     artifactProfile: profile[0] ?? null,
     constellationGroups: constellationGroups.map((group) => ({
diff --git a/lib/guides/schemas.test.ts b/lib/guides/schemas.test.ts
index 98a478a..dbe202f 100644
--- a/lib/guides/schemas.test.ts
+++ b/lib/guides/schemas.test.ts
@@ -26,25 +26,25 @@ describe("structured guide validation", () => {
   });
 
   it("requires at least one weapon percentage", () => {
-    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, rows: [{ weaponKey: "1", refinement: 5, overallPercent: null, personalPercent: null, note: null }] }).success).toBe(false);
-    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, rows: [{ weaponKey: "1", refinement: 5, overallPercent: 104, personalPercent: null, note: "Best free-to-play option" }] }).success).toBe(true);
+    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, groups: [{ note: null, rows: [{ weaponKey: "1", refinement: 5, overallPercent: null, personalPercent: null, note: null }] }] }).success).toBe(false);
+    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, groups: [{ note: null, rows: [{ weaponKey: "1", refinement: 5, overallPercent: 104, personalPercent: null, note: "Best free-to-play option" }] }] }).success).toBe(true);
   });
 
   it("preserves negative weapon percentages", () => {
-    const result = weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, rows: [{ weaponKey: "1", refinement: 5, overallPercent: -12.5, personalPercent: null, note: null }] });
+    const result = weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, groups: [{ note: null, rows: [{ weaponKey: "1", refinement: 5, overallPercent: -12.5, personalPercent: null, note: null }] }] });
     expect(result.success).toBe(true);
-    if (result.success) expect(result.data.rows[0].overallPercent).toBe(-12.5);
+    if (result.success) expect(result.data.groups[0].rows[0].overallPercent).toBe(-12.5);
   });
 
   it("limits an optional note on each weapon", () => {
     const row = { weaponKey: "1", refinement: 1, overallPercent: 100, personalPercent: null };
-    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, rows: [{ ...row, note: null }] }).success).toBe(true);
-    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, rows: [{ ...row, note: "x".repeat(2_001) }] }).success).toBe(false);
+    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, groups: [{ note: null, rows: [{ ...row, note: null }] }] }).success).toBe(true);
+    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: null, groups: [{ note: null, rows: [{ ...row, note: "x".repeat(2_001) }] }] }).success).toBe(false);
   });
 
   it("limits weapon and constellation header notes", () => {
-    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: "Header note", rows: [] }).success).toBe(true);
-    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: "x".repeat(2_001), rows: [] }).success).toBe(false);
+    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: "Header note", groups: [] }).success).toBe(true);
+    expect(weaponSectionSchema.safeParse({ expectedVersion: 1, note: "x".repeat(2_001), groups: [] }).success).toBe(false);
     expect(constellationSectionSchema.safeParse({ expectedVersion: 1, note: "Header note", groups: [] }).success).toBe(true);
     expect(constellationSectionSchema.safeParse({ expectedVersion: 1, note: "x".repeat(2_001), groups: [] }).success).toBe(false);
   });
diff --git a/lib/guides/schemas.ts b/lib/guides/schemas.ts
index e6bde61..007cef0 100644
--- a/lib/guides/schemas.ts
+++ b/lib/guides/schemas.ts
@@ -34,15 +34,18 @@ export const updateGuideSchema = z.strictObject({
 export const weaponSectionSchema = z.strictObject({
   expectedVersion: z.number().int().positive(),
   note: z.string().trim().max(2_000).nullable(),
-  rows: z.array(z.strictObject({
-    weaponKey: catalogKey,
-    refinement: z.number().int().min(1).max(5),
-    overallPercent: percent.nullable(),
-    personalPercent: percent.nullable(),
+  groups: z.array(z.strictObject({
     note: z.string().trim().max(2_000).nullable(),
-  }).refine((row) => row.overallPercent !== null || row.personalPercent !== null, {
-    message: "อาวุธต้องมีเปอร์เซ็นต์อย่างน้อยหนึ่งค่า",
-  })).max(100),
+    rows: z.array(z.strictObject({
+      weaponKey: catalogKey,
+      refinement: z.number().int().min(1).max(5),
+      overallPercent: percent.nullable(),
+      personalPercent: percent.nullable(),
+      note: z.string().trim().max(2_000).nullable(),
+    }).refine((row) => row.overallPercent !== null || row.personalPercent !== null, {
+      message: "อาวุธต้องมีเปอร์เซ็นต์อย่างน้อยหนึ่งค่า",
+    })).max(100),
+  })).max(20),
 });
 
 export const mainStatOptions = {
diff --git a/lib/guides/validation-messages.ts b/lib/guides/validation-messages.ts
index 1f14342..7fcb21c 100644
--- a/lib/guides/validation-messages.ts
+++ b/lib/guides/validation-messages.ts
@@ -41,7 +41,9 @@ function issueContext(section: GuideValidationSection, path: readonly PropertyKe
   const memberIndex = indexAfter(path, "members");
   const sectionIndex = indexAfter(path, "sections");
 
-  if (section === "weapon" && rowIndex !== null) return `อาวุธอันดับ ${rowIndex + 1}`;
+  if (section === "weapon" && groupIndex !== null) {
+    return rowIndex === null ? `Condition ${groupIndex + 1}` : `Condition ${groupIndex + 1} · อาวุธอันดับ ${rowIndex + 1}`;
+  }
   if (section === "artifact" && groupIndex !== null) {
     const group = groupIndex === 0 ? "Late Game" : "Early Game";
     return rowIndex === null ? `Artifact ${group}` : `Artifact ${group} อันดับ ${rowIndex + 1}`;
diff --git a/public/icon/stats/elemental-bonus.svg b/public/icon/stats/elemental-bonus.svg
new file mode 100644
index 0000000..6c14a6b
--- /dev/null
+++ b/public/icon/stats/elemental-bonus.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 64 64" fill="none">
+  <path fill="#F15A5A" d="M32 3 39 18 54 10 47 25 62 32 47 39 54 54 39 46 32 61 25 46 10 54 18 39 3 32 18 25 10 10 25 18z"/>
+  <circle cx="32" cy="32" r="11" fill="#fff" fill-opacity=".9"/>
+  <circle cx="32" cy="32" r="5" fill="#F15A5A"/>
+</svg>