public/foundryvtt-reve-de-dragon
1
1
Fork 1
Code Issues 4 Pull Requests Projects Releases 158 Wiki Activity

Merge branch 'v1.4-race' into 'v1.4'

Browse Source 
Ajout Race et fix Dice-so-nice

See merge request LeRatierBretonnien/foundryvtt-reve-de-dragon!264
This commit is contained in:
Leratier Bretonnien 2021-06-02 15:08:13 +00:00
commit 60a7b551af
5 changed files with 72 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
module/rdd-dice.js
View File

@ -123,8 +123,15 @@ export class RdDDice {
CONFIG.Dice.terms[DeDraconique.DENOMINATION] = DeDraconique; CONFIG.Dice.terms[DeDraconique.DENOMINATION] = DeDraconique;
CONFIG.Dice.terms[DeHeure.DENOMINATION] = DeHeure; CONFIG.Dice.terms[DeHeure.DENOMINATION] = DeHeure;
} }
static onReady() {
if (game.modules.get("dice-so-nice")?.active) {
if (game.settings.get("core", "noCanvas")) {
ui.notifications.warn("Dice So Nice! n'affichera pas de dés car vous avez coché l'option de Foundry 'Scène de jeu désactivé' 'Disable Game Canvas' ");
}
}
}
static async roll(formula, options = { showDice: false, rollMode: undefined}) { static async roll(formula, options = { showDice: false, rollMode: undefined }) {
const roll = new Roll(formula); const roll = new Roll(formula);
await roll.evaluate({ async: true }); await roll.evaluate({ async: true });
if (options.showDice) { if (options.showDice) {
@ -141,7 +148,7 @@ export class RdDDice {
static async rollOneOf(array) { static async rollOneOf(array) {
const roll = await RdDDice.rollTotal(`1d${array.length}`); const roll = await RdDDice.rollTotal(`1d${array.length}`);
return array[roll-1]; return array[roll - 1];
} }
static diceSoNiceReady(dice3d) { static diceSoNiceReady(dice3d) {
@ -153,7 +160,7 @@ export class RdDDice {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static async show(roll, rollMode = undefined) { static async show(roll, rollMode) {
if (roll.showDice || game.settings.get(SYSTEM_RDD, "dice-so-nice") == true) { if (roll.showDice || game.settings.get(SYSTEM_RDD, "dice-so-nice") == true) {
await this.showDiceSoNice(roll, rollMode); await this.showDiceSoNice(roll, rollMode);
} }
@ -161,25 +168,27 @@ export class RdDDice {
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
static async showDiceSoNice(roll, rollMode = undefined) { static async showDiceSoNice(roll, rollMode) {
if (game.modules.get("dice-so-nice") && game.modules.get("dice-so-nice").active) { if (game.modules.get("dice-so-nice")?.active) {
let whisper = null; if (game.dice3d) {
let blind = false; let whisper = null;
rollMode = rollMode ?? game.settings.get("core", "rollMode"); let blind = false;
switch (rollMode) { rollMode = rollMode ?? game.settings.get("core", "rollMode");
case "blindroll": //GM only switch (rollMode) {
blind = true; case "blindroll": //GM only
case "gmroll": //GM + rolling player blind = true;
whisper = ChatUtility.getUsers(user => user.isGM); case "gmroll": //GM + rolling player
break; whisper = ChatUtility.getUsers(user => user.isGM);
case "roll": //everybody break;
whisper = ChatUtility.getUsers(user => user.active); case "roll": //everybody
break; whisper = ChatUtility.getUsers(user => user.active);
case "selfroll": break;
whisper = [game.user.id]; case "selfroll":
break; whisper = [game.user.id];
break;
}
await game.dice3d.showForRoll(roll, game.user, true, whisper, blind);
} }
await game.dice3d.showForRoll(roll, game.user, true, whisper, blind);
} }
} }
} }

2
module/rdd-main.js
View File

@ -214,7 +214,7 @@ Hooks.once("ready", function () {
StatusEffects.onReady(); StatusEffects.onReady();
RdDHerbes.initializeHerbes(); RdDHerbes.initializeHerbes();
RdDDice.onReady();
/* -------------------------------------------- */ /* -------------------------------------------- */
/* Affiche/Init le calendrier */ /* Affiche/Init le calendrier */
let calendrier = new RdDCalendrier(); let calendrier = new RdDCalendrier();

28
packs/humanoides.db
View File

File diff suppressed because one or more lines are too long

1
template.json
View File

@ -17,6 +17,7 @@
"biographie": "Histoire personnelle...", "biographie": "Histoire personnelle...",
"notes": "Notes", "notes": "Notes",
"notesmj": "Notes du MJ", "notesmj": "Notes du MJ",
"race": "Humain",
"yeux": "", "yeux": "",
"cheveux": "", "cheveux": "",
"poids": "", "poids": "",

58
templates/actor-sheet.html
View File

@ -660,56 +660,50 @@
<article class="flexrow"> <article class="flexrow">
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Sexe : <label for="data.race">Race :</label>
<input class="description-value flexrow" type="text" name="data.sexe" value="{{data.sexe}}" data-dtype="String"/> <input class="flex-grow" type="text" name="data.race" value="{{data.race}}" data-dtype="String"/>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Poids : <label for="data.sexe">Sexe :</label>
<input class="description-value flexrow" type="text" name="data.poids" value="{{data.poids}}" data-dtype="String"/> <input class="flex-grow" type="text" name="data.sexe" value="{{data.sexe}}" data-dtype="String"/>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Taille : <label for="data.age">Age :</label>
<input class="description-value flexrow" type="text" name="data.taille" value="{{data.taille}}" data-dtype="String"/> <input class="flex-grow" type="text" name="data.age" value="{{data.age}}" data-dtype="String"/>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Cheveux : <label for="data.poids">Poids :</label>
<input class="description-value flexrow" type="text" name="data.cheveux" value="{{data.cheveux}}" data-dtype="String"/> <input class="flex-grow" type="text" name="data.poids" value="{{data.poids}}" data-dtype="String"/>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Yeux : <label for="data.taille">Taille :</label>
<input class="description-value flexrow" type="text" name="data.yeux" value="{{data.yeux}}" data-dtype="String"/> <input class="flex-grow" type="text" name="data.taille" value="{{data.taille}}" data-dtype="String"/>
</label>
</li> </li>
</ul> </ul>
<ul class="item-list alterne-list"> <ul class="item-list alterne-list">
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Age : <label for="data.main">Main directrice :</label>
<input class="description-value flexrow" type="text" name="data.age" value="{{data.age}}" data-dtype="String"/> <input type="text" name="data.main" value="{{data.main}}" data-dtype="String"/>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Heure de naissance : <label for="data.heure">Heure de naissance :</label>
<select class="description-value flexrow" type="text" name="data.heure" value="{{data.heure}}" data-dtype="String"> <select type="text" name="data.heure" value="{{data.heure}}" data-dtype="String">
{{#select data.heure}} {{#select data.heure}}
{{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}} {{>"systems/foundryvtt-reve-de-dragon/templates/heures-select-option.html"}}
{{/select}} {{/select}}
</select> </select>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Beauté : <label>Beauté :</label>
<label class="description-label competence-label">{{data.beaute}} <input type="text" value="{{data.beaute}}" data-dtype="String" disabled/>
</label>
</label>
</li> </li>
<li class="item flexrow list-item"> <li class="item flexrow list-item">
<label class="description-label competence-label">Main directrice : <label for="data.cheveux">Cheveux :</label>
<input class="description-value flexrow" type="text" name="data.main" value="{{data.main}}" data-dtype="String"/> <input class="flex-grow" type="text" name="data.cheveux" value="{{data.cheveux}}" data-dtype="String"/>
</label> </li>
<li class="item flexrow list-item">
<label for="data.yeux">Yeux :</label>
<input class="flex-grow" type="text" name="data.yeux" value="{{data.yeux}}" data-dtype="String"/>
</li> </li>
</ul> </ul>
</article> </article>