dragonleo/foundry-sw5e
1
0
Fork 0
forked from GitHub-Mirrors/foundry-sw5e
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'Develop' into character-sheet-importer

Browse source
This commit is contained in:
CK 2021-01-26 09:28:50 -05:00 • committed by GitHub
commit 159680aa55
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
less/update/components/actor-global.less
View file

@ -1056,4 +1056,4 @@
}
}
}
}
}

2
module/config.js
View file

@ -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"

2
module/item/entity.js
View file

@ -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

2
sw5e-global.css
View file

@ -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;

2
templates/actors/newActor/parts/swalt-traits.html
View file

@ -29,7 +29,7 @@
</section>
<section class="counters">
<div class="counter">
<h4 class="death-save rollable">{{ localize "SW5E.DeathSave" }}</h4>
<h4 class="death-save rollable" data-action="rollDeathSave">{{ localize "SW5E.DeathSave" }}</h4>
<div class="counter-value">
<div class="death-success">
<i class="fas fa-check"></i>