Fix spells bugs
This commit is contained in:
parent
89166a5d06
commit
db8e5efa2e
@ -1,172 +1,17 @@
|
|||||||
/************************************************************************************/
|
/************************************************************************************/
|
||||||
import WFRP_Tables from "/systems/wfrp4e/modules/system/tables-wfrp4e.js";
|
//import WFRP_Tables from "/systems/wfrp4e/modules/system/tables-wfrp4e.js";
|
||||||
import WFRP4E from "/systems/wfrp4e/modules/system/config-wfrp4e.js";
|
//import WFRP4E from "/systems/wfrp4e/modules/system/config-wfrp4e.js";
|
||||||
import ActorWfrp4e from "/systems/wfrp4e//modules/actor/actor-wfrp4e.js";
|
//import ActorWfrp4e from "/systems/wfrp4e//modules/actor/actor-wfrp4e.js";
|
||||||
|
import ActorWfrp4e_fr from "./modules/fr-actor-wfrp4e.js"
|
||||||
|
|
||||||
/************************************************************************************/
|
/************************************************************************************/
|
||||||
/* Override some methods of the WFRP4 actor class, mainly to compute spells/weapons */
|
/* Override some methods of the WFRP4 actor class, mainly to compute spells/weapons */
|
||||||
class ActorWfrp4e_fr extends ActorWfrp4e {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Calculates a weapon's range or damage formula.
|
|
||||||
*
|
|
||||||
* Takes a weapon formula for Damage or Range (SB + 4 or SBx3) and converts to a numeric value.
|
|
||||||
*
|
|
||||||
* @param {String} formula formula to be processed (SBx3 => 9).
|
|
||||||
*
|
|
||||||
* @return {Number} Numeric formula evaluation
|
|
||||||
*/
|
|
||||||
calculateRangeOrDamage(formula)
|
|
||||||
{
|
|
||||||
//console.log("FR function calculateRangeOrDamage !", formula);
|
|
||||||
let actorData = this.data
|
|
||||||
try
|
|
||||||
{
|
|
||||||
formula = formula.toLowerCase();
|
|
||||||
// Iterate through characteristics
|
|
||||||
for(let ch in actorData.data.characteristics)
|
|
||||||
{
|
|
||||||
// Determine if the formula includes the characteristic's abbreviation + B (SB, WPB, etc.)
|
|
||||||
if (formula.includes(ch.concat('b')))
|
|
||||||
{
|
|
||||||
// Replace that abbreviation with the Bonus value
|
|
||||||
formula = formula.replace(ch.concat('b'), actorData.data.characteristics[ch].bonus.toString());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (formula.includes("yard") )
|
|
||||||
formula = formula.replace('yard', "mètre" );
|
|
||||||
if (formula.includes("yds") )
|
|
||||||
formula = formula.replace('yds', "m." );
|
|
||||||
// To evaluate multiplication, replace x with *
|
|
||||||
formula = formula.replace('x', '*');
|
|
||||||
|
|
||||||
return eval(formula);
|
|
||||||
}
|
|
||||||
catch
|
|
||||||
{
|
|
||||||
return formula
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turns a formula into a processed string for display
|
|
||||||
*
|
|
||||||
* Processes damage formula based - same as calculateSpellAttributes, but with additional
|
|
||||||
* consideration to whether its a magic missile or not
|
|
||||||
*
|
|
||||||
* @param {String} formula Formula to process - "Willpower Bonus + 4"
|
|
||||||
* @param {boolean} isMagicMissile Whether or not it's a magic missile - used in calculating additional damage
|
|
||||||
* @returns {String} Processed formula
|
|
||||||
*/
|
|
||||||
calculateSpellDamage(formula, isMagicMissile)
|
|
||||||
{
|
|
||||||
let actorData = this.data
|
|
||||||
formula = formula.toLowerCase();
|
|
||||||
|
|
||||||
if (isMagicMissile) // If it's a magic missile, damage includes willpower bonus
|
|
||||||
{
|
|
||||||
formula += "+ " + actorData.data.characteristics["wp"].bonus
|
|
||||||
}
|
|
||||||
|
|
||||||
// Specific case, to avoid wrong matching with "Force"
|
|
||||||
if (formula.includes("force mentale"))
|
|
||||||
{
|
|
||||||
// Determine if it's looking for the bonus or the value
|
|
||||||
if (formula.includes('bonus')) {
|
|
||||||
formula = formula.replace( "bonus de force mentale", actorData.data.characteristics["wp"].bonus);
|
|
||||||
formula = formula.replace( "force mentale bonus", actorData.data.characteristics["wp"].bonus);
|
|
||||||
} else
|
|
||||||
formula = formula.replace("force mentale", actorData.data.characteristics["wp"].value);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Iterate through characteristics
|
|
||||||
for(let ch in actorData.data.characteristics)
|
|
||||||
{
|
|
||||||
// If formula includes characteristic name
|
|
||||||
while (formula.includes(actorData.data.characteristics[ch].label.toLowerCase()))
|
|
||||||
{
|
|
||||||
// Determine if it's looking for the bonus or the value
|
|
||||||
if (formula.includes('bonus')) {
|
|
||||||
formula = formula.replace("bonus de " + WFRP4E.characteristics[ch].toLowerCase(), actorData.data.characteristics[ch].bonus);
|
|
||||||
formula = formula.replace(game.wfrp4e.config.characteristics[ch].toLowerCase() + " bonus", actorData.data.characteristics[ch].bonus);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
formula = formula.replace(game.wfrp4e.config.characteristics[ch].toLowerCase(), actorData.data.characteristics[ch].value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//console.log("calculateSpellDamage -> " + formula );
|
|
||||||
return eval(formula);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Turns a formula into a processed string for display
|
|
||||||
*
|
|
||||||
* Turns a spell attribute such as "Willpower Bonus Rounds" into a more user friendly, processed value
|
|
||||||
* such as "4 Rounds". If the aoe is checked, it wraps the result in AoE (Result).
|
|
||||||
*
|
|
||||||
* @param {String} formula Formula to process - "Willpower Bonus Rounds"
|
|
||||||
* @param {boolean} aoe Whether or not it's calculating AoE (changes string return)
|
|
||||||
* @returns {String} formula processed formula
|
|
||||||
*/
|
|
||||||
calculateSpellAttributes(formula, aoe=false)
|
|
||||||
{
|
|
||||||
let actorData = this.data
|
|
||||||
formula = formula.toLowerCase();
|
|
||||||
|
|
||||||
// Do not process these special values
|
|
||||||
if (formula != game.i18n.localize("You").toLowerCase() && formula != game.i18n.localize("Special").toLowerCase() && formula != game.i18n.localize("Instant").toLowerCase())
|
|
||||||
{
|
|
||||||
// Specific case, to avoid wrong matching with "Force"
|
|
||||||
if (formula.includes("force mentale"))
|
|
||||||
{
|
|
||||||
// Determine if it's looking for the bonus or the value
|
|
||||||
if (formula.includes('bonus')) {
|
|
||||||
formula = formula.replace( "bonus de force mentale", actorData.data.characteristics["wp"].bonus);
|
|
||||||
formula = formula.replace( "force mentale bonus", actorData.data.characteristics["wp"].bonus);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
formula = formula.replace("force mentale", actorData.data.characteristics["wp"].value);
|
|
||||||
}
|
|
||||||
if (formula.includes("yard") )
|
|
||||||
formula = formula.replace('yard', "mètre" );
|
|
||||||
if (formula.includes("yds") )
|
|
||||||
formula = formula.replace('yds', "m." );
|
|
||||||
// Iterate through remaining characteristics
|
|
||||||
for(let ch in actorData.data.characteristics)
|
|
||||||
{
|
|
||||||
// If formula includes characteristic name
|
|
||||||
//console.log("Testing :", ch, WFRP4E.characteristics[ch].toLowerCase());
|
|
||||||
if (formula.includes(game.wfrp4e.config.characteristics[ch].toLowerCase()))
|
|
||||||
{
|
|
||||||
// Determine if it's looking for the bonus or the value
|
|
||||||
if (formula.includes('bonus')) {
|
|
||||||
formula = formula.replace("bonus de " + game.wfrp4e.config.characteristics[ch].toLowerCase(), actorData.data.characteristics[ch].bonus);
|
|
||||||
formula = formula.replace(game.wfrp4e.config.characteristics[ch].toLowerCase() + " bonus", actorData.data.characteristics[ch].bonus);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
formula = formula.replace(game.wfrp4e.config.characteristics[ch].toLowerCase(), actorData.data.characteristics[ch].value);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// If AoE - wrap with AoE ( )
|
|
||||||
if (aoe)
|
|
||||||
formula = "AoE (" + formula.capitalize() + ")";
|
|
||||||
|
|
||||||
//console.log("calculateSpellAttributes -> " + formula );
|
|
||||||
return formula.capitalize();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/************************************************************************************/
|
/************************************************************************************/
|
||||||
var compmod = "wfrp4e";
|
var compmod = "wfrp4e";
|
||||||
|
|
||||||
Hooks.once('ready', () => {
|
Hooks.once('ready', () => {
|
||||||
|
|
||||||
//WFRP_Tables = game.wfrp4e.tables;
|
|
||||||
//WFRP4E = game.wfrp4e.config;
|
|
||||||
//CONFIG.Actor.entityClass = ActorWfrp4e_fr;
|
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
|
||||||
@ -179,6 +24,11 @@ Hooks.once('init', () => {
|
|||||||
compmod = "wfrp4e-core";
|
compmod = "wfrp4e-core";
|
||||||
}
|
}
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
//WFRP_Tables = game.wfrp4e.tables;
|
||||||
|
//WFRP4E = game.wfrp4e.config;
|
||||||
|
CONFIG.Actor.entityClass = ActorWfrp4e_fr;
|
||||||
|
console.log("PATCH !DONE !!", CONFIG.Actor.entityClass);
|
||||||
|
|
||||||
// Babele stuff
|
// Babele stuff
|
||||||
if(typeof Babele !== 'undefined') {
|
if(typeof Babele !== 'undefined') {
|
||||||
|
|||||||
@ -3,7 +3,7 @@
|
|||||||
"name": "WH4-fr-translation",
|
"name": "WH4-fr-translation",
|
||||||
"title": "Traduction du module WH4 en Français.",
|
"title": "Traduction du module WH4 en Français.",
|
||||||
"description": "La traduction du module WH4.",
|
"description": "La traduction du module WH4.",
|
||||||
"version": "1.3.11",
|
"version": "1.3.12",
|
||||||
"minimumCoreVersion" : "0.6.6",
|
"minimumCoreVersion" : "0.6.6",
|
||||||
"compatibleCoreVersion": "1.0.0",
|
"compatibleCoreVersion": "1.0.0",
|
||||||
"author": "LeRatierBretonnien",
|
"author": "LeRatierBretonnien",
|
||||||
@ -19,7 +19,8 @@
|
|||||||
],
|
],
|
||||||
"esmodules": [
|
"esmodules": [
|
||||||
"babele-register.js",
|
"babele-register.js",
|
||||||
"addon-register.js"
|
"addon-register.js",
|
||||||
|
"modules/fr-actor-wfrp4e.js"
|
||||||
],
|
],
|
||||||
"scripts": [ ],
|
"scripts": [ ],
|
||||||
"styles": [],
|
"styles": [],
|
||||||
|
|||||||
3619
modules/fr-actor-wfrp4e.js
Normal file
3619
modules/fr-actor-wfrp4e.js
Normal file
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user