Display minis size to help to choose a proxy #181

rafdulaf · Sep 20, 2023 · 682e9c1 · 682e9c1
1 parent c987ef3
commit 682e9c1
Show file tree

Hide file tree

Showing 8 changed files with 107 additions and 2 deletions.
diff --git a/Conan/data/models.json b/Conan/data/models.json
@@ -771,6 +771,7 @@
             "sculptor": { "name": "Viktor Dragosani", "link": "https://www.facebook.com/search/top?q=viktor%20dragosani" },
             "paint": { "name": "madcollector", "link": "https://the-overlord.com/index.php?/profile/5567-madcollector/"},
             "type": "animal",
+            "size": { "base": { "type": "circle", "diameter": 35 }, "height": 25 },
             "origins": ["stretchgoal"],
             "forum": "https://the-overlord.com/index.php?/topic/3413-peinture-montrez-moi-vos-balthus-et-slasher/"
         },
@@ -954,6 +955,7 @@
             "sculptor": { "name": "Viktor Dragosani", "link": "https://www.facebook.com/search/top?q=viktor%20dragosani" },
             "paint": { "name": "Dahkon", "link": "https://the-overlord.com/index.php?/profile/44-dahkon/"},
             "type": "monster",
+            "size": { "base": { "type": "free", "width": 55, "height": 45 }, "height": 25 },
             "origins": ["dragon"],
             "forum": "https://the-overlord.com/index.php?/topic/611-peinture-montrez-moi-vos-dragons/"
         },

diff --git a/Conan/encyclopedia/models/img/shape_monster.webp b/Conan/encyclopedia/models/img/shape_monster.webp
diff --git a/Conan/encyclopedia/models/img/shape_regular.webp b/Conan/encyclopedia/models/img/shape_regular.webp
diff --git a/Conan/encyclopedia/models/lang/models.en.js b/Conan/encyclopedia/models/lang/models.en.js
@@ -5,6 +5,8 @@ EncyclopediaModels._i18n = {
     'fromAnd': "<br/>and",
     'model': "miniature",
     'models': "miniatures",
+    'size': "Size:",
+    'sizeSeparator': "or",
     'sculptedBy': "Sculpted by: ",
     'sculptorUnknown': "(The sculptor name is not sure)",
     'paintedBy': "Painted by: ",

diff --git a/Conan/encyclopedia/models/lang/models.fr.js b/Conan/encyclopedia/models/lang/models.fr.js
@@ -5,6 +5,8 @@ EncyclopediaModels._i18n = {
     'fromAnd': "<br/>et",
     'model': "figurine",
     'models': "figurines",
+    'size': "Taille :",
+    'sizeSeparator': "ou",
     'sculptedBy': "Sculpté par : ",
     'sculptorUnknown': "(Le nom du sculpteur n'est pas certain)",
     'paintedBy': "Peint par : ",

diff --git a/Conan/encyclopedia/models/lang/models.it.js b/Conan/encyclopedia/models/lang/models.it.js
@@ -5,6 +5,8 @@ EncyclopediaModels._i18n = {
     'fromAnd': "<br/>e",
     'model': "miniatura",
     'models': "miniature",
+    'size': "Taglia:",
+    'sizeSeparator': "o",
     'sculptedBy': "Scolpito da: ",
     'sculptorUnknown': "(Il nome dello scultore non è sicuro)",
     'paintedBy': "Dipinta da: ",

diff --git a/Conan/encyclopedia/models/models.css b/Conan/encyclopedia/models/models.css
@@ -93,7 +93,8 @@
 }
 
 .modeldetails .heroes,
-.modeldetails .tiles {
+.modeldetails .tiles,
+.modeldetails .sizes {
     line-height: 20px;
     margin: 10px 0;
 }

diff --git a/Conan/encyclopedia/models/models.js b/Conan/encyclopedia/models/models.js
@@ -349,8 +349,63 @@ var EncyclopediaModels = {
 
     onHide: function() {
     },
-
+    
     openModel: function(id) {
+        function deepEqual(object1, object2) {
+            const keys1 = Object.keys(object1);
+            const keys2 = Object.keys(object2);
+
+            if (keys1.length !== keys2.length) {
+                return false;
+            }
+
+            for (const key of keys1) {
+                const val1 = object1[key];
+                const val2 = object2[key];
+                const areObjects = isObject(val1) && isObject(val2);
+                if (areObjects && !deepEqual(val1, val2) ||
+                    !areObjects && val1 !== val2) {
+                    return false;
+                }
+            }
+
+            return true;
+        }
+        function isObject(object) {
+            return object != null && typeof object === 'object';
+        }
+        function reduceSize(as) {
+            if (as.length < 2)
+            {
+                // 0 or 1 element
+                return as;
+            }
+            else
+            {
+                var diff = [];
+
+                for (let a = 0; a < as.length; a++)
+                {
+                    var alreadyExists = false;
+                    for (let b = 0; b < diff.length; b++)
+                    {
+                        if (deepEqual(diff[b], as[a]))
+                        {
+                            alreadyExists = true;
+                            continue;
+                        }
+                    }
+                    if (!alreadyExists)
+                    {
+                        diff.push(as[a]);
+                    }
+                }
+
+                // All the same
+                return diff;
+            }
+        }
+
         var models = EncyclopediaModels._findModelsById(id);
 
         var originsCount = {};
@@ -377,6 +432,7 @@ var EncyclopediaModels = {
         var modelImages = [];
         var painters = [];
         var sculptors = [];
+        var sizes = [];
         for (var i in models)
         {
             var model = models[i];
@@ -398,6 +454,45 @@ var EncyclopediaModels = {
             {
                 sculptors.push(model.sculptor);
             }
+
+            sizes.push(model.size);
+        }
+
+        sizes = reduceSize(sizes);
+        var sizeCode = "";
+        if (sizes.length > 1 || (sizes.length == 1 && sizes[0] != null))
+        {
+            sizeCode = "<div class='sizes'>" + EncyclopediaModels._i18n.size + " ";
+            for (var s in sizes)
+            {
+                if (s != 0) sizeCode += " " + EncyclopediaModels._i18n.sizeSeparator + " ";
+
+                var size = sizes[s];
+                if (size == null) 
+                { 
+                    continue; 
+                }
+
+                var code = [];
+                if (size.base)
+                {
+                    if (size.base.type == "circle")
+                    {
+                        code.push("⌀ " + size.base.diameter + " mm");
+                    }
+                    else if (size.base.type == "free")
+                    {
+                        code.push("⌀ " + size.base.width + " mm x " + size.base.height + " mm");
+                    }
+                }
+                if (size.height)
+                {
+                    code.push("↕️ " + size.height + " mm");
+                }
+
+                sizeCode += code.join(" ");
+            }
+            sizeCode += "</div>";
         }
 
         var photos = "<div class='photos'>";
@@ -480,6 +575,7 @@ var EncyclopediaModels = {
                 + heroes
                 + tiles
                 + tokens
+                + sizeCode
                 + sculptor
                 + painter
                 + photos