feat(desktop): P17 街边中式细节物（石灯笼/水缸/摊贩摊位）图集扩展 28 格

2 files changed, 22 insertions, 3 deletions

diff --git a/src/LivingVillage.Desktop/Assets/jiangnan-world.png b/src/LivingVillage.Desktop/Assets/jiangnan-world.png
index 9138560..6e97728 100644
--- a/src/LivingVillage.Desktop/Assets/jiangnan-world.png
+++ b/src/LivingVillage.Desktop/Assets/jiangnan-world.png
diff --git a/src/LivingVillage.Desktop/VillageArt.fs b/src/LivingVillage.Desktop/VillageArt.fs
index 4845408..489da23 100644
--- a/src/LivingVillage.Desktop/VillageArt.fs
+++ b/src/LivingVillage.Desktop/VillageArt.fs
@@ -45,6 +45,9 @@ module VillageArt =
         | ReedCluster
         | StoneBench
         | RiverLantern
+        | StoneLantern
+        | WaterVat
+        | MarketStall
 
     type RenderProp =
         { Kind: RenderPropKind
@@ -135,6 +138,9 @@ module VillageArt =
         | SmokeSpriteA
         | SmokeSpriteB
         | SmokeSpriteC
+        | StoneLanternSprite
+        | WaterVatSprite
+        | StallSprite
 
     type private XnaColor = Microsoft.Xna.Framework.Color
     type private XnaRectangle = Microsoft.Xna.Framework.Rectangle
@@ -228,7 +234,11 @@ module VillageArt =
                 renderProp ReedCluster 15 13
                 renderProp StoneBench 9 11
                 renderProp RiverLantern 5 11
-                renderProp RiverLantern 7 14 ]
+                renderProp RiverLantern 7 14
+                renderProp StoneLantern 4 14
+                renderProp StoneLantern 16 14
+                renderProp WaterVat 12 11
+                renderProp MarketStall 3 11 ]
           Interior =
               { Elements =
                   [ interiorElement Window 2 2
@@ -260,7 +270,10 @@ module VillageArt =
             | FlowerBush
             | ReedCluster
             | StoneBench
-            | RiverLantern -> [ position x y ])
+            | RiverLantern
+            | StoneLantern
+            | WaterVat
+            | MarketStall -> [ position x y ])
         |> many
 
     let private positiveModulo divisor value =
@@ -445,7 +458,7 @@ module VillageArt =
     let characterAtlasRelativePath = "Assets/jiangnan-characters.png"
     let interiorAtlasRelativePath = "Assets/jiangnan-interior.png"
 
-    let worldTileCount = 25
+    let worldTileCount = 28
     let worldAtlasWidth = Sim.tilePixels * worldTileCount
     let worldAtlasHeight = Sim.tilePixels
     let characterAtlasWidth = 32 * 5 * 4 * 6
@@ -516,6 +529,9 @@ module VillageArt =
             | SmokeSpriteA -> 22
             | SmokeSpriteB -> 23
             | SmokeSpriteC -> 24
+            | StoneLanternSprite -> 25
+            | WaterVatSprite -> 26
+            | StallSprite -> 27
         XnaRectangle(index * Sim.tilePixels, 0, Sim.tilePixels, Sim.tilePixels)
 
     let private tilePosition x y : TilePosition =
@@ -653,6 +669,9 @@ module VillageArt =
             | ReedCluster -> drawSingleTile prop.Position ReedSprite
             | StoneBench -> drawSingleTile prop.Position BenchSprite
             | RiverLantern -> drawSingleTile prop.Position LanternSprite
+            | StoneLantern -> drawSingleTile prop.Position StoneLanternSprite
+            | WaterVat -> drawSingleTile prop.Position WaterVatSprite
+            | MarketStall -> drawSingleTile prop.Position StallSprite
 
         // Chimney smoke is a late pass so it always reads above the roof, the bamboo and
         // any other prop sharing its tile. The puff sits one row above the ridge centre