public/bol
1
0
Fork 1
Code Issues Pull Requests Actions Projects Releases 81 Wiki Activity

Enhance and bugfixes for combat

Browse Source
This commit is contained in:
sladecraven
2022-01-01 23:32:48 +01:00
parent 5915b4a0ac
commit 721cb08059
6 changed files with 425 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/actor/actor.js
View File

@@ -217,7 +217,7 @@ export class BoLActor extends Actor {
for (let protect of protectWorn) {
if ( protect.data.subtype == 'helm') {
formula += "+1"
} else {
} else if ( protect.data.subtype == 'armor') {
formula += "+" + protect.data.properties.soak.formula;
}
}

159
module/controllers/bol-rolls.js
View File

@@ -12,7 +12,7 @@ export class BoLRoll {
const adv = dataset.adv;
let attribute = eval(`actor.data.data.attributes.${key}`);
let label = (attribute.label) ? game.i18n.localize(attribute.label) : null;
let description = actor.name + " - " + game.i18n.localize('BOL.ui.attributeCheck') + " - " + game.i18n.localize(attribute.label) ;
let description = actor.name + " - " + game.i18n.localize('BOL.ui.attributeCheck') + " - " + game.i18n.localize(attribute.label);
return this.attributeRollDialog(actor, actorData, attribute, label, description, adv, 0);
}
@@ -23,7 +23,7 @@ export class BoLRoll {
const adv = dataset.adv;
let aptitude = eval(`actor.data.data.aptitudes.${key}`);
let label = (aptitude.label) ? game.i18n.localize(aptitude.label) : null;
let description = actor.name + " - " + game.i18n.localize('BOL.ui.aptitudeCheck') + " - " + game.i18n.localize(aptitude.label) ;
let description = actor.name + " - " + game.i18n.localize('BOL.ui.aptitudeCheck') + " - " + game.i18n.localize(aptitude.label);
return this.aptitudeRollDialog(actor, actorData, aptitude, label, description, adv, 0);
}
@@ -38,19 +38,19 @@ export class BoLRoll {
return;
}
let weaponData = weapon.data.data;
let attackDef= {
id:randomID(16),
let attackDef = {
id: randomID(16),
attacker: actor,
attackerData: actorData,
weapon :weapon,
weapon: weapon,
mod: 0,
target : target,
target: target,
defender: (target) ? game.actors.get(target.data.actorId) : undefined,
adv :dataset.adv || 0,
attribute : eval(`actor.data.data.attributes.${weaponData.properties.attackAttribute}`),
aptitude : eval(`actor.data.data.aptitudes.${weaponData.properties.attackAptitude}`),
label : (weapon.name) ? weapon.name : game.i18n.localize('BOL.ui.noWeaponName'),
description : actor.name + " - " + game.i18n.localize('BOL.ui.weaponAttack'),
adv: dataset.adv || 0,
attribute: eval(`actor.data.data.attributes.${weaponData.properties.attackAttribute}`),
aptitude: eval(`actor.data.data.aptitudes.${weaponData.properties.attackAptitude}`),
label: (weapon.name) ? weapon.name : game.i18n.localize('BOL.ui.noWeaponName'),
description: actor.name + " - " + game.i18n.localize('BOL.ui.weaponAttack'),
}
console.log("WEAPON!", attackDef, weaponData);
return this.weaponRollDialog(attackDef);
@@ -62,12 +62,12 @@ export class BoLRoll {
static async attributeRollDialog(actor, actorData, attribute, label, description, adv, mod, onEnter = "submit") {
const rollOptionTpl = 'systems/bol/templates/dialogs/attribute-roll-dialog.hbs';
const dialogData = {
adv:adv,
adv: adv,
mod: mod,
attr:attribute,
careers:actorData.features.careers,
boons:actorData.features.boons,
flaws:actorData.features.flaws
attr: attribute,
careers: actorData.features.careers,
boons: actorData.features.boons,
flaws: actorData.features.flaws
};
const rollOptionContent = await renderTemplate(rollOptionTpl, dialogData);
@@ -101,31 +101,31 @@ export class BoLRoll {
}
},
default: onEnter,
close: () => {}
close: () => { }
}, this.options());
return d.render(true);
}
static async weaponRollDialog( attackDef) {
static async weaponRollDialog(attackDef) {
const rollOptionTpl = 'systems/bol/templates/dialogs/weapon-roll-dialog.hbs';
const dialogData = {
attr:attackDef.attribute,
adv:attackDef.adv,
attr: attackDef.attribute,
adv: attackDef.adv,
mod: attackDef.mod,
apt:attackDef.aptitude,
apt: attackDef.aptitude,
weapon: attackDef.weapon,
attackId: attackDef.id,
careers: attackDef.attackerData.features.careers,
boons: attackDef.attackerData.features.boons,
flaws: attackDef.attackerData.features.flaws,
};
if ( attackDef.defender) {
if (attackDef.defender) {
dialogData.defence = attackDef.defender.defenseValue,
dialogData.shieldBlock = 'none'
let shields = attackDef.defender.shields
for( let shield of shields) {
for (let shield of shields) {
dialogData.shieldBlock = (shield.data.properties.blocking.blockingAll) ? 'blockall' : 'blockone';
dialogData.shieldAttackMalus = (shield.data.properties.blocking.malus)? shield.data.properties.blocking.malus : 1;
dialogData.shieldAttackMalus = (shield.data.properties.blocking.malus) ? shield.data.properties.blocking.malus : 1;
dialogData.applyShieldMalus = false
}
}
@@ -151,7 +151,7 @@ export class BoLRoll {
let shieldMalus = 0;
const applyShieldMalus = html.find('#applyShieldMalus').val() || false;
if (applyShieldMalus || dialogData.shieldBlock =='blockall') {
if (applyShieldMalus || dialogData.shieldBlock == 'blockall') {
shieldMalus = dialogData.shieldAttackMalus;
}
@@ -170,7 +170,7 @@ export class BoLRoll {
}
},
default: 'submit',
close: () => {}
close: () => { }
}, this.options());
return d.render(true);
}
@@ -178,12 +178,12 @@ export class BoLRoll {
static async aptitudeRollDialog(actor, actorData, aptitude, label, description, adv, mod, onEnter = "submit") {
const rollOptionTpl = 'systems/bol/templates/dialogs/aptitude-roll-dialog.hbs';
const dialogData = {
adv:adv,
adv: adv,
mod: mod,
apt:aptitude,
careers:actorData.features.careers,
boons:actorData.features.boons,
flaws:actorData.features.flaws
apt: aptitude,
careers: actorData.features.careers,
boons: actorData.features.boons,
flaws: actorData.features.flaws
};
const rollOptionContent = await renderTemplate(rollOptionTpl, dialogData);
let d = new Dialog({
@@ -216,14 +216,14 @@ export class BoLRoll {
}
},
default: onEnter,
close: () => {}
close: () => { }
}, this.options());
return d.render(true);
}
}
export class BoLDefaultRoll {
constructor(label, formula, description, isWeapon=false){
constructor(label, formula, description, isWeapon = false) {
this._label = label;
this._formula = formula;
this._isSuccess = false;
@@ -233,9 +233,9 @@ export class BoLDefaultRoll {
this._description = description;
}
async roll(actor){
async roll(actor) {
const r = new Roll(this._formula);
await r.roll({"async": true});
await r.roll({ "async": true });
const activeDice = r.terms[0].results.filter(r => r.active);
const diceTotal = activeDice.map(r => r.result).reduce((a, b) => a + b);
this._isSuccess = (r.total >= 9);
@@ -245,8 +245,8 @@ export class BoLDefaultRoll {
r.toMessage({
user: game.user.id,
flavor: msgFlavor,
speaker: ChatMessage.getSpeaker({actor: actor}),
flags : {msgType : "default"}
speaker: ChatMessage.getSpeaker({ actor: actor }),
flags: { msgType: "default" }
});
});
if (this._isSuccess && this._isWeapon) {
@@ -257,14 +257,14 @@ export class BoLDefaultRoll {
_buildChatMessage(actor) {
const rollMessageTpl = 'systems/bol/templates/chat/rolls/default-roll-card.hbs';
const tplData = {
actor : actor,
label : this._label,
isSuccess : this._isSuccess,
isFailure : !this._isSuccess,
isCritical : this._isCritical,
isFumble : this._isFumble,
hasDescription : this._description && this._description.length > 0,
description : this._description
actor: actor,
label: this._label,
isSuccess: this._isSuccess,
isFailure: !this._isSuccess,
isCritical: this._isCritical,
isFumble: this._isFumble,
hasDescription: this._description && this._description.length > 0,
description: this._description
};
return renderTemplate(rollMessageTpl, tplData);
}
@@ -272,16 +272,17 @@ export class BoLDefaultRoll {
}
export class BoLAttackRoll {
constructor(attackDef){
constructor(attackDef) {
this.attackDef = attackDef;
this._isSuccess = false;
this._isCritical = false;
this._isFumble = false;
}
}
async roll(){
async roll() {
const r = new Roll(this.attackDef.formula);
await r.roll({"async": false});
await r.roll({ "async": false });
//await BoLUtility.showDiceSoNice(r);
const activeDice = r.terms[0].results.filter(r => r.active);
const diceTotal = activeDice.map(r => r.result).reduce((a, b) => a + b);
this._isSuccess = (r.total >= 9);
@@ -291,17 +292,18 @@ export class BoLAttackRoll {
r.toMessage({
user: game.user.id,
flavor: msgFlavor,
speaker: ChatMessage.getSpeaker({actor: this.attackDef.attacker}),
flags : {msgType : "default"}
speaker: ChatMessage.getSpeaker({ actor: this.attackDef.attacker }),
flags: { msgType: "default" }
});
});
if (this._isSuccess ) {
if (this._isSuccess) {
let attrDamage = this.attackDef.weapon.data.data.properties.damageAttribute;
let weaponFormula = BoLUtility.getDamageFormula(this.attackDef.weapon.data.data.properties.damage)
let damageFormula = weaponFormula + "+" + this.attackDef.attacker.data.data.attributes[attrDamage].value;
this.damageRoll = new Roll(damageFormula);
await this.damageRoll.roll({"async": false});
await this.damageRoll.roll({ "async": false });
//await BoLUtility.showDiceSoNice(this.damageRoll);
// Update attackDef object
this.attackDef.damageFormula = damageFormula;
this.attackDef.damageRoll = this.damageRoll;
@@ -310,44 +312,51 @@ export class BoLAttackRoll {
this.damageRoll.toMessage({
user: game.user.id,
flavor: msgFlavor,
speaker: ChatMessage.getSpeaker({actor: this.attackDef.attacker}),
flags : {msgType : "default"}
}).then( result => {
if (this.attackDef.target) {
// Broadcast to GM or process it directly in case of GM defense
if ( !game.user.isGM) {
game.socket.emit("system.bol", { msg: "msg_attack_success", data: this.attackDef });
speaker: ChatMessage.getSpeaker({ actor: this.attackDef.attacker }),
flags: { msgType: "default" }
});
});
if (this._isCritical) {
ChatMessage.create({
alias: this.attackDef.attacker.name,
whisper: BoLUtility.getWhisperRecipientsAndGMs(this.attackDef.attacker.name),
content: await renderTemplate('systems/bol/templates/chat/rolls/attack-heroic-card.hbs', {
attackId: attackDef.id,
attacker: attackDef.attacker,
defender: attackDef.defender,
defenderWeapons: defenderWeapons,
damageTotal: attackDef.damageRoll.total
})
})
} else {
BoLUtility.processAttackSuccess( this.attackDef);
BoLUtility.sendAttackSuccess( this.attackDef);
}
}
});
});
}
}
_buildDamageChatMessage(actor, weapon, total) {
const rollMessageTpl = 'systems/bol/templates/chat/rolls/damage-roll-card.hbs';
const tplData = {
actor : actor,
label : this._label,
actor: actor,
label: this._label,
weapon: weapon,
damage: total,
isCritical: this._isCritical,
};
return renderTemplate(rollMessageTpl, tplData);
}
}
_buildChatMessage(actor) {
const rollMessageTpl = 'systems/bol/templates/chat/rolls/default-roll-card.hbs';
const tplData = {
actor : actor,
label : this._label,
isSuccess : this._isSuccess,
isFailure : !this._isSuccess,
isCritical : this._isCritical,
isFumble : this._isFumble,
hasDescription : this._description && this._description.length > 0,
description : this._description
actor: actor,
label: this._label,
isSuccess: this._isSuccess,
isFailure: !this._isSuccess,
isCritical: this._isCritical,
isFumble: this._isFumble,
hasDescription: this._description && this._description.length > 0,
description: this._description
};
return renderTemplate(rollMessageTpl, tplData);
}

85
module/system/bol-utility.js
View File

@@ -95,9 +95,31 @@ export class BoLUtility {
game.socket.emit("system.fvtt-fragged-kingdom", { msg: "msg_gm_chat_message", data: chatGM });
}
/* -------------------------------------------- */
static sendAttackSuccess(attackDef) {
if (attackDef.target) {
// Broadcast to GM or process it directly in case of GM defense
if (!game.user.isGM) {
game.socket.emit("system.bol", { msg: "msg_attack_success", data: attackDef });
} else {
BoLUtility.processAttackSuccess(attackDef);
}
}
}
/* -------------------------------------------- */
static async chatListeners(html) {
// Damage handling
html.on("click", '.damage-increase', event => {
let attackId = event.currentTarget.attributes['data-attack-id'].value;
let damageMode = event.currentTarget.attributes['data-damage-mode'].value;
if ( game.user.isGM) {
BoLUtility.processDamageIncrease(event, attackId, damageMode)
} else {
game.socket.emit("system.bol", { msg: "msg_damage_increase", data: {event: event, attackId: attackId, damageMode: damageMode} });
}
});
html.on("click", '.damage-handling', event => {
let attackId = event.currentTarget.attributes['data-attack-id'].value;
let defenseMode = event.currentTarget.attributes['data-defense-mode'].value;
@@ -111,6 +133,31 @@ export class BoLUtility {
});
}
/* -------------------------------------------- */
static async processDamageIncrease(event, attackId, damageMode ) {
if ( !game.user.isGM) {
return;
}
BoLUtility.removeChatMessageId(BoLUtility.findChatMessageId(event.currentTarget));
// Only GM process this
let attackDef = this.attackStore[attackId];
if (attackDef) {
attackDef.damageMode = damageMode;
if (defenseMode == 'damage-plus-6') {
attackDef.damageRoll.total += 6;
}
if (defenseMode == 'damage-plus-12') {
attackDef.damageRoll.total += 12;
attackDef.defender.subHeroPoints(1);
}
if (defenseMode == 'damage-normal') {
// Do nothing !
}
BoLUtility.sendAttackSuccess( this.attackDef);
}
}
/* -------------------------------------------- */
static async processDamageHandling(event, attackId, defenseMode, weaponId=-1) {
if ( !game.user.isGM) {
@@ -120,14 +167,14 @@ export class BoLUtility {
// Only GM process this
let attackDef = this.attackStore[attackId];
console.log("DEFENSE2", attackId, defenseMode, weaponId, attackDef);
if (attackDef) {
attackDef.defenseMode = defenseMode;
if (defenseMode == 'damage-with-armor') {
let armorFormula = attackDef.defender.getArmorFormula();
attackDef.rollArmor = new Roll(armorFormula)
attackDef.rollArmor.roll( {async: false} );
attackDef.finalDamage = attackDef.damageRoll.total - attackDef.rollArmor.total;
attackDef.armorProtect = (attackDef.rollArmor.total<0) ? 0 : attackDef.rollArmor.total;
attackDef.finalDamage = attackDef.damageRoll.total - attackDef.armorProtect;
attackDef.finalDamage = (attackDef.finalDamage<0) ? 0 : attackDef.finalDamage;
attackDef.defender.sufferDamage(attackDef.finalDamage);
}
@@ -136,9 +183,13 @@ export class BoLUtility {
attackDef.defender.sufferDamage(attackDef.finalDamage);
}
if (defenseMode == 'hero-reduce-damage') {
let armorFormula = attackDef.defender.getArmorFormula();
attackDef.rollArmor = new Roll(armorFormula)
attackDef.rollArmor.roll( {async: false} );
attackDef.armorProtect = (attackDef.rollArmor.total<0) ? 0 : attackDef.rollArmor.total;
attackDef.rollHero = new Roll("1d6");
attackDef.rollHero.roll( {async: false} );
attackDef.finalDamage = attackDef.damageRoll.total - attackDef.rollHero.total;
attackDef.finalDamage = attackDef.damageRoll.total - attackDef.rollHero.total - attackDef.armorProtect;
attackDef.finalDamage = (attackDef.finalDamage<0) ? 0 : attackDef.finalDamage;
attackDef.defender.sufferDamage(attackDef.finalDamage);
attackDef.defender.subHeroPoints(1);
@@ -157,6 +208,7 @@ export class BoLUtility {
rollArmor: attackDef.rollArmor,
rollHero: attackDef.rollHero,
weaponHero : attackDef.weaponHero,
armorProtect: attackDef.armorProtect,
defender: attackDef.defender,
defenseMode: attackDef.defenseMode,
finalDamage: attackDef.finalDamage
@@ -313,6 +365,9 @@ export class BoLUtility {
if (sockmsg.name == "msg_damage_handling") {
BoLUtility.processDamageHandling(sockmsg.data.event, sockmsg.data.attackId, sockmsg.data.defenseMode)
}
if (sockmsg.name == "msg_damage_increase") {
BoLUtility.processDamageIncrease(sockmsg.data.event, sockmsg.data.attackId, sockmsg.data.damageMode)
}
}
/* -------------------------------------------- */
@@ -338,6 +393,30 @@ export class BoLUtility {
let formula = nbDice + "d" + res[2] + postForm + ((res[modIndex]) ? res[modIndex] : "");
return formula;
}
/* -------------------------------------------- */
static async showDiceSoNice(roll, rollMode) {
if (game.modules.get("dice-so-nice")?.active) {
if (game.dice3d) {
let whisper = null;
let blind = false;
rollMode = rollMode ?? game.settings.get("core", "rollMode");
switch (rollMode) {
case "blindroll": //GM only
blind = true;
case "gmroll": //GM + rolling player
whisper = BoLUtility.getUsers(user => user.isGM);
break;
case "roll": //everybody
whisper = BoLUtility.getUsers(user => user.active);
break;
case "selfroll":
whisper = [game.user.id];
break;
}
await game.dice3d.showForRoll(roll, game.user, true, whisper, blind);
}
}
}
/* -------------------------------------------- */
static async confirmDelete(actorSheet, li) {

2
system.json
View File

@@ -7,7 +7,7 @@
"url": "https://github.com/ZigmundKreud/bol",
"license": "LICENSE.txt",
"flags": {},
"version": "0.8.9.0",
"version": "0.8.9.1",
"minimumCoreVersion": "0.8.6",
"compatibleCoreVersion": "9",
"scripts": [],

6
templates/chat/rolls/attack-heroic-card.hbs Normal file
View File

@@ -0,0 +1,6 @@
<img class="chat-icon" src="{{attacker.img}}" alt="{{attacker.name}}"/>
Jet Héroïque !
<button class="damage-increase" data-damage-mode="damage-plus-6" data-attack-id="{{attackId}}">Augmenter les dommages de 6</button>
<button class="damage-increase" data-damage-mode="damage-plus-12" data-attack-id="{{attackId}}">Augmenter les dommages de 12 (1 point d'Heroisme)</button>
<button class="damage-increase" data-damage-mode="damage-normal" data-attack-id="{{attackId}}">Laisser les dommages inchangés</button>

5
templates/chat/rolls/defense-result-card.hbs
View File

@@ -3,13 +3,14 @@
<ul>
<li>
{{#if (eq defenseMode "damage-with-armor")}}
Protection de l'armure : {{rollArmor.total}}.
Protection de l'armure : {{armorProtect}}.
{{/if}}
{{#if (eq defenseMode "damage-without-armor")}}
Aucune protection d'armure !
{{/if}}
{{#if (eq defenseMode "hero-reduce-damage")}}
Un point d'héroisme dépensé, pour une réduction des dommages de {{rollHero.total}}.
Protection de l'armure : {{armorProtect}}.
Un point d'héroisme dépensé, pour une réduction des dommages supplémentaire de {{rollHero.total}}.
{{/if}}
{{#if (eq defenseMode "hero-in-extremis")}}
Aucun dommage encaissé, grâce à la parade in-extremis avec {{weaponHero.name}}. L'arme a été détruite pendant cette parade !