KojuContent visual update

Assets/Altzone/Scripts/Model/Poco/Clan/AdData.cs

@@ -11,6 +11,9 @@ public class AdStoreObject
     {
         public string _borderFrame;
         public string _backgroundColour;
+        public TMPro.TMP_FontAsset _TextFont; // Uusi lis�ys (Perttu)
+        public string _TextColour; // Uusi lis�ys (Perttu)
+        public string _furniture;  // Uusi lis�ys (Perttu)
 
         public string BorderFrame
         {
@@ -37,6 +40,45 @@ public string BackgroundColour
             }
         }
 
+        public TMPro.TMP_FontAsset TextFont // Uusi lis�ys (Perttu)
+        {
+            get => _TextFont;
+            set
+            {
+                if (value != null) _TextFont = value;
+                else
+                {
+                    Debug.LogError($"Invalid font value: \"{value}\". Font not changed.");
+                }
+            }
+        }
+
+        public string TextColour // Uusi lis�ys (Perttu)
+        {
+            get => _TextColour;
+            set
+            {
+                if (ColorUtility.TryParseHtmlString(value, out Color colour)) _TextColour = value;
+                else
+                {
+                    Debug.LogError($"Invalid colour value: \"{value}\". Text colour not changed.");
+                }
+            }
+        }
+
+        public string Furniture // Uusi lis�ys (Perttu)
+        {
+            get => _furniture;
+            set
+            {
+                if (AdDecorationReference.Instance.GetFurnitureSprite(value) != null) _furniture = value;
+                else
+                {
+                    Debug.LogError($"Invalid furniture id: \"{value}\". Furniture not changed.");
+                }
+            }
+        }
+
         public AdStoreObject(string border, string backgroundColour)
         {
             if (AdDecorationReference.Instance.GetBorderFrameSprite(border) != null) _borderFrame = border;
@@ -48,6 +90,17 @@ public AdStoreObject(string border, string backgroundColour)
 
             if (ColorUtility.TryParseHtmlString(backgroundColour, out Color colour)) _backgroundColour = backgroundColour;
             else _backgroundColour = "#E35000";
+
+            // Uusi lis�ys (Perttu)
+            //if (ColorUtility.TryParseHtmlString(adTextColour, out Color textColour)) _adTextColour = adTextColour;
+            //else _adTextColour = "#000000";
+
+            //if (AdDecorationReference.Instance.GetFurnitureSprite(furniture) != null) _furniture = furniture;
+            //else
+            //{
+            //    Debug.LogWarning($"Invalid furniture id: \"{border}\". Using the default furniture.");
+            //    _furniture = AdDecorationReference.Instance.FurnitureList[0].Name;
+            //}
         }
     }
 }

Assets/Altzone/Scripts/Reference Sheets/AdDecorationReference.cs

@@ -11,6 +11,8 @@ public class AdDecorationReference : ScriptableObject
 
         [SerializeField] private List<AdBorderFrameObject> _frameList;
 
+        [SerializeField] private List<AdFurnitureObject> _furnitureList; // Uusi lis�ys (Perttu)
+
         [Header("Colours")]
         [SerializeField] private Color _orangeColor;
         [SerializeField] private Color _yellowColor;
@@ -20,9 +22,12 @@ public class AdDecorationReference : ScriptableObject
         [SerializeField] private Color _purpleColor;
         [SerializeField] private Color _darkPinkColor;
         [SerializeField] private Color _redColor;
+        [SerializeField] private Color _blackColor; // Uusi lis�ys (Perttu)
         private List<Color> _colourList;
+        private List<Color> _textColourList; // Uusi lis�ys (Perttu)
 
         private List<AdBorderFrameObject> _validatedFrameList = null;
+        private List<AdFurnitureObject> _validatedFurnitureList = null; // Uusi lis�ys (Perttu)
         private static AdDecorationReference _instance = null;
         private static bool _hasInstance = false;
 
@@ -35,6 +40,16 @@ public List<AdBorderFrameObject> FrameList {
             }
         } // Public accessor for _info
 
+        public List<AdFurnitureObject> FurnitureList // Uusi lis�ys (Perttu)
+        {
+            get
+            {
+                if (_validatedFurnitureList == null) ValidateFurniture();
+                ValidateFurniture();
+                return _validatedFurnitureList;
+            }
+        }
+
         public List<Color> ColourList
         {
             get
@@ -55,6 +70,26 @@ public List<Color> ColourList
             }
         }
 
+        public List<Color> TextColourList // Uusi lis�ys (Perttu)
+        {
+            get
+            {
+                if (_textColourList == null || _textColourList.Count == 0)
+                {
+                    _textColourList = new();
+                    _textColourList.Add(_blackColor);
+                    _textColourList.Add(_yellowColor);
+                    _textColourList.Add(_lightGreenColor);
+                    _textColourList.Add(_lightBlueColor);
+                    _textColourList.Add(_blueColor);
+                    _textColourList.Add(_purpleColor);
+                    _textColourList.Add(_darkPinkColor);
+                    _textColourList.Add(_redColor);
+                }
+                return _textColourList;
+            }
+        }
+
 
         public static AdDecorationReference Instance
         {
@@ -119,6 +154,58 @@ private AdBorderFrameObject GetBorderFrame(string name)
             }
             return null;
         }
+
+        // Uusi lis�ys (Perttu)
+        private void ValidateFurniture()
+        {
+            HashSet<string> uniqueNames = new();
+            HashSet<Sprite> uniqueMap = new();
+
+            if (_validatedFurnitureList != null && _validatedFurnitureList.Count > 0) return;
+            List<AdFurnitureObject> furnitures = new();
+            foreach (AdFurnitureObject furniture in _furnitureList)
+            {
+                if (!furniture.IsValid()) continue;
+
+                if (!uniqueNames.Add(furniture.Name))
+                {
+                    Debug.LogError($"duplicate furniture Name {furniture.Name}");
+                }
+                if (!uniqueMap.Add(furniture.Image))
+                {
+                    Debug.LogError($"duplicate furniture Image {furniture.Image}");
+                    continue;
+                }
+                furnitures.Add(furniture);
+            }
+            _validatedFurnitureList = furnitures;
+        }
+        // Uusi lis�ys (Perttu)
+        public Sprite GetFurnitureSprite(string name)
+        {
+            AdFurnitureObject data = GetFurniture(name);
+            if (data == null) return null;
+            return data.Image;
+        }
+        // Uusi lis�ys (Perttu)
+        private AdFurnitureObject GetFurniture(string name)
+        {
+            //Debug.LogWarning($"Full name: {name}");
+            if (string.IsNullOrWhiteSpace(name))
+            {
+                return null;
+            }
+
+            foreach (AdFurnitureObject info in _furnitureList)
+            {
+                if (info.Name == name)
+                {
+                    if (info.IsValid()) return info;
+                    else return null;
+                }
+            }
+            return null;
+        }
     }
 
     [Serializable]
@@ -134,4 +221,18 @@ public bool IsValid()
             return true;
         }
     }
+
+    [Serializable]
+    public class AdFurnitureObject // Uusi lis�ys (Perttu)
+    {
+        public string Name;
+        public Sprite Image;
+
+        public bool IsValid()
+        {
+            if (string.IsNullOrWhiteSpace(Name)) return false;
+            if (Image == null) return false;
+            return true;
+        }
+    }
 }