Godsend Agenda 1.3.0 roll result improvements

GODSEND-Agenda/Readme.md

@@ -5,7 +5,7 @@ Created with PUGjs and SASS by [Andreas J.](https:wiki.roll20.net/Anduh).
 
 ## Changelog
 
-### v.1.3.1
+### v.1.3.0
 - several visual fixes
 - 
 

GODSEND-Agenda/sheet.css

@@ -157,6 +157,7 @@
   border: 2px black;
   border-style: none none solid none;
   width: var(--sheetwidth);
+  height: 99px;
 }
 .charsheet div.tab-buttons button {
   font-size: 1.5em;
@@ -164,6 +165,18 @@
 .charsheet div.tab-buttons select {
   width: 90px;
 }
+.charsheet div.tab-buttons h1.godsend {
+  background: no-repeat center/100% url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GODSEND-Agenda/img/logo.jpg");
+}
+.charsheet div.tab-buttons h1.atlantis {
+  background: no-repeat center/100% url("https://raw.githubusercontent.com/Anduh/roll20-character-sheets/godsend-agenda-1-3/GODSEND-Agenda/img/logo-atlantis.png");
+}
+.charsheet div.tab-buttons h1.hellas {
+  background: no-repeat center/100% url("https://raw.githubusercontent.com/Anduh/roll20-character-sheets/godsend-agenda-1-3/GODSEND-Agenda/img/logo-hellas.png");
+}
+.charsheet div.tab-buttons h1.talislanta {
+  background: no-repeat center/100% url("https://raw.githubusercontent.com/Anduh/roll20-character-sheets/godsend-agenda-1-3/GODSEND-Agenda/img/logo-talislanta.png");
+}
 .charsheet div.tab-buttons h1 {
   display: none;
 }
@@ -172,6 +185,8 @@
 .charsheet div.tab-buttons input[value=hellas] ~ h1.hellas,
 .charsheet div.tab-buttons input[value=atlantis] ~ h1.atlantis {
   display: flex;
+  height: 99px;
+  width: 612px;
 }
 .charsheet .border {
   border-style: solid;
@@ -194,7 +209,6 @@
   border: none;
   background: white;
   opacity: 0.9;
-  min-height: 90%;
   max-width: 750px;
 }
 .charsheet .gap {
@@ -233,10 +247,10 @@
   display: grid;
   grid-gap: 4px;
   grid-template-columns: 5fr 4fr;
-  grid-template-rows: 65px 40px 162px auto;
-  grid-template-areas: "common   common" "points  points" "attrs   notes" "skills  notes";
+  grid-template-rows: 65px 40px 162px auto 100px;
+  grid-template-areas: "common   common" "points  points" "attrs   notes" "skills  notes" "footer footer";
   width: var(--sheetwidth);
-  height: 1300px;
+  height: auto;
   position: relative;
 }
 .charsheet section.common {
@@ -360,6 +374,10 @@
 .charsheet section.notes textarea {
   height: 90px;
 }
+.charsheet section.footer {
+  grid-area: footer;
+  background: no-repeat center/100% url("https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GODSEND-Agenda/img/result-chart.jpg");
+}
 .charsheet main.notes {
   display: grid;
   width: 750px;
@@ -369,6 +387,9 @@
 .charsheet main.notes h2 {
   grid-column: span 2;
 }
+.charsheet main.notes section {
+  height: auto;
+}
 .charsheet main.settings {
   display: grid;
   width: 750px;

GODSEND-Agenda/sheet.html

@@ -4,10 +4,10 @@
 <div class="tab-buttons spaced center">
   <input class="tabstoggle" type="hidden" name="attr_sheetTab" value="character"/>
   <input class="gametoggle" type="hidden" name="attr_gametype" value="godsend"/>
-  <h1 class="godsend">GODSEND AGENDA</h1>
-  <h1 class="talislanta">Talislanta</h1>
-  <h1 class="hellas">Hellas</h1>
-  <h1 class="atlantis">Atlantis Second Age</h1>
+  <h1 class="godsend" title="GODSEND Agenda"></h1>
+  <h1 class="talislanta" title="Talislanta"></h1>
+  <h1 class="hellas" title="Hellas"></h1>
+  <h1 class="atlantis" title="Atlantis Second Age"></h1>
   <div><span>Page selection</span>
     <select name="attr_sheetTab">
       <option value="character">character</option>
@@ -110,7 +110,7 @@
     <h2>Skills</h2>
     <div class="desc-row"><span>name</span><span>level</span><span class="attr">attr</span><span class="desc">notes</span></div>
     <fieldset class="repeating_skills">
-      <button name="roll_skill" value="@{whisper}&{template:rolls} {{title=@{name} }} {{subtitle=@{character_name} }} {{roll= [[@{dice}+@{level}[skill level]+@{attribute}[attribute]@{modquery}]]}}" type="roll"></button>
+      <button name="roll_skill" value="@{whisper}&{template:rolls} {{title=@{name} }} @{showname} {{roll= [[@{dice}[dice]+@{level}[@{name} level]+@{attribute}[attribute] @{modquery}]]}}" type="roll"></button>
       <input class="name" name="attr_name" title="@{name}" list="skillsgodsend" type="text"/>
       <input name="attr_level" title="@{level}" type="number"/>
       <select name="attr_attribute">
@@ -127,11 +127,12 @@
         <option class="cap" value="[[@{none}]]">none</option>
       </select>
       <input class="desc" name="attr_notes" title="@{notes}" type="text"/>
+      <input name="attr_attrname" type="hidden"/>
     </fieldset>
     <h2>powers</h2>
     <div class="desc-row"><span class="powers">name</span><span>rank</span><span>base cost</span><span>rank cost</span><span>cost total</span><span>desc</span></div>
     <fieldset class="repeating_powers">
-      <button class="sendtext" name="roll_power" value="@{whisper}&{template:rolls} {{title=@{name} }} {{subtitle=@{character_name} }} {{rank= [[@{rank}]] }} {{desc=@{desc} }}" type="roll"></button>
+      <button class="sendtext" name="roll_power" value="@{whisper}&{template:rolls} {{title=@{name} }} @{showname} {{rank= [[@{rank}]] }} {{desc=@{desc} }}" type="roll"></button>
       <input class="name" name="attr_name" title="@{name}" type="text"/>
       <input class="txtfield" name="attr_rank" title="@{rank}" type="number"/>
       <input class="txtfield" name="attr_cost_base" type="number"/>
@@ -142,7 +143,7 @@
     <h2>Weapons</h2>
     <div class="desc-row"><span class="weapons">name</span><span>acc</span><span>dr</span><span>RoF</span><span>Ammo</span><span>rng</span><span>R#</span><span>attr</span><span>skill lvl</span></div>
     <fieldset class="repeating_weapons">
-      <button name="roll_weapon" value="@{whisper}&{template:rolls} {{title=@{name} }} {{subtitle=@{character_name} }} {{roll= [[@{dice}+@{acc}[accuracy]+@{skill}[skill level]+@{attribute}[attribute]@{modquery}]]}} {{Damage= [[@{dr}]]}}" type="roll"></button>
+      <button name="roll_weapon" value="@{whisper}&{template:rolls} {{title=@{name} }} @{showname} {{roll= [[@{dice}[Dice]+@{acc}[accuracy]+@{skill}[skill level]+@{attribute}[attribute] @{modquery}]]}} {{Damage= [[@{dr}]]}}" type="roll"></button>
       <input class="name" name="attr_name" title="@{name}" type="text"/>
       <input class="txtfield" name="attr_acc" type="number"/>
       <input class="txtfield" name="attr_dr" type="number"/>
@@ -166,10 +167,9 @@
       <input name="attr_skill" type="text"/>
     </fieldset>
     <h2>Armor</h2>
-    <div class="desc-row"><span class="armor">name</span><span>acc</span><span>pr</span><span>enc</span><span>R#</span></div>
+    <div class="desc-row"><span class="armor">name</span><span>pr</span><span>enc</span><span>R#</span></div>
     <fieldset class="repeating_armor">
       <input class="name" name="attr_name" title="@{name}" type="text"/>
-      <input class="txtfield" name="attr_acc" type="number"/>
       <input class="txtfield" name="attr_pr" type="number"/>
       <input class="txtfield" name="attr_enc" type="number"/>
       <input name="attr_rsharp" type="text"/>
@@ -190,6 +190,7 @@
     <h2>notes</h2>
     <textarea name="attr_notes"></textarea>
   </section>
+  <section class="footer"></section>
 </main>
 <main class="notes">
   <h2>Notes</h2>
@@ -222,6 +223,12 @@
       <option value=" ">No</option>
     </select>
   </div>
+  <div class="section rowflex nowrap"><span>Show Character Name in rolls?</span>
+    <select class="short" name="attr_showname" title="@{showname}">
+      <option value="{{subtitle=@{character_name} }}">Yes</option>
+      <option value=" ">No</option>
+    </select>
+  </div>
   <div class="section rowflex nowrap gap"><span title="@{whisper}">Whisper rolls to GM?</span>
     <input name="attr_whisper" title="@{whisper}" type="checkbox" value="/w gm"/>
   </div>
@@ -229,6 +236,7 @@
     <select name="attr_dice" title="@{dice}">
       <option value="2d10cf0cs0" selected="selected">2d10 (GODSEND Agenda)</option>
       <option value="1d20">d20 (Talislanta, Hellas, Atlantis)</option>
+      <option value="2d10" selected="selected">2d10 (1s &amp; 10s higlighted)</option>
     </select>
   </div>
   <div class="section rowflex nowrap gap"><span>Game System (Header &amp; layout)</span>
@@ -318,6 +326,8 @@
 </rolltemplate>
 <!--sheetworkers-->
 <script type="sheet/worker">
+//current sheet version
+const currentversion = "1.3.0";
 
 const int = score => parseInt(score, 10) || 0;
 
@@ -334,6 +344,7 @@ buttonlist.forEach(button => {
     });
 });
 
+
 // game system
 
 /*

GODSEND-Agenda/src/js/sheetworker.js

@@ -1,4 +1,6 @@
 
+//current sheet version
+const currentversion = "1.3.0";
 
 const int = score => parseInt(score, 10) || 0;
 
@@ -15,6 +17,7 @@ buttonlist.forEach(button => {
     });
 });
 
+
 // game system
 
 /*

GODSEND-Agenda/src/pug/core.pug

@@ -8,10 +8,10 @@ input.gamesys(type="hidden" name="attr_gametype" value="")
   //- <button class="npc" type="action" name="act_npc" >NPC</button>
   input.tabstoggle(type="hidden" name="attr_sheetTab" value="character")
   input.gametoggle(type="hidden" name="attr_gametype" value="godsend")
-  h1.godsend='GODSEND AGENDA'
-  h1.talislanta='Talislanta'
-  h1.hellas='Hellas'
-  h1.atlantis='Atlantis Second Age'
+  h1.godsend(title="GODSEND Agenda")
+  h1.talislanta(title="Talislanta")
+  h1.hellas(title="Hellas")
+  h1.atlantis(title="Atlantis Second Age")
   div
     span Page selection
     select(name="attr_sheetTab")
@@ -72,11 +72,12 @@ main.character
       span.attr attr
       span.desc notes
     fieldset.repeating_skills
-      button(name="roll_skill" value!="@{whisper}&{template:rolls} {{title=@{name} }} {{subtitle=@{character_name} }} {{roll= [[@{dice}+@{level}[skill level]+@{attribute}[attribute]@{modquery}]]}}" type="roll")
+      button(name="roll_skill" value!="@{whisper}&{template:rolls} {{title=@{name} }} @{showname} {{roll= [[@{dice}[dice]+@{level}[@{name} level]+@{attribute}[attribute] @{modquery}]]}}" type="roll")
       input.name(name="attr_name" title="@{name}" list="skillsgodsend" type="text")
       input(name="attr_level" title="@{level}" type="number")
       +attrselect
       input.desc(name="attr_notes" title="@{notes}" type="text")
+      input(name="attr_attrname" type="hidden")
 
     h2 powers
     .desc-row
@@ -87,7 +88,7 @@ main.character
       span cost total
       span desc
     fieldset.repeating_powers
-      button.sendtext(name="roll_power" value!="@{whisper}&{template:rolls} {{title=@{name} }} {{subtitle=@{character_name} }} {{rank= [[@{rank}]] }} {{desc=@{desc} }}" type="roll")
+      button.sendtext(name="roll_power" value!="@{whisper}&{template:rolls} {{title=@{name} }} @{showname} {{rank= [[@{rank}]] }} {{desc=@{desc} }}" type="roll")
       input.name(name="attr_name" title="@{name}" type="text")
       input.txtfield(name="attr_rank" title="@{rank}" type="number")
       input.txtfield(name="attr_cost_base" type="number")
@@ -107,7 +108,7 @@ main.character
       span attr
       span skill lvl
     fieldset.repeating_weapons
-      button(name="roll_weapon" value!="@{whisper}&{template:rolls} {{title=@{name} }} {{subtitle=@{character_name} }} {{roll= [[@{dice}+@{acc}[accuracy]+@{skill}[skill level]+@{attribute}[attribute]@{modquery}]]}} {{Damage= [[@{dr}]]}}" type="roll")
+      button(name="roll_weapon" value!="@{whisper}&{template:rolls} {{title=@{name} }} @{showname} {{roll= [[@{dice}[Dice]+@{acc}[accuracy]+@{skill}[skill level]+@{attribute}[attribute] @{modquery}]]}} {{Damage= [[@{dr}]]}}" type="roll")
       input.name(name="attr_name" title="@{name}"  type="text")
       input.txtfield(name="attr_acc" type="number")
       input.txtfield(name="attr_dr" type="number")
@@ -121,13 +122,11 @@ main.character
     h2 Armor
     .desc-row
       span.armor name
-      span acc
       span pr
       span enc
       span='R#'
     fieldset.repeating_armor
       input.name(name="attr_name" title="@{name}"  type="text")
-      input.txtfield(name="attr_acc" type="number")
       input.txtfield(name="attr_pr" type="number")
       input.txtfield(name="attr_enc" type="number")
       input(name="attr_rsharp" type="text")
@@ -142,12 +141,15 @@ main.character
     each option in notes1
       h2= option
       textarea(name=`attr_${option}`)
+  section.footer
+
 main.notes
   h2 Notes
   each option in notes
     section.columnflex
       h3= option
       textarea(name=`attr_${option}`)
+
 main.settings
   h2 Settings
   .section.rowflex.nowrap
@@ -155,6 +157,11 @@ main.settings
     select.short(name="attr_modquery" title="@{modquery}")
       option(value="+(?{Roll Modifier|0}[Modifiers])") Yes
       option(value=" ") No
+  .section.rowflex.nowrap
+    span='Show Character Name in rolls?'
+    select.short(name="attr_showname" title="@{showname}")
+      option(value="{{subtitle=@{character_name} }}") Yes
+      option(value=" ") No
   .section.rowflex.nowrap.gap
     span(title="@{whisper}") Whisper rolls to GM?
     input(name="attr_whisper" title="@{whisper}" type="checkbox" value="/w gm")
@@ -163,6 +170,7 @@ main.settings
     select(name="attr_dice" title="@{dice}")
       option(value="2d10cf0cs0" selected)= '2d10 (GODSEND Agenda)'
       option(value="1d20")= 'd20 (Talislanta, Hellas, Atlantis)'
+      option(value="2d10" selected)= '2d10 (1s & 10s higlighted)'
   .section.rowflex.nowrap.gap
     span= 'Game System (Header & layout)'
     select(name="attr_gametype" )
@@ -170,3 +178,8 @@ main.settings
       option(value="talislanta")= 'Talislanta'
       option(value="hellas")= 'Hellas'
       option(value="atlantis")= 'Atlantis: Second Age'
+  //-.section.rowflex.nowrap
+    span='Show Costs for Powers?'
+    select.short(name="attr_showcost" title="@{showcost}")
+      option(value="{{base cost= @{cost_base} }} {{rank cost= @{cost_rank} }} {{total cost= @{cost_total} }}") Yes
+      option(value=" ") No

GODSEND-Agenda/src/pug/rolltemplate.html

@@ -1,36 +0,0 @@
-
-<rolltemplate class="sheet-rolltemplate-rolls">
-  <div class="sheet-container sheet-color-{{color}}">
-    <div class="sheet-header">
-      {{#title}}<div class="sheet-title">{{title}}</div>{{/title}}
-      {{#name}}<div class="sheet-name">{{name}}</div>{{/name}}
-      {{#subtitle}}<div class="sheet-subtitle">{{subtitle}}</div>{{/subtitle}}
-    </div>
-    <div class="sheet-content">
-      {{#allprops() title subtitle name desc color}}
-      <div class="sheet-key">{{key}}</div>
-      <div class="sheet-value">{{value}}</div>
-      {{/allprops() title subtitle name desc color}}
-      {{#roll}}
-      <div class="sheet-key">{{key}}</div>
-      <div class="sheet-value">{{value}}</div>
-      {{/roll}}
-      {{#rollLess() roll 0}}
-        <div class="sheet-fail">Critical Fumble!</div>
-      {{/rollLess() roll 0}}
-      {{#rollBetween() roll 1 5}}
-        <div class="sheet-fail">Failure</div>
-      {{/rollBetween() roll 1 5}}
-      {{#rollBetween() roll 6 10}}
-        <div class="sheet-crit">Partial Success</div>
-      {{/rollBetween() roll 6 10}}
-      {{#rollBetween() roll 11 19}}
-        <div class="sheet-crit">Success</div>
-      {{/rollBetween() roll 11 19}}
-      {{#rollGreater() roll 19}}
-        <div class="sheet-crit">Critical Success!</div>
-      {{/rollGreater() roll 19}}
-      {{#desc}}<div class="sheet-desc">{{desc}}</div>{{/desc}}
-    </div>
-  </div>
-</rolltemplate>

GODSEND-Agenda/src/scss/_core.scss

@@ -1,3 +1,10 @@
+// SASS Var
+
+$url: "https://raw.githubusercontent.com/Roll20/roll20-character-sheets/master/GODSEND-Agenda/img/";
+$urldev: "https://raw.githubusercontent.com/Anduh/roll20-character-sheets/godsend-agenda-1-3/GODSEND-Agenda/img/";
+// url("#{$url}bg.png")
+
+
 @import url('https://fonts.googleapis.com/css?family=Bebas+Neue|Lexend|Caesar+Dressing|Noto+Sans+TC&display=swap');
 
 
@@ -215,6 +222,7 @@
     border: 2px black;
     border-style: none none solid none;
     width: var(--sheetwidth);
+    height: 99px;
 
     button{
       font-size: 1.5em;
@@ -222,6 +230,18 @@
     select{
       width: 90px;
     }
+    h1.godsend{
+      background: no-repeat center/100% url("#{$url}logo.jpg");
+    }
+    h1.atlantis{
+      background: no-repeat center/100% url("#{$urldev}logo-atlantis.png");
+    }
+    h1.hellas{
+      background: no-repeat center/100% url("#{$urldev}logo-hellas.png");
+    }
+    h1.talislanta{
+      background: no-repeat center/100% url("#{$urldev}logo-talislanta.png");
+    }
     h1{
       display: none;
     }
@@ -230,6 +250,8 @@
     input[value="hellas"] ~ h1.hellas,
     input[value="atlantis"] ~ h1.atlantis{
       display: flex;
+      height: 99px;
+      width: 612px;
     }
   }
 
@@ -259,7 +281,6 @@
     border: none;
     background: white;
     opacity: 0.9;
-    min-height: 90%;
     max-width: 750px;
   }
 
@@ -306,13 +327,14 @@
     display: grid;
     grid-gap: 4px;
     grid-template-columns: 5fr 4fr;
-    grid-template-rows: 65px 40px 162px auto;
+    grid-template-rows: 65px 40px 162px auto 100px;
     grid-template-areas:"common   common"
                         "points  points"
                         "attrs   notes"
-                        "skills  notes";
+                        "skills  notes"
+                        "footer footer";
     width: var(--sheetwidth);
-    height: 1300px;
+    height: auto;
     position: relative;
   }
   // Character page - Section specific
@@ -464,6 +486,10 @@
     }
   }
 
+  section.footer{
+    grid-area: footer;
+    background: no-repeat center/100% url("#{$url}result-chart.jpg");
+  }
 
   main.notes {
     display: grid;
@@ -474,6 +500,10 @@
     h2{
       grid-column: span 2;
     }
+
+    section{
+      height: auto;
+    }
   }