Merge pull request #8004 from Pantoufle167/master

[Five Torches Deep]Updates
This commit is contained in:
Miguel Peres
2021-01-04 10:23:52 -03:00
committed by GitHub
2 changed files with 7 additions and 8 deletions
+7 -7
View File
@@ -6,8 +6,8 @@
<button name="act_toggle_config" title="config button" type="action" style="font-family: Pictos">y</button>
<input type="hidden" name="attr_weapon_buttons" value="0">
<input type="hidden" name="attr_npc_tec" value="0">
<button type="roll" class="pc" name="roll_minisheet" title="%{selected ou nom du personnage|minisheet}" data-i18n-title="%{selected ou nom du personnage|minisheet}" value="/w @{character_name} &{template:minisheet} {{name=@{character_name}}} {{value1=@{pc_hp}}} {{value1_max=@{pc_hp|max}}} {{value2=@{pc_ac}}} {{value3=@{pc_res}}} {{value3_max=@{pc_res|max}}} {{value4=@{pc_sup}}} {{value4_max=@{pc_sup|max}}} {{buttons_name=@{attrmacro}}} {{buttons=@{attrbuttonmacro}}} {{buttons2_name=@{wepmacro}}} {{buttons2=@{weapon_buttons}}} {{buttons3_name=@{magmacro}}} {{buttons3=@{magbuttonmacro}}} {{buttons4_name=@{sensmacro}}} {{buttons4=@{sensbuttonmacro}}}" style="font-family: Pictos; font-size: 20px; position: absolute; top: 70px; left: 815px;">N</button>
<button type="roll" class="npc" name="roll_npc_minisheet" title="%{selected ou nom du personnage|npc_minisheet}" data-i18n-title="%{selected ou nom du personnage|minisheet}" value="/w @{character_name} &{template:npcminisheet} {{name=@{character_name}}} {{value1=@{npc_hp}}} {{value1_max=@{npc_hp|max}}} {{value2=@{npc_ac}}} {{buttons_name=@{standardmacro}}} {{buttons=@{standardbuttonmacro}}} {{buttons2_name=@{strongmacro}}} {{buttons2=@{strongbuttonmacro}}} {{buttons3_name=@{weakmacro}}} {{buttons3=@{weakbuttonmacro}}} {{buttons4_name=Techniques}} {{buttons4=@{npc_tec}}}" style="font-family: Pictos; font-size: 20px; position: absolute; top: 70px; left: 815px;">N</button>
<button type="roll" class="pc" name="roll_minisheet" title="%{selected or character's name|minisheet}" value="/w @{character_name} &{template:minisheet} {{name=@{character_name}}} {{value1=@{pc_hp}}} {{value1_max=@{pc_hp|max}}} {{value2=@{pc_ac}}} {{value3=@{pc_res}}} {{value3_max=@{pc_res|max}}} {{value4=@{pc_sup}}} {{value4_max=@{pc_sup|max}}} {{buttons_name=@{attrmacro}}} {{buttons=@{attrbuttonmacro}}} {{buttons2_name=@{wepmacro}}} {{buttons2=@{weapon_buttons}}} {{buttons3_name=@{magmacro}}} {{buttons3=@{magbuttonmacro}}} {{buttons4_name=@{sensmacro}}} {{buttons4=@{sensbuttonmacro}}}" style="font-family: Pictos; font-size: 20px; position: absolute; top: 70px; left: 815px;">N</button>
<button type="roll" class="npc" name="roll_npc_minisheet" title="%{selected or character's name|npc_minisheet}" value="/w @{character_name} &{template:npcminisheet} {{name=@{character_name}}} {{value1=@{npc_hp}}} {{value1_max=@{npc_hp|max}}} {{value2=@{npc_ac}}} {{buttons_name=@{standardmacro}}} {{buttons=@{standardbuttonmacro}}} {{buttons2_name=@{strongmacro}}} {{buttons2=@{strongbuttonmacro}}} {{buttons3_name=@{weakmacro}}} {{buttons3=@{weakbuttonmacro}}} {{buttons4_name=Techniques}} {{buttons4=@{npc_tec}}}" style="font-family: Pictos; font-size: 20px; position: absolute; top: 70px; left: 815px;">N</button>
<!-- PC
============================= -->
@@ -275,7 +275,7 @@
<option value="@{pc_wisdomMod}" data-i18n="wisdom">Sagesse</option>
<option value="@{pc_charismaMod}" data-i18n="charisma">Charisme</option>
</select>
<input type="number" name="attr_pc_weaponToHitBonus" placeholder="+0" style="width: 130px">
<input type="number" name="attr_pc_weaponToHitBonus" placeholder="+0" value="0" style="width: 130px">
<input type="text" name="attr_pc_weapon_damage" placeholder="dégâts (ex: 1d8)" style="width: 150px;">
<select name="attr_pc_weaponMod" style="width: 150px">
<option value="@{pc_strengthMod}" data-i18n="strength">Force</option>
@@ -286,7 +286,7 @@
<option value="@{pc_charismaMod}" data-i18n="charisma">Charisme</option>
</select>
<input type="text" name="attr_pc_weapon_desc" placeholder="description" spellcheck="false" style="width: 700px; margin-bottom: 2px;">
<button name="roll_weapon" type="roll" value="@{togm} &{template:ftddamage} {{name=@{character_name}}} {{test_name=@{pc_weapon_name}}} {{always=[[@{config_advantage}]]}} {{r1=[[1d20+@{pc_weaponToHitMod}+@{pc_weapon_prof}+@{pc_weaponToHitBonus}]]}} {{r2=[[1d20+@{pc_weaponToHitMod}+@{pc_weapon_prof}+@{pc_weaponToHitBonus}]]}} {{damage_name=Dégâts}} {{r_damage=[[{@{pc_weapon_damage}+@{pc_weaponMod},1d1}kh1]]}}">
<button name="roll_weapon" type="roll" value="@{togm} &{template:ftddamage} {{name=@{character_name}}} {{test_name=@{pc_weapon_name}}} {{always=[[@{config_advantage}]]}} {{r1=[[1d20+@{pc_weaponToHitMod}[Attribute]+@{pc_weapon_prof}[Proficiency]+@{pc_weaponToHitBonus}[Hit Bonus]]]}} {{r2=[[1d20+@{pc_weaponToHitMod}[Attribute]+@{pc_weapon_prof}[Proficiency]+@{pc_weaponToHitBonus}[Hit Bonus]]]}} {{damage_name=Dégâts}} {{r_damage=[[{@{pc_weapon_damage}+@{pc_weaponMod},1d1}kh1]]}}">
<h3 style="width: 80px;" data-i18n="attack">Attaque</h3>
</button>
</fieldset>
@@ -399,8 +399,8 @@
<div class="q1">
<div class="flex">
<h3 data-i18n="to_hit_bonus">Bonus au toucher</h3>
<input type="text" name="attr_npc_bonus_atk" value="0" style="max-width: 50px">
<button name="roll_npc_attack" type="roll" value="@{togm} &{template:ftdroll} {{name=@{character_name}}} {{test_name=Jet d'attaque}} {{always=[[@{config_advantage}]]}} {{r1=[[1d20+[[@{npc_bonus_atk}]]]]}} {{r2=[[1d20+[[@{npc_bonus_atk}]]]]}}"><h3 data-i18n="attack roll">Jet d'attaque</h3></button>
<input type="number" name="attr_npc_bonus_atk" value="0" style="max-width: 50px">
<button name="roll_npc_attack" type="roll" value="@{togm} &{template:ftdroll} {{name=@{character_name}}} {{test_name=Jet d'attaque}} {{always=[[@{config_advantage}]]}} {{r1=[[1d20+@{npc_bonus_atk}]]}} {{r2=[[1d20+@{npc_bonus_atk}]]}}"><h3 data-i18n="attack roll">Jet d'attaque</h3></button>
</div>
<div class="flex">
<h3 data-i18n="damage">Dégâts</h3>
@@ -1168,7 +1168,7 @@ on("change:hd", function () {
return;
}
setAttrs({
"npc_bonus_atk": math[valeur].strong,
"npc_bonus_atk": parseInt(math[valeur].strong,10)||0,
"npc_damage": math[valeur].damage,
"npc_hp_max": math[valeur].hp,
"npc_base_mod": parseInt(math[valeur].base,10)||0,
@@ -157,7 +157,6 @@
"Maîtrise applicable ?": "Maîtrise applicable ?",
"Oui": "Oui",
"Non": "Non",
"%{selected ou nom du personnage|minisheet}": "%{selected ou nom du personnage|minisheet}",
"Caractéristiques": "Caractéristiques",
"Armes": "Armes",
"Magie": "Magie",