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

Merge vk

Browse Source
This commit is contained in:
sladecraven 2022-10-05 20:00:42 +02:00
parent 3739204b42
commit fd6fbba9cb
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
module/rdd-combat.js
View File

@ -351,6 +351,7 @@ export class RdDCombatManager extends Combat {
game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo }); game.combat.rollInitiative(combatantId, rollFormula, { initInfo: initInfo });
} }
/* -------------------------------------------- */
static _baseInitOffset(categorie, arme) { static _baseInitOffset(categorie, arme) {
if (categorie == "tir") { // Offset de principe pour les armes de jet if (categorie == "tir") { // Offset de principe pour les armes de jet
return 8; return 8;
@ -448,7 +449,7 @@ export class RdDCombat {
/* -------------------------------------------- */ /* -------------------------------------------- */
static createUsingTarget(attacker) { static createUsingTarget(attacker) {
const target = RdDCombat.getTarget(); const target = RdDCombat.getTarget()
if (target == undefined) { if (target == undefined) {
ui.notifications.warn((game.user.targets?.size ?? 0) > 1 ui.notifications.warn((game.user.targets?.size ?? 0) > 1
? "Vous devez choisir <strong>une seule</strong> cible à attaquer!" ? "Vous devez choisir <strong>une seule</strong> cible à attaquer!"
@ -555,12 +556,12 @@ export class RdDCombat {
/* -------------------------------------------- */ /* -------------------------------------------- */
constructor(attacker, defender, defenderTokenId, target) { constructor(attacker, defender, defenderTokenId, target) {
this.attacker = attacker; this.attacker = attacker
this.defender = defender; this.defender = defender
this.target = target; this.target = target
this.attackerId = this.attacker.id; this.attackerId = this.attacker.id
this.defenderId = this.defender.id; this.defenderId = this.defender.id
this.defenderTokenId = defenderTokenId; this.defenderTokenId = defenderTokenId
} }
/* -------------------------------------------- */ /* -------------------------------------------- */
@ -686,6 +687,14 @@ export class RdDCombat {
return rollData.rolled.isSuccess; return rollData.rolled.isSuccess;
} }
/* -------------------------------------------- */
verifierDistance( competence, arme) {
if ( competence.system.categorie == "tir" ) {
// TODO - ONGOING
}
}
/* -------------------------------------------- */ /* -------------------------------------------- */
async attaque(competence, arme) { async attaque(competence, arme) {
if (!await this.accorderEntite('avant-attaque')) { if (!await this.accorderEntite('avant-attaque')) {
@ -708,6 +717,7 @@ export class RdDCombat {
if (arme) { if (arme) {
this.attacker.verifierForceMin(arme); this.attacker.verifierForceMin(arme);
} }
this.verifierDistance(competence, arme)
const dialog = await RdDRoll.create(this.attacker, rollData, const dialog = await RdDRoll.create(this.attacker, rollData,
{ {

4
system.json
View File

@ -34,7 +34,7 @@
], ],
"url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/", "url": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/",
"license": "LICENSE.txt", "license": "LICENSE.txt",
"version": "10.0.23", "version": "10.0.24",
"compatibility": { "compatibility": {
"minimum": "10", "minimum": "10",
"verified": "10.286" "verified": "10.286"
@ -333,7 +333,7 @@
], ],
"socket": true, "socket": true,
"manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json", "manifest": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/raw/v10/system.json",
"download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.23.zip", "download": "https://www.uberwald.me/gitea/public/foundryvtt-reve-de-dragon/archive/foundryvtt-reve-de-dragon-10.0.24.zip",
"gridDistance": 1, "gridDistance": 1,
"gridUnits": "m", "gridUnits": "m",
"primaryTokenAttribute": "sante.vie", "primaryTokenAttribute": "sante.vie",