Merge pull request 'Fix WoM effects for robes and enchanted staff' (#102) from pallando/foundryvtt-wh4-lang-fr-fr:fixes into v10

Reviewed-on: #102
This commit is contained in:
uberwald 2024-06-11 07:52:17 +02:00
commit f0a0b055ea
9 changed files with 19 additions and 15 deletions

View File

@ -4,7 +4,7 @@
"Career Tables": "Table des Carrières",
"Character Creation": "Création de Personnage",
"Core Rulebook": "Livre de Base",
"Corruption & Mutation Tables": "ables de Corruption & Mutations",
"Corruption & Mutation Tables": "Tables de Corruption & Mutations",
"Critical Hit Tables": "Tables de Critiques",
"GM Booklet": "Livret du MJ",
"Hit Location": "Table de Localisation",

File diff suppressed because one or more lines are too long

View File

@ -1,8 +1,9 @@
let lore = this.effect.name.split("(")[1].split(")")[0].toLowerCase();
let spellLore = game.wfrp4e.config.magicLores[args.spell.system.lore.value].toLowerCase();
// If channelling corresponding lore
if (args.type == "channelling" && args.spell.system.lore.value == lore)
if (args.type == "channelling" && spellLore == lore)
args.prefillModifiers.slBonus += 2
// If channelling or casting different lore
else if (args.spell.system.lore.value != lore && args.spell.system.lore.value != "petty")
else if (spellLore != lore && args.spell.system.lore.value != "petty")
args.prefillModifiers.slBonus -= 1

View File

@ -1,12 +1,12 @@
// This script needs to be separate because equipTransfer is off on the other effect, and thus won't execute when added to an actor
let mainEffect = this.item.effects.contents[0];
if (mainEffect.name.includes("(Savoir)"))
if (mainEffect.name.includes("(Lore)"))
{
let choice = await ItemDialog.create(ItemDialog.objectToArray(game.wfrp4e.config.magicLores, this.item.img), 1, "Choisissez le Savoir");
if (choice.length)
{
mainEffect.update({name : mainEffect.name.replace("Savoir", choice[0].name)})
mainEffect.update({name : mainEffect.name.replace("Lore", choice[0].name)})
this.item.update({name : this.item.name += ` (${choice[0].name})`})
}
}

View File

@ -1,8 +1,9 @@
let lore = this.effect.name.split("(")[1].split(")")[0].toLowerCase();
let spellLore = game.wfrp4e.config.magicLores[args.spell.system.lore.value].toLowerCase();
// If channelling corresponding lore
if (args.type == "channelling" && args.spell.system.lore.value == lore)
if (args.type == "channelling" && spellLore == lore)
args.prefillModifiers.slBonus += 1
// If channelling or casting different lore
else if (args.spell.system.lore.value != lore && args.spell.system.lore.value != "petty")
else if (spellLore != lore && args.spell.system.lore.value != "petty")
args.prefillModifiers.slBonus -= 1

View File

@ -1,2 +1,3 @@
let lore = this.effect.name.split("(")[1].split(")")[0].toLowerCase();
return !args.spell || (args.type == "cast" && ["petty", lore].includes(args.spell.system.lore.value));
let spellLore = game.wfrp4e.config.magicLores[args.spell.system.lore.value].toLowerCase();
return !args.spell || (args.type == "cast" && [game.wfrp4e.config.magicLores["petty"].toLowerCase(), lore].includes(spellLore));

View File

@ -1,8 +1,9 @@
let lore = this.effect.name.split("(")[1].split(")")[0].toLowerCase();
let spellLore = game.wfrp4e.config.magicLores[args.spell.system.lore.value].toLowerCase();
// If channelling corresponding lore
if (args.type == "channelling" && args.spell.system.lore.value == lore)
if (args.type == "channelling" && spellLore == lore)
args.prefillModifiers.slBonus += 3
// If channelling or casting different lore
else if (args.spell.system.lore.value != lore && args.spell.system.lore.value != "petty")
else if (spellLore != lore && args.spell.system.lore.value != "petty")
args.prefillModifiers.slBonus -= 1

View File

@ -1,5 +1,5 @@
let lore = this.effect.name.split(" ")[2].toLowerCase();
if (args.item.type == "spell" && args.item.system.lore.value == lore)
if (args.item.type == "spell" && game.wfrp4e.config.magicLores[args.item.system.lore.value].toLowerCase() == lore)
{
args.item.system.cn.value -= 1
}

View File

@ -1,12 +1,12 @@
// This script needs to be separate because equipTransfer is off on the other effect, and thus won't execute when added to an actor
let mainEffect = this.item.effects.contents[0];
if (mainEffect.name.includes("<Savoir>"))
if (mainEffect.name.includes("<Lore>"))
{
let choice = await ItemDialog.create(ItemDialog.objectToArray(game.wfrp4e.config.magicLores, this.item.img), 1, "Choisissez le Savoir");
if (choice.length)
{
mainEffect.update({name : mainEffect.name.replace("<Savoir>", choice[0].name)})
mainEffect.update({name : mainEffect.name.replace("<Lore>", choice[0].name)})
this.item.update({name : this.item.name += ` (${choice[0].name})`})
}
}