Merge pull request #12291 from DigitalPagan/mythras_v3.3

Mythras v3.3, minor bugfixes and changes

Mythras/CHANGELOG.md

@@ -4,6 +4,17 @@ All notable changes to the Mythras sheet will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
+## 3.3
+### Fixed
+- [Issue #70: Using hidden HP configs is not working right](https://github.com/DigitalPagan/Mythras-Roll20-Sheet/issues/70)
+- [Issue #72: Text is too light when weapon is not favored](https://github.com/DigitalPagan/Mythras-Roll20-Sheet/issues/72) - Removed text transparency
+- Added some missing translation keys
+
+### Changed
+- Removed v3 conversion problems notice from the options bar
+- Removed the redo v3 conversions button from help pop-up
+- Reduced transparency on greyed out items
+
 ## 3.2
 ### Fixed
 - Issue causing default setting of Mythic Britain to actually be Mythic Babylon and visa-versa.

Mythras/pre-minified/Mythras.css

@@ -987,7 +987,7 @@ input.sheet-location-name {
 
 /* SKills */
 input.sheet-opaque-toggle:not([value="1"]) ~ div.sheet-opaque {
-    opacity: 40% !important;
+    opacity: 50% !important;
 }
 /* completely hide opaque-hide in compact mode */
 .sheet-compact-control[value="1"] + div.sheet-wrapper input.sheet-opaque-toggle:not([value="1"]) ~ div.sheet-opaque-hide {

Mythras/templates/common/help.html

@@ -3,10 +3,10 @@
         <a class="close" href="#">×</a>
         <h1><span class=sheet-rmargin" data-i18n="help">Help</span> (v<span name="attr_version"></span>)</h1>
         <input type="hidden" name="attr_version" value="2.7">
-        <div class="sheet-warnmsg">
+        <!--<div class="sheet-warnmsg">
             <p>If your sheet data failed to migrate from v2 to the new v3 sheet it is likely because of a bug discovered after launch.  Clicking this button will attempt to redo that conversion now that patches have been deployed:</p>
             <button type="action" name="act_redo-v3-upgrade">Redo v2 -> v3 Conversion</button>
-        </div>
+        </div>-->
         <p data-i18n="help-paragraph">
             Throughout the sheet you will find <span class="sheet-pictos">?</span> icons, like the one you clicked to open this pop-up.  These will provide direct links to documentation covering that section of the sheet.  In addition, the resources below may prove to be useful sources of information about the Mythras Roll20 sheet and/or Mythras in general.
         </p>

Mythras/templates/common/options_bar.html

@@ -50,7 +50,6 @@
         <!-- Option Bar Right -->
         <div class="sheet-flex sheet-gap">
             <div><input type='checkbox' data-i18n-title="compact_mode" name='attr_compact' value="1"><span class="sheet-checkico">J</span></div>
-            <div><span style="color: red">v3 Upgrade Problems? -></span></div>
             <a class="sheet-pictos" data-i18n-title="show_help_popup" href="#help">?</a>
             <a class="sheet-pictos" data-i18n-title="show_import_popup" href="#import">~</a>
             <a class="sheet-pictos" data-i18n-title="show_configuration_popup" href="#configuration">y</a>

Mythras/templates/sheet.js

@@ -353,7 +353,7 @@ function upgradeGeneric3Dot1() {
  * @param version the sheet version already parse to a float or 0 if not a valid float
  */
 function versioning(sheet_type, version) {
-    const latestVersion = '3.2';
+    const latestVersion = '3.3';
     if (debug) {console.log(`Current sheet version = ${version}`);}
     version = parseFloat(version) || 0;
     /* Eval sheet version and run upgrade functions as needed, note we have dropped functions of old versions */
@@ -377,7 +377,7 @@ function versioning(sheet_type, version) {
         else if (sheet_type === 'vehicle') {upgradeGeneric3Dot1();}
         versioning(sheet_type, '3.1');
     } else if (version >= 3.1) { /* TODO change this when we next introduce a version that requires updating */
-        setAttrs({"version": "3.2"});
+        setAttrs({"version": "3.3"});
     }
 }
 

Mythras/templates/sheet_types/character/character.css

@@ -72,7 +72,7 @@ input.sheet-location-name {
 
 /* SKills */
 input.sheet-opaque-toggle:not([value="1"]) ~ div.sheet-opaque {
-    opacity: 40% !important;
+    opacity: 50% !important;
 }
 /* completely hide opaque-hide in compact mode */
 .sheet-compact-control[value="1"] + div.sheet-wrapper input.sheet-opaque-toggle:not([value="1"]) ~ div.sheet-opaque-hide {

Mythras/translation.json

@@ -97,6 +97,7 @@
     "centimetres-a": "cm",
     "cephalothorax": "Cephalothorax",
     "cha-u": "CHA",
+    "cha+1/2_pow": "CHA + 1/2 POW",
     "changelog": "Changelog",
     "channel": "Channel",
     "character": "Character",
@@ -137,6 +138,10 @@
     "composite_pool": "Composite Pool",
     "composure": "Composure",
     "con-u": "CON",
+    "con+1/2_pow": "CON + 1/2 POW",
+    "con+siz": "CON + SIZ",
+    "con+siz+pow": "CON + SIZ + POW",
+    "con+siz+str": "CON + SIZ + STR",
     "conceal": "Conceal",
     "concentration": "Concentration",
     "condition": "Condition",
@@ -658,6 +663,9 @@
     "steps": "Steps",
     "storage": "Storage",
     "str-u": "STR",
+    "str+siz": "STR + SIZ",
+    "str+siz+CON": "STR + SIZ + CON",
+    "str+siz+POW": "STR + SIZ + POW",
     "strangeness": "Strangeness",
     "streamlined": "Streamlined",
     "streetwise": "Streetwise",