forked from public/bol
Add gitea CI/CD
This commit is contained in:
parent
2e3a97de04
commit
37ab0d01dc
@ -21,6 +21,18 @@ export class BoLActor extends Actor {
|
|||||||
super.prepareData()
|
super.prepareData()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------- */
|
||||||
|
async _preCreate(data, options, user) {
|
||||||
|
await super._preCreate(data, options, user);
|
||||||
|
|
||||||
|
// Configure prototype token settings
|
||||||
|
const prototypeToken = {};
|
||||||
|
if (this.type === "character") Object.assign(prototypeToken, {
|
||||||
|
sight: { enabled: true }, actorLink: true, disposition: CONST.TOKEN_DISPOSITIONS.FRIENDLY
|
||||||
|
});
|
||||||
|
this.updateSource({ prototypeToken });
|
||||||
|
}
|
||||||
|
|
||||||
/* -------------------------------------------- */
|
/* -------------------------------------------- */
|
||||||
isHeroAdversary() {
|
isHeroAdversary() {
|
||||||
if (this.type === 'character') {
|
if (this.type === 'character') {
|
||||||
|
@ -424,6 +424,7 @@ export class BoLRoll {
|
|||||||
} else {
|
} else {
|
||||||
this.rollData.shieldMalus = 0
|
this.rollData.shieldMalus = 0
|
||||||
}
|
}
|
||||||
|
this.updateTotalDice()
|
||||||
})
|
})
|
||||||
|
|
||||||
html.find('#career').change((event) => {
|
html.find('#career').change((event) => {
|
||||||
@ -492,10 +493,10 @@ export class BoLRoll {
|
|||||||
rollData.armorMalus = defender.armorMalusValue
|
rollData.armorMalus = defender.armorMalusValue
|
||||||
rollData.shieldBlock = 'none'
|
rollData.shieldBlock = 'none'
|
||||||
let shields = defender.shields
|
let shields = defender.shields
|
||||||
|
//console.log("Defender stats", defender)
|
||||||
for (let shield of shields) {
|
for (let shield of shields) {
|
||||||
rollData.shieldBlock = (shield.system.properties.blocking.blockingAll) ? 'blockall' : 'blockone';
|
rollData.shieldBlock = (shield.system.properties.blocking.blockingAll) ? 'blockall' : 'blockone';
|
||||||
rollData.shieldAttackMalus = (shield.system.properties.blocking.malus) ? shield.system.properties.blocking.malus : 1;
|
rollData.shieldAttackMalus = (shield.system.properties.blocking.malus) ? shield.system.properties.blocking.malus : 1;
|
||||||
rollData.applyShieldMalus = false
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -528,11 +529,6 @@ export class BoLRoll {
|
|||||||
rollData.nbFlaws = 0
|
rollData.nbFlaws = 0
|
||||||
rollData.nbDice = 0
|
rollData.nbDice = 0
|
||||||
rollData.isHeroAdversary = actor.isHeroAdversary()
|
rollData.isHeroAdversary = actor.isHeroAdversary()
|
||||||
if (rollData.shieldBlock == 'blockall') {
|
|
||||||
rollData.shieldMalus = rollData.shieldAttackMalus;
|
|
||||||
} else {
|
|
||||||
rollData.shieldMalus = 0
|
|
||||||
}
|
|
||||||
rollData.careerBonus = rollData.careerBonus ?? 0
|
rollData.careerBonus = rollData.careerBonus ?? 0
|
||||||
rollData.modRanged = rollData.modRanged ?? 0
|
rollData.modRanged = rollData.modRanged ?? 0
|
||||||
rollData.mod = rollData.mod ?? 0
|
rollData.mod = rollData.mod ?? 0
|
||||||
@ -545,6 +541,12 @@ export class BoLRoll {
|
|||||||
this.preProcessFightOption(rollData)
|
this.preProcessFightOption(rollData)
|
||||||
this.updateArmorMalus(rollData)
|
this.updateArmorMalus(rollData)
|
||||||
this.updatePPCost(rollData)
|
this.updatePPCost(rollData)
|
||||||
|
// Prepare blocking case
|
||||||
|
if (rollData.shieldBlock == 'blockall') {
|
||||||
|
rollData.shieldMalus = rollData.shieldAttackMalus;
|
||||||
|
} else {
|
||||||
|
rollData.shieldMalus = 0
|
||||||
|
}
|
||||||
// Save
|
// Save
|
||||||
this.rollData = rollData
|
this.rollData = rollData
|
||||||
console.log("ROLLDATA", rollData)
|
console.log("ROLLDATA", rollData)
|
||||||
@ -571,24 +573,21 @@ export class BoLRoll {
|
|||||||
ui.notifications.warn("Pas assez de Points de Pouvoir !")
|
ui.notifications.warn("Pas assez de Points de Pouvoir !")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
//console.log("ROLLMALUS", rollData)
|
|
||||||
|
|
||||||
rollData.registerInit = (rollData.aptitude && rollData.aptitude.key == 'init') ? $('#register-init').is(":checked") : false;
|
rollData.registerInit = (rollData.aptitude && rollData.aptitude.key == 'init') ? $('#register-init').is(":checked") : false;
|
||||||
|
|
||||||
const isMalus = (rollData.bmDice < 0)
|
const isMalus = (rollData.bmDice < 0)
|
||||||
//rollData.nbDice += (rollData.attackBonusDice) ? 1 : 0
|
|
||||||
|
|
||||||
let rollbase = rollData.attrValue + rollData.aptValue
|
let rollbase = rollData.attrValue + rollData.aptValue
|
||||||
if (rollData.weapon && rollData.weapon.system.properties.onlymodifier) {
|
if (rollData.weapon && rollData.weapon.system.properties.onlymodifier) {
|
||||||
rollbase = 0
|
rollbase = 0
|
||||||
}
|
}
|
||||||
|
|
||||||
let diceData = BoLUtility.getDiceData()
|
let diceData = BoLUtility.getDiceData()
|
||||||
let malusInit = rollData.combatData?.malusInit || 0
|
let malusInit = rollData.combatData?.malusInit || 0
|
||||||
const modifiers = rollbase + rollData.careerBonus + rollData.mod + rollData.weaponModifier - rollData.defence - rollData.modArmorMalus + rollData.shieldMalus + rollData.attackModifier + rollData.appliedArmorMalus + rollData.effectModifier - malusInit
|
const modifiers = rollbase + rollData.careerBonus + rollData.mod + rollData.weaponModifier - rollData.defence - rollData.modArmorMalus + rollData.shieldMalus + rollData.attackModifier + rollData.appliedArmorMalus + rollData.effectModifier - malusInit
|
||||||
const formula = (isMalus) ? rollData.nbDice + "d" + diceData.diceFormula + "kl2 + " + modifiers : rollData.nbDice + "d" + diceData.diceFormula + "kh2 + " + modifiers
|
const formula = (isMalus) ? rollData.nbDice + "d" + diceData.diceFormula + "kl2 + " + modifiers : rollData.nbDice + "d" + diceData.diceFormula + "kh2 + " + modifiers
|
||||||
rollData.formula = formula
|
rollData.formula = formula
|
||||||
rollData.modifiers = modifiers
|
rollData.modifiers = modifiers
|
||||||
|
console.log("Rolldata before", rollData)
|
||||||
|
|
||||||
let r = new BoLDefaultRoll(rollData);
|
let r = new BoLDefaultRoll(rollData);
|
||||||
r.roll();
|
r.roll();
|
||||||
|
@ -17,8 +17,7 @@
|
|||||||
"version": "11.0.7",
|
"version": "11.0.7",
|
||||||
"compatibility": {
|
"compatibility": {
|
||||||
"minimum": "10",
|
"minimum": "10",
|
||||||
"maximum": "11",
|
"maximum": "11"
|
||||||
"verified": "11"
|
|
||||||
},
|
},
|
||||||
"esmodules": [
|
"esmodules": [
|
||||||
"module/bol.js"
|
"module/bol.js"
|
||||||
|
Loading…
Reference in New Issue
Block a user