fixed discover a site roll

Ironsworn/Ironsworn.css

@@ -1139,15 +1139,15 @@ input.sheet-table-btn:checked ~ div.sheet-move-nav-content {
   height: 50em;
 }
 .sheet-move-container {
-  display: flex;
   flex-wrap: wrap;
   flex-direction: column;
   justify-content: space-between;
-  height: 36em;
+  height: 45em;
   margin-top: 1em;
   display: flex;
   font-size: 1em;
   font-weight: normal;
+  align-content: space-between;
 }
 .sheet-move-container .sheet-move-scroll-list {
   overflow: auto;
@@ -1167,20 +1167,32 @@ input.sheet-table-btn:checked ~ div.sheet-move-nav-content {
 .sheet-move-group-title h3 {
   color: #fff;
 }
+.sheet-move-name {
+  width: 100%;
+  border: 2px solid #4c4d4f;
+}
 .sheet-move-highlight:checked ~ .sheet-move-name {
   background: #fd0;
   outline-offset: 0;
   box-shadow: inset 0 0 0 2px;
 }
+.sheet-roll-show {
+  padding: 0 !important;
+  font-size: 20px !important;
+  margin: 0 !important;
+}
+.sheet-roll-show:hover {
+  color: #fff;
+}
 .sheet-move-list {
   padding: 0;
+  display: flex;
 }
 .sheet-move-list label {
   cursor: pointer;
 }
 .sheet-move-list div {
   font-weight: 600;
-  width: 100%;
   font-size: 14px;
   text-align: center;
   margin: 0 0 0px;
@@ -2261,6 +2273,7 @@ span.sheet-oracle-result {
 }
 .sheet-flex-container {
   display: flex;
+  align-items: flex-start;
 }
 .sheet-flex-wrapper {
   display: flex;
@@ -2482,6 +2495,7 @@ input.sheet-border-bottom {
 }
 .sheet-rolltemplate-ironsworn_oracles .sheet-result-row,
 .sheet-rolltemplate-moves_oracles .sheet-result-row,
+.sheet-rolltemplate-ironsworn_moves .sheet-result-row,
 .sheet-rolltemplate-delve_oracles .sheet-result-row {
   padding: 0.5em;
 }

Ironsworn/src/components/moves/mixins/container.pug

@@ -1,44 +1,53 @@
-mixin progressRoll(opts)
+mixin progressRoll(opts, visibility)
   button(
     type="roll"
     title=opts.title
     name=`roll${opts.name}`
-    class='hide'
+    class=visibility
     value=`&{template:ironsworn_progress} {{header=@{character_name}}} {{progress_name=${opts.title}}} {{progress=[[?{Filled Progress|0}]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}}`
   )
 
-mixin oracleRoll(opts)
+mixin oracleRoll(opts, visibility)
   button(
     type="roll"
     title=opts.title
     name=`roll${opts.name}`
-    class='hide'
+    class=visibility
     value=`&{template:${opts.type}} {{header=${opts.title}}} {{${opts.name}=[[d100]]}}`
   )
 
-mixin rarityRoll(opts)
+mixin discoverASiteRoll(opts, visibility)
+  button(
+    type="roll"
+    title=opts.title
+    name=`roll${opts.name}`
+    class=visibility
+    value=`&{template:ironsworn_moves} {{header=${opts.title}}} {{${opts.name}=[[2d10kl1]]}}`
+  )
+
+mixin rarityRoll(opts, visibility)
   button(
     type="roll"
     title=`${opts.title} Move`
-    class='hide'
+    class=visibility
     name=`roll${opts.name}`
     value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${opts.title}}} {{rarityAction=[[d6+${opts.stat}+(?{Modifier|0})]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}} {{rarityDie6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{rarityDie5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{rarityDie1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}}`
   )
 
-mixin owlRoll(opts)
+mixin owlRoll(opts, visibility)
   button(
     type="roll"
     title=`${opts.title} Move`
-    class='hide'
+    class=visibility
     name=`roll${opts.name}`
     value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${opts.title}}} {{action=[[d6+${opts.stat}+(?{Modifier|0})]]}} {{owl=[[?{Owl Companion|No,0|Yes,?{Owl's Health|0}}]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}+(?{Owl Companion})]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}}`
   )
 
-mixin movesRoll(opts)
+mixin movesRoll(opts, visibility)
   button(
     type="roll"
     title=`${opts.title} Move`
-    class='hide'
+    class=visibility
     name=`roll${opts.name}`
     value!=`&{template:ironsworn_moves} {{header=@{character_name}}} {{name=${opts.title}}} {{action=[[d6+${opts.stat}+(?{Modifier|0})]]}} {{negate1=[[1+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate2=[[2+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate3=[[3+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate4=[[4+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate5=[[5+${opts.stat_repeat}+(?{Modifier|0})]]}} {{negate6=[[6+${opts.stat_repeat}+(?{Modifier|0})]]}} {{challenge1=[[d10]]}} {{challenge2=[[d10]]}} {{momentum=[[@{momentum}]]}} {{modifiers=[[${opts.stat_repeat}+(?{Modifier|0})]]}} {{add=[[(?{Modifier|0})]]}} {{stat=[[${opts.stat_repeat}]]}}`
   )
@@ -59,36 +68,37 @@ mixin container(opts)
       div.roll-viewer
         if opts.progress
           +rollLabel
-            +progressRoll(opts)
+            +progressRoll(opts, 'hide')
         else if opts.oracle
           +rollLabel
-            +oracleRoll(opts)
+            +oracleRoll(opts, 'hide')
         else if opts.rarity
           +rollLabel
-            +rarityRoll(opts)
+            +rarityRoll(opts, 'hide')
         else if opts.owl
           +rollLabel
-            +owlRoll(opts)
+            +owlRoll(opts, 'hide')
+        else if opts.discover_a_site
+          +rollLabel
+            +discoverASiteRoll(opts, 'hide')
         else
           +rollLabel
-            +movesRoll(opts)
+            +movesRoll(opts, 'hide')
     div.move-description
       block
     div.oracle-footer.move-page-footer=opts.page
 
 mixin listButton(opts)
-  if opts.progress
-    +rollListLabel
-      +progressRoll(opts)
-  else if opts.oracle
-    +rollListLabel
-      +oracleRoll(opts)
-  else if opts.rarity
-    +rollListLabel
-      +rarityRoll(opts)
-  else if opts.owl
-    +rollListLabel
-      +owlRoll(opts)
-  else
-    +rollListLabel
-      +movesRoll(opts)
+  .button-container
+    if opts.progress
+      +progressRoll(opts, 'roll-show')
+    else if opts.oracle
+      +oracleRoll(opts, 'roll-show')
+    else if opts.rarity
+      +rarityRoll(opts, 'roll-show')
+    else if opts.owl
+      +owlRoll(opts, 'roll-show')
+    else if opts.discover_a_site
+      +discoverASiteRoll(opts, 'roll-show')
+    else
+      +movesRoll(opts, 'roll-show')

Ironsworn/src/components/moves/moves.pug

@@ -23,6 +23,7 @@ input(type='radio' class='hide full-move-list' name='attr_move_view' value='1' c
             h3=group.title
           each move in group.moves
             .move-list
+              +listButton(moveList[move.value])
               label.move
                 input(type='radio' class='hide selected-move' name='attr_selected_move' value=move.value)
                 input(type='checkbox' class='hide move-highlight' name=`attr_${move.value}_highlight`)

Ironsworn/src/components/moves/moves.styl

@@ -19,7 +19,7 @@ div
 input
   &.sheet-search-preview-bar
     width 17.6em
-    border 2px solid #4C4D4F
+    borderCommon()
     border-radius 0
     &:focus
       outline 3px solid #fd0
@@ -27,7 +27,7 @@ input
       box-shadow inset 0 0 0 2px
   &.sheet-search-bar
     width 50%
-    border 2px solid #4C4D4F
+    borderCommon()
     &:focus
       outline 3px solid #fd0
       outline-offset 0
@@ -51,23 +51,23 @@ input
   .sheet-move-scroll-list
     width 21.9em
     overflow auto
-    border 2px solid #4C4D4F
+    borderCommon()
     padding 0
     height 50em
 
 .sheet-move-container
-  display flex
   flex-wrap wrap
   flex-direction column
   justify-content space-between
-  height 36em
+  height 45em
   margin-top 1em
   display flex
   font-size 1em
   font-weight normal
+  align-content space-between
   .sheet-move-scroll-list
     overflow auto
-    border 2px solid #4C4D4F
+    borderCommon()
     padding 1em
     width max-content
 
@@ -82,6 +82,10 @@ input
   h3
     color #fff
 
+.sheet-move-name
+  width 100%
+  borderCommon()
+
 .sheet-move-highlight
   &:checked
     & ~ .sheet-move-name
@@ -89,13 +93,20 @@ input
       outline-offset 0
       box-shadow inset 0 0 0 2px
 
+.sheet-roll-show
+  padding 0 !important
+  font-size 20px !important
+  margin 0 !important
+  &:hover
+    color white
+
 .sheet-move-list
   padding 0
+  display flex
   label
     cursor pointer
   div
     font-weight 600
-    width 100%
     font-size 14px
     text-align center
     margin 0 0 0px
@@ -122,7 +133,7 @@ span
     margin-left 1em
 
 .sheet-move-group
-  border 2px solid #4C4D4F
+  borderCommon()
   box-sizing border-box
   width 30%
   margin 0.3em
@@ -130,7 +141,7 @@ span
   height -moz-fit-content
 
 .sheet-move-group-scroll
-  border 2px solid #4C4D4F
+  borderCommon()
   box-sizing border-box
   height fit-content
   height -moz-fit-content
@@ -188,7 +199,7 @@ span
 .sheet-move-description
   std-font('Crimson Text')
   padding 1em
-  border 2px solid #4C4D4F
+  borderCommon()
   p
     margin-bottom 0.3em
 

Ironsworn/src/components/oracles/oracles.styl

@@ -117,7 +117,7 @@ span.sheet-oracle-result
   width 80%
 
 .sheet-oracle-box
-  border: 2px solid #4C4D4F
+  borderCommon()
   box-sizing: border-box
   width: 100%
 

Ironsworn/src/data/move-list.pug

@@ -286,7 +286,7 @@
           p: `If you are returning to a previously explored site, roll both challenge dice, take the lowest value, and clear that number of progress boxes. Then, <em>Delve the Depths</em> to explore this place.`
         }
       ],      
-      discover: true
+      discover_a_site: true
     },
     draw_the_circle: {
       title: 'Draw the Circle',
@@ -368,8 +368,8 @@
       class: 'endure-harm',
       page: 'Ironsworn - page 91',
       radio: 'endure_harm',
-      stat: `@{iron}`,
-      stat_repeat: '@{iron}',
+      stat: `?{Stat|Health,@{health}|Iron,@{iron}}`,
+      stat_repeat: '?{Stat}',
       system: 'ironsworn',
       content: [
         {

Ironsworn/src/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "ironsworn",
-  "version": "0.0.1",
+  "version": "2.0.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

Ironsworn/src/roll-templates/moves/moves.pug

@@ -39,6 +39,12 @@ rolltemplate.sheet-rolltemplate-ironsworn_moves
     | {{/^rollLess() momentum 0}}
     | {{/rarityAction}}
 
+    | {{#discoverASite}}
+    .sheet-subheader {{header}}
+    .sheet-result-row
+      .sheet-oracle-table-text Clear {{discoverASite}} Progress
+    | {{/discoverASite}}
+
     | {{#custom}}
     | {{#header}}
     div.sheet-result-body.sheet-result-row

Ironsworn/src/roll-templates/oracles/oracles.styl

@@ -1,5 +1,6 @@
 .sheet-rolltemplate-ironsworn_oracles .sheet-result-row,
 .sheet-rolltemplate-moves_oracles .sheet-result-row,
+.sheet-rolltemplate-ironsworn_moves .sheet-result-row,
 .sheet-rolltemplate-delve_oracles .sheet-result-row
   padding 0.5em