Merge pull request #2 from Chilly5/farm,-resource,-monastary-assets

coleshin27 · web-flow · commit 1d6d0f82aff2 · 2026-04-26T16:13:26.000-07:00
Farm, resource, monastary assets
diff --git a/Open Empires/Assets/Materials/M_Resource_Berry.mat b/Open Empires/Assets/Materials/M_Resource_Berry.mat
@@ -21,7 +21,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: M_Resource_Berry
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: 4800000, guid: 729573e7fcaa8594594741fc4beccb81, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
diff --git a/Open Empires/Assets/Materials/M_Resource_Gold.mat b/Open Empires/Assets/Materials/M_Resource_Gold.mat
@@ -21,7 +21,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: M_Resource_Gold
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: 4800000, guid: 729573e7fcaa8594594741fc4beccb81, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
diff --git a/Open Empires/Assets/Materials/M_Resource_Stone.mat b/Open Empires/Assets/Materials/M_Resource_Stone.mat
@@ -8,7 +8,7 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: M_Resource_Stone
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: 4800000, guid: 729573e7fcaa8594594741fc4beccb81, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
diff --git a/Open Empires/Assets/Prefabs/Map/ResourceNode_BerryBush.prefab b/Open Empires/Assets/Prefabs/Map/ResourceNode_BerryBush.prefab
@@ -94,8 +94,8 @@ Transform:
   m_GameObject: {fileID: 6921116014429096323}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.35, z: 0}
-  m_LocalScale: {x: 0.7, y: 0.5, z: 0.7}
+  m_LocalPosition: {x: 0, y: 0.3, z: 0}
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6099838450192748623}
@@ -107,7 +107,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6921116014429096323}
-  m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &7836226013486256578
 MeshRenderer:
   m_ObjectHideFlags: 0
diff --git a/Open Empires/Assets/Prefabs/Map/ResourceNode_GoldMine.prefab b/Open Empires/Assets/Prefabs/Map/ResourceNode_GoldMine.prefab
@@ -53,8 +53,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 1, y: 1, z: 1}
-  m_Center: {x: 0, y: 0.4, z: 0}
+  m_Size: {x: 2, y: 2, z: 2}
+  m_Center: {x: 0, y: 1, z: 0}
 --- !u!114 &7143818975040167923
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -95,7 +95,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0.4, z: 0}
-  m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+  m_LocalScale: {x: 3.3, y: 3.3, z: 1.0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 338084431222298267}
@@ -107,7 +107,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8058183581848783805}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &8107487724247311621
 MeshRenderer:
   m_ObjectHideFlags: 0
diff --git a/Open Empires/Assets/Prefabs/Map/ResourceNode_StoneMine.prefab b/Open Empires/Assets/Prefabs/Map/ResourceNode_StoneMine.prefab
@@ -53,8 +53,8 @@ BoxCollider:
   m_ProvidesContacts: 0
   m_Enabled: 1
   serializedVersion: 3
-  m_Size: {x: 1, y: 0.8, z: 1}
-  m_Center: {x: 0, y: 0.35, z: 0}
+  m_Size: {x: 2, y: 2, z: 2}
+  m_Center: {x: 0, y: 1, z: 0}
 --- !u!114 &3895672541730475237
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -94,8 +94,8 @@ Transform:
   m_GameObject: {fileID: 5765204210009180425}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.35, z: 0}
-  m_LocalScale: {x: 0.9, y: 0.7, z: 0.9}
+  m_LocalPosition: {x: 0, y: 0.4, z: 0}
+  m_LocalScale: {x: 3.3, y: 3.3, z: 1.0}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 2426556172699702506}
@@ -107,7 +107,7 @@ MeshFilter:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5765204210009180425}
-  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
 --- !u!23 &8278548880955067706
 MeshRenderer:
   m_ObjectHideFlags: 0
diff --git a/Open Empires/Assets/Resources/BuildingSprites/Farm.png b/Open Empires/Assets/Resources/BuildingSprites/Farm.png
diff --git a/Open Empires/Assets/Resources/BuildingSprites/Farm.png.meta b/Open Empires/Assets/Resources/BuildingSprites/Farm.png.meta
diff --git a/Open Empires/Assets/Resources/BuildingSprites/Monastery.png b/Open Empires/Assets/Resources/BuildingSprites/Monastery.png
diff --git a/Open Empires/Assets/Resources/BuildingSprites/Monastery.png.meta b/Open Empires/Assets/Resources/BuildingSprites/Monastery.png.meta
diff --git a/Open Empires/Assets/Scripts/Core/GameSetup.cs b/Open Empires/Assets/Scripts/Core/GameSetup.cs
@@ -2038,14 +2038,16 @@ private void SpawnBuilding(BuildingData buildingData)
                     break;
                 }
                 case BuildingType.Farm:
-                    prefab = CreateFarmPrefab(buildingData.PlayerId);
+                    prefab = CreateBuildingSpritePrefab("Farm", "Farm", 2, 2, 2.75f, 0.25f / 2.75f)
+                          ?? CreateFarmPrefab(buildingData.PlayerId);
                     break;
                 case BuildingType.Tower:
                     prefab = CreateBuildingSpritePrefab("Tower", "Tower", 1, 1, 5f)
                           ?? CreateTowerPrefab(buildingData.PlayerId);
                     break;
                 case BuildingType.Monastery:
-                    prefab = CreateMonasteryPrefab(buildingData.PlayerId);
+                    prefab = CreateBuildingSpritePrefab("Monastery", "Monastery", 3, 3, 6f, 1.02f / 6f)
+                          ?? CreateMonasteryPrefab(buildingData.PlayerId);
                     break;
                 case BuildingType.Blacksmith:
                     prefab = CreateBuildingSpritePrefab("Blacksmith", "Blacksmith", 3, 3, 6f, 1.02f / 6f)
@@ -2777,7 +2779,8 @@ private void LateUpdate()
                 {
                     if (view.IsDead) continue; // Don't deactivate while corpse fade coroutine is running
                     var tile = sim.MapData.WorldToTile(unitData.SimPosition);
-                    bool visible = fogData.GetVisibility(localPid, tile.x, tile.y) == TileVisibility.Visible;
+                    bool visible = FogOfWarRenderer.DisableFogOfWar
+                        || fogData.GetVisibility(localPid, tile.x, tile.y) == TileVisibility.Visible;
                     view.gameObject.SetActive(visible);
                 }
             }
@@ -2801,11 +2804,15 @@ private void LateUpdate()
                 TileVisibility tileVis;
                 if (buildingData != null)
                 {
-                    tileVis = fogData.GetVisibility(localPid, buildingData.OriginTileX, buildingData.OriginTileZ);
+                    tileVis = FogOfWarRenderer.DisableFogOfWar
+                        ? TileVisibility.Visible
+                        : fogData.GetVisibility(localPid, buildingData.OriginTileX, buildingData.OriginTileZ);
                 }
                 else if (ghostBuildings.TryGetValue(kvp.Key, out var ghostTile))
                 {
-                    tileVis = fogData.GetVisibility(localPid, ghostTile.tileX, ghostTile.tileZ);
+                    tileVis = FogOfWarRenderer.DisableFogOfWar
+                        ? TileVisibility.Visible
+                        : fogData.GetVisibility(localPid, ghostTile.tileX, ghostTile.tileZ);
                 }
                 else
                 {
@@ -2877,7 +2884,9 @@ private void LateUpdate()
                         continue;
                     }
 
-                    var tileVis = fogData.GetVisibility(localPid, nodeTileX, nodeTileZ);
+                    var tileVis = FogOfWarRenderer.DisableFogOfWar
+                        ? TileVisibility.Visible
+                        : fogData.GetVisibility(localPid, nodeTileX, nodeTileZ);
 
                     if (tileVis == TileVisibility.Visible)
                     {
diff --git a/Open Empires/Assets/Scripts/Map/MapData.cs b/Open Empires/Assets/Scripts/Map/MapData.cs
@@ -160,7 +160,7 @@ public bool IsBuildableForFarm(int x, int z)
             if (!IsInBounds(x, z)) return false;
             if (IsOutsideCircle(x, z)) return false;
             var t = Tiles[x, z];
-            return t == TileType.Grass || t == TileType.Sand || t == TileType.Foundation || t == TileType.Farm;
+            return t == TileType.Grass || t == TileType.Sand || t == TileType.Foundation;
         }
 
         public bool IsWalkable(int x, int z, int playerId, BuildingRegistry buildingRegistry)
diff --git a/Open Empires/Assets/Scripts/Map/MapRenderer.cs b/Open Empires/Assets/Scripts/Map/MapRenderer.cs
@@ -866,22 +866,22 @@ private void SpawnPerPlayerResources(MapData mapData, Vector2Int[] playerBases)
                     Debug.LogWarning($"[MapRenderer] Could not place berry patch for player {p} near ({bx + 14}, {bz + 10})");
                 }
 
-                // Gold cluster: target offset (-14, +10), spiral retry
+                // Gold deposit: single 2x2 block, target offset (-14, +10), spiral retry
                 Vector3 goldTarget = ClampToMap(bx - 14, bz + 10);
                 if (FindValidSpawnPosition(mapData, ResourceType.Gold, goldTarget, 15, out Vector3 goldPos))
                 {
-                    SpawnResourceCluster(mapData, ResourceType.Gold, goldPos, 3000, goldMinePrefab);
+                    SpawnResourceNode(mapData, ResourceType.Gold, goldPos, 3000, goldMinePrefab);
                 }
                 else
                 {
                     Debug.LogWarning($"[MapRenderer] Could not place gold mine for player {p} near ({bx - 14}, {bz + 10})");
                 }
 
-                // Stone cluster: target offset (+10, -14), spiral retry
+                // Stone deposit: single 2x2 block, target offset (+10, -14), spiral retry
                 Vector3 stoneTarget = ClampToMap(bx + 10, bz - 14);
                 if (FindValidSpawnPosition(mapData, ResourceType.Stone, stoneTarget, 15, out Vector3 stonePos))
                 {
-                    SpawnResourceCluster(mapData, ResourceType.Stone, stonePos, 3000, stoneMinePrefab);
+                    SpawnResourceNode(mapData, ResourceType.Stone, stonePos, 3000, stoneMinePrefab);
                 }
                 else
                 {
@@ -926,10 +926,7 @@ private void SpawnNeutralScattered(MapData mapData, Vector2Int[] playerBases,
                     Vector3 target = ClampToMap(x, z);
                     if (FindValidSpawnPosition(mapData, type, target, 10, out Vector3 pos))
                     {
-                        if (type == ResourceType.Gold || type == ResourceType.Stone)
-                            SpawnResourceCluster(mapData, type, pos, amount, prefab);
-                        else
-                            SpawnResourceNode(mapData, type, pos, amount, prefab);
+                        SpawnResourceNode(mapData, type, pos, amount, prefab);
                         break;
                     }
                 }
@@ -1003,7 +1000,8 @@ private void SpawnResourceNode(MapData mapData, ResourceType type, Vector3 posit
             int footprintW = 1;
             int footprintH = 1;
 
-            if (type == ResourceType.Wood || type == ResourceType.Food)
+            if (type == ResourceType.Wood || type == ResourceType.Food
+                || type == ResourceType.Gold || type == ResourceType.Stone)
             {
                 // 2x2 footprint: snap position to center of 2x2 block
                 footprintW = 2;
@@ -1014,13 +1012,6 @@ private void SpawnResourceNode(MapData mapData, ResourceType type, Vector3 posit
                 originZ = originZ & ~1; // round down to nearest even
                 position = new Vector3(originX + 1.0f, position.y, originZ + 1.0f);
             }
-            else if (type == ResourceType.Gold || type == ResourceType.Stone)
-            {
-                // 1x1 footprint: snap position to tile center
-                int originX = Mathf.FloorToInt(position.x);
-                int originZ = Mathf.FloorToInt(position.z);
-                position = new Vector3(originX + 0.5f, position.y, originZ + 0.5f);
-            }
 
             // Skip spawning if any footprint tile is water or already occupied
             int tileX = Mathf.FloorToInt(position.x - footprintW * 0.5f);
@@ -1059,14 +1050,25 @@ private void SpawnResourceNode(MapData mapData, ResourceType type, Vector3 posit
                 if (type == ResourceType.Food)
                 {
                     go.transform.localScale *= 1.35f; // 1.5 * 1.35 ≈ 2.0 total, fills 2x2 tiles
-                    foreach (Transform child in go.transform)
-                        child.localPosition = Vector3.zero;
+                }
+
+                // Gold/Stone/Food now use billboarded sprites — extract the visual child
+                // out of the static-batched hierarchy so the billboard pivot survives.
+                if (type == ResourceType.Gold || type == ResourceType.Stone || type == ResourceType.Food)
+                {
+                    var renderer = go.GetComponentInChildren<MeshRenderer>();
+                    if (renderer != null && renderer.gameObject != go)
+                    {
+                        treeSprite = renderer.gameObject;
+                        treeSprite.transform.SetParent(billboardContainer, worldPositionStays: true);
+                    }
                 }
             }
 
             if (go != null)
             {
-                // Mark non-Wood nodes as static for batching (billboard sprites can't be static)
+                // Mark remaining (non-billboard) children of non-Wood nodes static for batching.
+                // The billboard sprite child has already been moved to billboardContainer above.
                 if (type != ResourceType.Wood)
                 {
                     foreach (var t in go.GetComponentsInChildren<Transform>(true))
diff --git a/Open Empires/Assets/Scripts/Map/ResourceNode.cs b/Open Empires/Assets/Scripts/Map/ResourceNode.cs
@@ -1,3 +1,4 @@
+using System.Collections.Generic;
 using UnityEngine;
 
 namespace OpenEmpires
@@ -8,6 +9,11 @@ public class ResourceNode : MonoBehaviour
         public bool IsSelected => isSelected;
         public bool IsGhostMode => isGhostMode;
 
+        public static readonly List<ResourceNode> All = new List<ResourceNode>();
+
+        private void Awake() { if (!All.Contains(this)) All.Add(this); }
+        private void OnDestroy() { All.Remove(this); }
+
         private ResourceNodeData nodeData;
         private bool isSelected;
         private bool isGhostMode;
@@ -42,6 +48,49 @@ public void SetBillboardSprite(GameObject sprite)
             billboardSprite = sprite;
         }
 
+        public Rect GetScreenBounds(Camera cam)
+        {
+            // Prefer the billboard sprite's renderer (for Gold/Stone/Food/Wood billboards),
+            // fall back to body renderers, then to the collider for legacy 3D resource nodes.
+            Bounds? worldBounds = null;
+            if (billboardSprite != null)
+            {
+                var r = billboardSprite.GetComponent<Renderer>();
+                if (r != null) worldBounds = r.bounds;
+            }
+            if (worldBounds == null && bodyRenderers != null && bodyRenderers.Length > 0)
+            {
+                Bounds b = bodyRenderers[0].bounds;
+                for (int i = 1; i < bodyRenderers.Length; i++)
+                    if (bodyRenderers[i] != null) b.Encapsulate(bodyRenderers[i].bounds);
+                worldBounds = b;
+            }
+            if (worldBounds == null)
+            {
+                var col = GetComponent<Collider>();
+                if (col != null) worldBounds = col.bounds;
+            }
+            if (worldBounds == null) return default;
+
+            Vector3 center = worldBounds.Value.center;
+            Vector3 ext = worldBounds.Value.extents;
+            float minX = float.MaxValue, minY = float.MaxValue;
+            float maxX = float.MinValue, maxY = float.MinValue;
+            for (int cx = -1; cx <= 1; cx += 2)
+            for (int cy = -1; cy <= 1; cy += 2)
+            for (int cz = -1; cz <= 1; cz += 2)
+            {
+                Vector3 corner = new Vector3(center.x + ext.x * cx, center.y + ext.y * cy, center.z + ext.z * cz);
+                Vector3 sp = cam.WorldToScreenPoint(corner);
+                if (sp.z < 0) return default;
+                if (sp.x < minX) minX = sp.x;
+                if (sp.x > maxX) maxX = sp.x;
+                if (sp.y < minY) minY = sp.y;
+                if (sp.y > maxY) maxY = sp.y;
+            }
+            return Rect.MinMaxRect(minX, minY, maxX, maxY);
+        }
+
         private void FitColliderToFootprint()
         {
             if (nodeData == null || nodeData.FootprintWidth <= 1) return;
diff --git a/Open Empires/Assets/Scripts/Units/UnitSelectionManager.cs b/Open Empires/Assets/Scripts/Units/UnitSelectionManager.cs
@@ -2092,6 +2092,25 @@ private void BoxSelect()
             {
                 SFXManager.Instance?.PlayUI(SFXType.UnitSelect, 0.5f);
             }
+
+            // Lowest priority: resource node — only if no units AND no buildings in box.
+            // ResourceNode supports single-select, so pick the first one whose screen rect overlaps.
+            if (selectedUnits.Count == 0 && selectedBuildings.Count == 0 && selectedResourceNode == null)
+            {
+                for (int i = 0; i < ResourceNode.All.Count; i++)
+                {
+                    var node = ResourceNode.All[i];
+                    if (node == null || !node.gameObject.activeInHierarchy || node.IsGhostMode) continue;
+
+                    Rect resRect = node.GetScreenBounds(mainCamera);
+                    if (resRect.width > 0 && selectionRect.Overlaps(resRect))
+                    {
+                        node.SetSelected(true);
+                        selectedResourceNode = node;
+                        break;
+                    }
+                }
+            }
         }
 
         private void UpdateDragPreview()
