Merge pull request #196 from mantonyz/master

Fixed errors in rolls and added dots for alertness on vamp sheets and V20 preview

CWOD-Mage/Mage.html

@@ -351,12 +351,12 @@
 <div class="sheet-col" style="width:270px" align="center">
     <h3 >Arete</h3>
     <div align="left" style="margin:0px 0px 0px 49px"> <input type="radio" name="attr_Arete" value="1" checked="checked" /><span></span>    <input type="radio" name="attr_Arete" value="2" /><span></span>    <input type="radio" name="attr_Arete" value="3" /><span></span>    <input type="radio" name="attr_Arete" value="4" /><span></span>    <input type="radio" name="attr_Arete" value="5" /><span></span>    <input type="radio" name="attr_Arete" value="6" /><span></span>    <input type="radio" name="attr_Arete" value="7" /><span></span>    <input type="radio" name="attr_Arete" value="8" /><span></span>    <input type="radio" name="attr_Arete" value="9" /><span></span>    <input type="radio" name="attr_Arete" value="10" /><span></span>
-        <button type='roll' name='roll_Areteroll' value='Dice Pool 5\n/r {(@{Arete}+?{Pool Mod|0})d10!}>?{Difficulty|6}f1'></button>
+        <button type='roll' name='roll_Areteroll' value='Dice Pool 5\n/r {(@{Arete}+?{Pool Mod|0})d10}>?{Difficulty|6}f1'></button>
     </div>
     <br><br><br>
     <h3 >Willpower</h3>
     <div align="left" style="margin:0px 0px 0px 49px"> <input type="radio" name="attr_Willpower" value="1" /><span></span>    <input type="radio" name="attr_Willpower" value="2" /><span></span>    <input type="radio" name="attr_Willpower" value="3" /><span></span>    <input type="radio" name="attr_Willpower" value="4" /><span></span>    <input type="radio" name="attr_Willpower" value="5"  checked="checked"/><span></span>    <input type="radio" name="attr_Willpower" value="6" /><span></span>    <input type="radio" name="attr_Willpower" value="7" /><span></span>    <input type="radio" name="attr_Willpower" value="8" /><span></span>    <input type="radio" name="attr_Willpower" value="9" /><span></span>    <input type="radio" name="attr_Willpower" value="10" /><span></span>
-        <button type='roll' name='roll_Willpowerroll' value='Dice Pool 5\n/r {(@{Willpower}+?{Pool Mod|0})d10!}>?{Difficulty|6}f1'></button>
+        <button type='roll' name='roll_Willpowerroll' value='Dice Pool 5\n/r {(@{Willpower}+?{Pool Mod|0})d10}>?{Difficulty|6}f1'></button>
     </div>
     <div align="left" style="margin:0px 0px 0px 30px">
         <input type="radio" name="attr_Willpower_Used" value="0" class="zero" checked/><span></span> <input type="radio" name="attr_Willpower_Used" value="1" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="2" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="3" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="4" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="5" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="6" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="7" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="8" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="9" class="used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="10" class="used"/><span></span>

CWOD-V20/V20.html

@@ -111,7 +111,7 @@
         <h4>Subterfuge</h4>
     </div>
     <div class="sheet-col" style="width:170px">
-            <input type="radio" name="attr_Alertness" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Alertness" value="1" /><span></span>    <input type="radio" name="attr_Alertness" value="2" /><span></span>    <input type="radio" name="attr_Alertness" value="3" /><span></span>    <input type="radio" name="attr_Alertness" value="4" /><span></span>    <input type="radio" name="attr_Alertness" value="5" /><span></span>
+            <input type="radio" name="attr_Alertness" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Alertness" value="1" /><span></span>    <input type="radio" name="attr_Alertness" value="2" /><span></span>    <input type="radio" name="attr_Alertness" value="3" /><span></span>    <input type="radio" name="attr_Alertness" value="4" /><span></span>    <input type="radio" name="attr_Alertness" value="5" /><span></span>  <input type="radio" name="attr_Alertness" value="6" /><span></span>  <input type="radio" name="attr_Alertness" value="7" /><span></span>  <input type="radio" name="attr_Alertness" value="8" /><span></span>
         <div class="sheet-row">
             <input type="radio" name="attr_Athletics" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Athletics" value="1" /><span></span>    <input type="radio" name="attr_Athletics" value="2" /><span></span>    <input type="radio" name="attr_Athletics" value="3" /><span></span>    <input type="radio" name="attr_Athletics" value="4" /><span></span>    <input type="radio" name="attr_Athletics" value="5" /><span></span>  <input type="radio" name="attr_Athletics" value="6" /><span></span>  <input type="radio" name="attr_Athletics" value="7" /><span></span>  <input type="radio" name="attr_Athletics" value="8" /><span></span>
         </div>
@@ -184,7 +184,7 @@
     </div>
     <div class="sheet-col" style="width:5px">
     </div>
-    <div class="sheet-col" style="width:100px">
+    <div class="sheet-col" style="width:105px">
         <h4>Academics</h4>
         <h4>Computer</h4>
         <h4>Finance</h4>
@@ -196,7 +196,7 @@
         <h4>Science</h4>
         <h4>Technology</h4>
     </div>
-    <div class="sheet-col" style="width:170px">
+    <div class="sheet-col" style="width:160px">
         <div class="sheet-row">
             <input type="radio" name="attr_Academics" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Academics" value="1" /><span></span>    <input type="radio" name="attr_Academics" value="2" /><span></span>    <input type="radio" name="attr_Academics" value="3" /><span></span>    <input type="radio" name="attr_Academics" value="4" /><span></span>    <input type="radio" name="attr_Academics" value="5" /><span></span>  <input type="radio" name="attr_Academics" value="6" /><span></span>  <input type="radio" name="attr_Academics" value="7" /><span></span>  <input type="radio" name="attr_Academics" value="8" /><span></span>
         </div>
@@ -409,7 +409,7 @@
     <div align="left" style="margin:0px 0px 0px 28px">
         <input type="radio" name="attr_Willpower_Used" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Willpower_Used" value="1" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="2" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="3" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="4" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="5" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="6" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="7" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="8" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="9" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="10" class=" used"/><span></span>
     </div>
-    <br>
+    <br><br>
     <h3>Blood Pool</h3>
     <div class="sheet-row" align="right" style="margin:0px 45px 0px 0px">
         <input type="radio" name="attr_BloodPool" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_BloodPool" value="1" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="2" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="3" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="4" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="5" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="6" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="7" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="8" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="9" class=" used"/><span></span> <input type="radio" name="attr_BloodPool" value="10" class=" used"/><span></span><br>
@@ -482,7 +482,7 @@
             <select name="attr_Incapacitated"> <option></option> <option value="Bashing">-</option> <option value="Leathal">/</option> <option value="Aggravated">X</option> </select>
         </div>
     </div>
-    <br>
+    <br><br>
     <div class="sheet-row">
         <h3 style="text-align: center">Weakness</h3>
     </div>

CWOD-Vampire/Vampire.html

@@ -111,7 +111,7 @@
         <h4>Subterfuge</h4>
     </div>
     <div class="sheet-col" style="width:170px">
-            <input type="radio" name="attr_Alertness" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Alertness" value="1" /><span></span>    <input type="radio" name="attr_Alertness" value="2" /><span></span>    <input type="radio" name="attr_Alertness" value="3" /><span></span>    <input type="radio" name="attr_Alertness" value="4" /><span></span>    <input type="radio" name="attr_Alertness" value="5" /><span></span>
+            <input type="radio" name="attr_Alertness" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Alertness" value="1" /><span></span>    <input type="radio" name="attr_Alertness" value="2" /><span></span>    <input type="radio" name="attr_Alertness" value="3" /><span></span>    <input type="radio" name="attr_Alertness" value="4" /><span></span>    <input type="radio" name="attr_Alertness" value="5" /><span></span>  <input type="radio" name="attr_Alertness" value="6" /><span></span>  <input type="radio" name="attr_Alertness" value="7" /><span></span>  <input type="radio" name="attr_Alertness" value="8" /><span></span>
         <div class="sheet-row">
             <input type="radio" name="attr_Athletics" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Athletics" value="1" /><span></span>    <input type="radio" name="attr_Athletics" value="2" /><span></span>    <input type="radio" name="attr_Athletics" value="3" /><span></span>    <input type="radio" name="attr_Athletics" value="4" /><span></span>    <input type="radio" name="attr_Athletics" value="5" /><span></span>  <input type="radio" name="attr_Athletics" value="6" /><span></span>  <input type="radio" name="attr_Athletics" value="7" /><span></span>  <input type="radio" name="attr_Athletics" value="8" /><span></span>
         </div>
@@ -406,7 +406,7 @@
     <br>
     <h3 >Willpower</h3>
     <div align="left" style="margin:0px 0px 0px 46px"> <input type="radio" name="attr_Willpower" value="1" /><span></span>    <input type="radio" name="attr_Willpower" value="2" /><span></span>    <input type="radio" name="attr_Willpower" value="3" /><span></span>    <input type="radio" name="attr_Willpower" value="4" /><span></span>    <input type="radio" name="attr_Willpower" value="5"  checked="checked"/><span></span>    <input type="radio" name="attr_Willpower" value="6" /><span></span>    <input type="radio" name="attr_Willpower" value="7" /><span></span>    <input type="radio" name="attr_Willpower" value="8" /><span></span>    <input type="radio" name="attr_Willpower" value="9" /><span></span>    <input type="radio" name="attr_Willpower" value="10" /><span></span>
-        <button type='roll' name='roll_Willpowerroll' value='Dice Pool 5\n/r {(@{Willpower}+?{Pool Mod|0})d10!}>?{Difficulty|6}f1'></button>
+        <button type='roll' name='roll_Willpowerroll' value='Dice Pool 5\n/r {(@{Willpower}+?{Pool Mod|0})d10}>?{Difficulty|6}f1'></button>
     </div>
     <div align="left" style="margin:0px 0px 0px 28px">
         <input type="radio" name="attr_Willpower_Used" value="0" class=" zero" checked/><span></span> <input type="radio" name="attr_Willpower_Used" value="1" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="2" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="3" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="4" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="5" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="6" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="7" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="8" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="9" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="10" class=" used"/><span></span>

CWOD-Werewolf/Werewolf.html

@@ -15,12 +15,12 @@
 <div class="sheet-col" style="width:110px">
     <h4 style="line-height:28px">Breed:</h4>
     <h4 style="line-height:28px">Auspice:</h4>
-    <h4 style="line-height:28px">Concept:</h4>
+    <h4 style="line-height:28px">Tribe:</h4>
 </div>
 <div class="sheet-col" style="width:155px">
     <input type="text" name="attr_Auspice" />
     <input type="text" name="attr_Breed" />
-    <input type="text" name="attr_Concept" />
+    <input type="text" name="attr_Tribe" />
 </div>
 <div class="sheet-col" style="width:110px">
     <h4 style="line-height:28px">Pack Name:</h4>
@@ -369,7 +369,7 @@
     <h3 style="text-align: center">Rage</h3>
         <div align="left" style="margin:0px 0px 0px 49px"> 
             <input type="radio" name="attr_Rage" value="1" checked /><span></span> <input type="radio" name="attr_Rage" value="2" /><span></span>    <input type="radio" name="attr_Rage" value="3" /><span></span>    <input type="radio" name="attr_Rage" value="4" /><span></span>    <input type="radio" name="attr_Rage" value="5"/><span></span>    <input type="radio" name="attr_Rage" value="6" /><span></span>    <input type="radio" name="attr_Rage" value="7" /><span></span>    <input type="radio" name="attr_Rage" value="8" /><span></span>    <input type="radio" name="attr_Rage" value="9" /><span></span>    <input type="radio" name="attr_Rage" value="10" /><span></span>
-            <button type='roll' name='roll_Rageroll' value='Dice Pool 5\n/r {(@{Rage}+?{Pool Mod|0})d10!}>?{Difficulty|6}f1'></button>
+            <button type='roll' name='roll_Rageroll' value='Dice Pool 5\n/r {(@{Rage}+?{Pool Mod|0})d10}>?{Difficulty|6}f1'></button>
         </div>
         <div align="left" style="margin:0px 0px 0px 31px">
             <input type="radio" name="attr_Rage_Used" value="0" class=" zero" checked /><span></span> <input type="radio" name="attr_Rage_Used" value="1"  class=" used"/><span></span>    <input type="radio" name="attr_Rage_Used" value="2" class=" used"/><span></span>    <input type="radio" name="attr_Rage_Used" value="3" class=" used" /><span></span>    <input type="radio" name="attr_Rage_Used" value="4" class=" used" /><span></span>    <input type="radio" name="attr_Rage_Used" value="5" class=" used"/><span></span>    <input type="radio" name="attr_Rage_Used" value="6" class=" used" /><span></span>    <input type="radio" name="attr_Rage_Used" value="7" class=" used" /><span></span>    <input type="radio" name="attr_Rage_Used" value="8" class=" used" /><span></span>    <input type="radio" name="attr_Rage_Used" value="9" class=" used" /><span></span>    <input type="radio" name="attr_Rage_Used" value="10" class=" used" /><span></span>
@@ -378,7 +378,7 @@
     <h3 style="text-align: center">Gnosis</h3>
         <div align="left" style="margin:0px 0px 0px 49px">
             <input type="radio" name="attr_Gnosis" value="1" checked /><span></span>    <input type="radio" name="attr_Gnosis" value="2" /><span></span>    <input type="radio" name="attr_Gnosis" value="3" /><span></span>    <input type="radio" name="attr_Gnosis" value="4" /><span></span>    <input type="radio" name="attr_Gnosis" value="5"/><span></span>    <input type="radio" name="attr_Gnosis" value="6" /><span></span>    <input type="radio" name="attr_Gnosis" value="7" /><span></span>    <input type="radio" name="attr_Gnosis" value="8" /><span></span>    <input type="radio" name="attr_Gnosis" value="9" /><span></span>    <input type="radio" name="attr_Gnosis" value="10" /><span></span>
-            <button type='roll' name='roll_Gnosisroll' value='Dice Pool 5\n/r {(@{Gnosis}+?{Pool Mod|0})d10!}>?{Difficulty|6}f1'></button>
+            <button type='roll' name='roll_Gnosisroll' value='Dice Pool 5\n/r {(@{Gnosis}+?{Pool Mod|0})d10}>?{Difficulty|6}f1'></button>
         </div>
         <div align="left" style="margin:0px 0px 0px 31px">
             <input type="radio" name="attr_Gnosis_Used" value="0" class=" zero" checked /><span></span> <input type="radio" name="attr_Gnosis_Used" value="1" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="2" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="3" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="4" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="5" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="6" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="7" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="8" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="9" class=" used"/><span></span>    <input type="radio" name="attr_Gnosis_Used" value="10" class=" used"/><span></span>
@@ -387,7 +387,7 @@
     <h3 style="text-align: center">Willpower</h3>
         <div align="left" style="margin:0px 0px 0px 49px">
             <input type="radio" name="attr_Willpower" value="1" checked/><span></span>    <input type="radio" name="attr_Willpower" value="2" /><span></span>    <input type="radio" name="attr_Willpower" value="3" /><span></span>    <input type="radio" name="attr_Willpower" value="4" /><span></span>    <input type="radio" name="attr_Willpower" value="5" /><span></span>    <input type="radio" name="attr_Willpower" value="6" /><span></span>    <input type="radio" name="attr_Willpower" value="7" /><span></span>    <input type="radio" name="attr_Willpower" value="8" /><span></span>    <input type="radio" name="attr_Willpower" value="9" /><span></span>    <input type="radio" name="attr_Willpower" value="10" /><span></span>
-            <button type='roll' name='roll_Willpowerroll' value='Dice Pool 5\n/r {(@{Willpower}+?{Pool Mod|0})d10!}>?{Difficulty|6}f1'></button>
+            <button type='roll' name='roll_Willpowerroll' value='Dice Pool 5\n/r {(@{Willpower}+?{Pool Mod|0})d10}>?{Difficulty|6}f1'></button>
         </div>
         <div align="left" style="margin:0px 0px 0px 31px">
             <input type="radio" name="attr_Willpower_Used" value="0" class=" zero" checked /><span></span> <input type="radio" name="attr_Willpower_Used" value="1" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="2" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="3" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="4" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="5" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="6" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="7" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="8" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="9" class=" used"/><span></span>    <input type="radio" name="attr_Willpower_Used" value="10" class=" used"/><span></span>