Merge remote-tracking branch 'refs/remotes/Roll20/master'

This commit is contained in:
Rats808
2016-11-11 12:48:37 -07:00
8 changed files with 11042 additions and 1326 deletions
+49 -6
View File
@@ -58,7 +58,6 @@ textarea {
resize:both;
}
.sheet-cheat {
width:100%;
display:block;
@@ -233,6 +232,10 @@ input[type="text"]{
display: table;
width: 100%;
}
.charsheet .sheet-3colrow .sheet-col {
width:33% !important;
margin-right:-5px !important;
}
/* make error row more visible (colorblind users could not see slightly darker border )
also need 1 more level in selector or base css will override border */
@@ -390,9 +393,20 @@ span.sheet-text-button {
background-color:#ce0f69;
color:#FFFFFF;
}
.sheet-skills .sheet-table-row .sheet-table-cell:first-child {
font-size:1rem;
padding-left:0;
}
.sheet-skills button[type=roll] {
width:1.25rem;
height:1.6rem;
padding-left:1px;
}
button[type=roll].sheet-custom-button::before,
button[type=roll].sheet-command-button::before {
content: "";
content: "" !important;
}
/************************************* BUFFS ******************************************/
.sheet-linked-fields {
@@ -492,11 +506,11 @@ input.sheet-tabinput {
margin-right:-14%;
}
.sheet-tab.sheet-tab99 {
width:10%;
width:11%;
}
.sheet-tabinput.sheet-tab99 {
width:10%;
margin-right:-10%;
width:11%;
margin-right:-11%;
}
@@ -1566,6 +1580,35 @@ input[type="number"].sheet-entry-wide {
display:none;
}
.sheet-textarea-gray:not(:checked) ~ .sheet-small-label2 textarea {
background-color: silver !important;
color: dimgrey !important;
pointer-events: none;
}
.sheet-textarea-gray:not(:checked) ~ .sheet-small-label2 {
pointer-events: none;
}
.sheet-insertmacrocell {
min-width:23.85%;
max-width:48.5%;
display:inline-block;
}
.sheet-insertmacrocell.sheet-col1{
width:24%;
}
.sheet-insertmacrocell.sheet-col2{
width:25%;
}
.sheet-insertmacrocell.sheet-col3{
width:25%;
}
.sheet-insertmacrocell.sheet-col4{
width:20%;
}
.sheet-insertmacrocell .sheet-small-label2{
width:95%;
display:inline;
}
/* top of repeating section */
.sheet-minimize-show:checked ~ .sheet-repeating-fields .sheet-expand,
.sheet-minimize-show:checked ~ .sheet-repeating-fields .sheet-sect,
@@ -2321,4 +2364,4 @@ input[type="number"].sheet-entry-wide {
border-color:#4A57ED;
color:White;
background-color: #4A57ED;
}
}
File diff suppressed because it is too large Load Diff
+49 -11
View File
@@ -1,4 +1,16 @@
{
"cs-athletics": "Athletics",
"cs-acrobatics": "Acrobatics",
"cs-finesse": "Finesse",
"cs-influence": "Influence",
"cs-nature": "Nature",
"cs-perception": "Perception",
"cs-performance": "Performance",
"cs-religion": "Religion",
"cs-society": "Society",
"cs-spellcraft": "Spellcraft",
"cs-stealth": "Stealth",
"cs-survival": "Survival",
"buffs-conditions-section":"Buffs and Conditions",
"1-ordinal": "1st",
"10-ordinal": "10th",
@@ -27,19 +39,20 @@
"additional-modifier-or-macro-(eg [[1d6]][investigator])": "Additional modifier or macro (eg [[1d6]][investigator]).",
"adjustment-abbrv": "Adj",
"adventure": "Adventure",
"adventure-skills": "Adventure Skills",
"age": "Age",
"alignment": "Alignment",
"all": "All",
"all-attacks": "All Attacks",
"all-attacks-insert-macro-attack": "Global Attack Insert Macro:",
"all-attacks-insert-macro-cmb": "CMB Attack Insert Macro:",
"all-attacks-insert-macro-cmb-damage": "CMB Damage Insert Macro:",
"all-attacks-insert-macro-damage": "Global Damage Insert Macro:",
"all-attacks-insert-macro-melee": "Melee Attack Insert Macro:",
"all-attacks-insert-macro-melee-damage": "Melee Damage Insert Macro:",
"all-attacks-insert-macro-ranged": "Ranged Attack Insert Macro:",
"all-attacks-insert-macro-ranged-damage": "Ranged Damage Insert Macro:",
"all-attacks-macro-insert-section": "All Attacks Macros",
"all-attacks-insert-macro-attack": "Add to Attack Roll macro",
"all-attacks-insert-macro-cmb": "Add to CMB Roll macro",
"all-attacks-insert-macro-cmb-damage": "Add to CMB Dmg macro",
"all-attacks-insert-macro-damage": "Add to Dmg macro",
"all-attacks-insert-macro-melee": "Add to Melee Attack Roll macro",
"all-attacks-insert-macro-melee-damage": "Add to Melee Dmg macro",
"all-attacks-insert-macro-ranged": "Add to Ranged Attack Roll macro",
"all-attacks-insert-macro-ranged-damage": "Add to Ranged Dmg macro",
"all-attacks-macro-insert-section": "Attack Add-in Macros",
"all-skills": "All Skills",
"alternate-ability-cmb-desc": "Alternate ability combat maneuver",
"alternate-ability-melee-desc": "Alternate ability melee attack",
@@ -71,6 +84,13 @@
"announce-22": "Skill options added to Take 10 or Take 20 to skill rolls, and to add Investigator dice to rolls.",
"announce-23": "<strong>IF YOU USED SKILL TAKE 10 or TAKE 20 or INVESTIGATOR DICE DROPDOWN</strong> You must reset it by changing the dropdown values and changing them back.",
"announce-24": "Damage bonus fixed. Other fixes found at this link: http://tinyurl.com/PF-Thread",
"announce-25": "<strong>Skillbook button available</strong> on the skills page. Displays skill choices in chat area. Drag it to macro bar like other buttons.",
"announce-26": "<strong>GMs NOTE: NPC CHANGES COMING</strong> in v.70 of this sheet. Please do the following:",
"announce-27": "Preview changes at the <strong>beta site</strong> (link in post at 'feedbank' link in footer at bottom of this sheet). View the changes and give us feedback",
"announce-28": "<strong>IMPORT A MONSTER FROM YOUR CAMPAIGN</strong> to observe changes. Make sure your macros still work.",
"announce-29": "Drag a monster from the compendium and report any bugs at the feedback link below.",
"announce-30": "Make sure <strong>IS NPC</strong> is checked on all monster sheets. Starting with version .70 IS NPC will be a flag for the sheet to behave differently.",
"announce-31": "Non english speakers, please assist with translating this sheet. Details at the 'help translate' link in the footer.",
"announcements": "Announcements:",
"announcements-old": "Old Announcements:",
"appraise": "Appraise",
@@ -134,6 +154,7 @@
"aura": "Aura",
"azure": "Azure",
"background": "Background",
"background-skills": "Background Skills",
"background-ranks-remaining": "Background Ranks Remaining",
"base": "Base",
"base-attack-bonus": "Base Attack Bonus",
@@ -145,6 +166,7 @@
"before-combat": "Before Combat",
"before-combat-place": "List any spells and/or abilities used before combat. His stats should reflect these spells.",
"belt:": "Belt:",
"biography": "Bio",
"black": "Black",
"black-default": "•Black",
"blank": "Blank",
@@ -419,6 +441,7 @@
"encumbrance-off-ground-title": "A character can lift as much as double his maximum load off the ground, but he or she can only stagger around with it",
"encumbrance-str-bonus-title": "Bonus to Strength score for carrying capacity only",
"energy-drained": " Energy Drain",
"enforce-requires-training": "Enforce Requires Training?",
"enhancement-abbrv": "Enh",
"enhancement-bonus": "Enhancement Bonus",
"entangled": " Entangled",
@@ -480,6 +503,7 @@
"gear-used-place": "Gear used in combat",
"gender": "Gender",
"generic-roll-template": "Generic Roll Template ",
"global": "Global",
"gold-pieces-abbrv": "&nbsp;GP",
"grappled": " Grappled",
"grazed": " Grazed ",
@@ -524,6 +548,7 @@
"immunities": " Immunities",
"immunities-title": "Takes no damage from listed sources. (e.g. acid, fire, paralysis)",
"include-attack-notes": "Include notes or images in attack rolls? Notes and image will be mapped to attack type.",
"include-attack-totals": "Include Attack Totals?",
"include-attacks-?": "Include Attack?",
"include-eighth-attack": "Include an 8th attack?",
"include-fifth-attack": "Include a 5th attack?",
@@ -535,6 +560,8 @@
"include-second-attack": "Include a 2nd attack?",
"include-seventh-attack": "Include a 7th attack?",
"include-sixth-attack": "Include a 6th attack?",
"include-skill-notes": "Include Skill notes?",
"include-skill-totals": "Include Skill Totals?",
"include-third-attack": "Include a 3rd attack?",
"influence": "Influence",
"initiative": "Initiative",
@@ -542,8 +569,8 @@
"initiative-and-speeds": "Initiative and Speeds",
"initiative-notes": " Initiative Notes",
"initiative-notes-title": "Include initiative notes with roll.",
"insert-macro-attack": "Attack Insert Macro:",
"insert-macro-damage": "Damage Insert Macro:",
"insert-macro-attack": "'Add to Attack' Macro:",
"insert-macro-damage": "'Add to Damage' Macro:",
"intelligence-abbrv": "INT",
"intelligence-abbrv-default": "•INT",
"intelligence-calculation-abbrv": "INT Calc",
@@ -568,6 +595,14 @@
"knowledge-nobility": "Knowledge (Nobility)",
"knowledge-planes": "Knowledge (Planes)",
"knowledge-religion": "Knowledge (Religion)",
"arcana": "Arcana",
"dungeoneering": "Dungeoneering",
"engineering": "Engineering",
"geography": "Geography",
"history": "History",
"local": "Local",
"nobility": "Nobility",
"planes": "Planes",
"known-or-special": "Known / Specialties",
"languages": "Languages",
"legs-title": "How many legs the character has. Affects carrying capacity",
@@ -637,6 +672,7 @@
"miscellaneous-bonus": "Misc Bonus",
"miscellaneous-macro-abbrv": "Misc Macro",
"miscellaneous-skill-abbrv": "Misc Skill",
"misc-skill": "Misc Skill",
"modifier-2-abbrv": "Mod2",
"modifier-abbrv": "Mod",
"morale": "Morale",
@@ -696,6 +732,7 @@
"not-applicable-abbrv-default": "•N/A",
"not-carried": "Not Carried",
"notes": "Notes",
"no-skills-available": "No Skills Available",
"npc": "NPC",
"npc-experience-points-abbrv": "XP",
"npc-feats-text": "Feats from compendium",
@@ -902,6 +939,7 @@
"skill-ranks": "Skill Ranks",
"skill-size-modifier": "Skill",
"skill-size-title": "Size adjustment for skills. Double for stealth",
"skill-untrained": "Skill is untrained",
"skills": "Skills",
"skills-per-level": "Skill Ranks per level due to Class only",
"skills-per-level-abbrv": "Skills /lvl",
+2 -2
View File
@@ -601,9 +601,9 @@
<table class="full_fixed">
<tr>
<td class="cs_style">Unarmed</td>
<td class="cs_calc">STR+DEX+<input class="value" type="text" name="attr_unarmed_cs_points" value="0" disabled="true">+<input class="value" type="text" name="attr_unarmed_cs_temp" value="0" disabled="true"></td>
<td class="cs_calc">STR+DEX+<input class="value" type="text" name="attr_unarmed_cs_points" value="@{unarmed_points}" disabled="true">+<input class="value" type="text" name="attr_unarmed_cs_temp" value="@{unarmed_temp}" disabled="true"></td>
<td class="cs_symbol">=</td>
<td class="cs_number"><input class="total" type="number" name="attr_unarmed_cs_total" value="(@{str}+@{dex}+@{unarmed_cs_points}+@{unarmed_cs_temp})" disabled="true"></td>
<td class="cs_number"><input class="total" type="number" name="attr_unarmed_cs_total" value="(@{str}+@{dex}+@{unarmed_points}+@{unarmed_temp})" disabled="true"></td>
<td class="cs_roll"><button type='roll' name="roll_unarmed_cs_check" value="&{template:runequest} {{name=Unarmed}} {{very_easy=[[@{unarmed_cs_total}*2]]}} {{very_easy_crit=[[ceil((@{unarmed_cs_total}*2)*.1)]]}} {{easy=[[ ceil(@{unarmed_cs_total}*1.5) ]]}} {{easy_crit=[[ ceil( ceil(@{unarmed_cs_total}*1.5) *.1 ) ]]}} {{standard=[[ @{unarmed_cs_total} ]]}} {{standard_crit=[[ ceil( @{unarmed_cs_total} *.1 ) ]]}} {{hard=[[ ceil(@{unarmed_cs_total}*.67) ]]}} {{hard_crit=[[ ceil( ceil(@{unarmed_cs_total}*.67) *.1 ) ]]}} {{formidable=[[ ceil(@{unarmed_cs_total}*.5) ]]}} {{formidable_crit=[[ ceil( ceil(@{unarmed_cs_total}*.5) *.1 ) ]]}} {{herculean=[[ ceil(@{unarmed_cs_total}*.1) ]]}} {{herculean_crit=[[ ceil( ceil(@{unarmed_cs_total}*.1) *.1) ]]}} {{rolled=[[ 1d100 ]]}}">
<button type='roll' name="roll_unarmed_cs_check_penalized" value="&{template:runequest} {{name=Unarmed}} {{very_easy=[[ (@{unarmed_cs_total}*2)-?{Penalty|0} ]]}} {{very_easy_crit=[[ ceil( ((@{unarmed_cs_total}*2)-?{Penalty|0}) *.1 ) ]]}} {{easy=[[ ceil(@{unarmed_cs_total}*1.5)-?{Penalty|0} ]]}} {{easy_crit=[[ ceil( (ceil(@{unarmed_cs_total}*1.5)-?{Penalty|0}) *.1 ) ]]}} {{standard=[[ @{unarmed_cs_total}-?{Penalty|0} ]]}} {{standard_crit=[[ ceil( (@{unarmed_cs_total}-?{Penalty|0}) *.1 ) ]]}} {{hard=[[ ceil(@{unarmed_cs_total}*.67)-?{Penalty|0} ]]}} {{hard_crit=[[ ceil( (ceil(@{unarmed_cs_total}*.67)-?{Penalty|0}) *.1 ) ]]}} {{formidable=[[ ceil(@{unarmed_cs_total}*.5)-?{Penalty|0} ]]}} {{formidable_crit=[[ ceil( (ceil(@{unarmed_cs_total}*.5)-?{Penalty|0}) *.1 ) ]]}} {{herculean=[[ ceil(@{unarmed_cs_total}*.1)-?{Penalty|0} ]]}} {{herculean_crit=[[ ceil( (ceil(@{unarmed_cs_total}*.1)-?{Penalty|0}) *.1) ]]}} {{rolled=[[ 1d100 ]]}}">-?</td>
<td class="cs_weapons"><input class="full" type="text" name="attr_unarmed_cs_weapons"></td>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
Binary file not shown.

After

Width:  |  Height:  |  Size: 671 KiB

@@ -0,0 +1,8 @@
{
"html": "WHFRP2.html",
"css": "WHFRP2.css",
"authors": "Axel Mellgren (Axel on Roll20.net).",
"roll20userid": "88344",
"preview": "WHFRP2.jpg",
"instructions": "This sheet is designed for use with WHFRP 2nd edition."
}