Sync with head

This commit is contained in:
sladecraven 2020-11-03 09:14:14 +01:00
parent e2301b1cfd
commit 34156295ea
10 changed files with 29 additions and 11 deletions

BIN
icons/creatures/dong.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

BIN
icons/creatures/vaseux.webp Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

View File

@ -146,9 +146,9 @@ Hooks.once("ready", function() {
let calendrier = new RdDCalendrier(); let calendrier = new RdDCalendrier();
let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html"; let templatePath = "systems/foundryvtt-reve-de-dragon/templates/calendar-template.html";
let templateData = {}; let templateData = {};
renderTemplate(templatePath, templateData).then(html => { /* DISABLEDrenderTemplate(templatePath, templateData).then(html => {
calendrier.render(true); calendrier.render(true);
} ); } ); */
}); });
/* -------------------------------------------- */ /* -------------------------------------------- */

View File

@ -613,7 +613,7 @@ export class RdDUtility {
static processChatCommand( commands, content, msg ) { static processChatCommand( commands, content, msg ) {
// Setup new message's visibility // Setup new message's visibility
let rollMode = game.settings.get("core", "rollMode"); let rollMode = game.settings.get("core", "rollMode");
if (["gmroll", "blindroll"].includes(rollMode)) msg["whisper"] = ChatMessage.getWhisperIDs("GM"); if (["gmroll", "blindroll"].includes(rollMode)) msg["whisper"] = ChatMessage.getWhisperRecipients("GM");
if (rollMode === "blindroll") msg["blind"] = true; if (rollMode === "blindroll") msg["blind"] = true;
msg["type"] = 0; msg["type"] = 0;
@ -623,7 +623,7 @@ export class RdDUtility {
if (command === "/table") { if (command === "/table") {
if ( commands[1] ) { if ( commands[1] ) {
let tableName = commands[1].toLowerCase(); let tableName = commands[1].toLowerCase();
table2func[tableName](); table2func[tableName].func();
} else { } else {
this.displayHelpTable( msg ); this.displayHelpTable( msg );
} }

View File

@ -422,7 +422,7 @@ export class TMRUtility {
let max = scoreDef.substr(3,2); let max = scoreDef.substr(3,2);
if ( roll >= min && roll <= max) { if ( roll >= min && roll <= max) {
let force = new Roll(renc.data.force).roll().total; let force = new Roll(renc.data.force).roll().total;
ChatMessage.create({ content: "Vous rencontrez un " + renc.name + " d'une force de " + force + " Points de Rêve" }); ChatMessage.create({ content: "Rencontre en " + caseName + "(jet : " + roll + "%)<br>Vous rencontrez un " + renc.name + " d'une force de " + force + " Points de Rêve" });
return false; return false;
} }
} }

View File

@ -222,6 +222,22 @@
height: 100%; height: 100%;
} }
.editor {
margin: 0;
overflow: hidden;
min-height: calc(100% - 225px) !important;
height: calc(100% - 225px) !important;
max-height: calc(100% - 225px) !important;
}
.editor-content {
padding: 5px;
margin: 0;
overflow: auto;
height: 100% !important;
min-height: 100% !important;
max-height: 100% !important;
}
.foundryvtt-reve-de-dragon .tox .tox-editor-container { .foundryvtt-reve-de-dragon .tox .tox-editor-container {
background: #fff; background: #fff;
} }

View File

@ -2,7 +2,7 @@
"name": "foundryvtt-reve-de-dragon", "name": "foundryvtt-reve-de-dragon",
"title": "Rêve de Dragon", "title": "Rêve de Dragon",
"description": "Rêve de Dragon RPG for FoundryVTT", "description": "Rêve de Dragon RPG for FoundryVTT",
"version": "0.9.15", "version": "0.9.16",
"minimumCoreVersion": "0.6.0", "minimumCoreVersion": "0.6.0",
"compatibleCoreVersion": "0.6.6", "compatibleCoreVersion": "0.6.6",
"templateVersion": 37, "templateVersion": 37,

View File

@ -2,7 +2,7 @@
{{!-- Sheet Header --}} {{!-- Sheet Header --}}
<header class="sheet-header"> <header class="sheet-header">
<img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" height="100" width="100" /> <img class="profile-img" src="{{actor.img}}" data-edit="img" title="{{actor.name}}" />
<div class="header-fields"> <div class="header-fields">
<h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name" /></h1> <h1 class="charname"><input name="name" type="text" value="{{actor.name}}" placeholder="Name" /></h1>
<div class="flexrow"> <div class="flexrow">
@ -176,8 +176,8 @@
</div> </div>
{{!-- Biography Tab --}} {{!-- Biography Tab --}}
<div class="tab description" data-group="primary" data-tab="description" style="height:200px"> <div class="tab description" data-group="primary" data-tab="description" style="height:400px !important; min-height: 400px !important;">
<div class="form-group" style="height:200px"> <div class="form-group editor" style="height:400px !important; min-height: 400px !important;">
{{editor content=data.description target="data.description" button=true owner=owner editable=editable}} {{editor content=data.description target="data.description" button=true owner=owner editable=editable}}
</div> </div>
</div> </div>

View File

@ -443,7 +443,7 @@
</div> </div>
{{!-- Biography Tab --}} {{!-- Biography Tab --}}
<div class="tab biography" data-group="primary" data-tab="description" style="height:200px"> <div class="tab biography" data-group="primary" data-tab="description">
<div class="grid grid-2col"> <div class="grid grid-2col">
<div class="flex-group-left flexcol competence-column"> <div class="flex-group-left flexcol competence-column">
<ol class="item-list"> <ol class="item-list">
@ -465,7 +465,9 @@
</div> </div>
</div> </div>
<div class="form-group" style="height:200px"> <div class="form-group" style="height:200px">
{{editor content="data.biographie" target="data.biographie" button=true owner=owner editable=editable}} <div class="form-group editor" style="height:400px !important; min-height: 400px !important;">
{{editor content=data.biographie target="data.biographie" button=true owner=owner editable=editable}}
</div>
</div> </div>
</div> </div>