VincentVk/foundryvtt-reve-de-dragon
0
0
Fork 0
forked from public/foundryvtt-reve-de-dragon
Code Pull Requests Activity

#52 Gestion astrologie

Browse Source
This commit is contained in:
sladecraven
2020-12-08 23:35:44 +01:00
parent 3e7ec8d51a
commit 1c2b2ece78
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
module/actor.js
View File

@@ -1778,15 +1778,11 @@ export class RdDActor extends Actor {
{ {
let armeItem = this.getOwnedItem(armeId); // Item.data.data ! let armeItem = this.getOwnedItem(armeId); // Item.data.data !
console.log("Going to PARY !!!!!!!!!", armeItem, attackerRoll.diffLibre); console.log("Going to PARY !!!!!!!!!", armeItem, attackerRoll.diffLibre);
<<<<<<< HEAD
if (armeItem.type == 'competencecreature') { if (armeItem.type == 'competencecreature') {
this.rollCompetence( armeItem.name, armeItem.data, attackerRoll, attacker); this.rollCompetenceCombat( armeItem.name, armeItem.data, attackerRoll, attacker);
} else { } else {
this.rollCompetence( armeItem.data.data.competence, armeItem.data, attackerRoll, attacker); this.rollCompetenceCombat( armeItem.data.data.competence, armeItem.data, attackerRoll, attacker);
} }
=======
this.rollCompetenceCombat( armeItem.data.data.competence, armeItem.data, attackerRoll, attacker);
>>>>>>> e2644f1 (Séparation compétences/combat)
} }
/* -------------------------------------------- */ /* -------------------------------------------- */

2
module/rdd-calendrier.js
View File

@@ -58,7 +58,7 @@ export class RdDCalendrier extends Application {
this.rebuildListeNombreAstral(); this.rebuildListeNombreAstral();
} }
} }
console.log(this.calendrier, this.calendrierPos); console.log(this.calendrier, this.calendrierPos, this.listeNombreAstral);
} }