Skip to content

Commit 438bcb4

Browse files
authored
Merge pull request #25 from League-of-Fabulous-Developers/dev
Dev
2 parents 6aef19f + 215c2d7 commit 438bcb4

File tree

7 files changed

+40
-7
lines changed

7 files changed

+40
-7
lines changed

module/sheets/actor-standard-sheet.mjs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,13 @@ export class FUStandardActorSheet extends ActorSheet {
347347
li.slideUp(200, () => this.render(false));
348348
});
349349

350+
/**
351+
* Clickable stars to update the current skill level.
352+
*
353+
*/
354+
html.find('')
355+
356+
350357
function handleItemClick(ev, isRightClick) {
351358
const li = $(ev.currentTarget).parents('.item');
352359
const itemId = li.data('itemId');

module/sheets/item-sheet.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class FUItemSheet extends ItemSheet {
7676
// [PDFPager Support] Opening Journal PDF pages from PDF Code
7777
$('#pdfLink').click(function () {
7878
const inputValue = $('input[name="system.source.value"]').val();
79-
const match = inputValue.match(/([A-Za-z]+)(\d+)/);
79+
const match = inputValue.match(/([A-Za-z]+)\s*(\d+)/);
8080

8181
if (match) {
8282
const pdfCode = match[1];

styles/css/fabulaultima.css

Lines changed: 10 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

styles/scss/utils/_icons.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,14 @@ $fu-poison: url("/systems/fabulaultima/styles/static/icons/fu-poison.svg");
114114
.is-martial {
115115
color: $color-danger !important;
116116
}
117+
.is-buff {
118+
color: $color-success !important;
119+
120+
&.float-text {
121+
display: inline-block;
122+
animation: floating 1s infinite ease-in-out;
123+
}
124+
}
117125

118126
.is-crisis {
119127
color: $color-danger !important;

template.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"mp": { "value": 10, "min": 0, "max": 10, "bonus": 0 },
1010
"rp1": { "name": "", "value": 0 },
1111
"rp2": { "name": "", "value": 0 },
12-
"rp3": { "name": "", "value": 0 }
12+
"rp3": { "name": "", "value": 0 },
13+
"zenit": { "value": 0 }
1314
},
1415
"affinities": {
1516
"phys": { "base": 0, "current": 0, "bonus": 0 },

templates/actor/partials/actor-attributes.hbs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,18 @@
2121
<span class="resource-label-m">{{ attribute.current }}</span>
2222
</label>
2323
<label class="ability-mod">
24-
<span class="resource-label-m" style="color:green">-</span>
24+
<div class="resource-label-m resource-content flex-group-center">
25+
{{#if (eq attribute.base attribute.current)}}
26+
<i class="fas fa-minus" style="color: #2c4a4254"></i>
27+
{{else}}
28+
{{#if (gt attribute.base attribute.current)}}
29+
<i class="fas fa-caret-down is-crisis float-text"></i>
30+
{{else}}
31+
<i class="fas fa-caret-up is-buff float-text"></i>
32+
{{/if}}
33+
{{/if}}
34+
</div>
35+
2536
</label>
2637
</div>
2738
{{/each}}

templates/item/item-armor-sheet.hbs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
system.rollInfo.useWeapon.hrZero.value }} /> </label>
1717
<label class="checkbox resource-label-sm"> <span>{{localize 'FU.IsMartial'}}</span><input
1818
type="checkbox" name="system.isMartial.value" {{ checked system.isMartial.value }} /> </label>
19-
<label class="checkbox resource-label-sm" data-tooltip="{{localize 'FU.TitleCardInfo'}}">
20-
<span>{{localize 'FU.TitleCardStatus'}}</span><input type="checkbox"
21-
name="system.showTitleCard.value" {{ checked system.showTitleCard.value }} /> </label>
2219
</div>
2320

2421
<section class="flex1 flex-group-center desc">

0 commit comments

Comments
 (0)