diff --git a/less/original/items.less b/less/original/items.less index 18d91755..83bb51c9 100644 --- a/less/original/items.less +++ b/less/original/items.less @@ -106,17 +106,17 @@ &:nth-child(even) { width: 150px; margin: 0.5em 0.5em; - padding: 0px 10px 0px 10px; + padding: 0 10px 0 10px; text-align: left; } } thead { - border-bottom: 0px; + border-bottom: 0; } th { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-weight: bold; @@ -129,7 +129,7 @@ &:nth-child(even) { width: 150px; margin: 0.5em 0.5em; - padding: 0px 10px 0px 10px; + padding: 0 10px 0 10px; text-align: left; } } @@ -137,7 +137,7 @@ .medtable { table { width: 500px; - border: 0px; + border: 0; margin: 0.5em 0.5em; } td { @@ -149,17 +149,17 @@ &:nth-child(even) { width: 450px; margin: 0.5em 0.5em; - padding: 0px 10px 0px 0px; + padding: 0 10px 0 0; text-align: left; } } thead { - border-bottom: 0px; + border-bottom: 0; } th { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-weight: bold; @@ -174,8 +174,8 @@ } .classtable { blockquote { - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; background-color: #bdc8cc; width: 600px; h3 { @@ -189,8 +189,8 @@ width: 100%; border-collapse: collapse; background: rgba(0, 0, 0, 0.05); - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; border-top: 0; border-bottom: 0; margin: 0.5em 0; @@ -200,7 +200,7 @@ thead { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-style: normal; @@ -209,7 +209,7 @@ th { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-style: normal; @@ -246,7 +246,7 @@ width: 100%; line-height: 18px; margin-bottom: 15px; - border: 0 0 0 0; + border: 0; border-bottom: none; overflow-x: auto; tbody { diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less index d49690bf..f32ecc4e 100644 --- a/less/update/components/actor-global.less +++ b/less/update/components/actor-global.less @@ -185,7 +185,7 @@ display: inline-block; text-align: right; - padding: 0px 3px; + padding: 0 3px; &:last-child { text-align: left; @@ -780,7 +780,7 @@ display: block; width: 100%; text-align: right; - padding: 0px 3px; + padding: 0 3px; &:last-child { text-align: left; } @@ -956,7 +956,7 @@ display: block; width: 100%; text-align: right; - padding: 0px 3px; + padding: 0 3px; &:last-child { text-align: left; } diff --git a/less/update/components/sidebar-global.less b/less/update/components/sidebar-global.less index 45bd2048..4cc2ee0b 100644 --- a/less/update/components/sidebar-global.less +++ b/less/update/components/sidebar-global.less @@ -231,7 +231,7 @@ padding-bottom: 4px; .folder { & > .folder-header { - line-height: default; + line-height: initial; padding: 0 0 0 8px; position: relative; border: none; diff --git a/less/update/components/sidebar.less b/less/update/components/sidebar.less index aa8b2905..72ddee9d 100644 --- a/less/update/components/sidebar.less +++ b/less/update/components/sidebar.less @@ -302,7 +302,7 @@ } .folder { & > .folder-header { - line-height: default; + line-height: initial; padding: 0 0 0 8px; position: relative; border: none; diff --git a/module/actor/entity.js b/module/actor/entity.js index 633ee6fe..228b08d4 100644 --- a/module/actor/entity.js +++ b/module/actor/entity.js @@ -641,8 +641,7 @@ export default class Actor5e extends Actor { knownTechPowers++; break; } - } - continue; + } } ad.attributes.force.known.value = knownForcePowers; ad.attributes.tech.known.value = knownTechPowers; diff --git a/module/actor/sheets/newSheet/character.js b/module/actor/sheets/newSheet/character.js index 38b0b1c8..58176a54 100644 --- a/module/actor/sheets/newSheet/character.js +++ b/module/actor/sheets/newSheet/character.js @@ -486,8 +486,8 @@ async function addFavorites(app, html, data) { let v = (comps.vocal) ? "V" : ""; let s = (comps.somatic) ? "S" : ""; let m = (comps.material) ? "M" : ""; - let c = (comps.concentration) ? true : false; - let r = (comps.ritual) ? true : false; + let c = !!(comps.concentration); + let r = !!(comps.ritual); item.powerComps = `${v}${s}${m}`; item.powerCon = c; item.powerRit = r; @@ -643,11 +643,7 @@ async function addSubTabs(app, html, data) { return tab.target == target }); data.options.subTabs[subgroup].map(el => { - if(el.target == target) { - el.active = true; - } else { - el.active = false; - } + el.active = el.target == target; return el; }) diff --git a/module/config.js b/module/config.js index 57d472f4..399fe55a 100644 --- a/module/config.js +++ b/module/config.js @@ -1022,7 +1022,7 @@ SW5E.powerLevels = { }; // TODO: This is used for spell scrolls, it maps the level to the compendium ID of the item the spell would be bound to -// We could use this wit, say, holocrons to produce scrolls +// We could use this with, say, holocrons to produce scrolls /* // Power Scroll Compendium UUIDs SW5E.powerScrollIds = { @@ -1262,10 +1262,10 @@ SW5E.characterFlags = { type: Boolean }, "armorIntegration": { - name: "SW5E.FlagsArmorIntegration", + name: "SW5E.FlagsArmorIntegration", hint: "SW5E.FlagsArmorIntegrationHint", section: "SW5E.SpeciesTraits", - type: Boolean + type: Boolean }, "businessSavvy": { name: "SW5E.FlagsBusinessSavvy", @@ -1274,7 +1274,7 @@ SW5E.characterFlags = { type: Boolean }, "cannibalize": { - name: "SW5E.FlagsCannibalize", + name: "SW5E.FlagsCannibalize", hint: "SW5E.FlagsCannibalizeHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1304,7 +1304,7 @@ SW5E.characterFlags = { type: Boolean }, "enthrallingPheromones": { - name: "SW5E.FlagsEnthrallingPheromones", + name: "SW5E.FlagsEnthrallingPheromones", hint: "SW5E.FlagsEnthrallingPheromonesHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1328,13 +1328,13 @@ SW5E.characterFlags = { type: Boolean }, "foreignBiology": { - name: "SW5E.FlagsForeignBiology", + name: "SW5E.FlagsForeignBiology", hint: "SW5E.FlagsForeignBiologyHint", section: "SW5E.SpeciesTraits", type: Boolean }, "furyOfTheSmall": { - name: "SW5E.FlagsFuryOfTheSmall", + name: "SW5E.FlagsFuryOfTheSmall", hint: "SW5E.FlagsFuryOfTheSmallHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1346,7 +1346,7 @@ SW5E.characterFlags = { type: Boolean }, "inscrutable": { - name: "SW5E.FlagsInscrutable", + name: "SW5E.FlagsInscrutable", hint: "SW5E.FlagsInscrutableHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1376,7 +1376,7 @@ SW5E.characterFlags = { type: Boolean }, "multipleHearts": { - name: "SW5E.FlagsMultipleHearts", + name: "SW5E.FlagsMultipleHearts", hint: "SW5E.FlagsMultipleHeartsHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1418,7 +1418,7 @@ SW5E.characterFlags = { type: Boolean }, "precognition": { - name: "SW5E.FlagsPrecognition", + name: "SW5E.FlagsPrecognition", hint: "SW5E.FlagsPrecognitionHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1431,9 +1431,9 @@ SW5E.characterFlags = { }, "puny": { name: "SW5E.FlagsPuny", - hint: "SW5E.FlagsPunyHint", - section: "SW5E.SpeciesTraits", - type: Boolean + hint: "SW5E.FlagsPunyHint", + section: "SW5E.SpeciesTraits", + type: Boolean }, "rapidReconstruction": { name: "SW5E.FlagsRapidReconstruction", @@ -1442,7 +1442,7 @@ SW5E.characterFlags = { type: Boolean }, "rapidlyRegenerative": { - name: "SW5E.FlagsRapidlyRegenerative", + name: "SW5E.FlagsRapidlyRegenerative", hint: "SW5E.FlagsRapidlyRegenerativeHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1454,7 +1454,7 @@ SW5E.characterFlags = { type: Boolean }, "savageAttacks": { - name: "SW5E.FlagsSavageAttacks", + name: "SW5E.FlagsSavageAttacks", hint: "SW5E.FlagsSavageAttacksHint", section: "SW5E.SpeciesTraits", type: Boolean @@ -1466,15 +1466,15 @@ SW5E.characterFlags = { type: Boolean }, "strongLegged": { - name: "SW5E.FlagsStrongLegged", + name: "SW5E.FlagsStrongLegged", hint: "SW5E.FlagsStrongLeggedHint", section: "SW5E.SpeciesTraits", type: Boolean }, "sunlightSensitivity": { - name: "SW5E.FlagsSunlightSensitivity", + name: "SW5E.FlagsSunlightSensitivity", hint: "SW5E.FlagsSunlightSensitivityHint", - section: "SW5E.SpeciesTraits", + section: "SW5E.SpeciesTraits", type: Boolean }, "surpriseAttack": { @@ -1496,7 +1496,7 @@ SW5E.characterFlags = { type: Boolean }, "tinker": { - name: "SW5E.FlagsTinker", + name: "SW5E.FlagsTinker", hint: "SW5E.FlagsTinkerHint", section: "SW5E.SpeciesTraits", type: Boolean diff --git a/sw5e copy.css b/sw5e copy.css index c19de745..14e890f5 100644 --- a/sw5e copy.css +++ b/sw5e copy.css @@ -102,7 +102,7 @@ body { font-size: 13px; color: #191813; } -.sw5e input[type="text"] +.sw5e input[type="text"], .sw5e select { height: calc(100% - 2px); border: 1px solid #7a7971; diff --git a/sw5e-global.css b/sw5e-global.css index 87c94f07..9f890ada 100644 --- a/sw5e-global.css +++ b/sw5e-global.css @@ -555,7 +555,7 @@ input[type="reset"]:disabled { padding-bottom: 4px; } .sidebar-tab .directory-list .folder > .folder-header { - line-height: default; + line-height: initial; padding: 0 0 0 8px; position: relative; border: none; @@ -899,7 +899,7 @@ input[type="reset"]:disabled { .sw5e.sheet.actor .swalt-sheet header .attributes .attribute-value .value-number { display: inline-block; text-align: right; - padding: 0px 3px; + padding: 0 3px; } .sw5e.sheet.actor .swalt-sheet header .attributes .attribute-value .value-number:last-child { text-align: left; @@ -1439,7 +1439,7 @@ input[type="reset"]:disabled { display: block; width: 100%; text-align: right; - padding: 0px 3px; + padding: 0 3px; } .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .resource-items .resource .attribute-value .value-number:last-child { text-align: left; @@ -1592,7 +1592,7 @@ input[type="reset"]:disabled { display: block; width: 100%; text-align: right; - padding: 0px 3px; + padding: 0 3px; } .sw5e.sheet.actor .swalt-sheet .tab.force-powerbook .resource-items .resource .attribute-value .value-number:last-child, .sw5e.sheet.actor .swalt-sheet .tab.tech-powerbook .resource-items .resource .attribute-value .value-number:last-child { diff --git a/sw5e.css b/sw5e.css index b0a5e8b6..51b2e6f4 100644 --- a/sw5e.css +++ b/sw5e.css @@ -1285,16 +1285,16 @@ .sw5e.sheet.item .sheet-body .smalltable td:nth-child(even) { width: 150px; margin: 0.5em 0.5em; - padding: 0px 10px 0px 10px; + padding: 0 10px 0 10px; text-align: left; } .sw5e.sheet.item .sheet-body .smalltable thead { - border-bottom: 0px; + border-bottom: 0; } .sw5e.sheet.item .sheet-body .smalltable th { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-weight: bold; @@ -1308,12 +1308,12 @@ .sw5e.sheet.item .sheet-body .smalltable th:nth-child(even) { width: 150px; margin: 0.5em 0.5em; - padding: 0px 10px 0px 10px; + padding: 0 10px 0 10px; text-align: left; } .sw5e.sheet.item .sheet-body .medtable table { width: 500px; - border: 0px; + border: 0; margin: 0.5em 0.5em; } .sw5e.sheet.item .sheet-body .medtable td:nth-child(odd) { @@ -1324,16 +1324,16 @@ .sw5e.sheet.item .sheet-body .medtable td:nth-child(even) { width: 450px; margin: 0.5em 0.5em; - padding: 0px 10px 0px 0px; + padding: 0 10px 0 0; text-align: left; } .sw5e.sheet.item .sheet-body .medtable thead { - border-bottom: 0px; + border-bottom: 0; } .sw5e.sheet.item .sheet-body .medtable th { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-weight: bold; @@ -1346,8 +1346,8 @@ text-align: left; } .sw5e.sheet.item .sheet-body .classtable blockquote { - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; background-color: #bdc8cc; width: 600px; } @@ -1361,8 +1361,8 @@ width: 100%; border-collapse: collapse; background: rgba(0, 0, 0, 0.05); - border-left: 0px; - border-right: 0px; + border-left: 0; + border-right: 0; border-top: 0; border-bottom: 0; margin: 0.5em 0; @@ -1372,7 +1372,7 @@ .sw5e.sheet.item .sheet-body .classtable thead { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-style: normal; @@ -1381,7 +1381,7 @@ .sw5e.sheet.item .sheet-body .classtable th { color: #000000; text-shadow: none; - border-bottom: 0px; + border-bottom: 0; background-color: #bdc8cc; text-transform: none; font-style: normal; @@ -1416,7 +1416,7 @@ width: 100%; line-height: 18px; margin-bottom: 15px; - border: 0 0 0 0; + border: 0; border-bottom: none; overflow-x: auto; } diff --git a/templates/actors/newActor/character-sheet.html b/templates/actors/newActor/character-sheet.html index b9e12be5..9983d562 100644 --- a/templates/actors/newActor/character-sheet.html +++ b/templates/actors/newActor/character-sheet.html @@ -150,4 +150,5 @@
{{> "systems/sw5e/templates/actors/newActor/parts/swalt-biography.html"}}
+ \ No newline at end of file diff --git a/templates/actors/newActor/expanded-limited-sheet.html b/templates/actors/newActor/expanded-limited-sheet.html index 8c8a46b3..2204b0fd 100644 --- a/templates/actors/newActor/expanded-limited-sheet.html +++ b/templates/actors/newActor/expanded-limited-sheet.html @@ -137,4 +137,5 @@
{{> "systems/sw5e/templates/actors/newActor/parts/swalt-biography.html"}}
+ \ No newline at end of file diff --git a/templates/actors/newActor/npc-sheet.html b/templates/actors/newActor/npc-sheet.html index 367aa29a..70552323 100644 --- a/templates/actors/newActor/npc-sheet.html +++ b/templates/actors/newActor/npc-sheet.html @@ -92,7 +92,7 @@
    {{#each data.abilities as |ability id|}}
  1. -

    {{ability.label}}

    +

    {{ability.label}}

    diff --git a/templates/actors/newActor/parts/swalt-core.html b/templates/actors/newActor/parts/swalt-core.html index 0e722c29..5bdfdaf8 100644 --- a/templates/actors/newActor/parts/swalt-core.html +++ b/templates/actors/newActor/parts/swalt-core.html @@ -5,7 +5,7 @@
      {{#each data.abilities as |ability id|}}
    1. -

      {{ability.label}}

      +

      {{ability.label}}

      diff --git a/templates/actors/newActor/parts/swalt-crew.html b/templates/actors/newActor/parts/swalt-crew.html index 79065c42..c67e67fe 100644 --- a/templates/actors/newActor/parts/swalt-crew.html +++ b/templates/actors/newActor/parts/swalt-crew.html @@ -66,7 +66,7 @@
      - Level {{item.data.levels}}       + Level {{item.data.levels}}      
      - Level {{item.data.levels}}       + Level {{item.data.levels}}       \ No newline at end of file diff --git a/templates/items/backpack.html b/templates/items/backpack.html index dbe7b66d..24b586d1 100644 --- a/templates/items/backpack.html +++ b/templates/items/backpack.html @@ -68,5 +68,6 @@ {{localize 'SW5E.ItemContainerWeightless'}}
      +
    diff --git a/templates/items/equipment.html b/templates/items/equipment.html index a7f08459..4e42f8ba 100644 --- a/templates/items/equipment.html +++ b/templates/items/equipment.html @@ -98,11 +98,11 @@
    {{ localize "SW5E.CapacityMultiplier" }} -    +    {{ localize "SW5E.DmgRed" }} -    +    {{ localize "SW5E.RegenerationRateCoefficient" }} -    +   
    {{!-- Starship Equipment Properties --}} @@ -112,15 +112,15 @@
    {{ localize "SW5E.CentStorageCapacity" }} -    +    {{ localize "SW5E.SysStorageCapacity" }} -    +    {{ localize "SW5E.FuelCostsMod" }} -    +    {{ localize "SW5E.PowerDiceRecovery" }} -    +    {{ localize "SW5E.HyperdriveClass" }} -    +   
    {{!-- Armor Class --}} diff --git a/templates/items/starshipmod.html b/templates/items/starshipmod.html index e5576670..a3340c4c 100644 --- a/templates/items/starshipmod.html +++ b/templates/items/starshipmod.html @@ -103,11 +103,11 @@
    {{ localize "SW5E.CapacityMultiplier" }} -    +    {{ localize "SW5E.DmgRed" }} -    +    {{ localize "SW5E.RegenerationRateCoefficient" }} -    +   
    {{!-- Starship Equipment Properties --}} @@ -117,15 +117,15 @@
    {{ localize "SW5E.CentStorageCapacity" }} -    +    {{ localize "SW5E.SysStorageCapacity" }} -    +    {{ localize "SW5E.FuelCostsMod" }} -    +    {{ localize "SW5E.PowerDiceRecovery" }} -    +    {{ localize "SW5E.HyperdriveClass" }} -    +   
    {{!-- Armor Class --}}