From d20e66dc55f795d7f62286c42a62d65ebec48b46 Mon Sep 17 00:00:00 2001 From: pwatson100 Date: Fri, 2 Dec 2022 15:19:06 +0000 Subject: [PATCH 1/7] Corrected issue with Nerves of Steel --- Release_Notes.txt | 7 +++- lang/cn.json | 15 -------- lang/de.json | 15 -------- lang/en.json | 15 -------- lang/es.json | 15 -------- lang/fr.json | 15 -------- lang/it.json | 15 -------- lang/pt-br.json | 15 -------- lang/zh-tw.json | 15 -------- module/actor/actor-sheet.js | 29 --------------- module/alienprgSettings.html | 18 ++------- module/alienrpg.js | 46 ----------------------- module/item/item-sheet.js | 49 ++++++++++--------------- module/item/item.js | 12 +++--- system.json | 6 +-- templates/item/agenda-sheet.html | 6 +-- templates/item/armor-sheet.html | 4 +- templates/item/item-sheet.html | 6 ++- templates/item/planet-system-sheet.html | 4 +- templates/item/skill-stunts-sheet.html | 6 +-- templates/item/specialty-sheet.html | 2 +- templates/item/talent-sheet.html | 2 +- templates/item/weapon-sheet.html | 8 ++-- 23 files changed, 59 insertions(+), 266 deletions(-) diff --git a/Release_Notes.txt b/Release_Notes.txt index 72899218..1647bd4e 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -474,4 +474,9 @@ Fix to chat dice tooltip image size issue caused by Foundry V10.290 the chat text for Private GM Roll, Blind GM Roll and Self roll now appear in green text for ease of differentiation. Version 3.0.4 -CSS update for Whisper. \ No newline at end of file +CSS update for Whisper. + +Version 3.0.5 +Nerves of Steel modifier (- 2 stress dice) being incorrectly deducted from Item rolls on characters and vehicles. +Comments on the Item sheets now use the rich text editor. +Removed settings for fonts that were not available in the browser. diff --git a/lang/cn.json b/lang/cn.json index f9cf317e..a15ba366 100644 --- a/lang/cn.json +++ b/lang/cn.json @@ -23,8 +23,6 @@ "Air": "氧气", "AirSupply": "氧气供应", "Appearance": "外表", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "武器", "ARMAMENTS": "军备", "Armor": "护甲", @@ -40,14 +38,11 @@ "Black": "黑色", "Bonus": "攻击加值", "BulkShortLabel": "重载", - "Calibri": "Calibri", "campaign": "活动", - "Candara": "Candara", "CapacityBarLabel": "负重", "CAPTAIN": "队长", "Career": "职业", "Cash": "现金", - "Changa": "Changa", "cinematic": "电影", "Class": "类别", "Classification": "等级", @@ -68,12 +63,8 @@ "ComputerMainframes": "电脑主机", "ConButtons": "左键应用状态,右键去除状态", "Conditions": "状态", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "消耗品", - "Corbel": "Corbel", "Cost": "费用", - "Courier": "Courier", "CreateItemTitle": "新建物品", "CreatureSkill": "该生物没有此技能。", "Crew": "船员", @@ -170,8 +161,6 @@ "Level": "等级", "Location": "位置", "Long": "远程", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "主要部件损坏", "Manoeuvrability": "机动性", "Manufacturer": "制造商", @@ -183,14 +172,12 @@ "MenuLabel": "编辑异形RPG设定", "MenuName": "异形RPG颜色及字体设定", "Mercenary": "雇佣兵", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "轻微部件损坏", "MODIFIER": "修饰符?", "Modifiers": "修正", "MODULES-UPGRADES": "模块/升级", "MorePanic": "更加恐慌", "moveFromFlocker": "从储物柜拿走", - "MS Gothic": "MS Gothic", "MultiPush": "允许多次推送", "Name": "名称", "NoActor": "你只能为你拥有的物品新建macro", @@ -323,13 +310,11 @@ "SynthStress": "模仿人类的恐慌和按钮", "System": "星系", "Systems": "星系", - "Tahoma": "Tahoma", "Talent-Crit": "天赋/暴击", "Talents": "天赋", "terrain": "地形", "THRUSTERS": "推进器", "TimeLimit": "时限", - "Times New Roman": "Times New Roman", "Tools": "工具", "totalOf": "你总共有", "Type": "种类", diff --git a/lang/de.json b/lang/de.json index 5c317b75..a2c36891 100644 --- a/lang/de.json +++ b/lang/de.json @@ -23,8 +23,6 @@ "Air": "Luft", "AirSupply": "Luft", "Appearance": "Aussehen", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "Bewaffnung", "ARMAMENTS": "RÜSTUNG", "Armor": "Panzerung", @@ -40,14 +38,11 @@ "Black": "Schwarz", "Bonus": "Bonus", "BulkShortLabel": "Masse", - "Calibri": "Calibri", "campaign": "KAMPAGNE", - "Candara": "Candara", "CapacityBarLabel": "Kapazität", "CAPTAIN": "KAPITÄN", "Career": "Beruf", "Cash": "Kasse", - "Changa": "Changa", "cinematic": "CINEMATIC", "Class": "Beruf", "Classification": "Klassifikation", @@ -68,12 +63,8 @@ "ComputerMainframes": "Computer-Großrechner", "ConButtons": "Linksklick hinz., Rechsklick entf.", "Conditions": "Zustände", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "Verbrauchsgüter", - "Corbel": "Corbel", "Cost": "Preis", - "Courier": "Courier", "CreateItemTitle": "Ggst. erstellen", "CreatureSkill": "Diese Kreatur hat diese Fertigkeit nicht.", "Crew": "Crew", @@ -170,8 +161,6 @@ "Level": "Stufe", "Location": "Standort", "Long": "Weit", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "GROSSER KOMPONENTENSCHADEN", "Manoeuvrability": "Manövrierbarkeit", "Manufacturer": "Hersteller", @@ -183,14 +172,12 @@ "MenuLabel": "Konfiguriere Alien RPG Einstellungen", "MenuName": "Alien RPG Schriftart und -farbe", "Mercenary": "Söldner", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "KLEINER KOMPONENTENSCHADEN", "MODIFIER": "Modifikator?", "Modifiers": "Modifikatoren", "MODULES-UPGRADES": "Module/Upgrades", "MorePanic": "Mehr Panik", "moveFromFlocker": "Nehmen Sie von Locker", - "MS Gothic": "MS Gothic", "MultiPush": "Multi-Push zulassen", "Name": "Name", "NoActor": "Du kannst nur ein Makro für Gegenstände in deinem Besitz anlegen", @@ -323,13 +310,11 @@ "SynthStress": "Imitate Human Panic and Push Button", "System": "System", "Systems": "Systeme", - "Tahoma": "Tahoma", "Talent-Crit": "Talente/Crít", "Talents": "Talente", "terrain": "Terrain", "THRUSTERS": "DRUCKSTRAHLER", "TimeLimit": "Zeitlimit", - "Times New Roman": "Times New Roman", "Tools": "Werkzeuge", "totalOf": "Du hast eine Summe von ", "Type": "Typ", diff --git a/lang/en.json b/lang/en.json index be8dd359..4585350d 100644 --- a/lang/en.json +++ b/lang/en.json @@ -23,8 +23,6 @@ "Air": "Air", "AirSupply": "Air Supply", "Appearance": "Appearance", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "Armament", "ARMAMENTS": "ARMAMENTS", "Armor": "Armor", @@ -40,14 +38,11 @@ "Black": "Black", "Bonus": "Bonus", "BulkShortLabel": "Bulk", - "Calibri": "Calibri", "campaign": "CAMPAIGN", - "Candara": "Candara", "CapacityBarLabel": "Capacity", "CAPTAIN": "CAPTAIN", "Career": "Career", "Cash": "Cash", - "Changa": "Changa", "cinematic": "CINEMATIC", "Class": "Class", "Classification": "Classification", @@ -68,12 +63,8 @@ "ComputerMainframes": "Computer Mainframes", "ConButtons": "Left Click to add. Right click to remove", "Conditions": "Conditions", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "Consumables", - "Corbel": "Corbel", "Cost": "Cost", - "Courier": "Courier", "CreateItemTitle": "Create Item", "CreatureSkill": "This Creature does not have this Skill.", "Crew": "Crew", @@ -170,8 +161,6 @@ "Level": "Level", "Location": "Location", "Long": "Long", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "MAJOR COMPONENT DAMAGE", "Manoeuvrability": "Manoeuvrability", "Manufacturer": "Manufacturer", @@ -183,14 +172,12 @@ "MenuLabel": "Configure Alien RPG Settings", "MenuName": "Alien RPG Colour and Font Settings", "Mercenary": "Mercenary", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "MINOR COMPONENT DAMAGE", "MODIFIER": "Modifier?", "Modifiers": "Modifiers", "MODULES-UPGRADES": "Modules/Upgrades", "MorePanic": "More Panic", "moveFromFlocker": "Take from Locker", - "MS Gothic": "MS Gothic", "MultiPush": "Allow multi-push", "Name": "Name", "NoActor": "You can only create macro buttons for owned Items", @@ -323,13 +310,11 @@ "SynthStress": "Imitate Human Panic and Push", "System": "System", "Systems": "Systems", - "Tahoma": "Tahoma", "Talent-Crit": "Talents/Crít", "Talents": "Talents", "terrain": "Terrain", "THRUSTERS": "THRUSTERS", "TimeLimit": "Time Limit", - "Times New Roman": "Times New Roman", "Tools": "Tools", "totalOf": "You have a Total of", "Type": "Type", diff --git a/lang/es.json b/lang/es.json index 40112139..88f726bb 100644 --- a/lang/es.json +++ b/lang/es.json @@ -23,8 +23,6 @@ "Air": "Aire", "AirSupply": "Reserva de aire", "Appearance": "Apariencia", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "Armamento", "ARMAMENTS": "ARMAMENTO", "Armor": "Armadura", @@ -40,14 +38,11 @@ "Black": "Negro", "Bonus": "Bonus", "BulkShortLabel": "Aumento", - "Calibri": "Calibri", "campaign": "CAMPAÑA", - "Candara": "Candara", "CapacityBarLabel": "Capacidad", "CAPTAIN": "CAPITÁN", "Career": "Profesión", "Cash": "Dinero", - "Changa": "Changa", "cinematic": "CINEMÁTICO", "Class": "Clase", "Classification": "Clasificación", @@ -68,12 +63,8 @@ "ComputerMainframes": "Computadoras Centrales", "ConButtons": "Clic izquierdo para añadir. Clic derecho para quitar", "Conditions": "Estados", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "Consumibles", - "Corbel": "Corbel", "Cost": "Coste", - "Courier": "Courier", "CreateItemTitle": "Crear Objeto", "CreatureSkill": "Esta criatura no tiene esta habilidad.", "Crew": "Tripulación", @@ -170,8 +161,6 @@ "Level": "Nivel", "Location": "Localización", "Long": "Largo", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "DAÑO PRINCIPAL EN COMPONENTES", "Manoeuvrability": "Maniobrabilidad", "Manufacturer": "Fabricante", @@ -183,14 +172,12 @@ "MenuLabel": "Configurar Ajustes de Alien RPG", "MenuName": "Alien RPG: Configuración de color y letra", "Mercenary": "Mercenario", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "DAÑOS MENORES EN COMPONENTES", "MODIFIER": "Modificador?", "Modifiers": "Modificadores", "MODULES-UPGRADES": "Módulos/Actualizaciones", "MorePanic": "Más pánico", "moveFromFlocker": "Tomar del casillero", - "MS Gothic": "MS Gothic", "MultiPush": "Permitir forzado múltiple", "Name": "Nombre", "NoActor": "Sólo puedes crear botones de macros para objetos propios", @@ -323,13 +310,11 @@ "SynthStress": "Imitar Pánico humano y Botón de Forzar", "System": "Sistema", "Systems": "Sistemas", - "Tahoma": "Tahoma", "Talent-Crit": "Talentos/Crítico", "Talents": "Talentos", "terrain": "Terreno", "THRUSTERS": "PROPULSORES", "TimeLimit": "Límite de tiempo", - "Times New Roman": "Times New Roman", "Tools": "Herramientas", "totalOf": "Tienes un total de", "Type": "Tipo", diff --git a/lang/fr.json b/lang/fr.json index 0d763877..e818929c 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -23,8 +23,6 @@ "Air": "Air", "AirSupply": "Réserve d'Air", "Appearance": "Apparence", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "Armement", "ARMAMENTS": "ARMEMENTS", "Armor": "Protection", @@ -40,14 +38,11 @@ "Black": "Noir", "Bonus": "Bonus", "BulkShortLabel": "Cloison", - "Calibri": "Calibri", "campaign": "CAMPAGNE", - "Candara": "Candara", "CapacityBarLabel": "Capacité", "CAPTAIN": "CAPITAINE", "Career": "Carrière", "Cash": "Espèces", - "Changa": "Changa", "cinematic": "CINÉMATIQUE", "Class": "Classe", "Classification": "Classification", @@ -68,12 +63,8 @@ "ComputerMainframes": "Mainframes d'ordinateur", "ConButtons": "Click gauche pour ajouter. Click droit pour retirer", "Conditions": "États", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "Consommables", - "Corbel": "Corbel", "Cost": "Coût", - "Courier": "Courier", "CreateItemTitle": "Créer Item", "CreatureSkill": "Cette créature n'a pas cette compétence.", "Crew": "Équipage", @@ -170,8 +161,6 @@ "Level": "Niveler", "Location": "Localisation", "Long": "Long", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "ENDOMMAGEMENT MAJEUR DES COMPOSANTS", "Manoeuvrability": "Maneuvrabilité", "Manufacturer": "Fabricant", @@ -183,14 +172,12 @@ "MenuLabel": "Configurer Alien RPG Paramètres", "MenuName": "Alien RPG Paramètres de couleur et de police", "Mercenary": "Mercenaire", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "ENDOMMAGEMENT MINEUR DES COMPOSANTS", "MODIFIER": "Modificateur?", "Modifiers": "Modificateurs", "MODULES-UPGRADES": "Modules/Mises à jour", "MorePanic": "Plus de Panique", "moveFromFlocker": "Prendre du casier", - "MS Gothic": "MS Gothic", "MultiPush": "Autoriser le multi-push", "Name": "Nom", "NoActor": "Vous ne pouvez créer des boutons de macro que pour les éléments détenus", @@ -323,13 +310,11 @@ "SynthStress": "Imiter les Humains (Jet de panique et Bouton FORCER)", "System": "Système", "Systems": "Systèmes", - "Tahoma": "Tahoma", "Talent-Crit": "Talents/Crít", "Talents": "Talents", "terrain": "Terrain", "THRUSTERS": "PROPULSEURS", "TimeLimit": "Limite de temps", - "Times New Roman": "Times New Roman", "Tools": "Outils", "totalOf": "Vous avez un total de", "Type": "Type", diff --git a/lang/it.json b/lang/it.json index d15ca4e2..81d5ca50 100644 --- a/lang/it.json +++ b/lang/it.json @@ -23,8 +23,6 @@ "Air": "Aria", "AirSupply": "Riserva d'aria", "Appearance": "Aspetto", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "Armi", "ARMAMENTS": "ARMAMENTI", "Armor": "Armatura", @@ -40,14 +38,11 @@ "Black": "Nero", "Bonus": "Bonus", "BulkShortLabel": "Ingombro", - "Calibri": "Calibri", "campaign": "CAMPAGNA", - "Candara": "Candara", "CapacityBarLabel": "Capienza", "CAPTAIN": "CAPITANO", "Career": "Carriera", "Cash": "Denaro", - "Changa": "Changa", "cinematic": "CINEMA", "Class": "Classe", "Classification": "Classificazione", @@ -68,12 +63,8 @@ "ComputerMainframes": "Mainframe del computer", "ConButtons": "Click col sinistro per aggiungere. Click col destro per rimuovere", "Conditions": "Condizioni", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "Consumabili", - "Corbel": "Corbel", "Cost": "Costo", - "Courier": "Courier", "CreateItemTitle": "Crea Oggetto", "CreatureSkill": "Questa Creatura non ha questa Abilità.", "Crew": "Equipaggio", @@ -170,8 +161,6 @@ "Level": "Livello", "Location": "Luogo", "Long": "Lunga", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "DANNO A COMPONENTE MAGGIORE", "Manoeuvrability": "Manovrabilità", "Manufacturer": "Casa produttrice", @@ -183,14 +172,12 @@ "MenuLabel": "Configura le Impostazioni di Alien RPG", "MenuName": "Impostazioni per Colore e Font di Alien RPG", "Mercenary": "Mercenario", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "DANNO A COMPONENTE MINORE", "MODIFIER": "Modificatore?", "Modifiers": "Modificatori", "MODULES-UPGRADES": "Moduli/Miglioramenti", "MorePanic": "Ulteriore Panico", "moveFromFlocker": "Prendi dal Baule", - "MS Gothic": "MS Gothic", "MultiPush": "Permetti multipli Tiri Forzati", "Name": "Nome", "NoActor": "Puoi creare pulsanti per le macro solo per gli Oggetti posseduti", @@ -323,13 +310,11 @@ "SynthStress": "Imita il Panico umano e forza il tiro", "System": "Sistema", "Systems": "Sistemi", - "Tahoma": "Tahoma", "Talent-Crit": "Doti/Crit", "Talents": "Doti", "terrain": "Terreno", "THRUSTERS": "PROPULSORI", "TimeLimit": "Limite di tempo", - "Times New Roman": "Times New Roman", "Tools": "Strumenti", "totalOf": "Hai un totale di", "Type": "Tipo", diff --git a/lang/pt-br.json b/lang/pt-br.json index a03ed860..8562a345 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -23,8 +23,6 @@ "Air": "Ar", "AirSupply": "Abastecimento de Ar", "Appearance": "Aparência", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "Armamento Padrão", "ARMAMENTS": "ARMAMENTOS", "Armor": "Armadura", @@ -40,14 +38,11 @@ "Black": "Preto", "Bonus": "Bônus", "BulkShortLabel": "Tamanho", - "Calibri": "Calibri", "campaign": "CAMPANHA", - "Candara": "Candara", "CapacityBarLabel": "Capacidade", "CAPTAIN": "CAPITÃO", "Career": "Carreira", "Cash": "Dinheiro", - "Changa": "Changa", "cinematic": "CINEMA", "Class": "Classe", "Classification": "Classificação", @@ -68,12 +63,8 @@ "ComputerMainframes": "Computadores Centrais", "ConButtons": "Clicar Botão Esquerdo do mouse para Adicionar e Direito para Remover", "Conditions": "Condições", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "Consumíveis", - "Corbel": "Corbel", "Cost": "Custo", - "Courier": "Courier", "CreateItemTitle": "Criar Item", "CreatureSkill": "Esta criatura não tem esta habilidade.", "Crew": "Tripulação", @@ -170,8 +161,6 @@ "Level": "Nível", "Location": "Localização", "Long": "Longa", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "DANOS GRAVES AO COMPONENTE", "Manoeuvrability": "Manobrabilidade", "Manufacturer": "Fabricante", @@ -183,14 +172,12 @@ "MenuLabel": "Definir Configurações de Alien RPG", "MenuName": "Configurações de cor e fonte", "Mercenary": "Mercenário", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "DANOS PEQUENOS A COMPONENTES", "MODIFIER": "Modificador?", "Modifiers": "Modificadores", "MODULES-UPGRADES": "Módulos/Atualizações", "MorePanic": "Mais Pânico", "moveFromFlocker": "Tirar do armário", - "MS Gothic": "MS Gothic", "MultiPush": "Permitir 'Forçar Rolagem' novamente", "Name": "Nome", "NoActor": "Você pode criar botões de macro apenas para Itens controlados", @@ -323,13 +310,11 @@ "SynthStress": "Emular Humano (Estresse e Forçar Rolagem)", "System": "Sistema", "Systems": "Sistemas", - "Tahoma": "Tahoma", "Talent-Crit": "Talento/Crít", "Talents": "Talentos", "terrain": "Terreno", "THRUSTERS": "PROPULSOR", "TimeLimit": "Tempo Limite", - "Times New Roman": "Times New Roman", "Tools": "Ferramentas", "totalOf": "Você tem um Total de", "Type": "Tipo", diff --git a/lang/zh-tw.json b/lang/zh-tw.json index e70fe3c9..b30cc5e9 100644 --- a/lang/zh-tw.json +++ b/lang/zh-tw.json @@ -23,8 +23,6 @@ "Air": "氧氣", "AirSupply": "氧氣供應", "Appearance": "外表", - "Arial": "Arial", - "Arial Narrow": "Arial Narrow", "Armament": "武器", "ARMAMENTS": "军备", "Armor": "護甲", @@ -40,14 +38,11 @@ "Black": "黑色", "Bonus": "攻擊加值", "BulkShortLabel": "重載", - "Calibri": "Calibri", "campaign": "活动", - "Candara": "Candara", "CapacityBarLabel": "負重", "CAPTAIN": "队长", "Career": "職業", "Cash": "现金", - "Changa": "Changa", "cinematic": "CINEMA", "Class": "類別", "Classification": "等級", @@ -68,12 +63,8 @@ "ComputerMainframes": "電腦主機", "ConButtons": "左鍵應用狀態,右鍵去除狀態", "Conditions": "狀態", - "Consolas": "Consolas", - "Constantia": "Constantia", "Consumables": "消耗品", - "Corbel": "Corbel", "Cost": "費用", - "Courier": "Courier", "CreateItemTitle": "新建物品", "CreatureSkill": "該生物沒有此技能。", "Crew": "船員", @@ -170,8 +161,6 @@ "Level": "等級", "Location": "位置", "Long": "遠程", - "Lucida Console": "Lucida Console", - "Lucida Sans Unicode": "Lucida Sans Unicode", "MAJOR-COMPONENT-DAMAGE": "主要部件损坏", "Manoeuvrability": "機動性", "Manufacturer": "制造商", @@ -183,14 +172,12 @@ "MenuLabel": "編輯異形RPG設定", "MenuName": "異形RPG顏色及字體設定", "Mercenary": "僱傭兵", - "Microsoft Sans Serif": "Microsoft Sans Serif", "MINOR-COMPONENT-DAMAGE": "轻微部件损坏", "MODIFIER": "修饰符?", "Modifiers": "修正", "MODULES-UPGRADES": "模块/升级", "MorePanic": "更加恐慌", "moveFromFlocker": "从储物柜拿走", - "MS Gothic": "MS Gothic", "MultiPush": "允许多次推送", "Name": "名稱", "NoActor": "你只能為你擁有的物品新建macro", @@ -323,13 +310,11 @@ "SynthStress": "模仿人类的恐慌和按钮", "System": "星系", "Systems": "星系", - "Tahoma": "Tahoma", "Talent-Crit": "天赋/暴击", "Talents": "天賦", "terrain": "地形", "THRUSTERS": "推进器", "TimeLimit": "时限", - "Times New Roman": "Times New Roman", "Tools": "工具", "totalOf": "你總共有", "Type": "種類", diff --git a/module/actor/actor-sheet.js b/module/actor/actor-sheet.js index f5d0eddb..a54ccbda 100644 --- a/module/actor/actor-sheet.js +++ b/module/actor/actor-sheet.js @@ -296,11 +296,6 @@ export class alienrpgActorSheet extends ActorSheet { attrMod.health = attrMod.health += 2; } - // await this.actor.update({ 'system.header.health.mod': (aData.header.health.mod = parseInt(attrMod.health || 0)) }); - // if (actor.actor.type === 'character') { - // await this.actor.update({ 'system.header.stress.mod': (aData.header.stress.mod = parseInt(attrMod.stress || 0)) }); - // } - } for (let [a, abl] of Object.entries(aData.attributes)) { @@ -308,7 +303,6 @@ export class alienrpgActorSheet extends ActorSheet { let field = `aData.attributes[${a}].mod`; let upData = parseInt(abl.value || 0) + parseInt(attrMod[a] || 0); await this.actor.update({ [target]: (field = upData) }); - // setProperty(this.actor, target, (field = upData)); abl.mod = parseInt(abl.value || 0) + parseInt(attrMod[a] || 0); abl.label = CONFIG.ALIENRPG.attributes[a]; } @@ -319,7 +313,6 @@ export class alienrpgActorSheet extends ActorSheet { let field = `aData.skills[${s}].mod`; let upData = parseInt(skl.value || 0) + parseInt(aData.attributes[conSkl].mod || 0) + parseInt(sklMod[s] || 0); await this.actor.update({ [target]: (field = upData) }); - // setProperty(this.actor, target, (field = upData)); skl.mod = parseInt(skl.value || 0) + parseInt(sklMod[s] || 0) + parseInt(aData.attributes[conSkl].mod || 0); skl.label = CONFIG.ALIENRPG.skills[s]; } @@ -446,7 +439,6 @@ export class alienrpgActorSheet extends ActorSheet { ammoweight = 0.5; } i.system.attributes.weight.value = i.system.attributes.weight.value || 0; - // i.totalWeight = i.system.attributes.weight.value + i.system.attributes.rounds.value * ammoweight; i.totalWeight = (i.system.attributes.weight.value + i.system.attributes.rounds.value * ammoweight) * i.system.attributes.quantity.value; totalWeight += i.totalWeight; } @@ -475,19 +467,6 @@ export class alienrpgActorSheet extends ActorSheet { data.inventory = Object.values(inventory); } - - // async _prepareCreatureItems(data) { - // const critInj = []; - - // // Iterate through items, allocating to containers - // for (let i of data.items) { - // critInj.push(i); - // data.critInj = critInj; - // } - // } - - - /* * Organize and classify Owned Items for Character sheets * @private @@ -664,7 +643,6 @@ export class alienrpgActorSheet extends ActorSheet { const itemContextMenu = [ { name: game.i18n.localize('ALIENRPG.addToFLocker'), - // icon: '">', icon: '', callback: (element) => { let item = this.actor.items.get(element.data('item-id')); @@ -673,7 +651,6 @@ export class alienrpgActorSheet extends ActorSheet { }, { name: game.i18n.localize('ALIENRPG.moveFromFlocker'), - // icon: '">', icon: '', callback: (element) => { let item = this.actor.items.get(element.data('item-id')); @@ -692,7 +669,6 @@ export class alienrpgActorSheet extends ActorSheet { name: game.i18n.localize('ALIENRPG.DeleteItem'), icon: '', callback: (element) => { - // this.actor.deleteOwnedItem(element.data('item-id')); let itemDel = this.actor.items.get(element.data('item-id')); itemDel.delete(); }, @@ -715,7 +691,6 @@ export class alienrpgActorSheet extends ActorSheet { name: game.i18n.localize('ALIENRPG.DeleteItem'), icon: '', callback: (element) => { - // this.actor.deleteOwnedItem(element.data('item-id')); let itemDel = this.actor.items.get(element.data('item-id')); itemDel.delete(); }, @@ -842,10 +817,6 @@ export class alienrpgActorSheet extends ActorSheet { }; let allowed = true; - // if (this.actor.type === 'creature') { - // allowed = false; - // } else - if (!alwaysAllowedItems.includes(type)) { if (!allowedItems[this.actor.type].includes(type)) { allowed = false; diff --git a/module/alienprgSettings.html b/module/alienprgSettings.html index 3ac962cd..1515dfab 100644 --- a/module/alienprgSettings.html +++ b/module/alienprgSettings.html @@ -10,21 +10,9 @@

{{localize "ALIENRPG.SheetColorSettings"}}

- - - - - - - - - - - - - - - + + + diff --git a/module/alienrpg.js b/module/alienrpg.js index 0eac46a9..ba4ec1c5 100644 --- a/module/alienrpg.js +++ b/module/alienrpg.js @@ -3,12 +3,9 @@ import registerActors from './register-actors.js'; import { alienrpgActor } from './actor/actor.js'; import { alienrpgItem } from './item/item.js'; import { alienrpgItemSheet } from './item/item-sheet.js'; -// import { alienrpgPlanetSheet } from './item/planet-system-sheet.js'; -// import { alienrpgCriticalInjury } from './item/critical-injury-sheet.js'; import { yze } from './YZEDiceRoller.js'; import { ALIENRPG } from './config.js'; import registerSettings from './settings.js'; -// import { AlienRPGSetup } from './setupHandler.js'; import { preloadHandlebarsTemplates } from './templates.js'; import { AlienRPGBaseDie } from './alienRPGBaseDice.js'; import { AlienRPGStressDie } from './alienRPGBaseDice.js'; @@ -104,8 +101,6 @@ Hooks.once('init', async function () { // Register sheet application classes Items.unregisterSheet('core', ItemSheet); Items.registerSheet('alienrpg', alienrpgItemSheet, { types: ['item', 'weapon', 'armor', 'talent', 'skill-stunts', 'agenda', 'specialty', 'planet-system', 'critical-injury'], makeDefault: false }); - // Items.registerSheet('alienrpg', alienrpgPlanetSheet, { types: ['planet-system'], makeDefault: false }); - // Items.registerSheet('alienrpg', alienrpgCriticalInjury, { types: ['critical-injury'], makeDefault: false }); registerSettings(); registerActors(); @@ -190,9 +185,6 @@ Hooks.once('init', async function () { // Build the panic table if it does not exist. Hooks.once('ready', async () => { // debugger; - // if (game.user.isGM) { - // await ModuleImport(); - // } sendDevMessage(); // if (game.user.isGM) { @@ -385,12 +377,7 @@ Hooks.on('renderChatMessage', (message, html, data) => { reRoll = 'mPush'; } - // if (actor.data.type != 'vehicles') { hostile = actor.type; - // } else { - // hostile = 'character'; - // } - // let hostile = actor.data.type; let blind = false; // Initialse the chat message let chatMessage = ''; @@ -404,11 +391,6 @@ Hooks.on('renderChatMessage', (message, html, data) => { actor.update({ 'system.header.stress.value': actor.system.header.stress.value + 1 }); break; - // case 'vehicles': - // let pilotData = game.actors.get(message.alias); - // pilotData.update({ 'system.header.stress.value': pilotData.system.header.stress.value + 1 }); - // break; - default: return; } @@ -472,34 +454,6 @@ function setupMacroFolders() { } - -/* -- -/* -------------------------------------------- */ -/* Hotbar Macros */ -/* -------------------------------------------- */ - -// async function createAlienrpgMacro(data, slot) { -// debugger; -// if (data.type !== 'Item') return; -// if (!('data' in data)) return ui.notifications.warn(game.i18n.localize('ALIENRPG.NoActor')); -// const item = data.data; - -// // Create the macro command -// const command = `game.alienrpg.rollItemMacro("${item.name}");`; -// let macro = game.macros.contents.find((m) => m.name === item.name && m.command === command); -// if (!macro) { -// macro = await Macro.create({ -// name: item.name, -// type: 'script', -// img: item.img, -// command: command, -// flags: { 'alienrpg.itemMacro': true }, -// }); -// } -// game.user.assignHotbarMacro(macro, slot); -// return false; -// } - /** * Create a Macro from an Item drop. * Get an existing item macro if one exists, otherwise create a new one. diff --git a/module/item/item-sheet.js b/module/item/item-sheet.js index c6dc3056..2890f49a 100644 --- a/module/item/item-sheet.js +++ b/module/item/item-sheet.js @@ -10,7 +10,9 @@ export class alienrpgItemSheet extends ItemSheet { return mergeObject(super.defaultOptions, { classes: ['alienrpg', 'sheet', 'item', 'item-sheet'], width: 675, - height: 489 + 'max-content', + // height: 489 + 'max-content', + // height: 566 - 'max-content', + height: 536, tabs: [{ navSelector: '.sheet-tabs', contentSelector: '.sheet-body', initial: 'general' }], }); } @@ -38,21 +40,11 @@ export class alienrpgItemSheet extends ItemSheet { /** @override */ async getData() { const data = await super.getData(); - // const item = foundry.utils.deepClone(this.item.data); - // debugger; - // let item = data.item; const item = data.item.toJSON(); // console.log(data); - - // const item = duplicate(this.item.data); - // const data = item; switch (item.type) { case 'planet-system': - // this._prepareSystemData(item); - let enrichedFields = [ - "system.misc.comment.value", - ]; - await this._enrichTextFields(item, enrichedFields); + this._prepareSystemData(item); break; case 'critical-injury': let enrichedFields1 = [ @@ -74,12 +66,7 @@ export class alienrpgItemSheet extends ItemSheet { break; case 'talent': - let enrichedFields6 = [ - "system.notes.notes", - "system.general.comment.value", - ]; - await this._enrichTextFields(item, enrichedFields6); - + await this._prepareTalentData(item) break; default: @@ -87,6 +74,7 @@ export class alienrpgItemSheet extends ItemSheet { let enrichedFieldsDef = [ "system.notes.notes", "system.general.comment.value", + "system.attributes.comment.value", ]; await this._enrichTextFields(item, enrichedFieldsDef); @@ -98,15 +86,22 @@ export class alienrpgItemSheet extends ItemSheet { async _prepareSystemData(data) { this.item.update({ img: 'systems/alienrpg/images/icons/solar-system.svg' }); + let enrichedFields = [ + "system.misc.comment.value", + ]; + await this._enrichTextFields(data, enrichedFields); } async _prepareAgendaData(data) { - this.item.update({ img: 'systems/alienrpg/images/icons/personal-agenda.png' }); let enrichedFields2 = [ "system.general.comment.value", ]; await this._enrichTextFields(data, enrichedFields2); + if (this.item.img == 'icons/svg/item-bag.svg' && this.item.img != this.img) { + this.item.update({ img: 'systems/alienrpg/images/icons/personal-agenda.png' }); + } + } async _prepareSpecialtyData(data) { @@ -124,17 +119,13 @@ export class alienrpgItemSheet extends ItemSheet { } else { this.item.update({ img: 'systems/alienrpg/images/icons/fire-dash.svg' }); } - } - /** @override */ - // setPosition(options = {}) { - // const position = super.setPosition(options); - // const sheetBody = this.element.find('.sheet-body'); - // // const bodyHeight = position.height - 192; - // const bodyHeight = position.height; - // sheetBody.css('height', bodyHeight); - // return position; - // } + let enrichedFields6 = [ + "system.notes.notes", + "system.general.comment.value", + ]; + await this._enrichTextFields(data, enrichedFields6); + } /* -------------------------------------------- */ diff --git a/module/item/item.js b/module/item/item.js index c860dbd4..d41f3789 100644 --- a/module/item/item.js +++ b/module/item/item.js @@ -37,10 +37,7 @@ export class alienrpgItem extends Item { let r2Data = 0; let reRoll = false; if (this.actor.type === 'character') { - let aStressMod = actorData.header.stress.mod; - - r2Data = parseInt(this.actor.getRollData().stress) + parseInt(aStressMod) - // r2Data = this.actor.getRollData().stress; + r2Data = this.actor.getRollData().stress; reRoll = false; } else { r2Data = 0; @@ -56,7 +53,7 @@ export class alienrpgItem extends Item { if (right) { // ************************************ - // Right Click Roll sodisplay modboxes + // Right Click Roll so display modboxes // ************************************ // call pop up box here to get any mods then update r1Data or rData as appropriate. @@ -258,10 +255,11 @@ export class alienrpgItem extends Item { let tactorid = fCrew[shooter].firerID; let modifier = parseInt(html.find('[name=modifier]')[0].value); let stressMod = parseInt(html.find('[name=stressMod]')[0].value); - let aStressMod = parseInt(game.actors.get(tactorid).system.header?.stress?.mod || 0); + // let aStressMod = parseInt(game.actors.get(tactorid).system.header?.stress?.mod || 0); let aStressVal = parseInt(game.actors.get(tactorid).system.header?.stress?.value || 0); let r1Data = parseInt(itemData.attributes.bonus.value + modifier + game.actors.get(tactorid).system.skills.rangedCbt.mod); - let r2Data = parseInt(aStressVal + aStressMod + stressMod); + // let r2Data = parseInt(aStressVal + aStressMod + stressMod); + let r2Data = parseInt(aStressVal + stressMod); label += ` (${this.actor.name}) `; // label += ` (${fCrew[shooter].firerName}) `; diff --git a/system.json b/system.json index 596ff461..5d3900cf 100644 --- a/system.json +++ b/system.json @@ -8,7 +8,7 @@ "relationships": { "systems": [{ "id": "alienrpg" }] }, - "version": "3.0.4", + "version": "3.0.5", "compatibility": { "minimum": "10", "verified": "10", @@ -73,8 +73,8 @@ } ], "socket": true, - "manifest": "https://github.com/pwatson100/alienrpg/releases/download/3.0.3/system.json", - "download": "https://github.com/pwatson100/alienrpg/releases/download/3.0.3/master.zip", + "manifest": "https://github.com/pwatson100/alienrpg/releases/download/3.0.5/system.json", + "download": "https://github.com/pwatson100/alienrpg/releases/download/3.0.5/master.zip", "protected": false, "initiative": "1d10", "gridDistance": 5, diff --git a/templates/item/agenda-sheet.html b/templates/item/agenda-sheet.html index d2c488c5..6d02bde5 100644 --- a/templates/item/agenda-sheet.html +++ b/templates/item/agenda-sheet.html @@ -1,4 +1,4 @@ -
+
@@ -13,11 +13,11 @@

{{!-- Sheet Body --}} -
+
{{!-- Attributes Tab --}}

{{localize 'ALIENRPG.Description'}}

-
{{editor system.general.comment.value target="system.general.comment.value" button=true owner=owner editable=true}}
+
{{editor system.general.comment.value target="system.general.comment.value" button=true owner=owner editable=true}}
\ No newline at end of file diff --git a/templates/item/armor-sheet.html b/templates/item/armor-sheet.html index 6a9f46d7..4dc24e3d 100644 --- a/templates/item/armor-sheet.html +++ b/templates/item/armor-sheet.html @@ -31,7 +31,9 @@

{{localize 'ALIENRPG.ArmorRating'}}

{{!-- Attributes Tab --}}

{{localize 'ALIENRPG.Comment'}}

- + {{!-- --}} +
{{editor system.attributes.comment.value target="system.attributes.comment.value" button=true owner=owner editable=true}}
+

{{localize 'ALIENRPG.Attributes'}}

diff --git a/templates/item/item-sheet.html b/templates/item/item-sheet.html index 11d64881..9d4ea644 100644 --- a/templates/item/item-sheet.html +++ b/templates/item/item-sheet.html @@ -41,7 +41,7 @@

{{localize 'ALIENRPG.Type'}}

{{!-- Sheet Body --}} -
+
{{!-- Attributes Tab --}}
{{#ife system.header.type.value '1'}} @@ -119,7 +119,9 @@

{{localize 'ALIENRPG.QuantityLabel'}}

{{/ife}}

{{localize 'ALIENRPG.Comment'}}

- + {{!-- --}} +
{{editor system.attributes.comment.value target="system.attributes.comment.value" button=true owner=owner editable=true}}
+
diff --git a/templates/item/planet-system-sheet.html b/templates/item/planet-system-sheet.html index 525368df..7976ef2a 100644 --- a/templates/item/planet-system-sheet.html +++ b/templates/item/planet-system-sheet.html @@ -1,4 +1,4 @@ -
+
@@ -28,7 +28,7 @@

{{localize "ALIENRPG.Location"}}

{{!-- Sheet Body --}} -
+
{{!-- Attributes Tab --}}
diff --git a/templates/item/skill-stunts-sheet.html b/templates/item/skill-stunts-sheet.html index a21b9e88..3eea4b94 100644 --- a/templates/item/skill-stunts-sheet.html +++ b/templates/item/skill-stunts-sheet.html @@ -1,4 +1,4 @@ - +

@@ -30,8 +30,8 @@

{{!-- Sheet Body --}} -
+
{{!-- Attributes Tab --}} -
{{editor system.description target="system.description" button=true owner=owner editable=true}}
+
{{editor system.description target="system.description" button=true owner=owner editable=true}}
\ No newline at end of file diff --git a/templates/item/specialty-sheet.html b/templates/item/specialty-sheet.html index f776173e..0389f6d5 100644 --- a/templates/item/specialty-sheet.html +++ b/templates/item/specialty-sheet.html @@ -16,7 +16,7 @@

{{localize "ALIENRPG.Description"}}

-
{{editor system.general.comment.value target="system.general.comment.value" button=true owner=owner editable=true}}
+
{{editor system.general.comment.value target="system.general.comment.value" button=true owner=owner editable=true}}

\ No newline at end of file diff --git a/templates/item/talent-sheet.html b/templates/item/talent-sheet.html index a9244e20..f25a89eb 100644 --- a/templates/item/talent-sheet.html +++ b/templates/item/talent-sheet.html @@ -41,7 +41,7 @@

{{localize "ALIENRPG.Career"}}

{{!-- Attributes Tab --}}

{{localize "ALIENRPG.Description"}}

-
{{editor system.general.comment.value target="system.general.comment.value" button=true owner=owner editable=true}}
+
{{editor system.general.comment.value target="system.general.comment.value" button=true owner=owner editable=true}}
{{!-- Notes Tab --}} diff --git a/templates/item/weapon-sheet.html b/templates/item/weapon-sheet.html index d3036de9..50f7e663 100644 --- a/templates/item/weapon-sheet.html +++ b/templates/item/weapon-sheet.html @@ -1,4 +1,4 @@ -
+

@@ -34,7 +34,7 @@

{{localize "ALIENRPG.Type"}}

{{!-- Sheet Body --}} -
+
{{!-- Attributes Tab --}}
@@ -74,7 +74,9 @@

{{localize "ALIENRPG.Type"}}

{{localize "ALIENRPG.Comment"}}

- + {{!-- --}} +
{{editor system.attributes.comment.value target="system.attributes.comment.value" button=true owner=owner editable=true}}
+
{{!-- Notes Tab --}} From bd303f6231e8ad6839238ad17089ee64fb128ebf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Jan 2023 23:22:57 +0000 Subject: [PATCH 2/7] Bump json5 and tsconfig-paths Bumps [json5](https://github.com/json5/json5) and [tsconfig-paths](https://github.com/dividab/tsconfig-paths). These dependencies needed to be updated together. Updates `json5` from 1.0.1 to 2.2.3 - [Release notes](https://github.com/json5/json5/releases) - [Changelog](https://github.com/json5/json5/blob/main/CHANGELOG.md) - [Commits](https://github.com/json5/json5/compare/v1.0.1...v2.2.3) Updates `tsconfig-paths` from 3.9.0 to 3.10.1 - [Release notes](https://github.com/dividab/tsconfig-paths/releases) - [Changelog](https://github.com/dividab/tsconfig-paths/blob/master/CHANGELOG.md) - [Commits](https://github.com/dividab/tsconfig-paths/compare/v3.9.0...v3.10.1) --- updated-dependencies: - dependency-name: json5 dependency-type: indirect - dependency-name: tsconfig-paths dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40d3f727..b1aa9100 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5821,6 +5821,15 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, "jsonfile": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", @@ -9360,26 +9369,15 @@ } }, "tsconfig-paths": { - "version": "3.9.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", - "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz", + "integrity": "sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==", "dev": true, "requires": { "@types/json5": "^0.0.29", "json5": "^1.0.1", - "minimist": "^1.2.0", + "minimist": "^1.2.6", "strip-bom": "^3.0.0" - }, - "dependencies": { - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "^1.2.0" - } - } } }, "tslib": { From 96dbdeaab0b02f628a0dd088de3bab5bab9d39cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 09:28:04 +0000 Subject: [PATCH 3/7] Bump http-cache-semantics from 4.1.0 to 4.1.1 Bumps [http-cache-semantics](https://github.com/kornelski/http-cache-semantics) from 4.1.0 to 4.1.1. - [Release notes](https://github.com/kornelski/http-cache-semantics/releases) - [Commits](https://github.com/kornelski/http-cache-semantics/compare/v4.1.0...v4.1.1) --- updated-dependencies: - dependency-name: http-cache-semantics dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 40d3f727..65188098 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5236,9 +5236,9 @@ "dev": true }, "http-cache-semantics": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz", - "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz", + "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==", "dev": true }, "http-proxy-agent": { From 66a817cd669915ce0b070687ed724576ededd5fb Mon Sep 17 00:00:00 2001 From: pwatson100 Date: Fri, 10 Mar 2023 10:29:26 +0000 Subject: [PATCH 4/7] NoS modfier correction. New German Language file. --- .gitignore | 1 + .vscode/settings.json | 27 ++----- Release_Notes.txt | 2 + lang/de.json | 84 ++++++++++----------- package-lock.json | 165 ++++++++++++++++++++++-------------------- package.json | 3 +- system.json | 2 +- 7 files changed, 140 insertions(+), 144 deletions(-) diff --git a/.gitignore b/.gitignore index 818dfc7e..10070897 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ foundry.js package-lock.json package.json alienrpg.lock +packs/alien-rpg-system diff --git a/.vscode/settings.json b/.vscode/settings.json index abd6b934..f71770b3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,29 +11,14 @@ "savePath": "/css" } ], - "liveSassCompile.settings.excludeList": [ - "**/node_modules/**", - ".vscode/**", - ".github/**" - ], + "liveSassCompile.settings.excludeList": ["**/node_modules/**", ".vscode/**", ".github/**"], "liveSassCompile.settings.generateMap": true, - "liveSassCompile.settings.autoprefix": [ - "> 1%", - "last 2 versions" - ], + "liveSassCompile.settings.autoprefix": ["> 1%", "last 2 versions"], "files.associations": { "*.html": "handlebars" }, "cSpell.language": "en-GB", - "cSpell.words": [ - "armor", - "colorset", - "FVTT", - "gulpfile", - "relevent", - "reroll", - "spbutt", - "typhonjs" - ], - "projectManager.groupList": true -} \ No newline at end of file + "cSpell.words": ["armor", "colorset", "FVTT", "gulpfile", "relevent", "reroll", "spbutt", "typhonjs"], + "projectManager.groupList": true, + "vscode-edge-devtools.sourceMaps": true +} diff --git a/Release_Notes.txt b/Release_Notes.txt index 1647bd4e..b7149c34 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -480,3 +480,5 @@ Version 3.0.5 Nerves of Steel modifier (- 2 stress dice) being incorrectly deducted from Item rolls on characters and vehicles. Comments on the Item sheets now use the rich text editor. Removed settings for fonts that were not available in the browser. +Updated German language file with thanks to @kingofkong#6768 + diff --git a/lang/de.json b/lang/de.json index a2c36891..f4ba7a16 100644 --- a/lang/de.json +++ b/lang/de.json @@ -5,7 +5,7 @@ "AbilityAbbemp": "emp", "AbilityAbbstr": "str", "AbilityAbbwit": "wit", - "AbilityAgl": "Geschick.", + "AbilityAgl": "Geschick", "AbilityEmp": "Empathie", "AbilityStr": "Stärke", "AbilityWit": "Verstand", @@ -16,7 +16,7 @@ "AddMenuHint": "Schriftartknopf zu Hauptkonfiguration hinzufügen", "AddMenuName": "Einstellungsknopf hinzufügen", "addToFLocker": "Zum Schließfach hinzufügen", - "AdHoc": "Ad Hoc", + "AdHoc": "Ad hoc", "Affiliation": "Zugehörigkeit", "AgendaStory": "Motivation/Story-Karten", "AI": "KI", @@ -29,7 +29,7 @@ "ArmorDoubled": "Rüstung Verdoppelt", "ArmorPiercing": "Panzerbrechend", "ArmorRating": "Panzerung", - "ArmorVsFire": "Panzerung V Feuer", + "ArmorVsFire": "Panzerung geg. Feuer", "AttackRoll": "Angriffswurf", "AttackTable": "Angriffstabelle", "Attributes": "Attribute", @@ -47,20 +47,20 @@ "Class": "Beruf", "Classification": "Klassifikation", "climate": "Klima", - "CloneActor": "Schauspieler klonen", + "CloneActor": "Figur klonen", "Clothing": "Kleidung", "ColonialMarine": "Colonial Marine", "ColonialMarshal": "Colonial Marshal", "colonies": "Kolonien", "Colpick": "Farbe wählen", "ColpickHint": "Wähle die Farbe für jedweden Text", - "CombatantRemove": "Entfernen Sie Schauspieler", - "CombatantReroll": "ReRoll Initiative", - "CombatantUpdate": "Schauspieler aktualisieren", + "CombatantRemove": "Entfernen Sie Figur", + "CombatantReroll": "Initiative neu würfeln", + "CombatantUpdate": "Figur aktualisieren", "Comment": "Kommentar", "CommonName": "Gewöhnlicher Name", "CompanyAgent": "Konzernagent", - "ComputerMainframes": "Computer-Großrechner", + "ComputerMainframes": "Computer-Mainframes", "ConButtons": "Linksklick hinz., Rechsklick entf.", "Conditions": "Zustände", "Consumables": "Verbrauchsgüter", @@ -82,12 +82,12 @@ "debug.hint": "Gibt erweiterte Debug-Informationen an die Konsole aus.", "debug.name": "Protokoll-Debug-Ausgabe", "DefMacro": "Verkürzte Makro-Syntax", - "DefMacroHint": "Aktiviere verkürzte Makro-Syntx zur direkten Zugriff auf Attribute, z.B. @str statt @attributes.str.value. Deaktiviere diese Einstellung, wenn der volle Attributpfad nötig ist, z.B. @attributes.str.label.", + "DefMacroHint": "Aktiviere verkürzte Makro-Syntax zum direkten Zugriff auf Attribute, z.B. @str statt @attributes.str.value. Deaktiviere diese Einstellung, wenn der volle Attributpfad nötig ist, z.B. @attributes.str.label.", "DefProto": "Grundeinstellung für Prototyp-Figur", "DefProtoHint": "Empfohlene Einstellung für alle neuen Figuren.", "Dehydrated": "Verdursten", "DeleteItem": "Löschen", - "DeleteItemTitle": "Ggs. löschen", + "DeleteItemTitle": "Ggst. löschen", "Description": "Beschreibung", "Details": "Details", "DiagnosticsDisplay": "Diagnose und Anzeigegeräte", @@ -98,9 +98,9 @@ "DialTitle1": "Wurf modifiziert", "DialTitle2": "probe", "Dice": "Würfel: ", - "DRAW": "zeichnen", + "DRAW": "ziehen", "EditItem": "Linksklick zum Bearbeiten, Rechtsklick zum Öffnen des Kontextmenüs.", - "EditItemTitle": "Ggs. bearbeiten", + "EditItemTitle": "Ggst. bearbeiten", "Effect": "Bewirken", "EmptyCrew": "Keine Besatzung", "Encumbered": "Belastet", @@ -113,7 +113,7 @@ "Extreme": "Extrem", "Fatal": "Tödlich", "Filter": "Filter", - "fLocker": "Fußschließfach", + "fLocker": "Kiste", "followingPush": "Nach dem Strapazieren,", "Fontpick": "Schriftart wählen", "FontStyle": "Schriftart", @@ -132,22 +132,22 @@ "GUNNER": "KANONIER", "GunnerName": "Schütze", "Health": "Gesundh.", - "healthDamage": " Gesundheitsschäden", + "healthDamage": " Verletzungen", "HealTime": "Genesungszeit", "hideChatBGImage": "Chat-Hintergrundbild ausblenden", "hideChatBGImageNote": "Aktivieren Sie diese Option, um das Hintergrundbild von Facehugger im Chat auszublenden", - "hideInitChat": "Initiieren Sie Initiativ-Chat-Nachrichten", + "hideInitChat": "Initiieren Sie Initiative-Chat-Nachrichten", "hideInitChatHint": "Aktivieren Sie diese Option, um Chatnachrichten für Initiativwürfe auszublenden", "hideJournalBGImage": "Journal-Hintergrundbild ausblenden", "hideJournalBGImageNote": "Hintergrundbild bei Journaleinträgen ausblenden", - "Homebrew": "Hausgemacht", + "Homebrew": "Hausregeln", "HOWMANY": "Wie viele?", - "HOWMANYDICE": "Wie viele Base sterben?", + "HOWMANYDICE": "Wie viele Basiswürfel?", "HOWMANYSTRESS": "Wie viele Stresswürfel?", "Hull": "Rumpf", "HULL": "RUMPF", "Inactive": "Inaktiv", - "InThePipe": "'Wir sind im Leitstrahl. Fünf von fünf.'", + "InThePipe": "'Wir sind auf Kurs, alles in Butter'", "Inventory": "Inventar", "InventoryArmorHeader": "Panzerung", "InventoryItemsHeader": "Gegenstände", @@ -161,7 +161,7 @@ "Level": "Stufe", "Location": "Standort", "Long": "Weit", - "MAJOR-COMPONENT-DAMAGE": "GROSSER KOMPONENTENSCHADEN", + "MAJOR-COMPONENT-DAMAGE": "SCHWERER KOMPONENTENSCHADEN", "Manoeuvrability": "Manövrierbarkeit", "Manufacturer": "Hersteller", "meanTemperature": "Durchschnittstemperatur", @@ -177,8 +177,8 @@ "Modifiers": "Modifikatoren", "MODULES-UPGRADES": "Module/Upgrades", "MorePanic": "Mehr Panik", - "moveFromFlocker": "Nehmen Sie von Locker", - "MultiPush": "Multi-Push zulassen", + "moveFromFlocker": "Aus Kiste nehmen", + "MultiPush": "Multi-Strapazieren zulassen", "Name": "Name", "NoActor": "Du kannst nur ein Makro für Gegenstände in deinem Besitz anlegen", "NoAttribute": "Kein Attribut", @@ -190,14 +190,14 @@ "NoSkill": "Keine Fertigkeit", "NoStress": "Kein Stress.", "NoSupplys": "Dein Vorrat ist leer", - "NoSynCrit": "No Critical Injuries on Synthetics table", - "NOTABLES": "Es gibt keine Tabellen zum Zeichnen!", + "NoSynCrit": "Keine kritischen Verletzungen in Tabelle für Synthetische", + "NOTABLES": "Keine Tabelle vorhanden!", "NotActive": "Waffe ist nicht aktiv", "Notes": "Notizen", "NotifWrongItemType": "\"{type}\" Artikel können nicht zu a . hinzugefügt werden {actor}!", - "NoToken": "Du hast keine Figur angewählt.", + "NoToken": "Du hast keine Figur ausgewählt.", "NPC": "NSC", - "NPCpopUp": "Ankreuzen, um alle Tokens unverbunden und feindlich zu setzen.", + "NPCpopUp": "Ankreuzen, um alle Tokens auf unverbunden und feindlich zu setzen.", "Officer": "Offizier", "OneDay": "Eines Tages", "OneRound": "One Round", @@ -206,7 +206,7 @@ "OneTurn": "Eine Runde", "OpenInventoryBrowser": "Inventar anzeigen", "OpenItemTitle": "Inhalt umsch.", - "Overwatch": "OVERWATCH", + "Overwatch": "Feuerschutz", "Panic1": "ZUSAMMENREISSEN: Du schaffst es, deine Nerven im Griff zu behalten. Gerade so.", "Panic10": "STARRE: Du erstarrst vor Angst und verlierst deine nächste langsame Aktion. Dein STRESSLEVEL und der aller befreundeter SC in KURZER Entfernung zu dir steigt um 1.", "Panic11": "SCHUTZ SUCHEN: Du musst deine nächste Aktion dazu verwenden, dich von der Gefahr wegzubewegen und, wenn möglich, einen sicheren Ort aufzusuchen. Du darfst einen Wurf auf Rückzug ablegen (siehe Seite 93), wenn sich ein Feind in KONTAKT mit dir befindet. Dein STRESSLEVEL sinkt um 1, aber der aller befreundeter SC in KURZER Entfernung zu dir steigt um 1. Nach einer Runde kannst du wieder normal handeln.", @@ -221,7 +221,7 @@ "Panicked": "Panik", "Passengers": "Passagiere", "PASSENGERS": "PASSAGIERE", - "PCPanicLevel": "SC's Panikstufe steigt um einen Schritt auf ", + "PCPanicLevel": "SC's Panikstufe steigt um eine Stufe auf ", "PermanantTrauma": "Permanentes Trauma. Mache einen EMPATHIE-Wurf am Ende der Sitzung. ", "PersonalAgenda": "Motivation", "Pharmaceuticals": "Medikamente", @@ -243,28 +243,28 @@ "ResetNote": "NOTE: Speichern, Zurücksetzen und CRT UI lässt FVTT neu laden.", "Roboto-Regular": "Roboto-Regular", "Roll": "Wurf:", - "RollCrit": "Roll Crit", + "RollCrit": "Kritischer Wurf", "ROLLFOR": "für", "Rolling": "Würfelt", "RollManCharCrit": "Geben Sie die D66-Nummer ein", "rollManCreAttMax": "Zahl muss zwischen 1 und 6 liegen", - "rollManCreatureAttack": "Rolle einen manuellen Kreaturenangriff.", - "RollManCrit": "Rolle manuelle kritische Verletzung", + "rollManCreatureAttack": "Würfel einen manuellen Kreaturenangriff.", + "RollManCrit": "Würfel manuelle kritische Verletzung", "RollManSynCrit": "Geben Sie die D6-Nummer ein", "RollMod": "Wurf Modifikator ", - "ROLLONCREATURETABLE": "Zeichne außerirdische Kreaturentabellen", - "ROLLONSELECTED": "Rolle auf ausgewähltem Muttertisch", - "RollPanic": "Klicken Sie, um für Panik zu rollen", + "ROLLONCREATURETABLE": "Würfel auf außerirdische Kreaturentabellen", + "ROLLONSELECTED": "Würfel auf ausgewählte Haupttabelle", + "RollPanic": "Klicken Sie, um auf Panik zu rollen", "rollStress": "Stress würfeln", - "Roughneck": "Machinist", - "Rounds": "Rounds", + "Roughneck": "Maschinist", + "Rounds": "Runden", "SansitaSwashed": "Sansita Swashed", "Scientist": "Wissenschaftler", "Sector": "Sektor", "Sectors": "Sektoren", "Seepage104": "Siehe Seite 106 im Alien Regelwerk.", "Seepage106": "Siehe Seite 105 im Alien Regelwerk.", - "SelectFirer": "Wählen Sie Feuerwehrmann aus", + "SelectFirer": "Wählen Sie Feuernden aus", "SELTABLE": "Tabelle auswählen", "SENSOR-OP": "SENSOR-OP", "SheetColorSettings": "Einstellungen für Blattfarbe", @@ -291,7 +291,7 @@ "SPECIALTY": "SPEZIALITÄT", "Speed": "Geschwindigkeit", "Starving": "Verhungern", - "StoryPoints": "Story Points", + "StoryPoints": "Story-Punkte", "Stress": "Stress", "StressMod": "Stress Modifikator ", "Stunts": "Stunts", @@ -299,7 +299,7 @@ "StylePickerHint": "Wähle den Stil für Text", "SubmitButton": "Speichern", "sucess": "Erfolg", - "sucesses": "Erfolge", + "sucesses": "Erfolge(n)", "Suit": "Anzüge/Panzerung", "Supply": "Versorgungswurf", "supplyDecreases": "Dein Vorrat schwindet", @@ -307,13 +307,13 @@ "SwitchKeysHint": "Schalte zu Rechtsklick für Würfel und Linksklick für Mods", "SynthDontNeed": "Synthetische brauchen keine Luft, Nahrung, kein Wasser und keinen Schlaf. Sie sind immun gegen Vakuum, Kälte und Krankheit. Androide sind normalerweise unbeeinträchtigt von den Alien-Pathogenen.", "Synthetic": "Synthetisch", - "SynthStress": "Imitate Human Panic and Push Button", + "SynthStress": "Imitiere menschliche Panik und drücke Knopf", "System": "System", "Systems": "Systeme", - "Talent-Crit": "Talente/Crít", + "Talent-Crit": "Talente/Crit", "Talents": "Talente", "terrain": "Terrain", - "THRUSTERS": "DRUCKSTRAHLER", + "THRUSTERS": "ANTRIEB", "TimeLimit": "Zeitlimit", "Tools": "Werkzeuge", "totalOf": "Du hast eine Summe von ", @@ -328,7 +328,7 @@ "worstResult": "-mal. Verwende das schlimmste Ergebnis.", "XP": "Erfahrung", "Yellow": "Gelb", - "YouAreAtPanic": "Du bist panisch!", + "YouAreAtPanic": "Du bist in Panik!", "youHave": "Du hast ", "YourPanicLevel": "Deine Panikstufe steigt um einen Schritt auf ", "youTake": "Du nimmst " diff --git a/package-lock.json b/package-lock.json index b1aa9100..4cee21b6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1179,7 +1179,7 @@ "archy": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", + "integrity": "sha1-+cjBN1fMHde8N5rHeyxipcKGjEA=", "dev": true }, "are-we-there-yet": { @@ -1264,7 +1264,7 @@ "array-each": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/array-each/-/array-each-1.0.1.tgz", - "integrity": "sha512-zHjL5SZa68hkKHBFBK6DJCTtr9sfTCPCaph/L7tMSLcTFgy+zX7E+6q5UArbtOtMBCtxdICpfTCspRse+ywyXA==", + "integrity": "sha1-p5SvDAWrF1KEbudTofIRoFugxE8=", "dev": true }, "array-find-index": { @@ -1349,7 +1349,7 @@ "array-unique": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", "dev": true }, "array.prototype.flat": { @@ -1533,7 +1533,7 @@ "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { "is-descriptor": "^1.0.0" @@ -1837,7 +1837,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { "is-descriptor": "^0.1.0" @@ -1971,7 +1971,7 @@ "collection-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", "dev": true, "requires": { "map-visit": "^1.0.0", @@ -2028,7 +2028,7 @@ "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "concat-stream": { "version": "1.6.2", @@ -2101,7 +2101,7 @@ "copy-descriptor": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, "copy-props": { @@ -2359,7 +2359,7 @@ "detect-file": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", + "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", "dev": true }, "detect-newline": { @@ -3031,7 +3031,7 @@ "expand-brackets": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", "dev": true, "requires": { "debug": "^2.3.3", @@ -3055,7 +3055,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { "is-descriptor": "^0.1.0" @@ -3064,7 +3064,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" @@ -3073,13 +3073,13 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } @@ -3087,7 +3087,7 @@ "expand-tilde": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", + "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=", "dev": true, "requires": { "homedir-polyfill": "^1.0.1" @@ -3155,7 +3155,7 @@ "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { "is-descriptor": "^1.0.0" @@ -3164,7 +3164,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" @@ -3202,7 +3202,7 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true } } @@ -3375,13 +3375,13 @@ "for-in": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, "for-own": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha512-0OABksIGrxKK8K4kynWkQ7y1zounQxP+CWnyclVwj81KW3vlLlGUx57DKGcP/LH216GzqnstnPocF16Nxs0Ycg==", + "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", "dev": true, "requires": { "for-in": "^1.0.1" @@ -3407,7 +3407,7 @@ "fragment-cache": { "version": "0.2.1", "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", "dev": true, "requires": { "map-cache": "^0.2.2" @@ -3599,7 +3599,7 @@ "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, "getpass": { @@ -3904,7 +3904,7 @@ "global-prefix": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", + "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=", "dev": true, "requires": { "expand-tilde": "^2.0.2", @@ -3933,6 +3933,16 @@ "glob": "~7.1.1", "lodash": "~4.17.10", "minimatch": "~3.0.2" + }, + "dependencies": { + "minimatch": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.8.tgz", + "integrity": "sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==", + "requires": { + "brace-expansion": "^1.1.7" + } + } } }, "glogg": { @@ -4269,9 +4279,9 @@ }, "dependencies": { "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", + "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==", "dev": true }, "ansi-styles": { @@ -5076,7 +5086,7 @@ "gulplog": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", - "integrity": "sha512-hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", "dev": true, "requires": { "glogg": "^1.0.0" @@ -5191,7 +5201,7 @@ "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", "dev": true, "requires": { "get-value": "^2.0.6", @@ -5202,7 +5212,7 @@ "has-values": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", "dev": true, "requires": { "is-number": "^3.0.0", @@ -5212,7 +5222,7 @@ "kind-of": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", "dev": true, "requires": { "is-buffer": "^1.1.5" @@ -5613,7 +5623,7 @@ "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, "requires": { "kind-of": "^3.0.2" @@ -5622,7 +5632,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { "is-buffer": "^1.1.5" @@ -6188,7 +6198,7 @@ "map-cache": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", "dev": true }, "map-obj": { @@ -6200,7 +6210,7 @@ "map-visit": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", "dev": true, "requires": { "object-visit": "^1.0.0" @@ -6398,7 +6408,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" @@ -6409,7 +6419,7 @@ "fill-range": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, "requires": { "extend-shallow": "^2.0.1", @@ -6421,7 +6431,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" @@ -6432,13 +6442,13 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, "to-regex-range": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, "requires": { "is-number": "^3.0.0", @@ -6488,9 +6498,9 @@ "dev": true }, "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "requires": { "brace-expansion": "^1.1.7" } @@ -7252,7 +7262,7 @@ "object-copy": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", "dev": true, "requires": { "copy-descriptor": "^0.1.0", @@ -7263,7 +7273,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { "is-descriptor": "^0.1.0" @@ -7272,7 +7282,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { "is-buffer": "^1.1.5" @@ -7295,7 +7305,7 @@ "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", "dev": true, "requires": { "isobject": "^3.0.0" @@ -7316,7 +7326,7 @@ "object.defaults": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/object.defaults/-/object.defaults-1.1.0.tgz", - "integrity": "sha512-c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==", + "integrity": "sha1-On+GgzS0B96gbaFtiNXNKeQ1/s8=", "dev": true, "requires": { "array-each": "^1.0.1", @@ -7328,7 +7338,7 @@ "object.map": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object.map/-/object.map-1.0.1.tgz", - "integrity": "sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==", + "integrity": "sha1-z4Plncj8wK1fQlDh94s7gb2AHTc=", "dev": true, "requires": { "for-own": "^1.0.0", @@ -7338,7 +7348,7 @@ "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", "dev": true, "requires": { "isobject": "^3.0.1" @@ -7508,7 +7518,7 @@ "parse-filepath": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", + "integrity": "sha1-pjISf1Oq89FYdvWHLz/6x2PWyJE=", "dev": true, "requires": { "is-absolute": "^1.0.0", @@ -7533,7 +7543,7 @@ "parse-passwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", + "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=", "dev": true }, "parse-uri": { @@ -7557,7 +7567,7 @@ "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, "path-dirname": { @@ -7592,7 +7602,7 @@ "path-root": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", + "integrity": "sha1-mkpoFMrBwM1zNgqV8yCDyOpHRbc=", "dev": true, "requires": { "path-root-regex": "^0.1.0" @@ -7601,7 +7611,7 @@ "path-root-regex": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", + "integrity": "sha1-v8zcjfWxLcUsi0PsONGNcsBLqW0=", "dev": true }, "path-type": { @@ -7735,7 +7745,7 @@ "posix-character-classes": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", "dev": true }, "postcss": { @@ -7813,7 +7823,7 @@ "pretty-hrtime": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==", + "integrity": "sha1-t+PqQkNaTJsnWdmeDyAesZWALuE=", "dev": true }, "printj": { @@ -7965,7 +7975,7 @@ "rechoir": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==", + "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", "dev": true, "requires": { "resolve": "^1.1.6" @@ -8163,7 +8173,7 @@ "resolve-dir": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", + "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=", "dev": true, "requires": { "expand-tilde": "^2.0.0", @@ -8264,7 +8274,7 @@ "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", "dev": true, "requires": { "ret": "~0.1.10" @@ -8290,8 +8300,7 @@ "dependencies": { "ansi-regex": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "resolved": "", "dev": true }, "ansi-styles": { @@ -8526,7 +8535,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" @@ -8535,7 +8544,7 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true } } @@ -8614,7 +8623,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { "is-descriptor": "^0.1.0" @@ -8623,7 +8632,7 @@ "extend-shallow": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, "requires": { "is-extendable": "^0.1.0" @@ -8632,13 +8641,13 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true }, "ms": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true } } @@ -8657,7 +8666,7 @@ "define-property": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", "dev": true, "requires": { "is-descriptor": "^1.0.0" @@ -8706,7 +8715,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { "is-buffer": "^1.1.5" @@ -8873,7 +8882,7 @@ "static-extend": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", "dev": true, "requires": { "define-property": "^0.2.5", @@ -8883,7 +8892,7 @@ "define-property": { "version": "0.2.5", "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", "dev": true, "requires": { "is-descriptor": "^0.1.0" @@ -9254,7 +9263,7 @@ "to-object-path": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", "dev": true, "requires": { "kind-of": "^3.0.2" @@ -9263,7 +9272,7 @@ "kind-of": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, "requires": { "is-buffer": "^1.1.5" @@ -9554,7 +9563,7 @@ "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", "dev": true } } @@ -9596,7 +9605,7 @@ "unset-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", "dev": true, "requires": { "has-value": "^0.3.1", @@ -9606,7 +9615,7 @@ "has-value": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", "dev": true, "requires": { "get-value": "^2.0.3", @@ -9617,7 +9626,7 @@ "isobject": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", "dev": true, "requires": { "isarray": "1.0.0" @@ -9628,7 +9637,7 @@ "has-values": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", "dev": true } } diff --git a/package.json b/package.json index cde216a1..2109b4d6 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,7 @@ "name": "alienrpg", "version": "1.0.0", "description": "CSS compiler for the Alien RPG system", - "scripts": { - }, + "scripts": {}, "browserslist": [ "last 3 versions" ], diff --git a/system.json b/system.json index 5d3900cf..1d3fbba6 100644 --- a/system.json +++ b/system.json @@ -12,7 +12,7 @@ "compatibility": { "minimum": "10", "verified": "10", - "maximum": "10" + "maximum": "11" }, "minimumCoreVersion": "10", "compatibleCoreVersion": "10", From 233f55917363e366bdc6ebe4a4a94e3c9b75c5bd Mon Sep 17 00:00:00 2001 From: pwatson100 Date: Wed, 22 Mar 2023 11:04:21 +0000 Subject: [PATCH 5/7] Added warning if no Panic Table --- Release_Notes.txt | 1 + lang/cn.json | 1 + lang/de.json | 1 + lang/en.json | 1 + lang/es.json | 1 + lang/fr.json | 1 + lang/it.json | 1 + lang/pt-br.json | 1 + lang/zh-tw.json | 1 + module/actor/actor.js | 3 +++ 10 files changed, 12 insertions(+) diff --git a/Release_Notes.txt b/Release_Notes.txt index b7149c34..15c0c6e0 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -481,4 +481,5 @@ Nerves of Steel modifier (- 2 stress dice) being incorrectly deducted from Item Comments on the Item sheets now use the rich text editor. Removed settings for fonts that were not available in the browser. Updated German language file with thanks to @kingofkong#6768 +Added warning if the Panic Table has not been imported when Stress button pushed. diff --git a/lang/cn.json b/lang/cn.json index a15ba366..87cb0947 100644 --- a/lang/cn.json +++ b/lang/cn.json @@ -187,6 +187,7 @@ "NoDice": "没有骰子可滚", "NoItem": "你控制的角色拥有一件未命名的物品", "None": "莫", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "没有技能", "NoStress": "没有压力", "NoSupplys": "你的补给已耗尽。", diff --git a/lang/de.json b/lang/de.json index f4ba7a16..94f83528 100644 --- a/lang/de.json +++ b/lang/de.json @@ -187,6 +187,7 @@ "NoDice": "Keine Würfel zum Rollen", "NoItem": "Deine Figur hat diesen Gegenstand nicht", "None": "Keiner", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "Keine Fertigkeit", "NoStress": "Kein Stress.", "NoSupplys": "Dein Vorrat ist leer", diff --git a/lang/en.json b/lang/en.json index 4585350d..13b4ac17 100644 --- a/lang/en.json +++ b/lang/en.json @@ -187,6 +187,7 @@ "NoDice": "No Dice to Roll", "NoItem": "Your controlled Actor does not have an item named", "None": "None", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "No Skill", "NoStress": "No Stress", "NoSupplys": "You have run out of supplies", diff --git a/lang/es.json b/lang/es.json index 88f726bb..f888a86f 100644 --- a/lang/es.json +++ b/lang/es.json @@ -187,6 +187,7 @@ "NoDice": "No hay dados para tirar", "NoItem": "Tu personaje no tiene un objeto llamado", "None": "Ninguno", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "Sin habilidad", "NoStress": "Sin Tensión", "NoSupplys": "Te has quedado sin reservas", diff --git a/lang/fr.json b/lang/fr.json index e818929c..f99aedb1 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -187,6 +187,7 @@ "NoDice": "Pas de dés à lancer", "NoItem": "Votre acteur contrôlé n'a pas d'élément nommé", "None": "Rien", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "Aucune compétence", "NoStress": "Pas de Stress", "NoSupplys": "Vous êtes à court de fournitures", diff --git a/lang/it.json b/lang/it.json index 81d5ca50..d6acb218 100644 --- a/lang/it.json +++ b/lang/it.json @@ -187,6 +187,7 @@ "NoDice": "Nessun dado da tirare", "NoItem": "Il tuo Personaggio controllato non ha un oggetto col nome", "None": "Nulla", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "Nessuna Sbilità", "NoStress": "Nessuno Stress", "NoSupplys": "Hai esaurito le tue scorte", diff --git a/lang/pt-br.json b/lang/pt-br.json index 8562a345..7ccf8e1b 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -187,6 +187,7 @@ "NoDice": "Sem dados para rolar", "NoItem": "O Ator que você controla não possui um Item nomeado", "None": "Nenhum(a)", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "Sem Habilidade", "NoStress": "Sem estresse", "NoSupplys": "Você está sem Abastecimento", diff --git a/lang/zh-tw.json b/lang/zh-tw.json index b30cc5e9..ea107826 100644 --- a/lang/zh-tw.json +++ b/lang/zh-tw.json @@ -187,6 +187,7 @@ "NoDice": "没有骰子可滚", "NoItem": "你控制的角色擁有一件未命名的物品", "None": "莫", + "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", "NoSkill": "沒有技能", "NoStress": "沒有壓力", "NoSupplys": "你的補給已耗盡。", diff --git a/module/actor/actor.js b/module/actor/actor.js index fd0eb431..defecd69 100644 --- a/module/actor/actor.js +++ b/module/actor/actor.js @@ -261,6 +261,9 @@ export class alienrpgActor extends Actor { let chatMessage = ''; const table = game.tables.getName('Panic Table'); // let aStress = actor.getRollData().stress; + if (!table) { + return ui.notifications.error(game.i18n.localize('ALIENRPG.NoPanicTable')); + } let rollModifier = parseInt(modifier) + parseInt(stressMod); // console.log('🚀 ~ file: actor.js ~ line 432 ~ alienrpgActor ~ rollAbility ~ rollModifier', rollModifier); From ec92f232d5bc6695698682600f075435b467e75e Mon Sep 17 00:00:00 2001 From: pwatson100 Date: Sun, 2 Apr 2023 13:24:10 +0100 Subject: [PATCH 6/7] DE language update --- .gitignore | 1 + .vscode/settings.json | 2 +- Release_Notes.txt | 2 +- lang/de.json | 147 +++++++++++++++++++++--------------------- 4 files changed, 76 insertions(+), 76 deletions(-) diff --git a/.gitignore b/.gitignore index 10070897..1582d1d5 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ package-lock.json package.json alienrpg.lock packs/alien-rpg-system +macros/create-actor.js diff --git a/.vscode/settings.json b/.vscode/settings.json index f71770b3..043b9e1b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -11,7 +11,7 @@ "savePath": "/css" } ], - "liveSassCompile.settings.excludeList": ["**/node_modules/**", ".vscode/**", ".github/**"], + "liveSassCompile.settings.excludeList": ["/**/node_modules/**", "/.vscode/**", "/.github/**"], "liveSassCompile.settings.generateMap": true, "liveSassCompile.settings.autoprefix": ["> 1%", "last 2 versions"], "files.associations": { diff --git a/Release_Notes.txt b/Release_Notes.txt index 15c0c6e0..18964f77 100644 --- a/Release_Notes.txt +++ b/Release_Notes.txt @@ -480,6 +480,6 @@ Version 3.0.5 Nerves of Steel modifier (- 2 stress dice) being incorrectly deducted from Item rolls on characters and vehicles. Comments on the Item sheets now use the rich text editor. Removed settings for fonts that were not available in the browser. -Updated German language file with thanks to @kingofkong#6768 +Updated German language file with thanks to @kingofkong#6768, Tobot and @Raldanash#6529 Added warning if the Panic Table has not been imported when Stress button pushed. diff --git a/lang/de.json b/lang/de.json index 94f83528..457539ba 100644 --- a/lang/de.json +++ b/lang/de.json @@ -1,22 +1,22 @@ { "ALIENRPG": { "AbbreviationKg": "kg", - "AbilityAbbagl": "agl", + "AbilityAbbagl": "ges", "AbilityAbbemp": "emp", - "AbilityAbbstr": "str", - "AbilityAbbwit": "wit", + "AbilityAbbstr": "stä", + "AbilityAbbwit": "ver", "AbilityAgl": "Geschick", "AbilityEmp": "Empathie", "AbilityStr": "Stärke", "AbilityWit": "Verstand", - "AcidAttack": "Säurehaltiges Blut", + "AcidAttack": "Säure-Attacke", "AcidBlood": "Diese Kreatur hat kein säurehaltiges Blut", "Active": "Aktiv", - "AddItem": "Gegenstand hinzufügen", + "AddItem": "Objekt hinzufügen", "AddMenuHint": "Schriftartknopf zu Hauptkonfiguration hinzufügen", "AddMenuName": "Einstellungsknopf hinzufügen", - "addToFLocker": "Zum Schließfach hinzufügen", - "AdHoc": "Ad hoc", + "addToFLocker": "Zum Spind hinzufügen", + "AdHoc": "Notizen", "Affiliation": "Zugehörigkeit", "AgendaStory": "Motivation/Story-Karten", "AI": "KI", @@ -29,7 +29,7 @@ "ArmorDoubled": "Rüstung Verdoppelt", "ArmorPiercing": "Panzerbrechend", "ArmorRating": "Panzerung", - "ArmorVsFire": "Panzerung geg. Feuer", + "ArmorVsFire": "Panzerung(Feuer)", "AttackRoll": "Angriffswurf", "AttackTable": "Angriffstabelle", "Attributes": "Attribute", @@ -47,25 +47,25 @@ "Class": "Beruf", "Classification": "Klassifikation", "climate": "Klima", - "CloneActor": "Figur klonen", + "CloneActor": "Akteur klonen", "Clothing": "Kleidung", "ColonialMarine": "Colonial Marine", "ColonialMarshal": "Colonial Marshal", "colonies": "Kolonien", "Colpick": "Farbe wählen", "ColpickHint": "Wähle die Farbe für jedweden Text", - "CombatantRemove": "Entfernen Sie Figur", + "CombatantRemove": "Entferne Akteur", "CombatantReroll": "Initiative neu würfeln", - "CombatantUpdate": "Figur aktualisieren", + "CombatantUpdate": "Akteur aktualisieren", "Comment": "Kommentar", - "CommonName": "Gewöhnlicher Name", + "CommonName": "Normaler Name", "CompanyAgent": "Konzernagent", - "ComputerMainframes": "Computer-Mainframes", - "ConButtons": "Linksklick hinz., Rechsklick entf.", + "ComputerMainframes": "Computer-Großrechner", + "ConButtons": "Linksklick: hinzufügen, Rechsklick: Entfernen", "Conditions": "Zustände", "Consumables": "Verbrauchsgüter", "Cost": "Preis", - "CreateItemTitle": "Ggst. erstellen", + "CreateItemTitle": "Objekt erstellen", "CreatureSkill": "Diese Kreatur hat diese Fertigkeit nicht.", "Crew": "Crew", "CREW": "BESATZUNG", @@ -82,44 +82,44 @@ "debug.hint": "Gibt erweiterte Debug-Informationen an die Konsole aus.", "debug.name": "Protokoll-Debug-Ausgabe", "DefMacro": "Verkürzte Makro-Syntax", - "DefMacroHint": "Aktiviere verkürzte Makro-Syntax zum direkten Zugriff auf Attribute, z.B. @str statt @attributes.str.value. Deaktiviere diese Einstellung, wenn der volle Attributpfad nötig ist, z.B. @attributes.str.label.", + "DefMacroHint": "Aktiviere verkürzte Makro-Syntax zur direkten Zugriff auf Attribute, z.B. @str statt @attributes.str.value. Deaktiviere diese Einstellung, wenn der volle Attributpfad nötig ist, z.B. @attributes.str.label.", "DefProto": "Grundeinstellung für Prototyp-Figur", "DefProtoHint": "Empfohlene Einstellung für alle neuen Figuren.", "Dehydrated": "Verdursten", - "DeleteItem": "Löschen", - "DeleteItemTitle": "Ggst. löschen", + "DeleteItem": "Objekt entfernen", + "DeleteItemTitle": "Objekt löschen", "Description": "Beschreibung", "Details": "Details", "DiagnosticsDisplay": "Diagnose und Anzeigegeräte", "DialCancel": "Zurück", "DialRoll": " Würfeln", "DialText": "Gib den Modifikator ein.", - "DialTextXeno": "Gib den Schaden am Xeno ein.", + "DialTextXeno": "Gib den Schaden am Xeno ein!", "DialTitle1": "Wurf modifiziert", "DialTitle2": "probe", "Dice": "Würfel: ", "DRAW": "ziehen", "EditItem": "Linksklick zum Bearbeiten, Rechtsklick zum Öffnen des Kontextmenüs.", - "EditItemTitle": "Ggst. bearbeiten", - "Effect": "Bewirken", + "EditItemTitle": "Objekt bearbeiten", + "Effect": "Effekt", "EmptyCrew": "Keine Besatzung", "Encumbered": "Belastet", "Encumbrance": "Traglast", "Engaged": "Kontakt", "ENGINEER": "TECHNIKER", - "ENSOKEN": "Stellen Sie sicher, dass das Spieler-Token ausgewählt ist.", + "ENSOKEN": "Stelle sicher, dass das Spieler-Token ausgewählt ist.", "EnterMod": "Gib deinen Modifikator ein", "Exhausted": "Erschöpft", "Extreme": "Extrem", "Fatal": "Tödlich", "Filter": "Filter", - "fLocker": "Kiste", + "fLocker": "Spind", "followingPush": "Nach dem Strapazieren,", "Fontpick": "Schriftart wählen", "FontStyle": "Schriftart", "Food": "Nahrung", "FoodDrink": "Nahrung und Getränke", - "forceImportHint": "Erzwingt einen erneuten Import, als ob dies der erste Start des Moduls wäre.  Dadurch werden vorhandene Daten nicht überschrieben, aber fehlende Daten werden ersetzt.", + "forceImportHint": "Erzwingt einen erneuten Import, als ob dies der erste Start des Moduls wäre. Dadurch werden vorhandene Daten nicht überschrieben, aber fehlende Daten werden ersetzt.", "forceImportLabel": "Modulinhalt importieren", "forceImportName": "Führen Sie den Modulimport erneut aus", "Freezing": "Erfrieren", @@ -132,18 +132,18 @@ "GUNNER": "KANONIER", "GunnerName": "Schütze", "Health": "Gesundh.", - "healthDamage": " Verletzungen", + "healthDamage": " Gesundheitsschäden", "HealTime": "Genesungszeit", "hideChatBGImage": "Chat-Hintergrundbild ausblenden", - "hideChatBGImageNote": "Aktivieren Sie diese Option, um das Hintergrundbild von Facehugger im Chat auszublenden", - "hideInitChat": "Initiieren Sie Initiative-Chat-Nachrichten", + "hideChatBGImageNote": "Aktivieren Sie diese Option, um das Facehugger Hintergrundbild im Chat auszublenden", + "hideInitChat": "Initiieren Sie Initiativ-Chat-Nachrichten", "hideInitChatHint": "Aktivieren Sie diese Option, um Chatnachrichten für Initiativwürfe auszublenden", "hideJournalBGImage": "Journal-Hintergrundbild ausblenden", "hideJournalBGImageNote": "Hintergrundbild bei Journaleinträgen ausblenden", "Homebrew": "Hausregeln", "HOWMANY": "Wie viele?", - "HOWMANYDICE": "Wie viele Basiswürfel?", - "HOWMANYSTRESS": "Wie viele Stresswürfel?", + "HOWMANYDICE": "Wie viele Bassis-Würfel?", + "HOWMANYSTRESS": "Wie viele Stress-Würfel?", "Hull": "Rumpf", "HULL": "RUMPF", "Inactive": "Inaktiv", @@ -172,57 +172,56 @@ "MenuLabel": "Konfiguriere Alien RPG Einstellungen", "MenuName": "Alien RPG Schriftart und -farbe", "Mercenary": "Söldner", - "MINOR-COMPONENT-DAMAGE": "KLEINER KOMPONENTENSCHADEN", + "MINOR-COMPONENT-DAMAGE": "LEICHTER KOMPONENTENSCHADEN", "MODIFIER": "Modifikator?", "Modifiers": "Modifikatoren", "MODULES-UPGRADES": "Module/Upgrades", - "MorePanic": "Mehr Panik", - "moveFromFlocker": "Aus Kiste nehmen", + "MorePanic": "Panik-Stufe steigt!", + "moveFromFlocker": "Aus dem Spind nehmen", "MultiPush": "Multi-Strapazieren zulassen", "Name": "Name", "NoActor": "Du kannst nur ein Makro für Gegenstände in deinem Besitz anlegen", "NoAttribute": "Kein Attribut", "NoCharCrit": "Keine Tabelle für kritische Verletzungen", "noCrewAssigned": "Es wurde keine Besatzung zugewiesen", - "NoDice": "Keine Würfel zum Rollen", + "NoDice": "Keine Würfel zum werfen", "NoItem": "Deine Figur hat diesen Gegenstand nicht", - "None": "Keiner", - "NoPanicTable": "You need to Import the Panic Table - Configuration> Alien RPG > Re-Import", + "None": "Keine", "NoSkill": "Keine Fertigkeit", - "NoStress": "Kein Stress.", + "NoStress": "Kein Stress", "NoSupplys": "Dein Vorrat ist leer", - "NoSynCrit": "Keine kritischen Verletzungen in Tabelle für Synthetische", + "NoSynCrit": "Keine Kritischen Verletzungen in der Tabelle für Syntetische gefunden", "NOTABLES": "Keine Tabelle vorhanden!", "NotActive": "Waffe ist nicht aktiv", "Notes": "Notizen", "NotifWrongItemType": "\"{type}\" Artikel können nicht zu a . hinzugefügt werden {actor}!", - "NoToken": "Du hast keine Figur ausgewählt.", + "NoToken": "Du hast keine Figur angewählt.", "NPC": "NSC", - "NPCpopUp": "Ankreuzen, um alle Tokens auf unverbunden und feindlich zu setzen.", + "NPCpopUp": "Ankreuzen, um alle Tokens unverbunden und feindlich zu setzen.", "Officer": "Offizier", - "OneDay": "Eines Tages", - "OneRound": "One Round", + "OneDay": "Einen Tag", + "OneRound": "Eine Runde", "Ones": "Einsen: ", "OneShift": "Eine Schicht", - "OneTurn": "Eine Runde", + "OneTurn": "Eine Phase", "OpenInventoryBrowser": "Inventar anzeigen", "OpenItemTitle": "Inhalt umsch.", - "Overwatch": "Feuerschutz", + "Overwatch": "OVERWATCH", "Panic1": "ZUSAMMENREISSEN: Du schaffst es, deine Nerven im Griff zu behalten. Gerade so.", "Panic10": "STARRE: Du erstarrst vor Angst und verlierst deine nächste langsame Aktion. Dein STRESSLEVEL und der aller befreundeter SC in KURZER Entfernung zu dir steigt um 1.", "Panic11": "SCHUTZ SUCHEN: Du musst deine nächste Aktion dazu verwenden, dich von der Gefahr wegzubewegen und, wenn möglich, einen sicheren Ort aufzusuchen. Du darfst einen Wurf auf Rückzug ablegen (siehe Seite 93), wenn sich ein Feind in KONTAKT mit dir befindet. Dein STRESSLEVEL sinkt um 1, aber der aller befreundeter SC in KURZER Entfernung zu dir steigt um 1. Nach einer Runde kannst du wieder normal handeln.", "Panic12": "SCHREIEN: Du schreist dir eine Runde lang die Lunge aus dem Leib und verlierst deine nächste langsame Aktion. Dein STRESSLEVEL sinkt um 1, aber alle befreundeten SC, die deinen Schrei hören, müssen sofort einen Panikwurf ablegen.", - "Panic13": "FLIEHEN:  Du hältst das einfach nicht mehr aus. Du musst sofort an einen sicheren Ort fliehen und wirst dich weigern, ihn zu verlassen. Außerdem wirst du niemanden angreifen und nichts Gefährliches unternehmen. Du darfst keinen Wurf auf Rückzug ablegen, wenn sich ein Feind in KONTAKT mit dir befindet. Dein STRESSLEVEL sinkt um 1, aber alle befreundeten Charaktere, die dich davonrennen sehen, müssen sofort einen Panikwurf ablegen.", - "Panic14": "BERSERKER:  Du musst sofort die nächste Person oder Kreatur angreifen, ob Freund oder Feind. Du wirst nicht aufhören, bis du oder das Ziel außer Gefecht gesetzt ist. Jeder befreundete Charakter, der deinen Amoklauf mitbekommt, muss sofort einen Panikwurf ablegen.", - "Panic15": "KATATONIE:  Du brichst völlig zusammen und kannst weder sprechen noch dich bewegen, sondern starrst nur noch ausdruckslos ins Nichts.", - "Panic7": "NERVÖSES ZUCKEN:  Dein STRESSLEVEL und der aller befreundeter SC in KURZER Entfernung zu dir steigt um 1.", - "Panic8": "ZITTERN:  Du fängst an, unkontrolliert zu zittern. Alle Fertigkeitswürfe, die auf GESCHICKLICHKEIT basieren, erhalten einen Modifikator von −2, bis deine Panik aufhört.", + "Panic13": "FLIEHEN: Du hältst das einfach nicht mehr aus. Du musst sofort an einen sicheren Ort fliehen und wirst dich weigern, ihn zu verlassen. Außerdem wirst du niemanden angreifen und nichts Gefährliches unternehmen. Du darfst keinen Wurf auf Rückzug ablegen, wenn sich ein Feind in KONTAKT mit dir befindet. Dein STRESSLEVEL sinkt um 1, aber alle befreundeten Charaktere, die dich davonrennen sehen, müssen sofort einen Panikwurf ablegen.", + "Panic14": "BERSERKER: Du musst sofort die nächste Person oder Kreatur angreifen, ob Freund oder Feind. Du wirst nicht aufhören, bis du oder das Ziel außer Gefecht gesetzt ist. Jeder befreundete Charakter, der deinen Amoklauf mitbekommt, muss sofort einen Panikwurf ablegen.", + "Panic15": "KATATONIE: Du brichst völlig zusammen und kannst weder sprechen noch dich bewegen, sondern starrst nur noch ausdruckslos ins Nichts.", + "Panic7": "NERVÖSES ZUCKEN: Dein STRESSLEVEL und der aller befreundeter SC in KURZER Entfernung zu dir steigt um 1.", + "Panic8": "ZITTERN: Du fängst an, unkontrolliert zu zittern. Alle Fertigkeitswürfe, die auf GESCHICKLICHKEIT basieren, erhalten einen Modifikator von −2, bis deine Panik aufhört.", "Panic9": "GEGENSTAND FALLEN LASSEN: Ob durch Stress, Verwirrung oder die Einsicht, dass ihr ohnehin alle sterben werdet, lässt du eine Waffe oder einen anderen wichtigen Gegenstand fallen – die SL entscheidet, welchen. Dein STRESSLEVEL steigt um 1..", "PanicCondition": "Panikeffekt", "Panicked": "Panik", "Passengers": "Passagiere", "PASSENGERS": "PASSAGIERE", - "PCPanicLevel": "SC's Panikstufe steigt um eine Stufe auf ", + "PCPanicLevel": "Deine aktive Panik steigt auf ", "PermanantTrauma": "Permanentes Trauma. Mache einen EMPATHIE-Wurf am Ende der Sitzung. ", "PersonalAgenda": "Motivation", "Pharmaceuticals": "Medikamente", @@ -232,44 +231,44 @@ "population": "Bevölkerung", "Power": "Energie", "Push": "Strapazieren", - "Pwr": "Ene", + "Pwr": "Energ", "QuantityLabel": "Anzahl", "Radiation": "Strahlung", - "Range": "Reichweite", - "Rds": "Lädt neu", + "Range": "Reichw", + "Rds": "Mun", "Relationships": "Beziehungen", "relOne": "Kumpel", "relTwo": "Rivale", "ResetButton": "Zurücksetzen", - "ResetNote": "NOTE: Speichern, Zurücksetzen und CRT UI lässt FVTT neu laden.", + "ResetNote": "HINWEIS: Speichern, Zurücksetzen und CRT UI lässt FVTT neu laden.", "Roboto-Regular": "Roboto-Regular", "Roll": "Wurf:", - "RollCrit": "Kritischer Wurf", + "RollCrit": "Kritische Verletzung", "ROLLFOR": "für", "Rolling": "Würfelt", - "RollManCharCrit": "Geben Sie die D66-Nummer ein", + "RollManCharCrit": "Gib die W66-Nummer ein", "rollManCreAttMax": "Zahl muss zwischen 1 und 6 liegen", - "rollManCreatureAttack": "Würfel einen manuellen Kreaturenangriff.", - "RollManCrit": "Würfel manuelle kritische Verletzung", - "RollManSynCrit": "Geben Sie die D6-Nummer ein", + "rollManCreatureAttack": "Würfle einen manuellen Kreaturen-Angriff.", + "RollManCrit": "Würfle eine manuelle kritische Verletzung", + "RollManSynCrit": "Gib die W6-Nummer ein", "RollMod": "Wurf Modifikator ", - "ROLLONCREATURETABLE": "Würfel auf außerirdische Kreaturentabellen", - "ROLLONSELECTED": "Würfel auf ausgewählte Haupttabelle", - "RollPanic": "Klicken Sie, um auf Panik zu rollen", + "ROLLONCREATURETABLE": "Generiere außerirdische Kreaturentabellen", + "ROLLONSELECTED": "Würfle auf ausgewählter GM-Tabelle", + "RollPanic": "Klicke für einen Panik-Wurf", "rollStress": "Stress würfeln", - "Roughneck": "Maschinist", - "Rounds": "Runden", + "Roughneck": "Machinist", + "Rounds": "Munition", "SansitaSwashed": "Sansita Swashed", "Scientist": "Wissenschaftler", "Sector": "Sektor", "Sectors": "Sektoren", "Seepage104": "Siehe Seite 106 im Alien Regelwerk.", "Seepage106": "Siehe Seite 105 im Alien Regelwerk.", - "SelectFirer": "Wählen Sie Feuernden aus", + "SelectFirer": "Wählen Sie einen Schützen aus", "SELTABLE": "Tabelle auswählen", "SENSOR-OP": "SENSOR-OP", "SheetColorSettings": "Einstellungen für Blattfarbe", - "SHIP-ARMOR": "RÜSTUNG", + "SHIP-ARMOR": "PANZERUNG", "Short": "Kurz", "SIGNATURE": "UNTERSCHRIFT", "SignatureItem": "Persönlicher Gegenstand", @@ -292,7 +291,7 @@ "SPECIALTY": "SPEZIALITÄT", "Speed": "Geschwindigkeit", "Starving": "Verhungern", - "StoryPoints": "Story-Punkte", + "StoryPoints": "Story Points", "Stress": "Stress", "StressMod": "Stress Modifikator ", "Stunts": "Stunts", @@ -300,7 +299,7 @@ "StylePickerHint": "Wähle den Stil für Text", "SubmitButton": "Speichern", "sucess": "Erfolg", - "sucesses": "Erfolge(n)", + "sucesses": "Erfolge", "Suit": "Anzüge/Panzerung", "Supply": "Versorgungswurf", "supplyDecreases": "Dein Vorrat schwindet", @@ -308,16 +307,16 @@ "SwitchKeysHint": "Schalte zu Rechtsklick für Würfel und Linksklick für Mods", "SynthDontNeed": "Synthetische brauchen keine Luft, Nahrung, kein Wasser und keinen Schlaf. Sie sind immun gegen Vakuum, Kälte und Krankheit. Androide sind normalerweise unbeeinträchtigt von den Alien-Pathogenen.", "Synthetic": "Synthetisch", - "SynthStress": "Imitiere menschliche Panik und drücke Knopf", + "SynthStress": "Imitiere Panik und Strapazieren", "System": "System", "Systems": "Systeme", - "Talent-Crit": "Talente/Crit", + "Talent-Crit": "Talente/Crít", "Talents": "Talente", "terrain": "Terrain", - "THRUSTERS": "ANTRIEB", + "THRUSTERS": "SCHUBDÜSEN", "TimeLimit": "Zeitlimit", "Tools": "Werkzeuge", - "totalOf": "Du hast eine Summe von ", + "totalOf": "Du hast insgesamt ", "Type": "Typ", "VisionDevices": "Sichtgeräte", "Wallpoet": "Wallpoet", @@ -329,9 +328,9 @@ "worstResult": "-mal. Verwende das schlimmste Ergebnis.", "XP": "Erfahrung", "Yellow": "Gelb", - "YouAreAtPanic": "Du bist in Panik!", + "YouAreAtPanic": "Du gerätst in Panik!", "youHave": "Du hast ", - "YourPanicLevel": "Deine Panikstufe steigt um einen Schritt auf ", - "youTake": "Du nimmst " + "YourPanicLevel": "Deine Panik steigt auf ", + "youTake": "Du bekommst " } } From dc1fe77c57b8c6e4c580ff6c580e594ce59f60a4 Mon Sep 17 00:00:00 2001 From: pwatson100 Date: Sun, 2 Apr 2023 13:27:59 +0100 Subject: [PATCH 7/7] Updated mother instructions --- Mother Instructions/Mother Instructions EN.html | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Mother Instructions/Mother Instructions EN.html b/Mother Instructions/Mother Instructions EN.html index 5802b363..4dff167d 100644 --- a/Mother Instructions/Mother Instructions EN.html +++ b/Mother Instructions/Mother Instructions EN.html @@ -10,15 +10,13 @@ If you like my system please consider buying me a coffee: https://ko-fi.com/paulwatson


-

Change history for latest version 3.0.0

+

Change history for latest version 3.0.5

    -
  • Foundry V10 compatible
  • -
  • New V10 macros for Roll on selected Creature table and Roll on selected Mother table - Ensure you update them.
  • -
  • Dice roller now allows just Stress Dice to be rolled.
  • -
  • If the Base dice modifier is less than the attribute/skill is will subtract Stress dice in accordance with page 62 of the CRB.
  • -
  • It is now possible to create your own Critical Injuries table (See MO/TH/ER Instructions for required format).
  • -
  • Encumbrance for PC's with Pack Mule should now display correctly.
  • -
  • Changed the way "Nerves of Steel" and "Tough" are applied which should/might sort out rare issue with tokens losing the adjusted stat.
  • +
  • Nerves of Steel modifier (- 2 stress dice) being incorrectly deducted from Item rolls on characters and vehicles.
  • +
  • Comments on the Item sheets now use the rich text editor.
  • +
  • Removed settings for fonts that were not available in the browser.
  • +
  • Updated German language file with thanks to @kingofkong#6768, Tobot and @Raldanash#6529
  • +
  • Added warning if the Panic Table has not been imported when Stress button pushed.


The core system provides support for: