Skip to content

Commit

Permalink
Merge pull request #12175 from applebaggins/master
Browse files Browse the repository at this point in the history 
WOIN-sheet-feature-updates
  • Loading branch information
@BronsonHall
BronsonHall authored Sep 21, 2023
2 parents 4b1d898 + 0bab26e commit dee8a5a
Show file tree
Hide file tree
Showing 2 changed files with 127 additions and 22 deletions.
91 changes: 85 additions & 6 deletions WOIN/WOIN.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ div.sheet-header_old {
select.sheet-select1 {
background:transparent;
width:100px;
margin-bottom:-2px;
margin-bottom:0px;
}
select.sheet-select2 {
background:transparent;
Expand Down Expand Up @@ -641,7 +641,7 @@ input.sheet-new:checked ~ table.sheet-attrib button[type="roll"].sheet-rollatrri
input.sheet-old:checked ~ button[type="roll"].sheet-rollatrrib:active,
input.sheet-old:checked ~ table.sheet-attrib button[type="roll"].sheet-rollatrrib:active {
background:white;
color::#2D2A23;
color:#2D2A23;
border: 3px inset gray;
border: 3px inset gray;
padding-left: 4px;
Expand All @@ -651,8 +651,8 @@ input.sheet-old:checked ~ table.sheet-attrib button[type="roll"].sheet-rollatrri
}
/* button */
button[type="roll"].sheet-rollskill {
width: 30px;
height:30px;
width: 20px;
height:20px;
vertical-align: middle;
padding-left: 2px;
padding-right: 2px;
Expand All @@ -671,8 +671,8 @@ button[type="roll"].sheet-rollskill {
}
/* button */
button[type="roll"].sheet-rollskillold {
width: 30px;
height:30px;
width: 20px;
height:20px;
vertical-align: middle;
padding-left: 2px;
padding-right: 2px;
Expand Down Expand Up @@ -774,3 +774,82 @@ button[type="roll"].sheet-rollluck:active {
padding-top: 4px;
padding-bottom: 2px;
}
.sheet-rolltemplate-custom {
margin-left: -37px;
}
.withoutavatars .sheet-rolltemplate-custom {
margin-left: -7px;
}

.sheet-rolltemplate-custom .sheet-container {
border: 1px solid;
/* by default, the border is the same color as the header. You can change this here, e.g. to black */
border-color: var(--header-bg-color);
}

/* Header formatting - title and subtitle */
.sheet-rolltemplate-custom .sheet-header {
background-color: var(--header-bg-color);
/* change text-align to center to center the header text */
text-align: left;
color: var(--header-text-color);
padding: 5px;
}
.sheet-rolltemplate-custom .sheet-title {
font-size:1.1em;
}
.sheet-rolltemplate-custom .sheet-subtitle {
font-size:.9em;
}

/* example colors */
.sheet-rolltemplate-custom .sheet-container {
/* this is the default color */
--header-bg-color: rgba(112,32,130,1);
--header-text-color: #FFF;
}
.sheet-rolltemplate-custom .sheet-container.sheet-color-red {
--header-bg-color: #F00;
}
.sheet-rolltemplate-custom .sheet-container.sheet-color-green {
--header-bg-color: #0F0;
--header-text-color: #000;
}

/* Allprops part */
.sheet-rolltemplate-custom .sheet-content {
display: grid;
background: #FFF;
/* Header formatting - modify the column layout below */
grid-template-columns: auto auto;
/* Line height to match default roll template */
line-height:1.4em;
}
.sheet-rolltemplate-custom .sheet-content > div {
padding: 5px;
}

/* Left column */
.sheet-rolltemplate-custom .sheet-content .sheet-key {
font-weight: bold;
padding-right: 10px;
text-align: right;
}

/* Empty rule, use this if you want to change the right column
.sheet-rolltemplate-custom .sheet-value {
}
*/

/* Make even-numbered rows grey */
.sheet-rolltemplate-custom .sheet-content :nth-child(4n+3),
.sheet-rolltemplate-custom .sheet-content :nth-child(4n) {
background:#EEE;
}

/* Description field */
.sheet-rolltemplate-custom .sheet-desc {
grid-column: span 2;
padding: 5px;
text-align: center;
}
58 changes: 42 additions & 16 deletions WOIN/WOIN.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,9 @@
<div class='sheet-col'>
<input type="radio" class="sheet-new sheet-hidden" name="attr_sheet_type8" value="0" checked/>
<input type="radio" class="sheet-old sheet-hidden" name="attr_sheet_type8" value="1" />
<div class="sheet-headerold">
<button type="roll" class="sheet-rollluck" name="roll_Initiative" value="&{template:default} {{name= @{selected|token_name} }} {{initiative= Round [[ (@{intuition_1} + ?{Dice pool for Reactions/Tactics|0})d6 &{tracker}]] }}">Initiative</button>
</div>
<div class="sheet-header">Defenses</div>
<table class="sheet-skill">
<tr>
Expand Down Expand Up @@ -564,7 +567,7 @@
<th></th>
</tr>
<tr>
<td><button type="roll" class="sheet-rollskill" name="roll_weapon1" value="&{template:default} {{name= @{weapon1_name} }} {{range= @{weapon1_range} }} {{attack= [[ (@{weaponattrib1_select} + @{weapon1_skill} - @{weapon1_damagemod}*2 + ?{Positional effects d|0})d6 + @{include_luck}d6! ]] }} {{damage= [[(@{weapon1_damage} + @{weapon1_damagemod})d6 + @{weapon1_damageadd} ]] }}"></button></td>
<td><button type="roll" class="sheet-rollskill" name="roll_weapon1" value="&{template:default} {{name= @{weapon1_name} }} {{attack= [[ (@{weaponattrib1_select} + @{weapon1_skill} - @{weapon1_damagemod}*2 + ?{Positional effects d|0} )d6+ @{include_luck}d6!]] }} {{damage= [[(@{weapon1_damage} + @{weapon1_damagemod})d6 + @{weapon1_damageadd}]] @{weapon1_dmgtype1} }} {{range= @{weapon1_range} }}"></button></td>
<td><input type="text" class="sheet-text3" name="attr_weapon1_name" value="" placeholder="Weapon Name"/></td>
<td>
<select class="sheet-select1" name="attr_weaponattrib1_select">
Expand All @@ -581,11 +584,12 @@
<option value="@{psionics}">Psionics</option>
</select>
</td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_skill" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_damage" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_damageadd" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_damagemod" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_skill" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_damage" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_damageadd" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_damagemod" value="0" /></td>
<td><input type="number" class="sheet-number2" name="attr_weapon1_range" value="0" /></td>
<td><input type="text" class="sheet-text3" style="width:100px;" name="attr_weapon1_dmgtype1" placeholder="Slashing" /></td>
<th><input type="checkbox" class="sheet-box" name="attr_weapon1_open" value="1"/><span></span></th>
</tr>
</table>
Expand All @@ -604,16 +608,17 @@
<tr>
<th></th>
<th>Weapon</th>
<th>Attack Attribute</th>
<th>Skill d6</th>
<th>Dmg d6</th>
<th>Dmg pts</th>
<th>+Dmg d6</th>
<th>Attribute</th>
<th>Size</th>
<th>Cost</th>
<th>Range</th>
<th>Weight</th>
<th>Primary damage type</th>
<th></th>
</tr>
<tr>
<td><button type="roll" class="sheet-rollskillold" name="roll_weapon1" value="&{template:default} {{name= @{weapon1_name} }} {{range= @{weapon1_range} }} {{attack= [[ (@{weaponattrib1_select} + @{weapon1_skill} - @{weapon1_damagemod}*2 + ?{Positional effects d|0} )d6+ @{include_luck}d6!]] }} {{damage= [[(@{weapon1_damage} + @{weapon1_damagemod})d6 + @{weapon1_damageadd}]] }}"></button></td>
<td><button type="roll" class="sheet-rollskillold" name="roll_weapon1" value="&{template:default} {{name= [img](https://artfiles.alphacoders.com/531/53131.jpg) @{weapon1_name} }} {{attack= [[ (@{weaponattrib1_select} + @{weapon1_skill} - @{weapon1_damagemod}*2 + ?{Positional effects d|0} )d6+ @{include_luck}d6!]] }} {{damage= [[(@{weapon1_damage} + @{weapon1_damagemod})d6 + @{weapon1_damageadd}]] @{weapon1_dmgtype1} }} {{Alt damage= [[@{weapon2_damage}d6]] @{weapon1_dmgtype2} }} {{range= @{weapon1_range} }}"></button></td>
<!-- <td><button type="roll" class="sheet-rollskillold" name="roll_weapon1" value="&{template:default} {{name= @{weapon1_name} }} {{range= @{weapon1_range} }} {{attack= [[ (@{weaponattrib1_select} + @{weapon1_skill} - @{weapon1_damagemod}*2 + ?{Positional effects d|0} )d6+ @{include_luck}d6!]] }} {{damage= [[(@{weapon1_damage} + @{weapon1_damagemod})d6 + @{weapon1_damageadd}]] }}"></button></td> -->
<td><input type="text" class="sheet-text3" name="attr_weapon1_name" value="" placeholder="Weapon Name"/></td>
<td>
<select class="sheet-select1" name="attr_weaponattrib1_select">
Expand All @@ -630,13 +635,34 @@
<option value="@{psionics}">Psionics</option>
</select>
</td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_skill" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_damage" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_damageadd" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:80px;" name="attr_weapon1_damagemod" value="0" /></td>
<td><input type="number" class="sheet-number2" name="attr_weapon1_range" value="0" /></td>
<td><input type="text" class="sheet-text3" style="width:70px;" name="attr_weapon1_size" placeholder="Tiny" /></td>
<td><input type="text" class="sheet-text3" style="width:60px;" name="attr_weapon1_cost" placeholder="15gc" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_range" placeholder="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_weight" value="6" /></td>
<td><input type="text" class="sheet-text3" name="attr_weapon1_dmgtype1" value="" placeholder="slashing"/></td>
<th><input type="checkbox" class="sheet-box" name="attr_weapon1_open" value="1"/><span></span></th>
</tr>
<tr>
<th></th>
<th>Special traits</th>
<th>Skill dice pool</th>
<th>Dmg pool</th>
<th>Dmg pts</th>
<th>+Dmg d6</th>
<th>Alt dmg</th>
<th>Secondary damage type</th>
<th></th>
</tr>
<tr>
<td></td>
<td><input type="text" class="sheet-text3" name="attr_weapon1_traits" placeholder="-" /></td>
<td><input type="number" class="sheet-number2" style="width:100px;" name="attr_weapon1_skill" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:70px;" name="attr_weapon1_damage" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_damageadd" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon1_damagemod" value="0" /></td>
<td><input type="number" class="sheet-number2" style="width:60px;" name="attr_weapon2_damage" value="0" /></td>
<td><input type="text" class="sheet-text3" name="attr_weapon1_dmgtype2" value="" placeholder="fire"></td>
</tr>
</table>
<div>
<input type="checkbox" class="sheet-hider sheet-hidden" name="attr_weapon1_open" value="1"/><span></span>
Expand Down

0 comments on commit dee8a5a

Please sign in to comment.