Add MBR crossover tiles to Conan #188

Including italian translation by @pensareadaltro Conan Studio Equipment card text area enhancements #139
rafdulaf · Mar 27, 2024 · 5f9e953 · 5f9e953
1 parent c50995d
commit 5f9e953
Show file tree

Hide file tree

Showing 222 changed files with 3,256 additions and 14 deletions.
diff --git a/Batman/engine/studio/studio.css b/Batman/engine/studio/studio.css
@@ -150,7 +150,8 @@
     .dialog ul.floatingactions { display: none; }
 }
 
-.printoverflow { 
+.printoverflow {
+    position: relative; 
     display: inline-block; 
     overflow: hidden; 
     vertical-align: top;

diff --git a/Conan/data/equipments.json b/Conan/data/equipments.json
@@ -2093,6 +2093,102 @@
             "imagelocation": {"x": "66", "y": "54"},
             "imagezoom": "42",
             "origins": ["conqueror"]
+        },
+
+        {
+            "id": "heavy_sword",
+            "encumbrance": "3",
+
+            "melee": { "0": "orangereroll", "1": "none" },
+            "ranged": { "0": "none", "1": "none", "throwable": false },
+            "manipulation": { "0": "none", "1": "none", "explosive": false },
+            "active": { "0": "yellowreroll", "1": "none" },
+            "passive": { "0": "none", "1": "none" },
+
+            "image": "data/equipments/img/heavy_sword.webp",
+            "imagelocation": {"x": "61", "y": "54"},
+            "imagezoom": "100",
+            "origins": ["godsofthenorth"]
+        },
+
+        {
+            "id": "heavy_axe",
+            "encumbrance": "3",
+
+            "melee": { "0": "orange", "1": "yellow" },
+            "ranged": { "0": "none", "1": "none", "throwable": false },
+            "manipulation": { "0": "none", "1": "none", "explosive": false },
+            "active": { "0": "none", "1": "none" },
+            "passive": { "0": "none", "1": "none" },
+
+            "image": "data/equipments/img/heavy_axe.webp",
+            "imagelocation": {"x": "50", "y": "55"},
+            "imagezoom": "104",
+            "origins": ["godsofthenorth"]
+        },
+
+        {
+            "id": "throwing_axes",
+            "encumbrance": "1",
+
+            "melee": { "0": "none", "1": "none" },
+            "ranged": { "0": "yellowreroll", "1": "none", "throwable": false },
+            "manipulation": { "0": "none", "1": "none", "explosive": false },
+            "active": { "0": "none", "1": "none" },
+            "passive": { "0": "none", "1": "none" },
+
+            "image": "data/equipments/img/throwing_axes.webp",
+            "imagelocation": {"x": "50", "y": "45"},
+            "imagezoom": "85",
+            "origins": ["godsofthenorth"]
+        },
+
+        {
+            "id": "studded_leather_armor",
+            "encumbrance": "3",
+
+            "melee": { "0": "none", "1": "none" },
+            "ranged": { "0": "none", "1": "none", "throwable": false },
+            "manipulation": { "0": "none", "1": "none", "explosive": false },
+            "active": { "0": "none", "1": "none" },
+            "passive": { "0": "yellow", "1": "yellow" },
+
+            "image": "data/equipments/img/studded_leather_armor.webp",
+            "imagelocation": {"x": "52", "y": "45"},
+            "imagezoom": "88",
+            "origins": ["godsofthenorth"]
+        },
+
+        {
+            "id": "frost_armor",
+            "encumbrance": "2",
+
+            "melee": { "0": "none", "1": "none" },
+            "ranged": { "0": "none", "1": "none", "throwable": false },
+            "manipulation": { "0": "none", "1": "none", "explosive": false },
+            "active": { "0": "none", "1": "none" },
+            "passive": { "0": "orange", "1": "none" },
+
+            "image": "data/equipments/img/frost_armor.webp",
+            "imagelocation": {"x": "50", "y": "41"},
+            "imagezoom": "82",
+            "origins": ["godsofthenorth"]
+        },
+
+        {
+            "id": "frost_dagger",
+            "encumbrance": "2",
+
+            "melee": { "0": "yellow", "1": "yellow" },
+            "ranged": { "0": "none", "1": "none", "throwable": false },
+            "manipulation": { "0": "none", "1": "none", "explosive": false },
+            "active": { "0": "yellowreroll", "1": "none" },
+            "passive": { "0": "none", "1": "none" },
+
+            "image": "data/equipments/img/frost_dagger.webp",
+            "imagelocation": {"x": "51", "y": "38"},
+            "imagezoom": "102",
+            "origins": ["godsofthenorth"]
         }
     ]
 }
diff --git a/Conan/data/equipments/img/frost_armor.webp b/Conan/data/equipments/img/frost_armor.webp
diff --git a/Conan/data/equipments/img/frost_dagger.webp b/Conan/data/equipments/img/frost_dagger.webp
diff --git a/Conan/data/equipments/img/heavy_axe.webp b/Conan/data/equipments/img/heavy_axe.webp
diff --git a/Conan/data/equipments/img/heavy_sword.webp b/Conan/data/equipments/img/heavy_sword.webp
diff --git a/Conan/data/equipments/img/studded_leather_armor.webp b/Conan/data/equipments/img/studded_leather_armor.webp
diff --git a/Conan/data/equipments/img/throwing_axes.webp b/Conan/data/equipments/img/throwing_axes.webp
diff --git a/Conan/data/equipments/lang/equipments.en.json b/Conan/data/equipments/lang/equipments.en.json
@@ -341,6 +341,29 @@
         },
         "conans_great_sword": {
             "title": "Conan's Great Sword"
+        },
+        "heavy_sword": {
+            "title": "Heavy Sword"
+        },
+        "heavy_axe": {
+            "title": "Heavy Axe"
+        },
+        "throwing_axes": {
+            "title": "Throwing Axes"
+        },
+        "studded_leather_armor": {
+            "title": "Studded Leather Armor"
+        },
+        "frost_armor": {
+            "title": "Frost Armor",
+            "text": "A character must have the spellcaster skill to benefit from this item"
+        },
+        "frost_dagger": {
+            "title": "Frost Dagger",
+            "text": "A character must have the spellcaster skill to benefit from this item",
+            "textStyle": {
+                "textInter": 53
+            }
         }
     }
 }
diff --git a/Conan/data/equipments/lang/equipments.fr.json b/Conan/data/equipments/lang/equipments.fr.json
@@ -341,6 +341,29 @@
         },
         "conans_great_sword": {
             "title": "Grande Épée de Conan"
+        },
+        "heavy_sword": {
+            "title": "Épée Lourde"
+        },
+        "heavy_axe": {
+            "title": "Hache Lourde"
+        },
+        "throwing_axes": {
+            "title": "Haches de Lancer"
+        },
+        "studded_leather_armor": {
+            "title": "Armure de Cuir Cloutée"
+        },
+        "frost_armor": {
+            "title": "Armure de Givre",
+            "text": "La compétence Lanceur de Sorts est nécessaire pour utiliser cet objet."
+        },
+        "frost_dagger": {
+            "title": "Dague de Givre",
+            "text": "La compétence Lanceur de Sorts est nécessaire pour utiliser cet objet.",
+            "textStyle": {
+                "textInter": 53
+            }
         }
     }
 }
diff --git a/Conan/data/equipments/lang/equipments.it.json b/Conan/data/equipments/lang/equipments.it.json
@@ -341,6 +341,29 @@
         },
         "conans_great_sword": {
             "title": "Grande Spada di Conan"
+        },
+        "heavy_sword": {
+            "title": "Spadone"
+        },
+        "heavy_axe": {
+            "title": "Ascia bipenne"
+        },
+        "throwing_axes": {
+            "title": "Asce da lancio"
+        },
+        "studded_leather_armor": {
+            "title": "Armatura di cuoio borchiato"
+        },
+        "frost_armor": {
+            "title": "Armatura di ghiaccio",
+            "text": "Per usare questo equipaggiamento, il personaggio deve avere l'abilità Mago"
+        },
+        "frost_dagger": {
+            "title": "Pugnale di ghiaccio",
+            "text": "Per usare questo equipaggiamento, il personaggio deve avere l'abilità Mago",
+            "textStyle": {
+                "textInter": 53
+            }
         }
     }
 }
diff --git a/Conan/data/expansions.json b/Conan/data/expansions.json
@@ -133,6 +133,9 @@
         }, {
             "id": "corinthia",
             "type": "misc"
+        }, {
+            "id": "godsofthenorth",
+            "type": "misc"
         }
     ]
 }
diff --git a/Conan/data/expansions/lang/expansions.en.json b/Conan/data/expansions/lang/expansions.en.json
@@ -156,6 +156,10 @@
         "corinthia": {
             "title": "Corinthia (Crossover with Mythic Battles Pantheon)",
             "short": "Corinthia"
+        },
+        "godsofthenorth": {
+            "title": "Gods of the North (Crossover with Mythic Battles Ragnarök)",
+            "short": "Gods of the North"
         }
     }
 }
diff --git a/Conan/data/expansions/lang/expansions.fr.json b/Conan/data/expansions/lang/expansions.fr.json
@@ -156,6 +156,10 @@
         "corinthia": {
             "title": "Corinthia (Crossover avec Mythic Battles Panthéon)",
             "short": "Corinthia"
+        },
+        "godsofthenorth": {
+            "title": "Les Dieux du Nord (Crossover avec Mythic Battles Ragnarök)",
+            "short": "Dieux du Nord"
         }
     }
 }
diff --git a/Conan/data/expansions/lang/expansions.it.json b/Conan/data/expansions/lang/expansions.it.json
@@ -156,6 +156,10 @@
         "corinthia": {
             "title": "Corinthia (Crossover con Mythic Battles Pantheon)",
             "short": "Corinthia"
+        },
+        "godsofthenorth": {
+            "title": "Gli Dei del Nord (Crossover con Mythic Battles Ragnarök)",
+            "short": "Dei del nord"
         }
     }
 }