From 379b8358ee555e0319e45229b338eced500ee853 Mon Sep 17 00:00:00 2001 From: LeRatierBretonnien Date: Sat, 26 Aug 2023 20:59:41 +0200 Subject: [PATCH] #2 Fix skill profiency --- modules/hero6-actor.js | 23 ++++++++---------- modules/hero6-item-sheet.js | 6 ++--- .../complications/{000118.log => 000121.log} | 0 packs/complications/CURRENT | 2 +- packs/complications/LOG | 11 +++------ packs/complications/LOG.old | 16 ++++++------ packs/complications/MANIFEST-000116 | Bin 135 -> 0 bytes packs/complications/MANIFEST-000120 | Bin 0 -> 120 bytes packs/equipment/{000120.log => 000123.log} | 0 packs/equipment/CURRENT | 2 +- packs/equipment/LOG | 11 +++------ packs/equipment/LOG.old | 16 ++++++------ .../{MANIFEST-000118 => MANIFEST-000122} | Bin 173 -> 157 bytes packs/maneuvers/000113.log | Bin 0 -> 997 bytes packs/maneuvers/CURRENT | 2 +- packs/maneuvers/LOG | 11 +++------ packs/maneuvers/LOG.old | 16 ++++++------ packs/maneuvers/MANIFEST-000108 | Bin 134 -> 0 bytes packs/maneuvers/MANIFEST-000112 | Bin 0 -> 119 bytes .../000110.log => perks/000121.log} | 0 packs/perks/CURRENT | 2 +- packs/perks/LOG | 11 +++------ packs/perks/LOG.old | 16 ++++++------ packs/perks/MANIFEST-000116 | Bin 134 -> 0 bytes packs/perks/MANIFEST-000120 | Bin 0 -> 119 bytes packs/{perks/000118.log => powers/000122.log} | 0 packs/powers/CURRENT | 2 +- packs/powers/LOG | 11 +++------ packs/powers/LOG.old | 16 ++++++------ .../{MANIFEST-000117 => MANIFEST-000121} | Bin 169 -> 154 bytes .../{powers/000119.log => skills/000121.log} | 0 packs/skills/CURRENT | 2 +- packs/skills/LOG | 11 +++------ packs/skills/LOG.old | 16 ++++++------ packs/skills/MANIFEST-000116 | Bin 135 -> 0 bytes packs/skills/MANIFEST-000120 | Bin 0 -> 120 bytes packs/talents/000118.log | 0 .../{skills/000118.log => talents/000121.log} | 0 packs/talents/CURRENT | 2 +- packs/talents/LOG | 11 +++------ packs/talents/LOG.old | 16 ++++++------ packs/talents/MANIFEST-000116 | Bin 134 -> 0 bytes packs/talents/MANIFEST-000120 | Bin 0 -> 119 bytes templates/items/item-skill-sheet.hbs | 19 +++++++-------- 44 files changed, 106 insertions(+), 145 deletions(-) rename packs/complications/{000118.log => 000121.log} (100%) delete mode 100644 packs/complications/MANIFEST-000116 create mode 100644 packs/complications/MANIFEST-000120 rename packs/equipment/{000120.log => 000123.log} (100%) rename packs/equipment/{MANIFEST-000118 => MANIFEST-000122} (73%) create mode 100644 packs/maneuvers/000113.log delete mode 100644 packs/maneuvers/MANIFEST-000108 create mode 100644 packs/maneuvers/MANIFEST-000112 rename packs/{maneuvers/000110.log => perks/000121.log} (100%) delete mode 100644 packs/perks/MANIFEST-000116 create mode 100644 packs/perks/MANIFEST-000120 rename packs/{perks/000118.log => powers/000122.log} (100%) rename packs/powers/{MANIFEST-000117 => MANIFEST-000121} (75%) rename packs/{powers/000119.log => skills/000121.log} (100%) delete mode 100644 packs/skills/MANIFEST-000116 create mode 100644 packs/skills/MANIFEST-000120 delete mode 100644 packs/talents/000118.log rename packs/{skills/000118.log => talents/000121.log} (100%) delete mode 100644 packs/talents/MANIFEST-000116 create mode 100644 packs/talents/MANIFEST-000120 diff --git a/modules/hero6-actor.js b/modules/hero6-actor.js index c085289..d51a1f3 100644 --- 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 diff --git a/modules/hero6-item-sheet.js b/modules/hero6-item-sheet.js index 5d1d2f4..ed1514b 100644 --- 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 => { diff --git a/packs/complications/000118.log b/packs/complications/000121.log similarity index 100% rename from packs/complications/000118.log rename to packs/complications/000121.log diff --git a/packs/complications/CURRENT b/packs/complications/CURRENT index 2b6390e..30eb131 100644 --- a/packs/complications/CURRENT +++ b/packs/complications/CURRENT @@ -1 +1 @@ -MANIFEST-000116 +MANIFEST-000120 diff --git a/packs/complications/LOG b/packs/complications/LOG index c11caae..e87465a 100644 --- 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 diff --git a/packs/complications/LOG.old b/packs/complications/LOG.old index 88e5885..c11caae 100644 --- 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) diff --git a/packs/complications/MANIFEST-000116 b/packs/complications/MANIFEST-000116 deleted file mode 100644 index 4d84f4590d2763965eb329b482abc0c88dec44c6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmeC4WpyNpfss)vC$%g!CnZVGsj?)sJhM2}IX|}`u_&=5zlfcQ^H(dQykcfaYHqQj zfoY{IG1rkuYmBKhC`eTj7-&>49qnw-BMk>QTEY9GyYV%Zh7cL^eahtc(lgrjkDX|$$Hm_owpKLQvxi57(wD#x@J#pRHv zJU61^Rb3W>$09AFIQ2r7^zjxq4) zK^2WYd_=g@z8f>!_Z9;ebHL0$f1s(73e7)XzM{>x_Uki8XItBm2TK@ZaSAj_K^neS zb%1kJwXI4kDR=DVL8VSpDq)62udy_ZqSqTd@X1(komlVoX2ej?)7?WU^5uE+uusg;VX(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HFe3VTpBL@Q`Qz<6{ Ua~TVZ;@!#t<8 diff --git a/packs/perks/MANIFEST-000120 b/packs/perks/MANIFEST-000120 new file mode 100644 index 0000000000000000000000000000000000000000..32aa2a02e851ec5164b1d8715c8e38d44deadc4f GIT binary patch literal 119 zcmX>X(J7S3z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMD+M^(^m|2pVTde3~ zTvndrnPHrtlkaNgXc5lH$N&Z~`O5H+Aah@5{}T7`Ttjc?Dn=HF{Qa%B_i!*UGF5Ui JFjuj#0052^AxHoK literal 0 HcmV?d00001 diff --git a/packs/perks/000118.log b/packs/powers/000122.log similarity index 100% rename from packs/perks/000118.log rename to packs/powers/000122.log diff --git a/packs/powers/CURRENT b/packs/powers/CURRENT index 5ff346e..2b465ed 100644 --- a/packs/powers/CURRENT +++ b/packs/powers/CURRENT @@ -1 +1 @@ -MANIFEST-000117 +MANIFEST-000121 diff --git a/packs/powers/LOG b/packs/powers/LOG index 9e15fe1..f94e1bc 100644 --- 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 diff --git a/packs/powers/LOG.old b/packs/powers/LOG.old index 40db3a0..9e15fe1 100644 --- 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) diff --git a/packs/powers/MANIFEST-000117 b/packs/powers/MANIFEST-000121 similarity index 75% rename from packs/powers/MANIFEST-000117 rename to packs/powers/MANIFEST-000121 index 93bfc8f2155ec8286a74559a5bbb6ce4a99870c9..801b650e8dc51542cac946ec13ad38a6a505fe64 100644 GIT binary patch delta 22 dcmZ3+Pj$a%Mj7(*m49w*$Y5XC^P9SbMkXy-;1^~U#2vq<8 diff --git a/packs/powers/000119.log b/packs/skills/000121.log similarity index 100% rename from packs/powers/000119.log rename to packs/skills/000121.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index 2b6390e..30eb131 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000116 +MANIFEST-000120 diff --git a/packs/skills/LOG b/packs/skills/LOG index 0fcd2ca..d842aae 100644 --- 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 diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 0b586dd..0fcd2ca 100644 --- 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) diff --git a/packs/skills/MANIFEST-000116 b/packs/skills/MANIFEST-000116 deleted file mode 100644 index d800e529c6b982b8b6a49480b6a824cb688b5fe4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 135 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAw~7RhliFfx^L VGBB61*oYSPtpst)fZPfe8vuH_BWwTw diff --git a/packs/skills/MANIFEST-000120 b/packs/skills/MANIFEST-000120 new file mode 100644 index 0000000000000000000000000000000000000000..fd846ca0dc3cc537ec1729746fc53635618defee GIT binary patch literal 120 zcmdmM#mkw*z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdiFD;ykcfaYHqQj zfti_cP*_q_P>w-%Uzwb@-i81AoAX;G;VV+Ffvtg KGB8)M*Z=@~(jd$L literal 0 HcmV?d00001 diff --git a/packs/talents/000118.log b/packs/talents/000118.log deleted file mode 100644 index e69de29..0000000 diff --git a/packs/skills/000118.log b/packs/talents/000121.log similarity index 100% rename from packs/skills/000118.log rename to packs/talents/000121.log diff --git a/packs/talents/CURRENT b/packs/talents/CURRENT index 2b6390e..30eb131 100644 --- a/packs/talents/CURRENT +++ b/packs/talents/CURRENT @@ -1 +1 @@ -MANIFEST-000116 +MANIFEST-000120 diff --git a/packs/talents/LOG b/packs/talents/LOG index e722aff..a57e72a 100644 --- 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 diff --git a/packs/talents/LOG.old b/packs/talents/LOG.old index 43ac344..e722aff 100644 --- 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) diff --git a/packs/talents/MANIFEST-000116 b/packs/talents/MANIFEST-000116 deleted file mode 100644 index 0e9aafd4e3327e27fc7eb5440ef89bad7c347078..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 134 zcmY$qR;ZK6z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|dAUN-jT{V&Or@L* U%w;TmsREo5AZ{6uTfxEy0F4+T2LJ#7 diff --git a/packs/talents/MANIFEST-000120 b/packs/talents/MANIFEST-000120 new file mode 100644 index 0000000000000000000000000000000000000000..f76c7b25bc70ebb0f7485f2c76c0d65e5b35fa62 GIT binary patch literal 119 zcmY$qR;ZK6z{n_-lUkOVlai$8R9TW*o>`pgoS$2eSd>_jU&PMDdeKB)F|#B!w^-3I zKR?UG$lKSexWX^TH?@k9kpT=~@>O~HZs}oFeu4hZA?~40IgES|`PuBN-*7N6GF5Ui JFjukg0RW}?Aw~cI literal 0 HcmV?d00001 diff --git a/templates/items/item-skill-sheet.hbs b/templates/items/item-skill-sheet.hbs index 31cee39..f5454d3 100644 --- a/templates/items/item-skill-sheet.hbs +++ b/templates/items/item-skill-sheet.hbs @@ -52,22 +52,21 @@ data-dtype="Number"/> -
  • - +
    • - {{#if system.skillfamiliarity}} + + {{#if (not system.skillprofiency)}} +
  • + +
    • - {{/if}} + {{/if}} -
  • - -
    • {{#if (ne system.skilltype "combat")}}