Merge pull request #2209 from Lockbox313/master

Fixes for The Laundry character sheet
This commit is contained in:
Phil
2017-01-23 16:23:56 -07:00
committed by GitHub
2 changed files with 100 additions and 34 deletions
+78 -31
View File
@@ -95,7 +95,7 @@
</td>
<td style="text-align: right"><span data-i18n="endurance">Endurance</span></td>
<td>
<input type="number" name="attr_endurance" value="@{con}*5" readonly="readonly" />%
<input type="number" name="attr_endurance" value="@{con}*5" disabled />%
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_abilities} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{characteristic_name=^{endurance}}} {{characteristic_threshold=[[@{endurance}]]}} {{special_success=[[(ceil(@{endurance}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -112,7 +112,7 @@
</td>
<td style="text-align: right"><span data-i18n="damage-mod">Damage Mod.</span></td>
<td>
<input type="number" name="attr_damage-mod" readonly="readonly" />
<input type="text" style="width:4em;" name="attr_damage_mod" readonly="readonly" />
</td>
</tr>
@@ -127,7 +127,7 @@
</td>
<td style="text-align: right"><span data-i18n="idea">Idea</span></td>
<td>
<input type="number" name="attr_idea" value="@{int} * 5" readonly="readonly" />%
<input type="number" name="attr_idea" value="@{int} * 5" disabled />%
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_abilities} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{characteristic_name=^{idea}}} {{characteristic_threshold=[[@{idea}]]}} {{special_success=[[(ceil(@{idea}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -144,7 +144,7 @@
</td>
<td style="text-align: right"><span data-i18n="luck">Luck</span></td>
<td>
<input type="number" name="attr_luck" value="@{pow}*5" readonly="readonly" />%
<input type="number" name="attr_luck" value="@{pow}*5" disabled />%
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_abilities} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{characteristic_name=^{luck}}} {{characteristic_threshold=[[@{luck}]]}} {{special_success=[[(ceil(@{luck}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -161,7 +161,7 @@
</td>
<td style="text-align: right"><span data-i18n="agility">Agility</span></td>
<td>
<input type="number" name="attr_agility" value="@{dex}*5" readonly="readonly" />%
<input type="number" name="attr_agility" value="@{dex}*5" disabled />%
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_abilities} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{characteristic_name=^{agility}}} {{characteristic_threshold=[[@{agility}]]}} {{special_success=[[(ceil(@{agility}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -172,13 +172,13 @@
<td>
<input type="number" name="attr_born" />
</td>
<td><span data-i18n="charisma">CHR</span></td>
<td><span data-i18n="CHR">CHR</span></td>
<td>
<input type="number" name="attr_charisma" />
</td>
<td style="text-align: right"><span data-i18n="influence">Influence</span></td>
<td style="text-align: right"><span data-i18n="charisma">Charisma</span></td>
<td>
<input type="number" name="attr_influence" value="@{chr}*5" readonly="readonly" />%
<input type="number" name="attr_influence" value="@{charisma}*5" disabled />%
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_abilities} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{characteristic_name=^{charisma}}} {{characteristic_threshold=[[@{charisma}]]}} {{special_success=[[(ceil(@{charisma}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -195,7 +195,7 @@
</td>
<td style="text-align: right"><span data-i18n="knowledge" >Know</span></td>
<td>
<input type="number" name="attr_knowledge" value="@{edu}*5" readonly="readonly" />%
<input type="number" name="attr_knowledge" value="@{edu}*5" disabled />%
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_abilities} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{characteristic_name=^{knowledge}}} {{characteristic_threshold=[[@{knowledge}]]}} {{special_success=[[(ceil(@{knowledge}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -226,7 +226,7 @@
<td>
<input type="number" name="attr_initial-san" />
</td>
<td><span data-i18n="madness">Madness</span>
<td><span data-i18n="threshold">Threshold</span>
</td>
<td>
<input type="number" name="attr_madness" />
@@ -236,12 +236,12 @@
<td><span data-i18n="maximum-san">Maximum Sanity</span>
</td>
<td>
<input type="number" name="attr_maximum-san" />
<input type="number" disabled value="[[100-@{mythos}]]" name="attr_maximum_san" />
</td>
<td><span data-i18n="threshold">Threshold</span>
<td><span data-i18n="cur-san">Cur. SAN</span>
</td>
<td>
<input type="number" name="attr_threshold" />
<input type="number" name="attr_cur_san" />
</td>
</tr>
</tbody>
@@ -251,7 +251,7 @@
<tbody>
<th><span><h3 style="text-align: center; color: #37b;">Cthulhu Mythos</h3></span></th>
<tr>
<td><span data-i18n="initial-san">Mythos (00%)</span>
<td><span data-i18n="mythos">Mythos (00%)</span>
</td>
<td>
<input type="number" name="attr_mythos" />
@@ -267,16 +267,24 @@
<td><span data-i18n="max-hp">Max HP</span>
</td>
<td>
<input type="number" name="attr_max-hp" />
<input readonly type="number" name="attr_hp_max" />
</td>
</tr>
<tr>
<td><span data-i18n="major-wound">Major Wound</span>
</td>
<td>
<input type="number" name="attr_major-wound" />
<input type="number" readonly name="attr_major_wound" />
</td>
</tr>
<tr>
<td><span data-i18n="hp">HP</span>
</td>
<td>
<input type="number" name="attr_cur_hp" />
</td>
</tr>
</table>
</div>
<div class="sheet-col" style="width: 45%;">
@@ -380,7 +388,7 @@
</td>
<td><span data-i18n="bargin">Bargin</span>(05%)</td>
<td>
<input type="number" name="attr_athelitics" />
<input type="number" name="attr_bargin" />
</td>
<td>
<button type="roll" value="@{PC-whisper} &{template:coc_skills} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{skill_name=^{bargin}}} {{skill_threshold=[[@{bargin}]]}} {{special_success=[[(ceil(@{bargin}/5))]]}} {{diceroll=[[1d100cs<1cf>100]]}}" />
@@ -1040,7 +1048,7 @@
<hr/>
<div><!-- SCIENCE -->
<h3 style="text-align: center; color: #FFF; background-color: #000;"><span data-i18n="weapons">Science</span></h3>
<h3 style="text-align: center; color: #FFF; background-color: #000;"><span data-i18n="science">Science</span></h3>
<div class="sheet-3colrow">
<div class="sheet-col">
<table style="width: 30%;">
@@ -1349,15 +1357,15 @@
<table style="width: 100%;"><!-- Weapons -->
<tr>
<th><span data-i18n="type">Type</span></th>
<th><span data-i18n="artillary">%</span></th>
<th><span data-i18n="artillary">Weapon</span></th>
<th><span data-i18n="artillary">Damage</span></th>
<th><span data-i18n="artillary">Attack</span></th>
<th><span data-i18n="artillary">Special</span></th>
<th><span data-i18n="artillary">Range</span></th>
<th><span data-i18n="artillary">HP</span></th>
<th><span data-i18n="artillary">Ammo</span></th>
<th><span data-i18n="artillary">Siz</span></th>
<th><span>%</span></th>
<th><span data-i18n="weapon">Weapon</span></th>
<th><span data-i18n="damage">Damage</span></th>
<th><span data-i18n="attack">Attack</span></th>
<th><span data-i18n="special">Special</span></th>
<th><span data-i18n="range">Range</span></th>
<th><span data-i18n="wpn-hp">HP</span></th>
<th><span data-i18n="ammo">Ammo</span></th>
<th><span data-i18n="wpn-size">Siz</span></th>
</tr>
<tr>
@@ -2122,6 +2130,45 @@
<script type="text/worker">
on("change:str change:siz", function(){
getAttrs(["str","siz"], function(values){
valStr=parseInt(values.str);
valSiz=parseInt(values.siz);
val=valStr+valSiz;
damBonus="";
if (val < 13){
damBonus="-1d6";
}
if (val > 12 && val < 17 ){
damBonus="-1d4";
}
if (val > 16 && val < 25){
damBonus="";
}
if (val > 24 && val < 33){
damBonus="+1d4";
}
if (val > 32 && val < 41){
damBonus="+1d6";
}
if (val > 41){
damBonus="+2d6";
}
setAttrs({damage_mod: damBonus});
});
})
on("change:app", function(){
getAttrs(["app"], function(values){
@@ -2242,14 +2289,14 @@
valCon=parseInt(values.con);
valSiz=parseInt(values.siz);
val=valCon+valSiz;
val=valCon+valSiz;
val=Math.round(val/2)
setAttrs({
woundThreshold: Math.round(val/4)
major_wound: Math.round(val/2)
});
setAttrs({
hp_max: Math.round(val/2)
hp_max: val
});
});
});
+22 -3
View File
@@ -5,8 +5,10 @@
"INT" : "INT",
"POW" : "POW",
"SIZ" : "SIZ",
"CHR" : "CHR",
"age" : "Age",
"agility" : "Agility",
"ammo" : "Ammo",
"appraise" : "Appraise",
"art" : "Art",
"art-user-place" : "Art Speciality",
@@ -15,6 +17,7 @@
"assignment" : "Assignment",
"astronomy" : "Astronomy",
"athelitics" : "Athelitics",
"attack" : "Attack",
"attitude" : "Attitude",
"bargin" : "Bargin",
"biology" : "Biology",
@@ -23,8 +26,9 @@
"brawl" : "Brawl (25%)",
"bureaucracy" : "Bureaucracy",
"character-name" : "Name",
"characteristic" : "Characteristic",
"characteristics-and-rolls" : "Characteristics & Attributes",
"charisma" : "CHR",
"charisma" : "Charisma",
"chemistry" : "Chemistry",
"circumstances" : "Circumstances",
"climb" : "Climb",
@@ -37,6 +41,8 @@
"craft" : "Craft",
"craft-1-place" : "Craft Speciality",
"cryptography" : "cryptography",
"cur-san" : "Cur. SAN",
"damage" : "Damage",
"damage-mod" : "Damage Mod.",
"deceased" : "Deceased",
"demolition" : "Demolition",
@@ -50,6 +56,7 @@
"equipment" : "Equipment",
"etiquette" : "Etiquette",
"exp-bonus" : "Exp Bonus",
"fail-result" : "Failed",
"fast-talk" : "Fast Talk",
"fine-manipulation" : "Fine Manipulation",
"firearm-assult-rifle" : "Firearm (Assult Rifle) (15%)",
@@ -75,9 +82,10 @@
"heavy-machine" : "Heavy Machine",
"height" : "Height",
"hide" : "Hide",
"hp" : "HP",
"idea" : "Idea",
"influence" : "Influence",
"initial-san" : "Mythos (00%)",
"initial-san" : "Initial Sanity",
"insight" : "Insight",
"jump" : "Jump",
"know-accounting" : "Knowledge (Accounting)",
@@ -104,6 +112,7 @@
"mother-tongue-place" : "Language (Own: Intx5%)",
"motivation" : "Motivation",
"mov" : "MOV",
"mythos" : "Mythos %",
"navigate" : "Navigate",
"notes" : "Notes",
"occult-knowledge" : "Occult Encounters",
@@ -122,21 +131,27 @@
"psychology" : "Psychology",
"psychotherapy" : "Psychotherapy",
"public" : "Public",
"range" : "Range",
"repair" : "Repair",
"research" : "Research",
"result" : "Result",
"ride" : "Ride",
"rolls-results" : "Roll Results",
"scenario" : "Scenario",
"science" : "Science",
"sense" : "Sense",
"skills" : "Skills",
"Skill%" : "%",
"sleight-of-hand" : "Sleight of hand",
"sorcery" : "Sorcery",
"special" : "Special",
"spot" : "Spot",
"status" : "Status",
"stealth" : "Stealth",
"strategy" : "Strategy",
"strength" : "STR",
"supervisors" : "Supervisor(s)",
"success-result" : "Success",
"swim" : "Swim",
"teach" : "Teach",
"technology-use" : "Technology Use",
@@ -144,10 +159,14 @@
"threshold" : "Threshold",
"track" : "Track",
"type" : "Type",
"value" : "Value",
"wealth" : "Wealth(s)",
"weapon" : "Weapon",
"weapon-throw" : "Throw (25%)",
"weapons" : "Combat Skills",
"weight" : "Weight",
"whisper-to-guardian" : "Whisper to GM",
"wpn-hp": "HP",
"wpn-size" : "SIZ",
"zoology" : "Zoology"
}
}