Merge pull request #250 from pwatson100/V11-plus

New features and code refactoring

.vscode/settings.json

@@ -18,7 +18,7 @@
     "*.html": "handlebars"
   },
   "cSpell.language": "en-GB",
-  "cSpell.words": ["armor", "colorset", "FVTT", "gulpfile", "ifne", "relevent", "reroll", "spbutt", "typhonjs"],
+  "cSpell.words": ["armor", "colorset", "facehugger", "FVTT", "gulpfile", "ifne", "imagecontainer", "newdots", "relevent", "reroll", "spbutt", "typhonjs"],
   "projectManager.groupList": true,
   "vscode-edge-devtools.sourceMaps": true
 }

Release_Notes.txt

@@ -509,3 +509,13 @@ Right clicking on the heart icon will allow modifiers to be added to panic rolls
 If the "Human Panic, Push..." checkbox is checked the sheet will now display Conditions and Consumables for the player allowing them to set the conditions and roll against supplied to help simulate a human in play. 
 Updated CRT UI Spaceship sheet.
 
+Version 3.1.3
+Minor & Major component damage on a ship now add a condition icon to the token.
+Right click on the Minor/Major component damage icon to manually roll to add selected component damage.
+Spaceship damage dots automatically resize based on the ships "Hull" value.
+Reducing radiation now makes permanent radiation checks.  On a facehugger permanent radiation will be added from the right side.   
+This can ONLY be removed by the GM (see MO/TH/ER Instructions).
+Corrected issue with character critical injuries creation as the Fatal box was not being checked.  
+They also now show any modifiers to Medical Aid rolls. 
+Code refactoring and backend changes for better V11 compatibility. 
+

css/alienrpg.css

@@ -378,6 +378,13 @@ a.inline-roll {
   cursor: pointer;
 }
 
+.rollVehicleWeapon:hover, .rollVehicleWeapon:focus {
+  text-shadow: 0 0 20px hsl(0, 100%, 50%);
+  font-size: 110%;
+  font-weight: bolder;
+  cursor: pointer;
+}
+
 .openItem:hover, .openItem:focus {
   text-shadow: 0 0 20px hsl(0, 100%, 50%);
   font-size: 110%;
@@ -2309,7 +2316,7 @@ button:focus {
 .critical-inj {
   display: grid;
   grid-template-areas: "crit1 crit2 crit3 crit4";
-  grid-template-columns: 5% 21% 70% 3%;
+  grid-template-columns: 5% 31% 60% 3%;
   -webkit-box-align: center;
       -ms-flex-align: center;
           align-items: center;
@@ -4522,6 +4529,17 @@ combobox:focus {
   -ms-flex-wrap: wrap;
       flex-wrap: wrap;
 }
+.alienrpg .newdots {
+  cursor: pointer;
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+      -ms-flex-pack: center;
+          justify-content: center;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+}
 .alienrpg .resource-label {
   font-family: var(--alienfont);
   text-transform: uppercase;
@@ -5229,6 +5247,17 @@ combobox:focus {
   font-weight: bolder;
   text-transform: uppercase;
 }
+.alienrpg .crt .rollVehicleWeapon:hover,
+.alienrpg .crt .rollVehicleWeapon:focus {
+  text-shadow: 0 0 15px var(--aliengreen);
+  -webkit-box-shadow: 0 0 7px var(--aliengreen);
+          box-shadow: 0 0 7px var(--aliengreen);
+  background-color: var(--aliengreen);
+  color: #000;
+  font-size: 100%;
+  font-weight: bolder;
+  text-transform: uppercase;
+}
 .alienrpg .crt .grid-talents {
   text-align: center;
   grid-template-columns: 90% 10%;
@@ -5282,7 +5311,7 @@ combobox:focus {
   border: 0px solid var(--aliengreen);
 }
 .alienrpg .crt .Item11 .items-list {
-  height: 179px;
+  height: auto;
 }
 .alienrpg .crt .critical-inj {
   padding-bottom: 10px;

lang/cn.json

@@ -97,7 +97,7 @@
     "debug.hint": "将扩展调试信息打印到控制台。",
     "debug.name": "日志调试输出",
     "decelerate": "Decelerate",
-    "Defensive": "DEFENSIVE",
+    "Defensive": "Defensive",
     "DefMacro": "缩减Macro语法",
     "DefMacroHint": "启用更为精简的macro语法，这回允许你直接引用各类属性，例如：@str而非@attributes.str.value. 如果你需要各项属性引用完整的属性model，例如@attributes.str.label，那么请禁用此项。",
     "DefProto": "默认模板指示物设定",
@@ -115,6 +115,8 @@
     "DialTitle1": "投骰已修正",
     "DialTitle2": "检定",
     "Dice": "骰子: ",
+    "displayUnequipped-hint": "选择是否在 HUD 上显示非活动项目",
+    "displayUnequipped-name": "显示无效",
     "dock": "Dock",
     "Dollar": "Add $",
     "DollarNote": "Automatically add $ symbol after editing Cash or Cost",
@@ -232,7 +234,7 @@
     "NoToken": "你没有选中一个指示物",
     "NPC": "NPC",
     "NPCpopUp": "确认该选项后会让所有该角色的指示物不与角色卡关联，并默认视为敌对指示物。",
-    "Offensive": "OFFENSIVE",
+    "Offensive": "Offensive",
     "Officer": "长官",
     "OneDay": "一天",
     "OneRound": "一回合",
@@ -260,6 +262,9 @@
     "PASSENGERS": "乘客",
     "PCPanicLevel": "角色的恐慌等级已经提升了一级，目前为",
     "PermanantTrauma": "永久性的心理创伤。在这次游戏结束时进行一次共情检定。",
+    "PermanentRadiation": "Permanent Radiation",
+    "PermanentRadiationAdded": "添加永久辐射",
+    "PermanentRadiationRemoved": "永久消除辐射",
     "PersonalAgenda": "个人目标",
     "Pharmaceuticals": "药物",
     "Pilot": "驾驶员",
@@ -275,6 +280,7 @@
     "Pwr": "力量",
     "QuantityLabel": "数量",
     "Radiation": "辐射",
+    "RadiationReduced": "减少辐射",
     "ram": "Ram",
     "Range": "射程",
     "Rds": "重新加载",
@@ -295,6 +301,8 @@
     "rollManCreAttMax": "数字必须介于 1 和 6 之间",
     "rollManCreatureAttack": "滚动手动生物攻击。",
     "RollManCrit": "滚动手动重伤",
+    "RollManShipMajorCrit": "数字必须介于 2 和 12 之间",
+    "RollManShipMinorCrit": "数字必须介于 1 和 44 之间",
     "RollManSynCrit": "输入 D6 号码",
     "RollMod": "投掷修正值",
     "ROLLONCREATURETABLE": "绘制外星生物表",
@@ -374,6 +382,8 @@
     "SynthStress": "模仿人类的恐慌和按钮",
     "System": "星系",
     "Systems": "星系",
+    "TAH-tooltip-hint": "显示展开的工具提示",
+    "TAH-tooltip-name": "显示工具提示",
     "Talent-Crit": "天赋/暴击",
     "Talents": "天赋",
     "targetLock": "Target Lock",
@@ -387,6 +397,7 @@
     "totalOf": "你总共有",
     "Type": "种类",
     "upgrade": "Upgrade",
+    "Utility": "公用事业",
     "VisionDevices": "侦测装置",
     "Wallpoet": "Wallpoet",
     "Water": "水",

lang/de.json

@@ -115,6 +115,8 @@
     "DialTitle1": "Wurf modifiziert",
     "DialTitle2": "Probe",
     "Dice": "Würfel: ",
+    "displayUnequipped-hint": "Wählen Sie aus, ob inaktive Elemente im HUD angezeigt werden sollen",
+    "displayUnequipped-name": "Anzeige inaktiv",
     "dock": "Andocken",
     "Dollar": "$",
     "DollarNote": "Fügt nach der Bearbeitung von Bargeld oder Kosten automatisch das Symbol „$“ hinzu",
@@ -259,6 +261,9 @@
     "PASSENGERS": "PASSAGIERE",
     "PCPanicLevel": "SC Panikstufe steigt um einen Schritt auf ",
     "PermanantTrauma": "Permanentes Trauma. Mache einen EMPATHIE-Wurf am Ende der Sitzung. ",
+    "PermanentRadiation": "Permanent Radiation",
+    "PermanentRadiationAdded": "Permanente Strahlung hinzugefügt",
+    "PermanentRadiationRemoved": "Permanente Strahlung entfernt",
     "PersonalAgenda": "Motivation",
     "Pharmaceuticals": "Medikamente",
     "Pilot": "Pilot",
@@ -274,6 +279,7 @@
     "Pwr": "Ene.",
     "QuantityLabel": "Anzahl",
     "Radiation": "Strahlung",
+    "RadiationReduced": "Strahlung reduziert",
     "ram": "Rammen",
     "Range": "Reichweite",
     "Rds": "Munition",
@@ -294,6 +300,8 @@
     "rollManCreAttMax": "Zahl muss zwischen 1 und 6 liegen",
     "rollManCreatureAttack": "Würfle einen manuellen Kreaturen-Angriff.",
     "RollManCrit": "Würfle eine manuelle kritische Verletzung",
+    "RollManShipMajorCrit": "Zahl muss zwischen 2 und 12 liegen",
+    "RollManShipMinorCrit": "Zahl muss zwischen 1 und 44 liegen",
     "RollManSynCrit": "Gib die W6-Nummer ein",
     "RollMod": "Wurf Modifikator ",
     "ROLLONCREATURETABLE": "Generiere außerirdische Kreaturentabellen",
@@ -373,6 +381,8 @@
     "SynthStress": "Imitiere menschliche Panik und das strapazieren",
     "System": "System",
     "Systems": "Systeme",
+    "TAH-tooltip-hint": "Erweiterte Tooltips anzeigen",
+    "TAH-tooltip-name": "Tooltips anzeigen",
     "Talent-Crit": "Talent-Krítisch",
     "Talents": "Talente",
     "targetLock": "Ziel anvisieren",
@@ -386,6 +396,7 @@
     "totalOf": "Du hast ein Ergebnis von ",
     "Type": "Typ",
     "upgrade": "Verbesserung",
+    "Utility": "Dienstprogramm",
     "VisionDevices": "Sichtgeräte",
     "Wallpoet": "Wallpoet",
     "Water": "Wasser",

lang/en.json

@@ -97,7 +97,7 @@
     "debug.hint": "Prints extended debug information to the console.",
     "debug.name": "Log Debug Output",
     "decelerate": "Decelerate",
-    "Defensive": "DEFENSIVE",
+    "Defensive": "Defensive",
     "DefMacro": "Shortened Macro Syntax",
     "DefMacroHint": "Enable a shortened macro syntax which allows referencing attributes directly, for example @str instead of @attributes.str.value. Disable this setting if you need the ability to reference the full attribute model, for example @attributes.str.label.",
     "DefProto": "Default Prototype Token Settings",
@@ -115,6 +115,8 @@
     "DialTitle1": "Roll Modified",
     "DialTitle2": "check",
     "Dice": "Dice: ",
+    "displayUnequipped-hint": "Choose whether to display inactive items on the HUD",
+    "displayUnequipped-name": "Display Inactive",
     "dock": "Dock",
     "Dollar": "Add $",
     "DollarNote": "Automatically add $ symbol after editing Cash or Cost",
@@ -232,7 +234,7 @@
     "NoToken": "You do not have a token selected",
     "NPC": "NPC",
     "NPCpopUp": "Checking this box will cause all tokens created to be Unlinked and Hostile.",
-    "Offensive": "OFFENSIVE",
+    "Offensive": "Offensive",
     "Officer": "Officer",
     "OneDay": "One Day",
     "OneRound": "One Round",
@@ -260,6 +262,9 @@
     "PASSENGERS": "PASSENGERS",
     "PCPanicLevel": "PC's Panic level has increased by one step to ",
     "PermanantTrauma": "Permanent Trauma. Make an EMPATHY roll at the end of the session. ",
+    "PermanentRadiation": "Permanent Radiation",
+    "PermanentRadiationAdded": "Permanent Radiation Added",
+    "PermanentRadiationRemoved": "Permanent Radiation Removed",
     "PersonalAgenda": "Personal Agenda",
     "Pharmaceuticals": "Pharmaceuticals",
     "Pilot": "Pilot",
@@ -275,6 +280,7 @@
     "Pwr": "Pwr",
     "QuantityLabel": "Quantity",
     "Radiation": "Radiation",
+    "RadiationReduced": "Radiation Reduced",
     "ram": "Ram",
     "Range": "Range",
     "Rds": "Reloads",
@@ -295,6 +301,8 @@
     "rollManCreAttMax": "Number must be between 1 and 6",
     "rollManCreatureAttack": "Roll Manual Creature Attack.",
     "RollManCrit": "Roll Manual Critical Injury",
+    "RollManShipMajorCrit": "Number must be between 2 and 12",
+    "RollManShipMinorCrit": "Number must be between 1 and 44",
     "RollManSynCrit": "Enter D6 Number",
     "RollMod": "Roll Modifier",
     "ROLLONCREATURETABLE": " Draw Alien Creature Tables",
@@ -374,6 +382,8 @@
     "SynthStress": "Human Panic, Push, ect.",
     "System": "System",
     "Systems": "Systems",
+    "TAH-tooltip-hint": "Show expanded Tooltips",
+    "TAH-tooltip-name": "Show Tooltips",
     "Talent-Crit": "Talents/Crít",
     "Talents": "Talents",
     "targetLock": "Target Lock",
@@ -387,6 +397,7 @@
     "totalOf": "You have a Total of",
     "Type": "Type",
     "upgrade": "Upgrade",
+    "Utility": "Utility",
     "VisionDevices": "Vision Devices",
     "Wallpoet": "Wallpoet",
     "Water": "Water",

lang/es.json

@@ -97,7 +97,7 @@
     "debug.hint": "Imprime información de depuración extendida en la consola.",
     "debug.name": "Registro de salida de depuración",
     "decelerate": "Decelerate",
-    "Defensive": "DEFENSIVE",
+    "Defensive": "Defensive",
     "DefMacro": "Sintaxis de macros abreviada",
     "DefMacroHint": "Habilitar sintaxis de macros abreviada que permita hacer referencia a atributos directamente, por ejemplo @str en vez de @attributes.str.value. Desactiva esta opción si necesitas hacer referencia al modelo de atributos completo, por ejemplo @attributes.str.label.",
     "DefProto": "Configuración predeterminada de token",
@@ -115,6 +115,8 @@
     "DialTitle1": "Tirada modificada",
     "DialTitle2": "Chequeo",
     "Dice": "Dado: ",
+    "displayUnequipped-hint": "Elija si mostrar elementos inactivos en el HUD",
+    "displayUnequipped-name": "Pantalla inactiva",
     "dock": "Dock",
     "Dollar": "Añadir $",
     "DollarNote": "Añadir automaticamente el símbolo $ tras editar Dinero o Coste",
@@ -232,7 +234,7 @@
     "NoToken": "No tienes un token seleccionado",
     "NPC": "PNJ",
     "NPCpopUp": "Marcar esta casilla hará que todos los tokens se desvinculen y se vuelvan hostiles.",
-    "Offensive": "OFFENSIVE",
+    "Offensive": "Offensive",
     "Officer": "Oficial",
     "OneDay": "Un Día",
     "OneRound": "Un Asalto",
@@ -260,6 +262,9 @@
     "PASSENGERS": "PASAJEROS",
     "PCPanicLevel": "El nivel de pánico de los PJs ha aumentado en uno a ",
     "PermanantTrauma": "Trauma permanente. Haz una tirada de EMPATÍA al final de la sesión. ",
+    "PermanentRadiation": "Permanent Radiation",
+    "PermanentRadiationAdded": "Radiación permanente añadida",
+    "PermanentRadiationRemoved": "Radiación permanente eliminada",
     "PersonalAgenda": "Agenda Personal",
     "Pharmaceuticals": "Fármacos",
     "Pilot": "Piloto",
@@ -275,6 +280,7 @@
     "Pwr": "Ene",
     "QuantityLabel": "Cantidad",
     "Radiation": "Radiación",
+    "RadiationReduced": "Radiación reducida",
     "ram": "Ram",
     "Range": "Distancia",
     "Rds": "Recargas",
@@ -295,6 +301,8 @@
     "rollManCreAttMax": "El número debe estar entre 1 y 6",
     "rollManCreatureAttack": "Tira Ataque de criatura manual.",
     "RollManCrit": "Roll Manual Lesiones Críticas",
+    "RollManShipMajorCrit": "El número debe estar entre 2 y 12",
+    "RollManShipMinorCrit": "El número debe estar entre 1 y 44",
     "RollManSynCrit": "Ingrese el número D6",
     "RollMod": "Modificador de tirada",
     "ROLLONCREATURETABLE": "Dibujar tablas de criaturas alienígenas",
@@ -374,6 +382,8 @@
     "SynthStress": "Imitar Pánico humano y Botón de Forzar",
     "System": "Sistema",
     "Systems": "Sistemas",
+    "TAH-tooltip-hint": "Mostrar información sobre herramientas ampliada",
+    "TAH-tooltip-name": "Mostrar información sobre herramientas",
     "Talent-Crit": "Talentos/Crítico",
     "Talents": "Talentos",
     "targetLock": "Target Lock",
@@ -387,6 +397,7 @@
     "totalOf": "Tienes un total de",
     "Type": "Tipo",
     "upgrade": "Upgrade",
+    "Utility": "Utilidad",
     "VisionDevices": "Dispositivos Ópticos",
     "Wallpoet": "Wallpoet",
     "Water": "Agua",