Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@madadric
madadric committed Sep 18, 2018
2 parents 47d9564 + 5432d99 commit a032914
Show file tree
Hide file tree
Showing 2,038 changed files with 710,090 additions and 151,987 deletions.
30 changes: 15 additions & 15 deletions 13th Age Official/13th_Age_Official.css
View file
Expand Up @@ -158,23 +158,23 @@ input {
.sheet-power button[type=roll].sheet-powerlabel,
.sheet-body button[type=roll].sheet-attrlabel
{
background-color: #014A89;
background-color: #014A89;
color: white;
border: 5px solid #014A89;
padding-left: 20px;
padding-left: 10px;
font-size: 14px;
width: 60px;
width: 35px;
display: inline-block;
background-image: none;
text-shadow:none;
box-shadow:none;
border-radius:0px;
padding-top:0px;
padding-right:0px;
padding-bottom:0px;
text-shadow: none;
box-shadow: none;
border-radius: 0px;
padding-top: 0px;
padding-right: 0px;
padding-bottom: 0px;
margin: 0px;
vertical-align:top;
height: 28px;
vertical-align: top;
height: 18px;
margin-left: -20px;
}

Expand All @@ -200,7 +200,7 @@ input {
margin: 0px;
position: relative;
top: 0px;
left: 52px;
left: 35px;
line-height: 12px;
min-width: 60px;
}
Expand All @@ -213,7 +213,7 @@ input {
}

.sheet-derived button[type=roll].sheet-derlabel.sheet-recovery {
width: 65px;
width: 60px;
padding-right: 0px;
}

Expand Down Expand Up @@ -289,7 +289,7 @@ input {

.sheet-derived .sheet-derlabel.sheet-hp.sheet-stag {
padding-left: 5px;
margin-left: -5px;
margin-left: -2px;
width: 65px;
}

Expand Down Expand Up @@ -1118,7 +1118,7 @@ button[type=roll]:hover *
.sheet-deathsavecontainer {
position: absolute;
top: 35px;
left: 60px;
left: 20px;
width: 200px;
}

Expand Down
6 changes: 3 additions & 3 deletions 13th Age Official/13th_Age_Official.html
View file
Expand Up @@ -146,11 +146,11 @@
</div>
</div>
<div class="derived">
<div class="dercontainer">
<div class="dercontainer" style="background-color: #014A89;">
<span class="derlabel hp" data-i18n="max-hp">Max HP</span>
<span class="derived" name="attr_HP_max" title="@{HP_max}"></span>
<span class="derived" style="background-color: white;" name="attr_HP_max" title="@{HP_max}"></span>
<span class="derlabel hp stag" data-i18n="staggered">Staggered</span>
<span class="derived" name="attr_HP-staggered" title="@{HP-staggered}"></span>
<span class="derived" style="background-color: white;" name="attr_HP-staggered" title="@{HP-staggered}"></span>
</div>
<div class="dercontainer">
<div class="hpbox">
Expand Down
138 changes: 129 additions & 9 deletions 13th_Age-neovatar/13th_Age-neovatar.css
View file
@@ -1,4 +1,4 @@
/* version: 1.8.0 */
/* version: 1.8.1 */

.sheet-13thAge {
padding-top: 10px;
Expand Down Expand Up @@ -41,22 +41,22 @@
}

.sheet-caps {
font-size: 1.6em;
font-size: 16px;
font-variant: small-caps;
background-color: rgba(0,0,0,0.7);
width: calc(100% - 30px);
padding-bottom: 3px;
padding-bottom: 2px;
padding-top: 2px;
float: left;
}

.sheet-brush {
background: url("https://neovatar.github.io/roll20-character-sheets/13th_Age-neovatar/img/bgh4.png");
width: 15px;
height: 1.6em;
height: 26px;
float: left;
padding-bottom: 2px;
padding-top: 2px;
padding-bottom: 0px;
padding-top: 0px;
}

.sheet-l1 {
Expand Down Expand Up @@ -431,6 +431,46 @@ textarea.sheet-textarea-desc {

/* roll templates */

.sheet-rolltemplate-13thage_generic .sheet-rt-table {
margin: 0;
border: none;
}
.sheet-rolltemplate-13thage_generic .sheet-rt-table td,
.sheet-rolltemplate-13thage_generic .sheet-rt-table th {
padding: 5px;
border: none;
}

.sheet-rolltemplate-13thage_power .sheet-rt-table {
margin: 0;
border: none;
}
.sheet-rolltemplate-13thage_power .sheet-rt-table td,
.sheet-rolltemplate-13thage_power .sheet-rt-table th {
padding: 5px;
border: none;
}

.sheet-rolltemplate-13thage_background .sheet-rt-table {
margin: 0;
border: none;
}
.sheet-rolltemplate-13thage_background .sheet-rt-table td,
.sheet-rolltemplate-13thage_background .sheet-rt-table th {
padding: 5px;
border: none;
}

.sheet-rolltemplate-13thage_block .sheet-rt-table {
margin: 0;
border: none;
}
.sheet-rolltemplate-13thage_block .sheet-rt-table td,
.sheet-rolltemplate-13thage_block .sheet-rt-table th {
padding: 5px;
border: none;
}

/* generic template */
.sheet-rolltemplate-13thage_generic table {
width:100%;
Expand All @@ -445,6 +485,7 @@ textarea.sheet-textarea-desc {
overflow: hidden;
}


.sheet-rolltemplate-13thage_generic .sheet-header {
background-color:#000;
margin: 2px 25px 2px 25px;
Expand All @@ -462,17 +503,22 @@ textarea.sheet-textarea-desc {
}

.sheet-rolltemplate-13thage_generic td {
padding:5px;line-height:1.4em;
padding:5px;
line-height:1.4em;
vertical-align:top;
text-align:right
text-align:right;
border: none;
padding: 5px;
}
.sheet-rolltemplate-13thage_generic tr:nth-child(odd) {
background-color:#D3D3D3;
}

.sheet-rolltemplate-13thage_generic td:nth-child(odd) {
text-align:left;
font-weight:bold
font-weight:bold;
border: none;
padding: 5px;
}

.sheet-rolltemplate-13thage_generic .inlinerollresult {
Expand All @@ -496,6 +542,80 @@ textarea.sheet-textarea-desc {
background-color: #4A57ED;
}

/* background template */
.sheet-rolltemplate-13thage_background table {
width:100%;
background-color:white;
border:2px solid #000;
border-spacing: 0;
border-collapse: separate;
border-radius: 5px;
-moz-box-shadow: 2px 2px 5px #000;
-webkit-box-shadow: 2px 2px 5px #000;
box-shadow:2px 2px 5px #000;
overflow: hidden;
}


.sheet-rolltemplate-13thage_background .sheet-header {
background-color:#000;
margin: 2px 25px 2px 25px;
border: 1px solid #000;
color:white;
font-family:"Helvetica Neue",Helvetica,sans-serif;
font-size:1em;
font-weight:bold;
text-align: center;
}

.sheet-rolltemplate-13thage_background .sheet-header a{
color:white;
text-decoration: underline;
}

.sheet-rolltemplate-13thage_background td {
padding:5px;
line-height:1.4em;
vertical-align:top;
text-align:right;
border: none;
padding: 5px;
}
.sheet-rolltemplate-13thage_background tr:nth-child(odd) {
background-color:#D3D3D3;
}

.sheet-rolltemplate-13thage_background td:nth-child(odd) {
text-align:left;
border: none;
padding: 5px;
}

.sheet-rolltemplate-13thage_background .sheet-bold {
font-weight:bold;
}

.sheet-rolltemplate-13thage_background .inlinerollresult {
color: white;
background-color: black;
border-color:black;
}

.sheet-rolltemplate-13thage_background .inlinerollresult.fullcrit {
color: white;
background-color: #3FB315
}

.sheet-rolltemplate-13thage_background .inlinerollresult.fullfail {
color: white;
background-color: #B31515
}

.sheet-rolltemplate-13thage_background .inlinerollresult.importantroll {
color: white;
background-color: #4A57ED;
}

/* power template */
.sheet-rolltemplate-13thage_power table {
width:100%;
Expand Down
35 changes: 29 additions & 6 deletions 13th_Age-neovatar/13th_Age-neovatar.html
View file
@@ -1,4 +1,4 @@
<!-- version: 1.8.0 -->
<!-- version: 1.8.1 -->

<div style="display:none;">
<b style="color:red;font-size:150%;">Attention: </b>
Expand Down Expand Up @@ -653,7 +653,7 @@
<input style="width:100%;" class="sheet-center" title="@{repeating_background_X_points}" name="attr_points" value="number" type="number" />
</span>
<span style="width:15%" class="sheet-table-data sheet-center">
<button title="Roll background check" class="sheet-round-button" type="roll" value="&{template:13thage_generic} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=Skill check}} {{Background=@{desc}}} ?{Attribute| Strength , &#38;#123;&#38;#123;Attribute=Strength&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{STR-mod}+@{points}]]]]&#38;#125;&#38;#125; | Constitution , &#38;#123;&#38;#123;Attribute=Constitution&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{CON-mod}+@{points}]]]]&#38;#125;&#38;#125; | Dexterity , &#38;#123;&#38;#123;Attribute=Dexterity&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{DEX-mod}+@{points}]]]]&#38;#125;&#38;#125; | Intelligence , &#38;#123;&#38;#123;Attribute=Intelligence&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{INT-mod}+@{points}]]]]&#38;#125;&#38;#125; | Wisdom , &#38;#123;&#38;#123;Attribute=Wisdom&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{WIS-mod}+@{points}]]]]&#38;#125;&#38;#125; | Charisma , &#38;#123;&#38;#123;Attribute=Charisma&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{CHA-mod}+@{points}]]]]&#38;#125;&#38;#125;}"></button>
<button title="Roll background check" class="sheet-round-button" type="roll" value="&{template:13thage_background} {{character_name=@{character_name}}} {{character_id=@{character_id}}} {{name=Background}} {{background=@{desc}}} ?{Attribute| Strength , &#38;#123;&#38;#123;Attribute=Strength&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{STR-mod}+@{points}]]]]&#38;#125;&#38;#125; | Constitution , &#38;#123;&#38;#123;Attribute=Constitution&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{CON-mod}+@{points}]]]]&#38;#125;&#38;#125; | Dexterity , &#38;#123;&#38;#123;Attribute=Dexterity&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{DEX-mod}+@{points}]]]]&#38;#125;&#38;#125; | Intelligence , &#38;#123;&#38;#123;Attribute=Intelligence&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{INT-mod}+@{points}]]]]&#38;#125;&#38;#125; | Wisdom , &#38;#123;&#38;#123;Attribute=Wisdom&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{WIS-mod}+@{points}]]]]&#38;#125;&#38;#125; | Charisma , &#38;#123;&#38;#123;Attribute=Charisma&#38;#125;&#38;#125; &#38;#123;&#38;#123;Check=[[1d20+[[@{level}+@{CHA-mod}+@{points}]]]]&#38;#125;&#38;#125;}"></button>
</span>
</div>
</div>
Expand Down Expand Up @@ -975,13 +975,13 @@
</div>
</div>
</div>
<div style="font-size:8px" class="sheet-right"><br>Sheet Version: 1.8.0</div>
<div style="font-size:8px" class="sheet-right"><br>Sheet Version: 1.8.1</div>
</div>

<!-- roll templates -->
<!-- generic roll template -->
<rolltemplate class="sheet-rolltemplate-13thage_generic">
<table>
<table class="sheet-rt-table">
<tr><td colspan="2" class="sheet-header">
{{#character_name}}
{{#character_id}}[{{character_name}}](http://journal.roll20.net/character/{{character_id}}){{/character_id}}
Expand All @@ -999,9 +999,32 @@
</table>
</rolltemplate>

<!-- background roll template -->
<rolltemplate class="sheet-rolltemplate-13thage_background">
<table class="sheet-rt-table">
<tr><td colspan="2" class="sheet-header">
{{#character_name}}
{{#character_id}}[{{character_name}}](http://journal.roll20.net/character/{{character_id}}){{/character_id}}
{{^character_id}}{{character_name}}{{/character_id}}
{{#name}}:{{/name}}
{{/character_name}}
{{#name}}
{{#name_link}}[{{name}}]({{name_link}}){{/name_link}}
{{^name_link}}{{name}}{{/name_link}}
{{/name}}
</td></tr>
{{#background}}
<tr><td colspan="2">{{background}}</td></tr>
{{/background}}
{{#allprops() character_name character_id name_link background}}
<tr><td class="sheet-bold">{{key}}</td><td>{{value}}</td></tr>
{{/allprops() character_name character_id name_link background}}
</table>
</rolltemplate>

<!-- power roll template -->
<rolltemplate class="sheet-rolltemplate-13thage_power">
<table>
<table class="sheet-rt-table">
<tr><td colspan="2" class="sheet-header">
{{#character_name}}
{{#character_id}}[{{character_name}}](http://journal.roll20.net/character/{{character_id}}){{/character_id}}
Expand All @@ -1027,7 +1050,7 @@

<!-- block text roll templates -->
<rolltemplate class="sheet-rolltemplate-13thage_block">
<table>
<table class="sheet-rt-table">
<tr><td colspan="2" class="sheet-header">
{{#character_name}}
{{#character_id}}[{{character_name}}](http://journal.roll20.net/character/{{character_id}}){{/character_id}}
Expand Down
2 changes: 1 addition & 1 deletion 13th_Age-neovatar/Gruntfile.js
View file
Expand Up @@ -16,7 +16,7 @@ module.exports = function(grunt) {
files: [
{src: 'src/index.html', dest: 'testbed/index.html'},
{src: 'src/13th_Age-neovatar.css', dest: 'testbed/13th_Age-neovatar.css'},
{src: 'src/editor.css', dest: 'testbed/editor.css'},
{src: 'src/app.css', dest: 'testbed/app.css'},
{src: 'src/base.css', dest: 'testbed/base.css'},
]
},
Expand Down
3 changes: 3 additions & 0 deletions 13th_Age-neovatar/README.md
View file
Expand Up @@ -49,6 +49,9 @@ This will create `13th_Age-neovatar.[css|html]` that you can copy and paste into

### Changelog

**1.8.1:**
* CSS fixes for upstream Roll20 changes

**1.8.0:**
* Added @tier_dmg_mult attribute, calculated by helper
* Use tier ability damage bonus multiplier in basic attacks
Expand Down
4 changes: 2 additions & 2 deletions 13th_Age-neovatar/package.json
View file
@@ -1,7 +1,7 @@
{
"title": "13th Age Roll 20 Character Sheet - neovatar edition",
"version": "1.8.0",
"name": "roll20-13th_Age-neovatar",
"version": "1.8.1",
"name": "roll20-13th_age-neovatar",
"author": {
"name": "Thomas Seliger"
},
Expand Down
2 changes: 1 addition & 1 deletion 13th_Age-neovatar/sheet.json
View file
Expand Up @@ -4,5 +4,5 @@
"authors": "Thomas Seliger (neovatar)",
"roll20userid": "388327",
"preview": "13th_Age-neovatar.jpg",
"instructions": "New edition of a 13th Age character sheet with some automation.\n\nVersion: 1.8.0\n\nIf you find bugs or have suggestions, please use the [Github issue tracker](https://github.com/neovatar/roll20-character-sheets/issues) for this sheet.\n\nFor changes in this version, please check the [CHANGELOG](https://github.com/Roll20/roll20-character-sheets/blob/master/13th_Age-neovatar/README.md#changelog) on Roll20.net Github repository."
"instructions": "New edition of a 13th Age character sheet with some automation.\n\nVersion: 1.8.1\n\nIf you find bugs or have suggestions, please use the [Github issue tracker](https://github.com/neovatar/roll20-character-sheets/issues) for this sheet.\n\nFor changes in this version, please check the [CHANGELOG](https://github.com/Roll20/roll20-character-sheets/blob/master/13th_Age-neovatar/README.md#changelog) on Roll20.net Github repository."
}

0 comments on commit a032914

Please sign in to comment.