Skip to content

Commit 28f3e6a

Browse files
orffenorffen
authored
Merge pull request #20 from orffen/devel
r4
2 parents 6a6b69f + 38798d7 commit 28f3e6a

File tree

9 files changed

+136
-11
lines changed

9 files changed

+136
-11
lines changed

‎module/basicfantasyrpg.mjs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,19 @@ Hooks.once("ready", async function() {
8080
Hooks.on("hotbarDrop", (bar, data, slot) => createItemMacro(data, slot));
8181
});
8282

83+
/* -------------------------------------------- */
84+
/* Token Creation Hooks */
85+
/* -------------------------------------------- */
86+
87+
Hooks.on("createToken", async function(token, options, id) {
88+
if (token.actor.type === "monster") {
89+
let newHitPoints = new Roll(`${token.actor.data.data.hitDice.number}${token.actor.data.data.hitDice.size}+${token.actor.data.data.hitDice.mod}`);
90+
await newHitPoints.evaluate({ async: true });
91+
token.actor.data.data.hitPoints.value = Math.max(1, newHitPoints.total);
92+
token.actor.data.data.hitPoints.max = Math.max(1, newHitPoints.total);
93+
}
94+
});
95+
8396
/* -------------------------------------------- */
8497
/* Hotbar Macros */
8598
/* -------------------------------------------- */

‎styles/basicfantasyrpg.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,10 @@
301301
flex: 2;
302302
}
303303

304+
.flex-align-center {
305+
align-self: center;
306+
}
307+
304308
.align-left {
305309
-webkit-box-pack: start;
306310
-ms-flex-pack: start;

‎styles/damage.svg‎

Lines changed: 42 additions & 0 deletions
Loading

‎styles/melee.svg‎

Lines changed: 9 additions & 0 deletions
Loading

‎styles/ranged.svg‎

Lines changed: 57 additions & 0 deletions
Loading

‎system.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "basicfantasyrpg",
33
"title": "Basic Fantasy RPG",
44
"description": "The Basic Fantasy RPG system for FoundryVTT!",
5-
"version": "r3",
5+
"version": "r4",
66
"minimumCoreVersion": "0.8.9",
77
"compatibleCoreVersion": "9",
88
"author": "Orffen",
@@ -23,6 +23,6 @@
2323
"secondaryTokenAttribute": null,
2424
"url": "https://github.com/orffen/basicfantasyrpg",
2525
"manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/main/system.json",
26-
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r3.zip",
26+
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r4.zip",
2727
"license": "LICENSE.txt"
2828
}

‎templates/actor/actor-character-sheet.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
1111
<label for="data.hitPoints.value" class="resource-label">{{localize 'BASICFANTASYRPG.HitPoints'}}</label>
1212
<div class="resource-content flexrow flex-center flex-between">
1313
<input type="text" name="data.hitPoints.value" value="{{data.hitPoints.value}}" data-dtype="Number"/>
14-
<span class="flexshrink">&nbsp;/&nbsp;</span>
14+
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
1515
<input type="text" name="data.hitPoints.max" value="{{data.hitPoints.max}}" data-dtype="Number"/>
1616
</div>
1717
</div>
@@ -20,7 +20,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
2020
<label for="data.level.value" class="resource-label">{{localize data.class.label}}&nbsp;/&nbsp;{{localize data.level.label}}</label>
2121
<div class="resource-content flexrow flex-center flex-between">
2222
<input type="text" name="data.class.value" value="{{data.class.value}}" data-dtype="String"/>
23-
<span class="flexshrink">&nbsp;</span>
23+
<span class="flexshrink flex-align-center">&nbsp;</span>
2424
<input type="text" name="data.level.value" value="{{data.level.value}}" data-dtype="Number"/>
2525
</div>
2626
</div>
@@ -29,7 +29,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
2929
<label for="data.xp.value" class="resource-label">{{localize data.xp.abbr}}&nbsp;/&nbsp;{{localize 'BASICFANTASYRPG.NextLevel'}}</label>
3030
<div class="resource-content flexrow flex-center flex-between">
3131
<input type="text" name="data.xp.value" value="{{data.xp.value}}" data-dtype="Number"/>
32-
<span class="flexshrink">&nbsp;/&nbsp;</span>
32+
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
3333
<input type="text" name="data.xp.next" value="{{data.xp.next}}" data-dtype="Number"/>
3434
</div>
3535
</div>

‎templates/actor/actor-monster-sheet.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
1111
<label for="data.hitPoints.value" class="resource-label">{{localize 'BASICFANTASYRPG.HitPoints'}}</label>
1212
<div class="resource-content flexrow flex-center flex-between">
1313
<input type="number" name="data.hitPoints.value" value="{{data.hitPoints.value}}" data-dtype="Number"/>
14-
<span class="flexshrink">&nbsp;/&nbsp;</span>
14+
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
1515
<input type="number" name="data.hitPoints.max" value="{{data.hitPoints.max}}" data-dtype="Number"/>
1616
</div>
1717
</div>
@@ -21,9 +21,9 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
2121
<div class="resource-content flexrow flex-center flex-between">
2222
<input type="number" name="data.hitDice.number" value="{{data.hitDice.number}}" data-dtype="Number"/>
2323
<input type="text" name="data.hitDice.size" value="{{data.hitDice.size}}" data-dtype="String"/>
24-
<span class="flexshrink">+</span>
24+
<span class="flexshrink flex-align-center">+</span>
2525
<input type="number" name="data.hitDice.mod" value="{{data.hitDice.mod}}" data-dtype="Number" sign="true"/>
26-
<span class="flexshrink">&nbsp;/&nbsp;</span>
26+
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
2727
<input type="number" name="data.specialAbility.value" value="{{data.specialAbility.value}}" data-dtype="Number"/>
2828
</div>
2929
</div>

‎templates/actor/parts/actor-combat.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<h4>{{weapon.name}}</h4>
4848
</div>
4949
<div class="item-prop item-image">
50-
<a class="rollable" data-roll-type="weapon" data-attack="melee"><img src="icons/skills/melee/weapons-crossed-poleaxes-white.webp" title="{{localize 'BASICFANTASYRPG.Melee'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
51-
<a class="rollable" data-roll-type="weapon" data-attack="ranged"><img src="icons/skills/ranged/arrows-flying-salvo-gray.webp" title="{{localize 'BASICFANTASYRPG.Ranged'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
50+
<a class="rollable" data-roll-type="weapon" data-attack="melee"><img src="systems/basicfantasyrpg/styles/melee.svg" title="{{localize 'BASICFANTASYRPG.Melee'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
51+
<a class="rollable" data-roll-type="weapon" data-attack="ranged"><img src="systems/basicfantasyrpg/styles/ranged.svg" title="{{localize 'BASICFANTASYRPG.Ranged'}} {{localize 'BASICFANTASYRPG.Attack'}}" width="24" height="24"/></a>
5252
<span class="flexshrink">/</span>
53-
<a class="rollable" data-roll-type="damage" data-roll="{{weapon.data.damage.value}}" data-label="{{weapon.name}} {{localizeLowerCase weapon.data.damage.label}}"><img src="icons/skills/melee/shield-damaged-broken-brown.webp" title="{{weapon.data.damage.value}}" width="24" height="24"/></a>
53+
<a class="rollable" data-roll-type="damage" data-roll="{{weapon.data.damage.value}}" data-label="{{weapon.name}} {{localizeLowerCase weapon.data.damage.label}}"><img src="systems/basicfantasyrpg/styles/damage.svg" title="{{weapon.data.damage.value}}" width="24" height="24"/></a>
5454
</div>
5555
<div class="item-controls">
5656
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>

0 commit comments

Comments
 (0)