cosmo/daggerheart
1
0
Fork 0
mirror of https://github.com/Foundryborne/daggerheart.git synced 2026-01-12 03:31:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'main' of https://github.com/Foundryborne/daggerheart

Browse source
This commit is contained in:
Dapoolp 2025-08-24 22:26:51 +02:00
commit 7954874ec3
3 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
module/data/chat-message/adversaryRoll.mjs
View file

@ -112,7 +112,7 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
this.currentTargets = this.getTargetList(); this.currentTargets = this.getTargetList();
// this.registerTargetHook(); // this.registerTargetHook();
if (this.targetMode === true && this.hasRoll) { if (this.hasRoll) {
this.targetShort = this.targets.reduce( this.targetShort = this.targets.reduce(
(a, c) => { (a, c) => {
if (c.hit) a.hit += 1; if (c.hit) a.hit += 1;
@ -126,7 +126,8 @@ export default class DHActorRoll extends foundry.abstract.TypeDataModel {
} }
this.canViewSecret = this.parent.speakerActor?.testUserPermission(game.user, 'OBSERVER'); this.canViewSecret = this.parent.speakerActor?.testUserPermission(game.user, 'OBSERVER');
this.canButtonApply = game.user.isGM; this.canButtonApply = game.user.isGM; //temp
this.isGM = game.user.isGM; //temp
} }
getTargetList() { getTargetList() {

2
styles/less/global/chat.less
View file

@ -77,7 +77,7 @@
.flavor-text { .flavor-text {
font-size: var(--font-size-12); font-size: var(--font-size-12);
line-height: 20px; line-height: 20px;
color: var(--color-dark-4); color: light-dark(@dark, @beige);
text-align: center; text-align: center;
display: block; display: block;
} }

6
templates/ui/chat/parts/target-part.hbs
View file

@ -1,6 +1,6 @@
<div class="roll-part target-section dice-roll" data-action="expandRoll"> <div class="roll-part target-section dice-roll" data-action="expandRoll">
<div class="roll-part-header"><div><span>Target</span></div></div> <div class="roll-part-header"><div><span>Target</span></div></div>
{{#if (or (and targets.length (or (gt targetShort.hit 0) (gt targetShort.miss 0))) (and hasSave pendingSaves))}} {{#if isGM}}
<div class="roll-part-extra on-reduced"> <div class="roll-part-extra on-reduced">
<div class="wrapper"> <div class="wrapper">
{{#if (or (gt targetShort.hit 0) (gt targetShort.miss 0))}} {{#if (or (gt targetShort.hit 0) (gt targetShort.miss 0))}}
@ -30,8 +30,8 @@
<img class="target-img" src="{{img}}"> <img class="target-img" src="{{img}}">
<div class="target-data"> <div class="target-data">
<div class="target-name" data-perm-id="{{actorId}}"><span>{{name}}</span></div> <div class="target-name" data-perm-id="{{actorId}}"><span>{{name}}</span></div>
{{#if (and ../targetMode ../hasRoll)}} {{#if (and ../hasRoll (hasProperty this "hit"))}}
<div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}"> <div class="target-hit-status {{#if hit}}is-hit{{else}}is-miss{{/if}}" data-perm-id="{{actorId}}" data-perm-hidden="true">
{{#if hit}} {{#if hit}}
{{localize "DAGGERHEART.GENERAL.hit.single"}} {{localize "DAGGERHEART.GENERAL.hit.single"}}
{{else}} {{else}}