#2 Fix skill profiency

2023-08-26 20:59:41 +02:00 · 2023-08-26 20:59:41 +02:00 · 379b8358ee
parent 40ee7c3c40
commit 379b8358ee
44 changed files with 106 additions and 145 deletions
--- a/modules/hero6-actor.js
+++ b/modules/hero6-actor.js
@ -216,7 +216,6 @@ export class Hero6Actor extends Actor {
        skill.roll = charac.roll
      }
    }
-    console.log("SILL", skill)
    if (skill.system.levels > 0) {
      skill.roll += skill.system.levels
    }
@ -225,16 +224,16 @@ export class Hero6Actor extends Actor {
  /* -------------------------------------------- */
  prepareManeuver(maneuver) {
    if (maneuver.system.maneuvertype == "mental") {
-      maneuver.roll = 11 + this.system.characteristics.omcv.value
+      maneuver.roll = 11 + (Number(this.system.characteristics.omcv.value) || 0)
      if (Number(maneuver.system.omcv)) {
-        maneuver.roll += Number(maneuver.system.omcv)
+        maneuver.roll += (Number(maneuver.system.omcv) || 0)
      } else {
        maneuver.noOMCV = true
      }
    } else {
-      maneuver.roll = 11 + this.system.characteristics.ocv.value
+      maneuver.roll = 11 + (Number(this.system.characteristics.ocv.value) || 0)
      if (Number(maneuver.system.ocv)) {
-        maneuver.roll += Number(maneuver.system.ocv)
+        maneuver.roll += (Number(maneuver.system.ocv) || 0)
      } else {
        maneuver.noOCV = true
      }
@ -656,12 +655,10 @@ export class Hero6Actor extends Actor {
        const ray = new Ray(token.object?.center || token.center, defenderToken.center)
        rollData.tokensDistance = canvas.grid.measureDistances([{ ray }], { gridSpaces: false })[0] / canvas.grid.grid.options.dimensions.distance
      } else {
-        ui.notifications.info("No token connected to this actor, unable to compute distance.")
-        return
+        //ui.notifications.info("No token connected to this actor, unable to compute distance.")
+        //return
      }
      if (defender) {
-        rollData.forceAdvantage = defender.isAttackerAdvantage()
-        rollData.advantageFromTarget = true
      }
    }
    console.log("ROLLDATA", rollData)
@ -781,7 +778,7 @@ export class Hero6Actor extends Actor {
    if (weapon) {
      weapon = duplicate(weapon)
      let rollData = this.getCommonRollData()
-      rollData.weaponRoll = 11 + this.system.characteristics.ocv.value + (Number(weapon.system.ocv) || 0)
+      rollData.weaponRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(weapon.system.ocv) || 0)
      rollData.mode = "weapon"
      rollData.weapon = weapon
      rollData.img = weapon.img
@ -796,7 +793,7 @@ export class Hero6Actor extends Actor {
    if (maneuver) {
      maneuver = duplicate(maneuver)
      let rollData = this.getCommonRollData()
-      rollData.maneuverRoll = 11 + this.system.characteristics.omcv.value + (Number(maneuver.system.omcv) || 0)
+      rollData.maneuverRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(maneuver.system.omcv) || 0)
      rollData.mode = "mentalmaneuver"
      rollData.maneuver = maneuver
      rollData.img = maneuver.img
@ -812,9 +809,9 @@ export class Hero6Actor extends Actor {
      power = duplicate(power)
      let rollData = this.getCommonRollData()
      if (power.system.attackvalue == "ocv")  {
-        rollData.powerRoll = 11 + this.system.characteristics.ocv.value + (Number(power.system.ocv) || 0)
+        rollData.powerRoll = 11 + (Number(this.system.characteristics.ocv.value) || 0) + (Number(power.system.ocv) || 0)
      } else {
-        rollData.powerRoll = 11 + this.system.characteristics.omcv.value + (Number(power.system.omcv) || 0)
+        rollData.powerRoll = 11 + (Number(this.system.characteristics.omcv.value) || 0) + (Number(power.system.omcv) || 0)
      }
      rollData.mode = "powerattack"
      rollData.power = power
--- a/modules/hero6-item-sheet.js
+++ b/modules/hero6-item-sheet.js
@ -147,13 +147,13 @@ export class Hero6ItemSheet extends ItemSheet {
    });

    html.find('.item-skill-profiency').click(ev => {
-      this.object.update( {'system.levels': 12, 'system.cost': 2} )
+      this.object.update( {'system.skillfamiliarity': false, 'system.cost': 2} )
    } )
    html.find('.item-skill-familiarity').click(ev => {
-      this.object.update( {'system.levels': 10, 'system.cost': 1} )
+      this.object.update( {'system.skillprofiency': false, 'system.cost': 1} )
    } )
    html.find('.item-skill-everyman').click(ev => {
-      this.object.update( {'system.levels': 8, 'system.cost': 0} )
+      this.object.update( {'system.cost': 0} )
    } )

    html.find('.view-subitem').click(ev => {
--- a/packs/complications/000121.log
+++ b/packs/complications/000121.log
--- a/packs/complications/CURRENT
+++ b/packs/complications/CURRENT
@ -1 +1 @@
-MANIFEST-000116
+MANIFEST-000120
--- a/packs/complications/LOG
+++ b/packs/complications/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.616025 7f2deaffd6c0 Recovering log #114
-2023/08/26-09:36:55.641371 7f2deaffd6c0 Delete type=3 #112
-2023/08/26-09:36:55.641419 7f2deaffd6c0 Delete type=0 #114
-2023/08/26-09:47:17.308368 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.308393 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.348814 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.377261 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377290 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:06.792894 7f2debfff6c0 Recovering log #118
+2023/08/26-20:26:06.893142 7f2debfff6c0 Delete type=3 #116
+2023/08/26-20:26:06.893197 7f2debfff6c0 Delete type=0 #118
--- a/packs/complications/LOG.old
+++ b/packs/complications/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.658202 7f2deaffd6c0 Recovering log #110
-2023/08/26-05:35:25.710452 7f2deaffd6c0 Delete type=3 #108
-2023/08/26-05:35:25.710513 7f2deaffd6c0 Delete type=0 #110
-2023/08/26-05:36:09.833813 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.833846 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.840534 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.847596 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847688 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.616025 7f2deaffd6c0 Recovering log #114
+2023/08/26-09:36:55.641371 7f2deaffd6c0 Delete type=3 #112
+2023/08/26-09:36:55.641419 7f2deaffd6c0 Delete type=0 #114
+2023/08/26-09:47:17.308368 7f2b69bff6c0 Level-0 table #119: started
+2023/08/26-09:47:17.308393 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
+2023/08/26-09:47:17.348814 7f2b69bff6c0 Delete type=0 #117
+2023/08/26-09:47:17.377261 7f2b69bff6c0 Manual compaction at level-0 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.377290 7f2b69bff6c0 Manual compaction at level-1 from '!items!05yAsPAteobyHoVT' @ 72057594037927935 : 1 .. '!items!yFhVFTqzLKcqApBr' @ 0 : 0; will stop at (end)
--- a/packs/complications/MANIFEST-000116
+++ b/packs/complications/MANIFEST-000116
--- a/packs/complications/MANIFEST-000120
+++ b/packs/complications/MANIFEST-000120
--- a/packs/equipment/000123.log
+++ b/packs/equipment/000123.log
--- a/packs/equipment/CURRENT
+++ b/packs/equipment/CURRENT
@ -1 +1 @@
-MANIFEST-000118
+MANIFEST-000122
--- a/packs/equipment/LOG
+++ b/packs/equipment/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.581647 7f2dea7fc6c0 Recovering log #116
-2023/08/26-09:36:55.613104 7f2dea7fc6c0 Delete type=3 #114
-2023/08/26-09:36:55.613185 7f2dea7fc6c0 Delete type=0 #116
-2023/08/26-09:47:17.031250 7f2b69bff6c0 Level-0 table #121: started
-2023/08/26-09:47:17.031303 7f2b69bff6c0 Level-0 table #121: 0 bytes OK
-2023/08/26-09:47:17.068068 7f2b69bff6c0 Delete type=0 #119
-2023/08/26-09:47:17.178686 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.245324 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:06.721589 7f2deaffd6c0 Recovering log #120
+2023/08/26-20:26:06.788346 7f2deaffd6c0 Delete type=3 #118
+2023/08/26-20:26:06.788465 7f2deaffd6c0 Delete type=0 #120
--- a/packs/equipment/LOG.old
+++ b/packs/equipment/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.591750 7f2dea7fc6c0 Recovering log #112
-2023/08/26-05:35:25.654891 7f2dea7fc6c0 Delete type=3 #110
-2023/08/26-05:35:25.654982 7f2dea7fc6c0 Delete type=0 #112
-2023/08/26-05:36:09.796628 7f2b69bff6c0 Level-0 table #117: started
-2023/08/26-05:36:09.796668 7f2b69bff6c0 Level-0 table #117: 0 bytes OK
-2023/08/26-05:36:09.803598 7f2b69bff6c0 Delete type=0 #115
-2023/08/26-05:36:09.820108 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.820164 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.581647 7f2dea7fc6c0 Recovering log #116
+2023/08/26-09:36:55.613104 7f2dea7fc6c0 Delete type=3 #114
+2023/08/26-09:36:55.613185 7f2dea7fc6c0 Delete type=0 #116
+2023/08/26-09:47:17.031250 7f2b69bff6c0 Level-0 table #121: started
+2023/08/26-09:47:17.031303 7f2b69bff6c0 Level-0 table #121: 0 bytes OK
+2023/08/26-09:47:17.068068 7f2b69bff6c0 Delete type=0 #119
+2023/08/26-09:47:17.178686 7f2b69bff6c0 Manual compaction at level-0 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.245324 7f2b69bff6c0 Manual compaction at level-1 from '!folders!48DCB6UNXCsERTXK' @ 72057594037927935 : 1 .. '!items!zFQRJSrYV4E12NgW' @ 0 : 0; will stop at (end)
--- a/packs/equipment/MANIFEST-000122
+++ b/packs/equipment/MANIFEST-000122
--- a/packs/maneuvers/000113.log
+++ b/packs/maneuvers/000113.log
--- a/packs/maneuvers/CURRENT
+++ b/packs/maneuvers/CURRENT
@ -1 +1 @@
-MANIFEST-000108
+MANIFEST-000112
--- a/packs/maneuvers/LOG
+++ b/packs/maneuvers/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.640615 7f2dea7fc6c0 Recovering log #106
-2023/08/26-09:36:55.658513 7f2dea7fc6c0 Delete type=3 #104
-2023/08/26-09:36:55.658566 7f2dea7fc6c0 Delete type=0 #106
-2023/08/26-09:47:17.348939 7f2b69bff6c0 Level-0 table #111: started
-2023/08/26-09:47:17.348972 7f2b69bff6c0 Level-0 table #111: 0 bytes OK
-2023/08/26-09:47:17.377099 7f2b69bff6c0 Delete type=0 #109
-2023/08/26-09:47:17.377272 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377305 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:06.895976 7f2deaffd6c0 Recovering log #110
+2023/08/26-20:26:07.003837 7f2deaffd6c0 Delete type=3 #108
+2023/08/26-20:26:07.003972 7f2deaffd6c0 Delete type=0 #110
--- a/packs/maneuvers/LOG.old
+++ b/packs/maneuvers/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.713305 7f2debfff6c0 Recovering log #102
-2023/08/26-05:35:25.813680 7f2debfff6c0 Delete type=3 #100
-2023/08/26-05:35:25.813733 7f2debfff6c0 Delete type=0 #102
-2023/08/26-05:36:09.827049 7f2b69bff6c0 Level-0 table #107: started
-2023/08/26-05:36:09.827083 7f2b69bff6c0 Level-0 table #107: 0 bytes OK
-2023/08/26-05:36:09.833693 7f2b69bff6c0 Delete type=0 #105
-2023/08/26-05:36:09.847570 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847666 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.640615 7f2dea7fc6c0 Recovering log #106
+2023/08/26-09:36:55.658513 7f2dea7fc6c0 Delete type=3 #104
+2023/08/26-09:36:55.658566 7f2dea7fc6c0 Delete type=0 #106
+2023/08/26-09:47:17.348939 7f2b69bff6c0 Level-0 table #111: started
+2023/08/26-09:47:17.348972 7f2b69bff6c0 Level-0 table #111: 0 bytes OK
+2023/08/26-09:47:17.377099 7f2b69bff6c0 Delete type=0 #109
+2023/08/26-09:47:17.377272 7f2b69bff6c0 Manual compaction at level-0 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.377305 7f2b69bff6c0 Manual compaction at level-1 from '!items!0HeZcvevni63brWf' @ 72057594037927935 : 1 .. '!items!yAT32VYV2aIWOBkK' @ 0 : 0; will stop at (end)
--- a/packs/maneuvers/MANIFEST-000108
+++ b/packs/maneuvers/MANIFEST-000108
--- a/packs/maneuvers/MANIFEST-000112
+++ b/packs/maneuvers/MANIFEST-000112
--- a/packs/maneuvers/000110.log
+++ b/packs/maneuvers/000110.log
--- a/packs/perks/CURRENT
+++ b/packs/perks/CURRENT
@ -1 +1 @@
-MANIFEST-000116
+MANIFEST-000120
--- a/packs/perks/LOG
+++ b/packs/perks/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.643370 7f2debfff6c0 Recovering log #114
-2023/08/26-09:36:55.661508 7f2debfff6c0 Delete type=3 #112
-2023/08/26-09:36:55.661568 7f2debfff6c0 Delete type=0 #114
-2023/08/26-09:47:17.415364 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.415408 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.468404 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.468554 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.468570 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:06.914678 7f2dea7fc6c0 Recovering log #118
+2023/08/26-20:26:07.021982 7f2dea7fc6c0 Delete type=3 #116
+2023/08/26-20:26:07.022085 7f2dea7fc6c0 Delete type=0 #118
--- a/packs/perks/LOG.old
+++ b/packs/perks/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.714189 7f2deaffd6c0 Recovering log #110
-2023/08/26-05:35:25.838791 7f2deaffd6c0 Delete type=3 #108
-2023/08/26-05:35:25.838847 7f2deaffd6c0 Delete type=0 #110
-2023/08/26-05:36:09.840742 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.840802 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.847326 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.847619 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847709 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.643370 7f2debfff6c0 Recovering log #114
+2023/08/26-09:36:55.661508 7f2debfff6c0 Delete type=3 #112
+2023/08/26-09:36:55.661568 7f2debfff6c0 Delete type=0 #114
+2023/08/26-09:47:17.415364 7f2b69bff6c0 Level-0 table #119: started
+2023/08/26-09:47:17.415408 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
+2023/08/26-09:47:17.468404 7f2b69bff6c0 Delete type=0 #117
+2023/08/26-09:47:17.468554 7f2b69bff6c0 Manual compaction at level-0 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.468570 7f2b69bff6c0 Manual compaction at level-1 from '!items!L3vwlIh3oloE6A8W' @ 72057594037927935 : 1 .. '!items!yWTR7MCOtGWm1KCz' @ 0 : 0; will stop at (end)
--- a/packs/perks/MANIFEST-000116
+++ b/packs/perks/MANIFEST-000116
--- a/packs/perks/MANIFEST-000120
+++ b/packs/perks/MANIFEST-000120
--- a/packs/powers/000122.log
+++ b/packs/powers/000122.log
--- a/packs/powers/CURRENT
+++ b/packs/powers/CURRENT
@ -1 +1 @@
-MANIFEST-000117
+MANIFEST-000121
--- a/packs/powers/LOG
+++ b/packs/powers/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.615731 7f2deb7fe6c0 Recovering log #115
-2023/08/26-09:36:55.638127 7f2deb7fe6c0 Delete type=3 #113
-2023/08/26-09:36:55.638240 7f2deb7fe6c0 Delete type=0 #115
-2023/08/26-09:47:17.273897 7f2b69bff6c0 Level-0 table #120: started
-2023/08/26-09:47:17.273922 7f2b69bff6c0 Level-0 table #120: 0 bytes OK
-2023/08/26-09:47:17.308253 7f2b69bff6c0 Delete type=0 #118
-2023/08/26-09:47:17.377250 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377280 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:06.793023 7f2deb7fe6c0 Recovering log #119
+2023/08/26-20:26:06.911684 7f2deb7fe6c0 Delete type=3 #117
+2023/08/26-20:26:06.911747 7f2deb7fe6c0 Delete type=0 #119
--- a/packs/powers/LOG.old
+++ b/packs/powers/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.658202 7f2deb7fe6c0 Recovering log #111
-2023/08/26-05:35:25.710453 7f2deb7fe6c0 Delete type=3 #109
-2023/08/26-05:35:25.710530 7f2deb7fe6c0 Delete type=0 #111
-2023/08/26-05:36:09.820280 7f2b69bff6c0 Level-0 table #116: started
-2023/08/26-05:36:09.820311 7f2b69bff6c0 Level-0 table #116: 0 bytes OK
-2023/08/26-05:36:09.826570 7f2b69bff6c0 Delete type=0 #114
-2023/08/26-05:36:09.847536 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.847643 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.615731 7f2deb7fe6c0 Recovering log #115
+2023/08/26-09:36:55.638127 7f2deb7fe6c0 Delete type=3 #113
+2023/08/26-09:36:55.638240 7f2deb7fe6c0 Delete type=0 #115
+2023/08/26-09:47:17.273897 7f2b69bff6c0 Level-0 table #120: started
+2023/08/26-09:47:17.273922 7f2b69bff6c0 Level-0 table #120: 0 bytes OK
+2023/08/26-09:47:17.308253 7f2b69bff6c0 Delete type=0 #118
+2023/08/26-09:47:17.377250 7f2b69bff6c0 Manual compaction at level-0 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.377280 7f2b69bff6c0 Manual compaction at level-1 from '!items!3vinyVxuFdrQDCBo' @ 72057594037927935 : 1 .. '!items!zpF2QY4tx7qdBomQ' @ 0 : 0; will stop at (end)
--- a/packs/powers/MANIFEST-000121
+++ b/packs/powers/MANIFEST-000121
--- a/packs/skills/000121.log
+++ b/packs/skills/000121.log
--- a/packs/skills/CURRENT
+++ b/packs/skills/CURRENT
@ -1 +1 @@
-MANIFEST-000116
+MANIFEST-000120
--- a/packs/skills/LOG
+++ b/packs/skills/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.581650 7f2deaffd6c0 Recovering log #114
-2023/08/26-09:36:55.613104 7f2deaffd6c0 Delete type=3 #112
-2023/08/26-09:36:55.613190 7f2deaffd6c0 Delete type=0 #114
-2023/08/26-09:47:17.245521 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.245592 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.273789 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.377230 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.377298 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:06.721598 7f2dea7fc6c0 Recovering log #118
+2023/08/26-20:26:06.788573 7f2dea7fc6c0 Delete type=3 #116
+2023/08/26-20:26:06.788747 7f2dea7fc6c0 Delete type=0 #118
--- a/packs/skills/LOG.old
+++ b/packs/skills/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.591750 7f2deaffd6c0 Recovering log #110
-2023/08/26-05:35:25.654890 7f2deaffd6c0 Delete type=3 #108
-2023/08/26-05:35:25.654974 7f2deaffd6c0 Delete type=0 #110
-2023/08/26-05:36:09.813203 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.813236 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.819942 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.820154 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.820177 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.581650 7f2deaffd6c0 Recovering log #114
+2023/08/26-09:36:55.613104 7f2deaffd6c0 Delete type=3 #112
+2023/08/26-09:36:55.613190 7f2deaffd6c0 Delete type=0 #114
+2023/08/26-09:47:17.245521 7f2b69bff6c0 Level-0 table #119: started
+2023/08/26-09:47:17.245592 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
+2023/08/26-09:47:17.273789 7f2b69bff6c0 Delete type=0 #117
+2023/08/26-09:47:17.377230 7f2b69bff6c0 Manual compaction at level-0 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.377298 7f2b69bff6c0 Manual compaction at level-1 from '!items!0663RVbZRl0oZ0Dr' @ 72057594037927935 : 1 .. '!items!zLKcnLGEcMwECjni' @ 0 : 0; will stop at (end)
--- a/packs/skills/MANIFEST-000116
+++ b/packs/skills/MANIFEST-000116
--- a/packs/skills/MANIFEST-000120
+++ b/packs/skills/MANIFEST-000120
--- a/packs/talents/000118.log
+++ b/packs/talents/000118.log
--- a/packs/talents/000121.log
+++ b/packs/talents/000121.log
--- a/packs/talents/CURRENT
+++ b/packs/talents/CURRENT
@ -1 +1 @@
-MANIFEST-000116
+MANIFEST-000120
--- a/packs/talents/LOG
+++ b/packs/talents/LOG
@ -1,8 +1,3 @@
-2023/08/26-09:36:55.660955 7f2deb7fe6c0 Recovering log #114
-2023/08/26-09:36:55.671184 7f2deb7fe6c0 Delete type=3 #112
-2023/08/26-09:36:55.671335 7f2deb7fe6c0 Delete type=0 #114
-2023/08/26-09:47:17.377408 7f2b69bff6c0 Level-0 table #119: started
-2023/08/26-09:47:17.377442 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
-2023/08/26-09:47:17.415173 7f2b69bff6c0 Delete type=0 #117
-2023/08/26-09:47:17.468538 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/26-09:47:17.468563 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-20:26:07.008269 7f2debfff6c0 Recovering log #118
+2023/08/26-20:26:07.084332 7f2debfff6c0 Delete type=3 #116
+2023/08/26-20:26:07.084432 7f2debfff6c0 Delete type=0 #118
--- a/packs/talents/LOG.old
+++ b/packs/talents/LOG.old
@ -1,8 +1,8 @@
-2023/08/26-05:35:25.815813 7f2deb7fe6c0 Recovering log #110
-2023/08/26-05:35:25.893020 7f2deb7fe6c0 Delete type=3 #108
-2023/08/26-05:35:25.893112 7f2deb7fe6c0 Delete type=0 #110
-2023/08/26-05:36:09.847777 7f2b69bff6c0 Level-0 table #115: started
-2023/08/26-05:36:09.847839 7f2b69bff6c0 Level-0 table #115: 0 bytes OK
-2023/08/26-05:36:09.855108 7f2b69bff6c0 Delete type=0 #113
-2023/08/26-05:36:09.855336 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
-2023/08/26-05:36:09.855380 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-09:36:55.660955 7f2deb7fe6c0 Recovering log #114
+2023/08/26-09:36:55.671184 7f2deb7fe6c0 Delete type=3 #112
+2023/08/26-09:36:55.671335 7f2deb7fe6c0 Delete type=0 #114
+2023/08/26-09:47:17.377408 7f2b69bff6c0 Level-0 table #119: started
+2023/08/26-09:47:17.377442 7f2b69bff6c0 Level-0 table #119: 0 bytes OK
+2023/08/26-09:47:17.415173 7f2b69bff6c0 Delete type=0 #117
+2023/08/26-09:47:17.468538 7f2b69bff6c0 Manual compaction at level-0 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
+2023/08/26-09:47:17.468563 7f2b69bff6c0 Manual compaction at level-1 from '!items!1oojD2KMJsxNlMez' @ 72057594037927935 : 1 .. '!items!znoFgVzNQOCTGUBl' @ 0 : 0; will stop at (end)
--- a/packs/talents/MANIFEST-000116
+++ b/packs/talents/MANIFEST-000116
--- a/packs/talents/MANIFEST-000120
+++ b/packs/talents/MANIFEST-000120
--- a/templates/items/item-skill-sheet.hbs
+++ b/templates/items/item-skill-sheet.hbs
@ -52,22 +52,21 @@
                data-dtype="Number"/>
            </li>

-            <li class="flexrow"><label class="item-field-label-long">Familiarity only</label>
-              <input type="checkbox" class="item-field-label-medium item-skill-familiarity" name="system.skillfamiliarity" {{checked system.skillfamiliarity}} 
-                {{#if (or system.skillprofiency system.skilllevelonly)}}disabled{{/if}}                 
+            <li class="flexrow"><label class="item-field-label-long">Proficency</label>
+              <input type="checkbox" class="item-field-label-medium item-skill-profiency" name="system.skillprofiency" {{checked system.skillprofiency}}  
                data-dtype="Number"/>
            </li>
-              {{#if system.skillfamiliarity}}
+
+            {{#if (not system.skillprofiency)}}         
+              <li class="flexrow"><label class="item-field-label-long">Familiarity only</label>
+                <input type="checkbox" class="item-field-label-medium item-skill-familiarity" name="system.skillfamiliarity" {{checked system.skillfamiliarity}} 
+                  data-dtype="Number"/>
+              </li>
              <li class="flexrow"><label class="item-field-label-long">Everyman skill</label>
                <input type="checkbox" class="item-field-label-medium item-skill-everyman" name="system.skilleveryman" {{checked system.skilleveryman}} data-dtype="Number"/>
              </li>
-              {{/if}}
+            {{/if}}

-            <li class="flexrow"><label class="item-field-label-long">Proficency</label>
-              <input type="checkbox" class="item-field-label-medium item-skill-profiency" name="system.skillprofiency" {{checked system.skillprofiency}}  
-                {{#if (or system.skillfamiliarity system.skilllevelonly)}}disabled{{/if}}                                 
-                data-dtype="Number"/>
-            </li>

            {{#if (ne system.skilltype "combat")}}
              <li class="flexrow"><label class="item-field-label-long">Levels Cost</label>