Roll formulas completed

This commit is contained in:
carmoeri
2020-09-21 22:46:55 -07:00
parent 46defc0917
commit 101af5bb16
2 changed files with 58 additions and 45 deletions
@@ -1920,7 +1920,7 @@ body {
.sheet-rolltemplate-grid {
display: grid;
grid-template-columns: 20% 80%;
grid-template-columns: 50% 50%;
}
.sheet-rolltemplate-label {
@@ -34,7 +34,7 @@
<div class="weapons-weapon-grid-button-group">
Roll:
<button type='roll' name="roll_Combat-Dice"
value="&{template:damage} {{weaponname=@{weapon_name}}} {{totaldamage=[[(?{Modifier to Damage Dice|0}+@{weapon_Damage_rep}+@{weapon_Attribute_rep})t[Combat-Dice]]]+@{weapon_Damagebonus_rep}}} {{areastruck=[[1t[Hit-Location]]]}} " +>
value="&{template:damage} {{character_name=@{character_name}}} {{weaponname=@{weapon_name}}} {{rangereach=@{weapon_reach}}} {{size=@{weapon_size}}} {{damage=@{weapon_damage}}}{{qualities=@{weapon_qualities}}}{{bonusdamage=@{weapon_type}}}{{totaldamage=[[(@{weapon_damage}+@{weapon_type})t[Combat-Dice]]]}} {{areastruck=[[t[Hit-Location-Table]]]}}">
</button>
</div>
<div class="weapons-weapon-labels field-border-narrow">Type</div>
@@ -43,11 +43,11 @@
<div class="weapons-weapon-labels field-border-medium">Damage</div>
<div class="weapons-weapon-labels field-border-medium">Loads</div>
<select class="input-field-medium" name="attr_weapon_type" title="Weapon Type">
<option value="melee" selected>Melee</option>
<option value="range" selected>Range</option>
<option value="@{weapon_damagebonus_melee}" selected>Melee</option>
<option value="@{weapon_damagebonus_range}">Range</option>
</select>
<input class="input-field-medium" type="text" name="attr_weapon_reach" />
<select class="input-field-medium" name="attr_weapon_size" title="Weapon Size">
<select class="input-field-medium" name="attr_weapon_size" title="Weapon Size: 1-Handed, 2-Handed, Unbalanced, Unwieldy, Fixed, Monstrous">
<option value="1H" selected>1H</option>
<option value="2H">2H</option>
<option value="UB">UB</option>
@@ -359,7 +359,7 @@
<div class="area-center-content">
<div class="area-characteristics">
<div class="char-banner">
<input class="sheet-banner-char-name-input type="text" name="attr_character_name" />
<input class="sheet-banner-char-name-input" type="text" name="attr_character_name" />
</div>
<div class="char-characteristics">
<!--
@@ -439,7 +439,7 @@
<div class="field-border-narrow talents-grid-label">Name</div>
<input class="input-field-medium" type="text" name="attr_talent_name" value="" />
<div class="field-border-narrow talents-grid-label">Rank</div>
<input class="input-field-narrow" name="attr_talent_rank" value="0" />
<input class="input-field-narrow" type="text" name="attr_talent_rank" />
<div class="field-border-narrow talents-grid-label">Skill</div>
<select class="input-field-medium" name="attr_talent_skill" title="Talent Skill">
<option value="Agility" selected>Agility</option>
@@ -483,7 +483,7 @@
</button>
</div>
<div class="field-border-narrow talents-grid-label">Effect</div>
<input class="input-field-wide sheet-col-span-2-9" name="attr_talent_qualities" value="" />
<input class="input-field-wide sheet-col-span-2-9" type="text" name="attr_talent_qualities" value="" />
</div>
</fieldset>
</div>
@@ -994,14 +994,14 @@
<span> uses talent </span>
<span style="color: rgb(4, 63, 2);font-weight: 800;">{{name}}</span>
<div class="sheet-rolltemplate-grid">
<div class="sheet-rolltemplate-label">Base:</div>
<div class="sheet-rolltemplate-value">{{base}}</div>
<div class="sheet-rolltemplate-label">Skill:</div>
<div class="sheet-rolltemplate-value">{{skill}}</div>
<div class="sheet-rolltemplate-label">Rank:</div>
<div class="sheet-rolltemplate-value">{{rank}}</div>
<div class="sheet-rolltemplate-label">Effects:</div>
<div class="sheet-rolltemplate-value">{{qualities}}</div>
<div class="sheet-rolltemplate-label">Base</div>
<div class="sheet-rolltemplate-value">: {{base}}</div>
<div class="sheet-rolltemplate-label">Skill</div>
<div class="sheet-rolltemplate-value">: {{skill}}</div>
<div class="sheet-rolltemplate-label">Rank</div>
<div class="sheet-rolltemplate-value">: {{rank}}</div>
<div class="sheet-rolltemplate-label">Effects</div>
<div class="sheet-rolltemplate-value">: {{qualities}}</div>
</div>
</div>
</rolltemplate>
@@ -1014,26 +1014,26 @@
</div>
</rolltemplate>
<rolltemplate class="rolltemplate-damage">
<rolltemplate class="sheet-rolltemplate-damage">
<div class="sheet-rolltemplate-bkgrnd">
<div class="sheet-rolltemplate-banner">{{character_name}}'s Damage</div>
<div class="sheet-rolltemplate-grid">
<div class="sheet-rolltemplate-label">Weapon:</div>
<div class="sheet-rolltemplate-value">{{weaponname}}</div>
<div class="sheet-rolltemplate-label">Damage:</div>
<div class="sheet-rolltemplate-value">{{totaldamage}}</div>
<div class="sheet-rolltemplate-label">Area Struck:</div>
<div class="sheet-rolltemplate-value">{{areastruck}}</div>
<div class="sheet-rolltemplate-label">Range/Reach:</div>
<div class="sheet-rolltemplate-value">{{rangereach}}</div>
<div class="sheet-rolltemplate-label">Grip:</div>
<div class="sheet-rolltemplate-value">{{grip}}</div>
<div class="sheet-rolltemplate-label">Size:</div>
<div class="sheet-rolltemplate-value">{{size}}</div>
<div class="sheet-rolltemplate-label">Damage:</div>
<div class="sheet-rolltemplate-value">{{damage}}</div>
<div class="sheet-rolltemplate-label">Qualities:</div>
<div class="sheet-rolltemplate-value">{{qualities}}</div>
<div class="sheet-rolltemplate-label">Weapon</div>
<div class="sheet-rolltemplate-value">: {{weaponname}}</div>
<div class="sheet-rolltemplate-label">Range/Reach</div>
<div class="sheet-rolltemplate-value">: {{rangereach}}</div>
<div class="sheet-rolltemplate-label">Size</div>
<div class="sheet-rolltemplate-value">: {{size}}</div>
<div class="sheet-rolltemplate-label">Weapon Damage</div>
<div class="sheet-rolltemplate-value">: {{damage}}</div>
<div class="sheet-rolltemplate-label">Bonus Damage</div>
<div class="sheet-rolltemplate-value">: {{bonusdamage}}</div>
<div class="sheet-rolltemplate-label" style="margin-bottom: 8px;">Total Damage</div>
<div class="sheet-rolltemplate-value" style="margin-bottom: 8px;">: {{totaldamage}}</div>
<div class="sheet-rolltemplate-label" style="margin-bottom: 4px;">Area Struck</div>
<div class="sheet-rolltemplate-value" style="margin-bottom: 4px;">: {{areastruck}}</div>
<div class="sheet-rolltemplate-label">Qualities</div>
<div class="sheet-rolltemplate-value">: {{qualities}}</div>
</div>
</div>
</rolltemplate>
@@ -1091,9 +1091,9 @@
var newAttrValue = {};
if (attrName == 'brawn')
newAttrValue['weapon_damagebonus_melee'] = bonusValue;
if (attrName == 'coordination')
if (attrName == 'awareness')
newAttrValue['weapon_damagebonus_range'] = bonusValue;
if (attrName == 'willpower')
if (attrName == 'personality')
newAttrValue['weapon_damagebonus_presence'] = bonusValue;
setAttrs(newAttrValue);
@@ -1115,6 +1115,14 @@
}
}
rollWeaponDamage = function(eventInfo) {
//value="&{template:damage} {{weaponname=@{weapon_name}}}
//{{totaldamage=[[(?{Modifier to Damage Dice|0}+@{weapon_Damage_rep}+@{weapon_Attribute_rep})t[Combat-Dice]]]+@{weapon_Damagebonus_rep}}}
//{{areastruck=[[1t[Hit-Location]]]}} " +>
}
//***** CHANGE EVENTS *********************************************
//on('change:attribute', handleChangeAttribute);
//on('change:gender', handleChangeAttribute);
@@ -1131,7 +1139,10 @@
on('change:acrobatics_expertise', updateTN);
on('change:melee_expertise', updateTN);
on('change:stealth_expertise', updateTN);
on('change:awareness', updateTN);
on('change:awareness', function(eventInfo) {
updateBonusDamage(eventInfo);
updateTN(eventInfo);
});
on('change:insight_expertise', updateTN);
on('change:observation_expertise', updateTN);
on('change:survival_expertise', updateTN);
@@ -1142,10 +1153,7 @@
});
on('change:athletics_expertise', updateTN);
on('change:resistance_expertise', updateTN);
on('change:coordination', function(eventInfo) {
updateBonusDamage(eventInfo);
updateTN(eventInfo);
});
on('change:coordination', updateTN);
on('change:parry_expertise', updateTN);
on('change:ranged_weapon_expertise', updateTN);
on('change:sailing_expertise', updateTN);
@@ -1156,20 +1164,25 @@
on('change:linguistics_expertise', updateTN);
on('change:lore_expertise', updateTN);
on('change:warfare_expertise', updateTN);
on('change:personality', updateTN);
on('change:personality', function(eventInfo) {
updateBonusDamage(eventInfo);
updateTN(eventInfo);
});
on('change:animal_handling_expertise', updateTN);
on('change:command_expertise', updateTN);
on('change:counsel_expertise', updateTN);
on('change:persuade_expertise', updateTN);
on('change:society_expertise', updateTN);
on('change:willpower', function(eventInfo) {
updateBonusDamage(eventInfo);
updateTN(eventInfo);
});
on('change:willpower', updateTN);
on('change:discipline_expertise', updateTN);
on('change:sorcery_expertise', updateTN);
//**** CLICK EVENTS ****************************************
on('clicked:Combat-Dice', rollWeaponDamage);
//**** OPEN EVENT ****************************************
on('sheet:opened',function(){
console.log('Starting Conan sheet...');