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

v10 #576

Merged
uberwald merged 2 commits from VincentVk/foundryvtt-reve-de-dragon:v10 into v10 2022-11-18 11:24:13 +01:00
Conversation 0 Commits 2 Files Changed 11 +85 -48
11 changed files with 85 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
module/actor.js
View File

@ -3199,11 +3199,12 @@ export class RdDActor extends Actor {
signes: this.listItemsData("signedraconique"),
caracReve: this.system.carac.reve.value,
pointsReve: this.getReveActuel(),
isRapide: isRapide
isRapide: isRapide,
isGM: game.user.isGM,
hasPlayerOwner: this.hasPlayerOwner
}
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrFormData);
this.currentTMR = await RdDTMRDialog.create(html, this, tmrFormData);
this.currentTMR = await RdDTMRDialog.create(this, tmrFormData);
this.currentTMR.render(true);
}

2
module/item-arme.js
View File

@ -177,7 +177,7 @@ export class RdDItemArme extends Item {
equipe: true,
rapide: true,
force: 0,
dommages: 0,
dommages: "0",
dommagesReels: 0,
mortalite: 'non-mortel',
competence: 'Corps à corps',

89
module/rdd-combat.js
View File

@ -151,50 +151,61 @@ export class RdDCombatManager extends Combat {
}
/* -------------------------------------------- */
/** Retourne une liste triée d'actions d'armes avec le split arme1 main / arme 2 main */
/** Retourne une liste triée d'actions d'armes avec le split arme1 main / arme 2 main / lancer */
static listActionsArmes(armes, competences, carac) {
// Gestion des armes 1/2 mains
let actionsArme = [];
let actions = [];
for (const arme of armes) {
let action = duplicate(arme)
if (action.system.equipe) {
let compData = competences.find(c => c.name == action.system.competence)
actionsArme.push(action);
action.action = 'attaque';
action.system.dommagesReels = Number(action.system.dommages);
action.system.niveau = compData.system.niveau;
action.system.initiative = RdDCombatManager.calculInitiative(compData.system.niveau, carac[compData.system.defaut_carac].value);
// Dupliquer les armes pouvant être à 1 main et 2 mains en patchant la compétence
if (action.system.unemain && !action.system.deuxmains) {
action.system.mainInfo = "(1m)";
} else if (!action.system.unemain && action.system.deuxmains) {
action.system.mainInfo = "(2m)";
} else if (action.system.unemain && action.system.deuxmains) {
action.system.mainInfo = "(1m)";
const comp2m = action.system.competence.replace(" 1 main", " 2 mains"); // Replace !
const comp = competences.find(c => c.name == comp2m)
const arme2main = duplicate(action);
arme2main.system.mainInfo = "(2m)";
arme2main.system.niveau = comp.system.niveau;
arme2main.system.competence = comp2m;
arme2main.system.initiative = RdDCombatManager.calculInitiative(arme2main.system.niveau, carac[comp.system.defaut_carac].value);
actionsArme.push(arme2main);
const containsSlash = action.system.dommages.includes("/");
if (containsSlash) {
const tableauDegats = action.system.dommages.split("/");
action.system.dommagesReels = Number(tableauDegats[0]);
arme2main.system.dommagesReels = Number(tableauDegats[1]);
}
else{
ui.notifications.info("Les dommages de l'arme à 1/2 mains " + action.name + " ne sont pas corrects (ie sous la forme X/Y)");
}
if (arme.system.equipe) {
const dommages = arme.system.dommages;
const tableauDommages = dommages.includes("/") ? dommages.split("/") : [dommages, dommages] ;
if (arme.system.unemain && arme.system.deuxmains && !dommages.includes("/")) {
ui.notifications.info("Les dommages de l'arme à 1/2 mains " + arme.name + " ne sont pas corrects (ie sous la forme X/Y)");
}
if (arme.system.unemain) {
actions.push(RdDCombatManager.$prepareAttaqueArme({
arme: arme,
infoMain: "(1 main)",
dommagesReel: Number(tableauDommages[0]),
competence: arme.system.competence,
carac: carac,
competences: competences
}));
}
if (arme.system.deuxmains) {
actions.push(RdDCombatManager.$prepareAttaqueArme({
arme: arme,
infoMain: "(2 mains)",
dommagesReel: Number(tableauDommages[1]),
competence: arme.system.competence.replace(" 1 main", " 2 mains"),
carac: carac,
competences: competences
}));
}
if (arme.system.lancer) {
actions.push(RdDCombatManager.$prepareAttaqueArme({
arme: arme,
infoMain: "(lancer)",
dommagesReel: Number(tableauDommages[0]),
competence: arme.system.lancer,
carac: carac,
competences: competences
}));
}
}
}
return actionsArme.sort(Misc.ascending(armeData => armeData.name + (armeData.system.mainInfo ?? '')));
return actions.sort(Misc.ascending(action => action.name + (action.system.infoMain ?? '')));
}
static $prepareAttaqueArme(infoAttaque) {
const comp = infoAttaque.competences.find(c => c.name == infoAttaque.competence);
const attaque = duplicate(infoAttaque.arme);
attaque.action = 'attaque';
attaque.system.competence = infoAttaque.competence;
attaque.system.dommagesReels = infoAttaque.dommagesReel;
attaque.system.infoMain = infoAttaque.infoMain;
attaque.system.niveau = comp.system.niveau;
attaque.system.initiative = RdDCombatManager.calculInitiative(comp.system.niveau, infoAttaque.carac[comp.system.defaut_carac].value);
return attaque;
}
static listActionsCreature(competences) {

3
module/rdd-tmr-dialog.js
View File

@ -23,7 +23,8 @@ import { RdDCalendrier } from "./rdd-calendrier.js";
export class RdDTMRDialog extends Dialog {
static async create(html, actor, tmrData) {
static async create(actor, tmrData) {
let html = await renderTemplate('systems/foundryvtt-reve-de-dragon/templates/dialog-tmr.html', tmrData);
if (tmrData.mode != 'visu') {
// Notification au MJ

1
module/rdd-utility.js
View File

@ -203,6 +203,7 @@ export class RdDUtility {
'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-potion.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-categorie-vehicule.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-competence.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-competence-lancer.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-herbesoin-ingredient.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-heures.html',
'systems/foundryvtt-reve-de-dragon/templates/enum-initpremierround.html',

1
template.json
View File

@ -644,6 +644,7 @@
"force": "0",
"resistance": 0,
"competence": "",
"lancer": "",
"cout": 0,
"portee_courte": 0,
"magique": false,

12
templates/dialog-tmr.html
View File

@ -5,7 +5,15 @@
<tr id="tmrrow1">
<td>
{{#if (eq mode "visu")}}
<div class="flex-group-center">
<h4>Visualisation!</h4>
</div>
{{else}}
{{#if (and isGM hasPlayerOwner)}}
<div class="flex-group-center">
<h4>Le gardien gére les TMR du joueur, le joueur ne peut pas monter dans les TMR!</h4>
</div>
{{/if}}
<div class="flex-group-center">
<img class="small-button-direction" id='dir-top-left' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top-left.svg'>
<img class="small-button-direction" id='dir-top' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-top.svg'>
@ -16,7 +24,6 @@
<img class="small-button-direction" id='dir-bottom' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom.svg'>
<img class="small-button-direction" id='dir-bottom-right' src='systems/foundryvtt-reve-de-dragon/styles/img/ui/dir-bottom-right.svg'>
</div>
{{/if}}
<div class="flex-group-center lire-signe-draconique">
<a>Lire un signe draconique</a>
</div>
@ -43,7 +50,8 @@
Fatigue
<span id="tmr-fatigue-table">{{{fatigue.html}}}</span>
</div>
</td>
{{/if}}
</td>
</tr>
</table>

5
templates/enum-competence-lancer.html Normal file
View File

@ -0,0 +1,5 @@
{{#each (trier @root.competences) as |competence key|}}
{{#if (eq competence.system.categorie 'lancer')}}
<option value="{{competence.name}}">{{competence.name}}</option>
{{/if}}
{{/each}}

2
templates/hud-actor-attaque.html
View File

@ -7,7 +7,7 @@
data-combatant-id="{{../combatant.id}}"
data-action-index="{{action.index}}"
title="{{action.name}}">
<label>{{action.name}} {{action.system.mainInfo}}</label>
<label>{{action.name}} {{action.system.infoMain}}</label>
</div>
{{/unless}}
{{/each}}

2
templates/hud-actor-init.html
View File

@ -6,7 +6,7 @@
data-combatant-id="{{../combatant.id}}"
data-action-index="{{action.index}}"
title="{{action.name}}">
<label>init: {{action.name}} {{action.system.mainInfo}}</label>
<label>init: {{action.name}} {{action.system.infoMain}}</label>
</div>
{{/each}}
{{#each commandes as |commande key|}}

9
templates/item-arme-sheet.html
View File

@ -11,6 +11,15 @@
{{/select}}
</select>
</div>
<div class="form-group">
<label for="system.lancer">Compétence de lancer</label>
<select name="system.lancer" data-dtype="String">
{{#select system.lancer}}
<option value="">- lancer impossible -</option>
{{>"systems/foundryvtt-reve-de-dragon/templates/enum-competence-lancer.html"}}
{{/select}}
</select>
</div>
<div class="form-group">
<label for="system.dommages">Dommages </label>
<input class="attribute-value" type="text" name="system.dommages" value="{{system.dommages}}" data-dtype="String"/>