diff --git a/lang/en.json b/lang/en.json index b76b1763..47b8e11b 100644 --- a/lang/en.json +++ b/lang/en.json @@ -52,6 +52,7 @@ "WITCHER.Armor.Reliable": "Rel.", "WITCHER.Armor.EncumbranceValue": "Encumbrance", "WITCHER.Armor.Resistances": "Resistances", + "WITCHER.Armor.Res": "Res", "WITCHER.Armor.Bludgeoning": "Bludgeoning", "WITCHER.Armor.Slashing": "Slashing", "WITCHER.Armor.Percing": "Percing", @@ -114,7 +115,7 @@ "WITCHER.Diagram.otherComponents": "Other Components", "WITCHER.Diagram.investment": "Investment", "WITCHER.Diagram.Learned": "Learned", - "WITCHER.Diagram.Formulae": "Formuale", + "WITCHER.Diagram.Formulae": "Formulae", "WITCHER.Diagram.Ingredient": "Ingredient", "WITCHER.Diagram.Weapon": "Weapon", @@ -591,6 +592,7 @@ "WITCHER.Spell.Effect": "Effect", "WITCHER.Spell.AlternateComponents": "Alternate Components", "WITCHER.SPell.Signs": "Signs", + "WITCHER.Spell.Element": "Element", "WITCHER.Spell.StaCost": "STA Cost", "WITCHER.Spell.Variable": "STA Variable", diff --git a/lang/es.json b/lang/es.json index 8609ef45..0f7b47c9 100644 --- a/lang/es.json +++ b/lang/es.json @@ -58,6 +58,13 @@ "WITCHER.Armor.Bludgeoning": "Aplastante", "WITCHER.Armor.Slashing": "Cortante", "WITCHER.Armor.Percing": "Perforante", + "WITCHER.Armor.Elemental": "Elemental", + "WITCHER.Armor.Type": "Tipo", + + "WITCHER.Armor.Light": "Armadura ligera", + "WITCHER.Armor.Medium": "Armadura media", + "WITCHER.Armor.Heavy": "Armaduar pesada", + "WITCHER.Armor.Natural": "Armadura natural", "WITCHER.Armor.LocationHead": "Cabeza", "WITCHER.Armor.LocationTorso": "Torso", @@ -119,6 +126,8 @@ "WITCHER.Diagram.ElderfolkWeapon": "Arma del pueblo antiguo", "WITCHER.Diagram.ElderfolkArmor": "Armadura del pueblo antiguo", "WITCHER.Diagram.Ammunition": "Munición", + "WITCHER.Diagram.Bomb": "Bombas", + "WITCHER.Diagram.Traps": "Trampas", "WITCHER.Diagram.Novice": "Novicio", "WITCHER.Diagram.Journeyman": "Adepto", @@ -639,11 +648,11 @@ "WITCHER.Dialog.sizeHuge": "Enorme", "WITCHER.Dialog.rangeNone": "Ninguno", - "WITCHER.Dialog.rangePointBlank": "Bocajarro", - "WITCHER.Dialog.rangeClose": "Corto", - "WITCHER.Dialog.rangeMedium": "Medio", - "WITCHER.Dialog.rangeLong": "Largo", - "WITCHER.Dialog.rangeExtreme": "Extremo", + "WITCHER.Dialog.rangePointBlank": "Bocajarro (<2m)", + "WITCHER.Dialog.rangeClose": "Corto (1/4 Alc)", + "WITCHER.Dialog.rangeMedium": "Medio (1/2 Alc)", + "WITCHER.Dialog.rangeLong": "Largo (Máx Alc)", + "WITCHER.Dialog.rangeExtreme": "Extremo (2x Alc)", "WITCHER.Dialog.strikeNormal": "Ataque normal", "WITCHER.Dialog.strikeFast": "Ataque rápido", @@ -653,12 +662,13 @@ "WITCHER.Dialog.attackUse": "El ataque usará", "WITCHER.Dialog.attackExtra": "Ataque extra", "WITCHER.Dialog.attackLocation": " Localización de daño", + "WITCHER.Dialog.damageType": "Tipo de daño", "WITCHER.Dialog.attackModifierse": "Modificadores de ataque", "WITCHER.Dialog.attackSize": "Modificadores de tamaño del oponente", "WITCHER.Dialog.attackRange": "Modificadores de alcance", "WITCHER.Dialog.attackCustom": "Modificadores personalizados", "WITCHER.Dialog.attackStrike": "Tipo de ataque", - "WITCHER.Dialog.attackDamage": "daño", + "WITCHER.Dialog.attackDamage": "Daño", "WITCHER.Dialog.attackMeleeBonus": "Bono cuerpo a cuerpo", "WITCHER.Dialog.attackCustomDmg": "Modificadores de daño personalizados", "WITCHER.Dialog.attackWith": "Realizar un ataque con", @@ -711,10 +721,36 @@ "WITCHER.Resources.modifiers": "Modificadores de recursos", "WITCHER.Weapon.onlyDmg": "Solo tiradas de daño", + "WITCHER.Weapon.useAmmo": "Usar munición", "WITCHER.Spell.Damage": "Causa daño", "WITCHER.Damage.RemoveSP": "Resta la CP antes de aplicar el modificador de localización", "WITCHER.Effect.Rolled": "Rolled", + + "WITCHER.Settings.specialFont": "Usa la fuente especial de The Witcher", + + "WITCHER.SKill.profession": "Prof", + "WITCHER.SKill.pickup": "Recoger", + "WITCHER.SKill.learn": "Aprender", - "WITCHER.Settings.specialFont": "Usa la fuente especial de The Witcher" + "WITCHER.Items.transferTitle": "Transferir objetos", + "WITCHER.Items.transferMany": "¿Cuántos objetos quieres transferir?", + + "WITCHER.Damage.damageType": "¿Que tipo de daño?", + "WITCHER.Damage.resistSilver": "Aplicar resistencia a la plata", + "WITCHER.Damage.resistMeteorite": "Aplicar resistencia meteoríca ", + + "WITCHER.Damage.initial": "Daño inicial", + "WITCHER.Damage.totalSP": "Capacidad de parada total", + "WITCHER.Damage.afterSPReduct": "Daño después de la reducción de la clase de parada", + "WITCHER.Damage.afterLocationModifier": "Daño después del modificador de localización", + "WITCHER.Damage.afterResistances": "Daño después de las resistencias", + "WITCHER.Damage.totalApplied": "Daño total aplicado", + "WITCHER.Damage.NotEnough": "No hay suficiente daño para penetrar la armadura", + + "WITCHER.Context.applyDmg": "Aplicar daño", + "WITCHER.Context.Defense": "Defensa", + "WITCHER.Context.SelectActor": "Debes seleccionar al menos un actor", + + "WITCHER.Armor.tooMuch": "Hay demasiada armadura equipada del mismo tipo " } \ No newline at end of file diff --git a/scripts/TheWitcherTRPG.js b/scripts/TheWitcherTRPG.js index d06f8ccc..0a6c5791 100644 --- a/scripts/TheWitcherTRPG.js +++ b/scripts/TheWitcherTRPG.js @@ -24,7 +24,8 @@ async function preloadHandlebarsTemplates(){ "systems/TheWitcherTRPG/templates/partials/monster-inventory-tab.html", "systems/TheWitcherTRPG/templates/partials/monster-details-tab.html", "systems/TheWitcherTRPG/templates/partials/monster-spell-tab.html", - "systems/TheWitcherTRPG/templates/partials/skill-display.html" + "systems/TheWitcherTRPG/templates/partials/skill-display.html", + "systems/TheWitcherTRPG/templates/partials/item-header.html" ]; return loadTemplates(templatePath); } diff --git a/styles/item-sheets.css b/styles/item-sheets.css new file mode 100644 index 00000000..f7adf1a3 --- /dev/null +++ b/styles/item-sheets.css @@ -0,0 +1,90 @@ +.item-header { + display: flex; +} + +.item-header img{ + height: 100px; + max-width: 200px; +} + +.itemname { + margin-left: 5px; +} + +.item-header-row { + display: table; + margin: 0 auto; +} + +.item-header-first-collum { + width: 400px; +} + +.item-header-second-collum { + display: table-cell; + text-align: center; + width: 100px; +} + +.item-header-second-collum input { + width: 75px; + height: 27px; +} + +.item-header-second-collum label { + display: block; +} + +.item-header-spell { + width: 33.33%; +} + +.item-options { + display: flex; + width: 501px; + height: 54px; +} + +.item-option-tickbox { + height: 27px; +} + +.item-option-tickbox label { + float: left; + margin-top: 5px; +} + +.item-option-tickbox input { + float: right; +} + +.item-collum { + text-align: center; + width: 33.33%; +} + +.item-collum label{ + display: block; +} + +.item-row { + display: flex; + text-align: center; +} + +.item-second-collum{ + text-align: center; + width: 50%; +} + +.item-second-collum label{ + display: block; + width: 100%; +} + +.----item-collum input { + width: 75px; + height: 27px; + margin-right: 5px; + margin-left: 5px; +} \ No newline at end of file diff --git a/styles/witcher-styles.css b/styles/witcher-styles.css index d8c6860c..610ba501 100644 --- a/styles/witcher-styles.css +++ b/styles/witcher-styles.css @@ -9,6 +9,7 @@ @import "./loot-sheet.css"; @import "./profession-sheet.css"; @import "./crit-wounds-table.css"; +@import "./item-sheets.css"; @font-face { font-family:'Thewitcher'; diff --git a/system.json b/system.json index 8873c7cb..bc13aa45 100644 --- a/system.json +++ b/system.json @@ -3,7 +3,7 @@ "title": "TheWitcherTRPG - fvtt", "description": "The Witcher TRPG System.", "compatibleCoreVersion": "0.8.8", - "version": 0.65, + "version": 0.66, "author": "TechAntho", "scripts": [ ], diff --git a/templates/partials/item-header.html b/templates/partials/item-header.html new file mode 100644 index 00000000..d3163052 --- /dev/null +++ b/templates/partials/item-header.html @@ -0,0 +1,76 @@ +
+ +
+

+
+ {{#unless (eq item.type "spell")}} +
+ + +
+
+ + +
+
+ {{#if (eq item.type "mutagen")}} + + + {{/if}} + {{#unless (eq item.type "mutagen")}} + + + {{/unless}} +
+ {{/unless}} + {{#if (eq item.type "spell")}} +
+ + +
+
+ {{#if (eq data.class "Hexes")}} + + + {{/if}} + {{#unless (eq data.class "Hexes")}} + + + {{/unless}} +
+
+ {{#unless (eq data.staminaIsVar true)}} + + + {{/unless}} +
+ {{/if}} +
+
+
diff --git a/templates/sheets/alchemical-sheet.html b/templates/sheets/alchemical-sheet.html index 15201836..353677c5 100644 --- a/templates/sheets/alchemical-sheet.html +++ b/templates/sheets/alchemical-sheet.html @@ -1,20 +1,5 @@
-
- -
-

-
-
- - - - - - -
-
-
-
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} {{!-- Attributes Tab --}} diff --git a/templates/sheets/armor-sheet.html b/templates/sheets/armor-sheet.html index 6be628bf..eb38a17b 100644 --- a/templates/sheets/armor-sheet.html +++ b/templates/sheets/armor-sheet.html @@ -1,26 +1,23 @@ -
- -
-

-
-
- - - - - - -
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} +
+
+
+ +
-
-
-
- - - - +
+
+ + +
+
+
+
+ + +
{{!-- Attributes Tab --}} diff --git a/templates/sheets/component-sheet.html b/templates/sheets/component-sheet.html index 64d37180..9e8b50f5 100644 --- a/templates/sheets/component-sheet.html +++ b/templates/sheets/component-sheet.html @@ -1,39 +1,30 @@ -
- -
-

-
- - - - - - -
-
-
-
- - - {{#if (eq data.type "substances")}} - - + {{#select data.type}} + + + + + {{/select}} - {{/if}} +
+
+ {{#if (eq data.type "substances")}} + + + {{/if}} +
diff --git a/templates/sheets/diagrams-sheet.html b/templates/sheets/diagrams-sheet.html index 6c730f38..958a120f 100644 --- a/templates/sheets/diagrams-sheet.html +++ b/templates/sheets/diagrams-sheet.html @@ -1,43 +1,36 @@ -
- -
-

-
- - - - - - -
-
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} +
+
+
- -
-
+
+ + +
+
diff --git a/templates/sheets/enhancement-sheet.html b/templates/sheets/enhancement-sheet.html index 953f57c4..91a449c9 100644 --- a/templates/sheets/enhancement-sheet.html +++ b/templates/sheets/enhancement-sheet.html @@ -1,27 +1,16 @@ -
- -
-

-
- - - - - - -
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} +
+
+ +
-
-
- -
{{#if (eq data.type "armor")}}
{{localize "WITCHER.Actor.Profession.Level"}}
diff --git a/templates/sheets/mount-sheet.html b/templates/sheets/mount-sheet.html index 63886961..e14b093e 100644 --- a/templates/sheets/mount-sheet.html +++ b/templates/sheets/mount-sheet.html @@ -1,19 +1,5 @@ -
- -
-

-
- - - - - - -
-
-
- +{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} {{!-- Sheet Tab Navigation --}}
diff --git a/templates/sheets/spell-sheet.html b/templates/sheets/spell-sheet.html index 16f32854..41be028a 100644 --- a/templates/sheets/spell-sheet.html +++ b/templates/sheets/spell-sheet.html @@ -1,51 +1,16 @@ -
- -
-

-
- - - {{#if (eq data.class "Hexes")}} - - - {{/if}} - {{#unless (eq data.class "Hexes")}} - - {{/unless}} +{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} +
+
+
+ +
- {{#unless (eq data.staminaIsVar true)}} - - - {{/unless}} - -
-
-
-
+
{{#if (or (eq data.class "Spells") (eq data.class "Witcher"))}} + {{/if}} {{#if (eq data.class "Invocations")}} + {{/if}} +
+
{{#if (eq data.class "Witcher")}} + {{/if}}
- - +
+ + {{#unless (eq data.class "Hexes")}}
diff --git a/templates/sheets/valuable-sheet.html b/templates/sheets/valuable-sheet.html index 217179af..3a02f7a0 100644 --- a/templates/sheets/valuable-sheet.html +++ b/templates/sheets/valuable-sheet.html @@ -1,49 +1,46 @@ -
- -
-

-
- - - - - - -
-
- - -
- - - +{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} +
+
+ + +
+
+
+
+ + +
+
+
+ + - + {{!-- effect Tab --}}
diff --git a/templates/sheets/weapon-sheet.html b/templates/sheets/weapon-sheet.html index 15874051..43fe1d93 100644 --- a/templates/sheets/weapon-sheet.html +++ b/templates/sheets/weapon-sheet.html @@ -1,44 +1,39 @@ -
- -
-

-
-
- - - - - - -
+{{>"systems/TheWitcherTRPG/templates/partials/item-header.html"}} +
+
+
+ + +
+
+ +
-
-
- {{#unless data.isAmmo}} - - - {{/unless}} -
-
- - - - - - +
+
+ + +
+
+
+ {{#unless data.isAmmo}} + + + {{/unless}} +
{{localize "WITCHER.Mutagen.MutSource"}}{{localize "WITCHER.Item.Availability"}}{{localize "WITCHER.Valuable.Conceal"}}{{localize "WITCHER.Valuable.Conceal"}}