Skip to content

Commit

Permalink
Merge pull request #20 from orffen/devel
Browse files Browse the repository at this point in the history 
r4
  • Loading branch information
@orffen
orffen committed Feb 23, 2022
2 parents 6a6b69f + 38798d7 commit 28f3e6a
Show file tree
Hide file tree
Showing 9 changed files with 136 additions and 11 deletions.
13 changes: 13 additions & 0 deletions module/basicfantasyrpg.mjs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,19 @@ Hooks.once("ready", async function() {
Hooks.on("hotbarDrop", (bar, data, slot) => createItemMacro(data, slot));
});

/* -------------------------------------------- */
/* Token Creation Hooks */
/* -------------------------------------------- */

Hooks.on("createToken", async function(token, options, id) {
if (token.actor.type === "monster") {
let newHitPoints = new Roll(`${token.actor.data.data.hitDice.number}${token.actor.data.data.hitDice.size}+${token.actor.data.data.hitDice.mod}`);
await newHitPoints.evaluate({ async: true });
token.actor.data.data.hitPoints.value = Math.max(1, newHitPoints.total);
token.actor.data.data.hitPoints.max = Math.max(1, newHitPoints.total);
}
});

/* -------------------------------------------- */
/* Hotbar Macros */
/* -------------------------------------------- */
Expand Down
4 changes: 4 additions & 0 deletions styles/basicfantasyrpg.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,10 @@
flex: 2;
}

.flex-align-center {
align-self: center;
}

.align-left {
-webkit-box-pack: start;
-ms-flex-pack: start;
Expand Down
42 changes: 42 additions & 0 deletions styles/damage.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions styles/melee.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
57 changes: 57 additions & 0 deletions styles/ranged.svg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions system.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "basicfantasyrpg",
"title": "Basic Fantasy RPG",
"description": "The Basic Fantasy RPG system for FoundryVTT!",
"version": "r3",
"version": "r4",
"minimumCoreVersion": "0.8.9",
"compatibleCoreVersion": "9",
"author": "Orffen",
Expand All @@ -23,6 +23,6 @@
"secondaryTokenAttribute": null,
"url": "https://github.com/orffen/basicfantasyrpg",
"manifest": "https://raw.githubusercontent.com/orffen/basicfantasyrpg/main/system.json",
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r3.zip",
"download": "https://github.com/orffen/basicfantasyrpg/archive/refs/tags/r4.zip",
"license": "LICENSE.txt"
}
6 changes: 3 additions & 3 deletions templates/actor/actor-character-sheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
<label for="data.hitPoints.value" class="resource-label">{{localize 'BASICFANTASYRPG.HitPoints'}}</label>
<div class="resource-content flexrow flex-center flex-between">
<input type="text" name="data.hitPoints.value" value="{{data.hitPoints.value}}" data-dtype="Number"/>
<span class="flexshrink">&nbsp;/&nbsp;</span>
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
<input type="text" name="data.hitPoints.max" value="{{data.hitPoints.max}}" data-dtype="Number"/>
</div>
</div>
Expand All @@ -20,7 +20,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
<label for="data.level.value" class="resource-label">{{localize data.class.label}}&nbsp;/&nbsp;{{localize data.level.label}}</label>
<div class="resource-content flexrow flex-center flex-between">
<input type="text" name="data.class.value" value="{{data.class.value}}" data-dtype="String"/>
<span class="flexshrink">&nbsp;</span>
<span class="flexshrink flex-align-center">&nbsp;</span>
<input type="text" name="data.level.value" value="{{data.level.value}}" data-dtype="Number"/>
</div>
</div>
Expand All @@ -29,7 +29,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
<label for="data.xp.value" class="resource-label">{{localize data.xp.abbr}}&nbsp;/&nbsp;{{localize 'BASICFANTASYRPG.NextLevel'}}</label>
<div class="resource-content flexrow flex-center flex-between">
<input type="text" name="data.xp.value" value="{{data.xp.value}}" data-dtype="Number"/>
<span class="flexshrink">&nbsp;/&nbsp;</span>
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
<input type="text" name="data.xp.next" value="{{data.xp.next}}" data-dtype="Number"/>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions templates/actor/actor-monster-sheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
<label for="data.hitPoints.value" class="resource-label">{{localize 'BASICFANTASYRPG.HitPoints'}}</label>
<div class="resource-content flexrow flex-center flex-between">
<input type="number" name="data.hitPoints.value" value="{{data.hitPoints.value}}" data-dtype="Number"/>
<span class="flexshrink">&nbsp;/&nbsp;</span>
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
<input type="number" name="data.hitPoints.max" value="{{data.hitPoints.max}}" data-dtype="Number"/>
</div>
</div>
Expand All @@ -21,9 +21,9 @@ <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" place
<div class="resource-content flexrow flex-center flex-between">
<input type="number" name="data.hitDice.number" value="{{data.hitDice.number}}" data-dtype="Number"/>
<input type="text" name="data.hitDice.size" value="{{data.hitDice.size}}" data-dtype="String"/>
<span class="flexshrink">+</span>
<span class="flexshrink flex-align-center">+</span>
<input type="number" name="data.hitDice.mod" value="{{data.hitDice.mod}}" data-dtype="Number" sign="true"/>
<span class="flexshrink">&nbsp;/&nbsp;</span>
<span class="flexshrink flex-align-center">&nbsp;/&nbsp;</span>
<input type="number" name="data.specialAbility.value" value="{{data.specialAbility.value}}" data-dtype="Number"/>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions templates/actor/parts/actor-combat.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
<h4>{{weapon.name}}</h4>
</div>
<div class="item-prop item-image">
<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>
<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>
<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>
<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>
<span class="flexshrink">/</span>
<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>
<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>
</div>
<div class="item-controls">
<a class="item-control item-edit" title="Edit Item"><i class="fas fa-edit"></i></a>
Expand Down

0 comments on commit 28f3e6a

Please sign in to comment.