Skip to content

Commit 4c2d756

Browse files
authored
Merge pull request #105 from Cussa/master
Small fixes (weapon icon, vagabond start equipement, talent selection on roll dialog, player sheet with a cut, chargen issue when re-roll, remove rolls from limited player sheet)
2 parents 47470d3 + 35257d6 commit 4c2d756

File tree

8 files changed

+19
-6
lines changed

8 files changed

+19
-6
lines changed

Diff for: README.md

+8
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,14 @@ This system provides character sheets and items for your play, if you would lik
3131
## Release Notes
3232
=======
3333

34+
v4.3.1
35+
- 🐛 Fix: get weapon icon when dragging to macro bar
36+
- 🐛 Fix: Vagabond start equipment should be "Quarterstaff" (fix #104)
37+
- 🐛 Fix: removes "None" from Talent selection
38+
- 💄🐛 UI/Fix: corrects the player character sheet cut on the bottom
39+
- 🐛 Fix: Chargen issue when re-roll character
40+
- 🐛 Fix: remove click/roll functionality from the limited character sheet
41+
3442
v4.3.0
3543
- Improvement: any roll using the `/r` chat command now shows the result of the roll directly
3644
![D66 Roll](asset/d66roll.png?raw=true)

Diff for: script/actor/vaesen-actor-sheet.js

+3
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,9 @@ export class VaesenActorSheet extends ActorSheet {
121121

122122
activateListeners(html) {
123123
super.activateListeners(html);
124+
if (this.actor.limited)
125+
return;
126+
124127
html.find(".item-create").click((ev) => {
125128
this.onItemCreate(ev);
126129
});

Diff for: script/sheet/player.js

+4-1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,9 @@ export class PlayerCharacterSheet extends VaesenActorSheet {
117117
activateListeners(html) {
118118
super.activateListeners(html);
119119

120+
if (this.actor.limited)
121+
return;
122+
120123
html.find(".fav-togle").click((ev) => {
121124
this.onFavTogle(ev);
122125
});
@@ -227,7 +230,7 @@ export class PlayerCharacterSheet extends VaesenActorSheet {
227230
const div = $(item).parents(".weapon");
228231
const itemId = div.data("itemId");
229232
const itemName = $(item).text();
230-
const img = $(div).children(".icon").attr("src");
233+
const img = $(div).find(".icon").attr("src");
231234
const testName = `${itemName} ${game.i18n.localize("ROLL.ROLL")}`;
232235

233236
const data = {

Diff for: script/util/generator.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ export class generator {
290290
label: game.i18n.localize("GENERATOR.REROLL"),
291291
callback: async () => {
292292
reroll = true;
293-
await generator.generateCharacter();
293+
await generator.generateCharacter(actor);
294294
}
295295
}
296296
},

Diff for: script/util/generator_data.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,7 @@ export class generator_data {
781781
"Well-traveled"
782782
],
783783
equipment: [
784-
"Walking stick",
784+
"Quarterstaff",
785785
"Knife or Dagger",
786786
"Crowbar",
787787
"Liquor",

Diff for: script/util/roll.js

-1
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@ function buildSelectMultipleHtmlDialog(options, name, id) {
319319
);
320320
html.push(`<div class="flex row" style="width: 100%;">`);
321321
html.push(`<select id="${id}" style="width: 100%;" multiple>`);
322-
html.push(`<option value="0">None (0)</option>`);
323322
options.forEach((element) => {
324323
let descriptionWithoutTags = $("<p>").html(element.description).text();
325324
let requiresBonus =

Diff for: style/player.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
.vaesen .player {
2-
height: 100%;
2+
/* height: 100%; */
33
width: 100%;
44
}
55

Diff for: system.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"title": "Vaesen",
33
"description": "Nordic horror role-playing",
4-
"version": "4.3.0",
4+
"version": "4.3.1",
55
"esmodules": [
66
"script/hooks.js"
77
],

0 commit comments

Comments
 (0)