From f8d404d32d0123a8d69540b906bdb269d53dae4c Mon Sep 17 00:00:00 2001 From: unrealkakeman89 Date: Thu, 21 Jan 2021 20:17:49 +0000 Subject: [PATCH 1/5] Regenerate css --- sw5e-dark.css | 5 +++-- sw5e-light.css | 11 +++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sw5e-dark.css b/sw5e-dark.css index ea2714f0..dfc9cdf7 100644 --- a/sw5e-dark.css +++ b/sw5e-dark.css @@ -234,13 +234,14 @@ body.dark-theme .dice-roll .dice-total.fumble { box-shadow: 0 0 12px rgba(232, 17, 17, 0.5); } body.dark-theme #chat-controls .roll-type-select { - background: #363636; + background: #4f4f4f; + color: #FFFFFF; } body.dark-theme #chat-controls label { color: white; } body.dark-theme #chat-form textarea { - background: #363636; + background: #4f4f4f; } body.dark-theme #combat #combat-round { color: #E81111; diff --git a/sw5e-light.css b/sw5e-light.css index ba40918b..eefaf31b 100644 --- a/sw5e-light.css +++ b/sw5e-light.css @@ -56,7 +56,7 @@ body.light-theme input[type="time"], body.light-theme select, body.light-theme textarea { border: 1px solid #828282; - color: #FFFFFF; + color: #1C1C1C; } body.light-theme input[type="text"]:hover, body.light-theme input[type="number"]:hover, @@ -83,7 +83,7 @@ body.light-theme input[type="date"]::placeholder, body.light-theme input[type="time"]::placeholder, body.light-theme select::placeholder, body.light-theme textarea::placeholder { - color: #FFFFFF; + color: #1C1C1C; opacity: 0.5; } body.light-theme input[type="text"] ::-ms-input-placeholder, @@ -94,7 +94,7 @@ body.light-theme input[type="time"] ::-ms-input-placeholder, body.light-theme select ::-ms-input-placeholder, body.light-theme textarea ::-ms-input-placeholder { /* Microsoft Edge */ - color: #FFFFFF; + color: #1C1C1C; opacity: 0.5; } body.light-theme button, @@ -235,13 +235,13 @@ body.light-theme .dice-roll .dice-total.fumble { } body.light-theme #chat-controls .roll-type-select { background: #4f4f4f; + color: #FFFFFF; } body.light-theme #chat-controls label { color: #1C1C1C; } body.light-theme #chat-form textarea { background: #4f4f4f; - color: #FFFFFF; } body.light-theme #combat #combat-round { color: #c40f0f; @@ -298,7 +298,7 @@ body.light-theme .sidebar-tab .directory-header .header-search i.fa-search { color: #0d99cc; } body.light-theme .sidebar-tab .directory-header .header-search input { - background: white; + background: #4f4f4f; } body.light-theme .sidebar-tab .subdirectory { background: white; @@ -777,4 +777,3 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.notes section > input { body.light-theme .sw5e.sheet.actor.npc .swalt-sheet header .experience { color: #4f4f4f; } - From 1b058f0540d3369a93f922ce715e12fd81c051e5 Mon Sep 17 00:00:00 2001 From: TJ Date: Fri, 22 Jan 2021 16:17:49 -0600 Subject: [PATCH 2/5] Two ammo display fixes 1. Allow ammunition items to show up in the dropdown picker 2. Don't prompt to consume resources if the consuming object is a blaster --- module/config.js | 2 +- module/item/entity.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/config.js b/module/config.js index 4008e13b..c5168635 100644 --- a/module/config.js +++ b/module/config.js @@ -274,7 +274,7 @@ SW5E.consumableTypes = { "food": "SW5E.ConsumableFood", "medpac": "SW5E.ConsumableMedpac", "technology": "SW5E.ConsumableTechnology", - "ammunition": "SW5E.ConsumableAmmunition", + "ammo": "SW5E.ConsumableAmmunition", "trinket": "SW5E.ConsumableTrinket", "force": "SW5E.ConsumableForce", "tech": "SW5E.ConsumableTech" diff --git a/module/item/entity.js b/module/item/entity.js index 8b35bcc5..37bcb1ee 100644 --- a/module/item/entity.js +++ b/module/item/entity.js @@ -399,7 +399,7 @@ export default class Item5e extends Item { // Define follow-up actions resulting from the item usage let createMeasuredTemplate = hasArea; // Trigger a template creation let consumeRecharge = !!recharge.value; // Consume recharge - let consumeResource = !!resource.target && (resource.type !== "ammo") // Consume a linked (non-ammo) resource + let consumeResource = !!resource.target && resource.type !== "ammo" && !['simpleB', 'martialB'].includes(id.weaponType); // Consume a linked (non-ammo) resource, ignore if use is from a blaster let consumePowerSlot = requirePowerSlot; // Consume a power slot let consumeUsage = !!uses.per; // Consume limited uses let consumeQuantity = uses.autoDestroy; // Consume quantity of the item in lieu of uses From 5d91304592e07af2c2f584a67fec442e52fc8569 Mon Sep 17 00:00:00 2001 From: TJ Date: Sun, 24 Jan 2021 13:49:56 -0600 Subject: [PATCH 3/5] Fix to let death saves be rollable --- templates/actors/newActor/parts/swalt-traits.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/actors/newActor/parts/swalt-traits.html b/templates/actors/newActor/parts/swalt-traits.html index e8a0170b..efb281a0 100644 --- a/templates/actors/newActor/parts/swalt-traits.html +++ b/templates/actors/newActor/parts/swalt-traits.html @@ -29,7 +29,7 @@
-

{{ localize "SW5E.DeathSave" }}

+

{{ localize "SW5E.DeathSave" }}

From 4d8a81b3978e3a3d04d4c345ed35e59e37dcecae Mon Sep 17 00:00:00 2001 From: TJ Date: Sun, 24 Jan 2021 18:40:29 -0600 Subject: [PATCH 4/5] Update actor-global.less --- less/update/components/actor-global.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less index 62cdfe71..1029c588 100644 --- a/less/update/components/actor-global.less +++ b/less/update/components/actor-global.less @@ -1029,7 +1029,7 @@ } } nav.sheet-navigation { - grid-template-columns: repeat(4, 1fr); + grid-template-columns: repeat(5, 1fr); } .tab.attributes { .traits-resources { @@ -1056,4 +1056,4 @@ } } } -} \ No newline at end of file +} From fbd46f6dae466896a99b6e87ebaf0ae99d8c89db Mon Sep 17 00:00:00 2001 From: Cyr- Date: Mon, 25 Jan 2021 00:42:02 +0000 Subject: [PATCH 5/5] Regenerate css --- sw5e-global.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw5e-global.css b/sw5e-global.css index a9023252..4879e5b3 100644 --- a/sw5e-global.css +++ b/sw5e-global.css @@ -1626,7 +1626,7 @@ input[type="reset"]:disabled { display: block; } .sw5e.sheet.actor.npc .swalt-sheet nav.sheet-navigation { - grid-template-columns: repeat(4, 1fr); + grid-template-columns: repeat(5, 1fr); } .sw5e.sheet.actor.npc .swalt-sheet .tab.attributes .traits-resources { display: block;