From 7f0c40dc89672d218f10ba3f81a0ee235da30969 Mon Sep 17 00:00:00 2001
From: "Somhairle H. Marisol" <muqiu-han@outlook.com>
Date: Mon, 21 Sep 2026 11:15:49 +0800
Subject: feat(desktop): 村民五套服饰帽饰区分
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

人物图集扩至五套变体（1280x48）：靛蓝袍配布巾、褐衫配发髻马甲、翠衫配发簪红巾、灰袍配瓜皮帽，主角专属斗笠独立第五套；村民按 id 取模四种服饰轮转，永不与主角同装，四向两帧动画保持。
---
 src/LivingVillage.Desktop.Tests/PrototypeTests.fs     |  18 ++++++++++++++++++
 .../Assets/jiangnan-characters.png                    | Bin 1892 -> 2539 bytes
 src/LivingVillage.Desktop/VillageArt.fs               |  11 +++++++----
 3 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/LivingVillage.Desktop.Tests/PrototypeTests.fs b/src/LivingVillage.Desktop.Tests/PrototypeTests.fs
index 4d698ad..3e15272 100644
--- a/src/LivingVillage.Desktop.Tests/PrototypeTests.fs
+++ b/src/LivingVillage.Desktop.Tests/PrototypeTests.fs
@@ -222,6 +222,24 @@ type PrototypeTests () =
         Assert.AreEqual<AnimationFrame>(FrameTwo, (VillageArt.animationFrame 4L))
         Assert.AreEqual<AnimationFrame>(FrameOne, (VillageArt.animationFrame 8L))
 
+    [<TestMethod>]
+    member _.VillagersUseFourDistinctVariantsDistinctFromTheAvatar () =
+        let npcVariants = [ 0 .. 63 ] |> List.map (fun id -> npcVisualVariant (NpcId id)) |> Set.ofList
+
+        Assert.AreEqual<int>(4, npcVariants.Count)
+        Assert.IsFalse(npcVariants.Contains StrawHat)
+        Assert.AreEqual<NpcVisualVariant>(StrawHat, (avatarSpriteSpec SouthFacing 0L).Variant)
+
+        let variantXes =
+            npcVariants
+            |> Set.toList
+            |> List.map (fun variant ->
+                let rect = characterSourceRectangle { Variant = variant; Direction = SouthFacing; Frame = FrameOne }
+                rect.X)
+            |> Set.ofList
+        Assert.AreEqual<int>(4, variantXes.Count)
+        Assert.AreEqual<int>(1280, VillageArt.characterAtlasWidth)
+
     [<TestMethod>]
     member _.ChineseCopyProvidesFormalSceneTimeMenuAndStatusLabels () =
         let labels =
diff --git a/src/LivingVillage.Desktop/Assets/jiangnan-characters.png b/src/LivingVillage.Desktop/Assets/jiangnan-characters.png
index ffe6f66..cbbe570 100644
Binary files a/src/LivingVillage.Desktop/Assets/jiangnan-characters.png and b/src/LivingVillage.Desktop/Assets/jiangnan-characters.png differ
diff --git a/src/LivingVillage.Desktop/VillageArt.fs b/src/LivingVillage.Desktop/VillageArt.fs
index 151c73a..3b948e5 100644
--- a/src/LivingVillage.Desktop/VillageArt.fs
+++ b/src/LivingVillage.Desktop/VillageArt.fs
@@ -72,6 +72,7 @@ module VillageArt =
         | IndigoRobe
         | OchreVest
         | JadeSash
+        | GreyCap
         | StrawHat
 
     type FacingDirection =
@@ -239,10 +240,11 @@ module VillageArt =
         if remainder < 0 then remainder + divisor else remainder
 
     let npcVisualVariant (NpcId npcId) : NpcVisualVariant =
-        match positiveModulo 3 npcId with
+        match positiveModulo 4 npcId with
         | 0 -> IndigoRobe
         | 1 -> OchreVest
-        | _ -> JadeSash
+        | 2 -> JadeSash
+        | _ -> GreyCap
 
     let private positiveModulo64 divisor value =
         let remainder = value % divisor
@@ -289,7 +291,8 @@ module VillageArt =
             | IndigoRobe -> 0
             | OchreVest -> 1
             | JadeSash -> 2
-            | StrawHat -> 3
+            | GreyCap -> 3
+            | StrawHat -> 4
         let directionIndex =
             match spec.Direction with
             | NorthFacing -> 0
@@ -317,7 +320,7 @@ module VillageArt =
     let worldTileCount = 21
     let worldAtlasWidth = Sim.tilePixels * worldTileCount
     let worldAtlasHeight = Sim.tilePixels
-    let characterAtlasWidth = 32 * 4 * 4 * 2
+    let characterAtlasWidth = 32 * 5 * 4 * 2
     let characterAtlasHeight = 48
     let interiorAtlasWidth = 392
     let interiorAtlasHeight = 96
-- 
cgit v1.2.3