New icons

modules/dark-stars-actor-sheet.js

@@ -41,6 +41,8 @@ export class DarkStarsActorSheet extends ActorSheet {
       perks: this.actor.getPerks( ),
       weapons: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getWeapons()) ),
       ammos: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getAmmos()) ),
+      spells: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getSpells()) ),
+      powers: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getPowers()) ),
       armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())),
       shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())),
       equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ),

modules/dark-stars-actor.js

@@ -87,6 +87,11 @@ export class DarkStarsActor extends Actor {
     deriv.si.value = Math.round( ((attr.dex.value  + attr.sel.value) / 5) + 0.5) + deriv.si.bonus
     
     secondary.hp.max = ((attr.con.value + attr.siz.value ) * 2) + secondary.hp.bonus
+    for(let key in this.system.hitlocations) {
+      let loc = this.system.hitlocations[key]
+      loc.max = Math.floor(secondary.hp.max * loc.ratio)
+    }
+
     secondary.fp.max =  10  + attr.str.value + attr.con.value + secondary.fp.bonus
   }
 
@@ -125,6 +130,16 @@ export class DarkStarsActor extends Actor {
     DarkStarsUtility.sortArrayObjectsByName(comp)
     return comp;
   }
+  getSpells() {
+    let comp = duplicate(this.items.filter(item => item.type == 'spell') || []);
+    DarkStarsUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
+  getPowers() {
+    let comp = duplicate(this.items.filter(item => item.type == 'psychic') || []);
+    DarkStarsUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }  
   getEquippedArmor() {
     let comp = this.items.find(item => item.type == 'armor' && item.system.equipped)
     if (comp) {

modules/dark-stars-config.js

@@ -34,6 +34,12 @@ export const DARKSTARS_CONFIG = {
     "advanced": "Advanced",
     "role": "Role"
   },
+  magicTypes: {
+    "lemurian": "Lemurian", 
+    "bloodmagic": "Blood Magic Ritual", 
+    "ritual": "Ritual",
+    "miracle": "Miracle"
+  },
   cyberTypes: {
     "I": "I",
     "P": "P",

modules/dark-stars-item.js

@@ -8,7 +8,9 @@ export const defaultItemImg = {
   perk: "systems/fvtt-dark-stars/images/icons/perk.webp",
   ability: "systems/fvtt-dark-stars/images/icons/ability.webp",
   genetic: "systems/fvtt-dark-stars/images/icons/genetic.webp",
-  cyber: "systems/fvtt-dark-stars/images/icons/cyber.webp"
+  cyber: "systems/fvtt-dark-stars/images/icons/cyber.webp",
+  spell: "systems/fvtt-dark-stars/images/icons/magic.webp",
+  psychic: "systems/fvtt-dark-stars/images/icons/psychicpowers.webp",
   }
 
 /**

packs/armor/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/armor/LOG

@@ -1,8 +1,8 @@
-2023/10/21-12:57:48.590897 7f8105ffb6c0 Recovering log #100
+2023/10/29-23:31:17.929984 7f56117fa6c0 Recovering log #140
-2023/10/21-12:57:48.601577 7f8105ffb6c0 Delete type=3 #98
+2023/10/29-23:31:17.982863 7f56117fa6c0 Delete type=3 #138
-2023/10/21-12:57:48.601642 7f8105ffb6c0 Delete type=0 #100
+2023/10/29-23:31:17.982953 7f56117fa6c0 Delete type=0 #140
-2023/10/21-14:16:12.221910 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.276844 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.221948 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.276878 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.228790 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.283239 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.242411 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.283442 7f56037fe6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/21-14:16:12.242453 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.283477 7f56037fe6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)

packs/armor/LOG.old

@@ -1,8 +1,8 @@
-2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96
+2023/10/29-23:18:03.263368 7f5610ff96c0 Recovering log #136
-2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94
+2023/10/29-23:18:03.272973 7f5610ff96c0 Delete type=3 #134
-2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96
+2023/10/29-23:18:03.273033 7f5610ff96c0 Delete type=0 #136
-2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.114098 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.114130 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.122977 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.137181 7f56037fe6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.143842 7f56037fe6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)

packs/conditions/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/conditions/LOG

@@ -1,7 +1,7 @@
-2023/10/21-12:57:48.639550 7f8105ffb6c0 Recovering log #100
+2023/10/29-23:31:18.172067 7f56117fa6c0 Recovering log #140
-2023/10/21-12:57:48.652746 7f8105ffb6c0 Delete type=3 #98
+2023/10/29-23:31:18.222141 7f56117fa6c0 Delete type=3 #138
-2023/10/21-12:57:48.652801 7f8105ffb6c0 Delete type=0 #100
+2023/10/29-23:31:18.222239 7f56117fa6c0 Delete type=0 #140
-2023/10/21-14:16:12.242612 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.304351 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.242645 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.304405 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.248782 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.310587 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.269739 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.310811 7f56037fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/conditions/LOG.old

@@ -1,7 +1,7 @@
-2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96
+2023/10/29-23:18:03.312598 7f5610ff96c0 Recovering log #136
-2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94
+2023/10/29-23:18:03.323841 7f5610ff96c0 Delete type=3 #134
-2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96
+2023/10/29-23:18:03.323912 7f5610ff96c0 Delete type=0 #136
-2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.143970 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.144000 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.150731 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.169945 7f56037fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/currency/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/currency/LOG

@@ -1,7 +1,7 @@
-2023/10/21-12:57:48.654499 7f81077fe6c0 Recovering log #100
+2023/10/29-23:31:18.223966 7f5611ffb6c0 Recovering log #140
-2023/10/21-12:57:48.665788 7f81077fe6c0 Delete type=3 #98
+2023/10/29-23:31:18.265607 7f5611ffb6c0 Delete type=3 #138
-2023/10/21-12:57:48.665868 7f81077fe6c0 Delete type=0 #100
+2023/10/29-23:31:18.265707 7f5611ffb6c0 Delete type=0 #140
-2023/10/21-14:16:12.249000 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.310911 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.249065 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.311047 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.256005 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.317632 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.269765 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337853 7f56037fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/currency/LOG.old

@@ -1,7 +1,7 @@
-2023/10/21-09:46:53.241977 7f81067fc6c0 Recovering log #96
+2023/10/29-23:18:03.325846 7f5611ffb6c0 Recovering log #136
-2023/10/21-09:46:53.252607 7f81067fc6c0 Delete type=3 #94
+2023/10/29-23:18:03.335459 7f5611ffb6c0 Delete type=3 #134
-2023/10/21-09:46:53.252753 7f81067fc6c0 Delete type=0 #96
+2023/10/29-23:18:03.335539 7f5611ffb6c0 Delete type=0 #136
-2023/10/21-10:25:16.654235 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.150864 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.654260 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.150893 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.660290 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.156833 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.674565 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.169957 7f56037fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/cybernetics/CURRENT

@@ -1 +1 @@
-MANIFEST-000030
+MANIFEST-000071

packs/cybernetics/LOG

@@ -1,8 +1,8 @@
-2023/10/21-12:57:48.693267 7f8105ffb6c0 Recovering log #28
+2023/10/29-23:31:18.438487 7f56117fa6c0 Recovering log #69
-2023/10/21-12:57:48.706472 7f8105ffb6c0 Delete type=3 #26
+2023/10/29-23:31:18.492811 7f56117fa6c0 Delete type=3 #67
-2023/10/21-12:57:48.706580 7f8105ffb6c0 Delete type=0 #28
+2023/10/29-23:31:18.492904 7f56117fa6c0 Delete type=0 #69
-2023/10/21-14:16:12.269974 7f7e677006c0 Level-0 table #33: started
+2023/10/29-23:37:49.324508 7f56037fe6c0 Level-0 table #74: started
-2023/10/21-14:16:12.270032 7f7e677006c0 Level-0 table #33: 0 bytes OK
+2023/10/29-23:37:49.324550 7f56037fe6c0 Level-0 table #74: 0 bytes OK
-2023/10/21-14:16:12.276741 7f7e677006c0 Delete type=0 #31
+2023/10/29-23:37:49.330736 7f56037fe6c0 Delete type=0 #72
-2023/10/21-14:16:12.276863 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337897 7f56037fe6c0 Manual compaction at level-0 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)
-2023/10/21-14:16:12.276884 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337946 7f56037fe6c0 Manual compaction at level-1 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)

packs/cybernetics/LOG.old

@@ -1,8 +1,8 @@
-2023/10/21-09:46:53.283509 7f8106ffd6c0 Recovering log #24
+2023/10/29-23:18:03.364440 7f5610ff96c0 Recovering log #64
-2023/10/21-09:46:53.293910 7f8106ffd6c0 Delete type=3 #22
+2023/10/29-23:18:03.373971 7f5610ff96c0 Delete type=3 #62
-2023/10/21-09:46:53.294097 7f8106ffd6c0 Delete type=0 #24
+2023/10/29-23:18:03.374029 7f5610ff96c0 Delete type=0 #64
-2023/10/21-10:25:16.674800 7f7e677006c0 Level-0 table #29: started
+2023/10/29-23:22:59.170102 7f56037fe6c0 Level-0 table #70: started
-2023/10/21-10:25:16.674835 7f7e677006c0 Level-0 table #29: 0 bytes OK
+2023/10/29-23:22:59.170132 7f56037fe6c0 Level-0 table #70: 0 bytes OK
-2023/10/21-10:25:16.680984 7f7e677006c0 Delete type=0 #27
+2023/10/29-23:22:59.176387 7f56037fe6c0 Delete type=0 #68
-2023/10/21-10:25:16.681147 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.184020 7f56037fe6c0 Manual compaction at level-0 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.681203 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.184054 7f56037fe6c0 Manual compaction at level-1 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/equipment/LOG

@@ -1,7 +1,8 @@
-2023/10/21-12:57:48.603481 7f81077fe6c0 Recovering log #100
+2023/10/29-23:31:17.984959 7f5611ffb6c0 Recovering log #140
-2023/10/21-12:57:48.613256 7f81077fe6c0 Delete type=3 #98
+2023/10/29-23:31:18.036613 7f5611ffb6c0 Delete type=3 #138
-2023/10/21-12:57:48.613399 7f81077fe6c0 Delete type=0 #100
+2023/10/29-23:31:18.036664 7f5611ffb6c0 Delete type=0 #140
-2023/10/21-14:16:12.228908 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.283537 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.228932 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.283589 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.234945 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.290495 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.242424 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.310755 7f56037fe6c0 Manual compaction at level-0 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.310826 7f56037fe6c0 Manual compaction at level-1 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)

packs/equipment/LOG.old

@@ -1,7 +1,8 @@
-2023/10/21-09:46:53.186412 7f81067fc6c0 Recovering log #96
+2023/10/29-23:18:03.275156 7f5611ffb6c0 Recovering log #136
-2023/10/21-09:46:53.197532 7f81067fc6c0 Delete type=3 #94
+2023/10/29-23:18:03.285672 7f5611ffb6c0 Delete type=3 #134
-2023/10/21-09:46:53.197674 7f81067fc6c0 Delete type=0 #96
+2023/10/29-23:18:03.285737 7f5611ffb6c0 Delete type=0 #136
-2023/10/21-10:25:16.619385 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.129992 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.619433 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.130033 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.626151 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.137015 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.646310 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.143831 7f56037fe6c0 Manual compaction at level-0 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.143861 7f56037fe6c0 Manual compaction at level-1 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)

packs/genetics/CURRENT

@@ -1 +1 @@
-MANIFEST-000002
+MANIFEST-000019

packs/genetics/LOG

@@ -1,5 +1,8 @@
-2023/10/19-11:34:56.763463 7f8105ffb6c0 Delete type=3 #1
+2023/10/29-23:31:18.494918 7f5611ffb6c0 Recovering log #17
-2023/10/19-11:42:11.816999 7f7e677006c0 Level-0 table #5: started
+2023/10/29-23:31:18.543367 7f5611ffb6c0 Delete type=3 #15
-2023/10/19-11:42:11.817033 7f7e677006c0 Level-0 table #5: 0 bytes OK
+2023/10/29-23:31:18.543420 7f5611ffb6c0 Delete type=0 #17
-2023/10/19-11:42:11.824095 7f7e677006c0 Delete type=0 #3
+2023/10/29-23:37:49.338046 7f56037fe6c0 Level-0 table #22: started
-2023/10/19-11:42:11.824348 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.338094 7f56037fe6c0 Level-0 table #22: 0 bytes OK
+2023/10/29-23:37:49.344365 7f56037fe6c0 Delete type=0 #20
+2023/10/29-23:37:49.344491 7f56037fe6c0 Manual compaction at level-0 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.344516 7f56037fe6c0 Manual compaction at level-1 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)

packs/genetics/LOG.old

@@ -0,0 +1,8 @@
+2023/10/29-23:18:03.376448 7f5611ffb6c0 Recovering log #12
+2023/10/29-23:18:03.387048 7f5611ffb6c0 Delete type=3 #10
+2023/10/29-23:18:03.387107 7f5611ffb6c0 Delete type=0 #12
+2023/10/29-23:22:59.176500 7f56037fe6c0 Level-0 table #18: started
+2023/10/29-23:22:59.176528 7f56037fe6c0 Level-0 table #18: 0 bytes OK
+2023/10/29-23:22:59.183892 7f56037fe6c0 Delete type=0 #16
+2023/10/29-23:22:59.184045 7f56037fe6c0 Manual compaction at level-0 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.184084 7f56037fe6c0 Manual compaction at level-1 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/10/21-12:57:48.680492 7f8106ffd6c0 Recovering log #100
+2023/10/29-23:31:18.352208 7f5610ff96c0 Recovering log #140
-2023/10/21-12:57:48.690739 7f8106ffd6c0 Delete type=3 #98
+2023/10/29-23:31:18.436200 7f5610ff96c0 Delete type=3 #138
-2023/10/21-12:57:48.690798 7f8106ffd6c0 Delete type=0 #100
+2023/10/29-23:31:18.436263 7f5610ff96c0 Delete type=0 #140
-2023/10/21-14:16:12.262516 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.330846 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.262540 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.330869 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.269450 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.337661 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.269831 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337914 7f56037fe6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/21-14:16:12.269874 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337961 7f56037fe6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)

packs/perks/LOG.old

@@ -1,8 +1,8 @@
-2023/10/21-09:46:53.269089 7f8105ffb6c0 Recovering log #96
+2023/10/29-23:18:03.351155 7f56117fa6c0 Recovering log #136
-2023/10/21-09:46:53.280127 7f8105ffb6c0 Delete type=3 #94
+2023/10/29-23:18:03.361595 7f56117fa6c0 Delete type=3 #134
-2023/10/21-09:46:53.280264 7f8105ffb6c0 Delete type=0 #96
+2023/10/29-23:18:03.361648 7f56117fa6c0 Delete type=0 #136
-2023/10/21-10:25:16.667464 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.163288 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.667505 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.163313 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.674303 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.169835 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.674595 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.169984 7f56037fe6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.674627 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.170013 7f56037fe6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)

packs/shields/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/shields/LOG

@@ -1,7 +1,7 @@
-2023/10/21-12:57:48.614993 7f81067fc6c0 Recovering log #100
+2023/10/29-23:31:18.040442 7f5603fff6c0 Recovering log #140
-2023/10/21-12:57:48.625621 7f81067fc6c0 Delete type=3 #98
+2023/10/29-23:31:18.100074 7f5603fff6c0 Delete type=3 #138
-2023/10/21-12:57:48.625711 7f81067fc6c0 Delete type=0 #100
+2023/10/29-23:31:18.100170 7f5603fff6c0 Delete type=0 #140
-2023/10/21-14:16:12.235055 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.290582 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.235078 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.290606 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.242245 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.296703 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.242435 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.310776 7f56037fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/shields/LOG.old

@@ -1,7 +1,7 @@
-2023/10/21-09:46:53.199962 7f81077fe6c0 Recovering log #96
+2023/10/29-23:18:03.288243 7f5603fff6c0 Recovering log #136
-2023/10/21-09:46:53.211394 7f81077fe6c0 Delete type=3 #94
+2023/10/29-23:18:03.298374 7f5603fff6c0 Delete type=3 #134
-2023/10/21-09:46:53.211491 7f81077fe6c0 Delete type=0 #96
+2023/10/29-23:18:03.298481 7f5603fff6c0 Delete type=0 #136
-2023/10/21-10:25:16.626403 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.123190 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.626435 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.123237 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.633066 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.129849 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.646322 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.143641 7f56037fe6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000102
+MANIFEST-000142

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/10/21-12:57:48.667993 7f81067fc6c0 Recovering log #100
+2023/10/29-23:31:18.266929 7f5603fff6c0 Recovering log #140
-2023/10/21-12:57:48.678231 7f81067fc6c0 Delete type=3 #98
+2023/10/29-23:31:18.350204 7f5603fff6c0 Delete type=3 #138
-2023/10/21-12:57:48.678292 7f81067fc6c0 Delete type=0 #100
+2023/10/29-23:31:18.350298 7f5603fff6c0 Delete type=0 #140
-2023/10/21-14:16:12.256092 7f7e677006c0 Level-0 table #105: started
+2023/10/29-23:37:49.317738 7f56037fe6c0 Level-0 table #145: started
-2023/10/21-14:16:12.256115 7f7e677006c0 Level-0 table #105: 0 bytes OK
+2023/10/29-23:37:49.317765 7f56037fe6c0 Level-0 table #145: 0 bytes OK
-2023/10/21-14:16:12.262406 7f7e677006c0 Delete type=0 #103
+2023/10/29-23:37:49.324369 7f56037fe6c0 Delete type=0 #143
-2023/10/21-14:16:12.269805 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337878 7f56037fe6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/21-14:16:12.269852 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.337930 7f56037fe6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)

packs/skills/LOG.old

@@ -1,8 +1,8 @@
-2023/10/21-09:46:53.254913 7f81077fe6c0 Recovering log #96
+2023/10/29-23:18:03.336985 7f5603fff6c0 Recovering log #136
-2023/10/21-09:46:53.266376 7f81077fe6c0 Delete type=3 #94
+2023/10/29-23:18:03.348011 7f5603fff6c0 Delete type=3 #134
-2023/10/21-09:46:53.266469 7f81077fe6c0 Delete type=0 #96
+2023/10/29-23:18:03.348152 7f5603fff6c0 Delete type=0 #136
-2023/10/21-10:25:16.660405 7f7e677006c0 Level-0 table #101: started
+2023/10/29-23:22:59.156910 7f56037fe6c0 Level-0 table #141: started
-2023/10/21-10:25:16.660579 7f7e677006c0 Level-0 table #101: 0 bytes OK
+2023/10/29-23:22:59.156932 7f56037fe6c0 Level-0 table #141: 0 bytes OK
-2023/10/21-10:25:16.667324 7f7e677006c0 Delete type=0 #99
+2023/10/29-23:22:59.163186 7f56037fe6c0 Delete type=0 #139
-2023/10/21-10:25:16.674581 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.169973 7f56037fe6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.674617 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.170004 7f56037fe6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)

packs/weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000103
+MANIFEST-000143

packs/weapons/LOG

@@ -1,8 +1,8 @@
-2023/10/21-12:57:48.627611 7f8106ffd6c0 Recovering log #101
+2023/10/29-23:31:18.101982 7f5610ff96c0 Recovering log #141
-2023/10/21-12:57:48.637461 7f8106ffd6c0 Delete type=3 #99
+2023/10/29-23:31:18.169683 7f5610ff96c0 Delete type=3 #139
-2023/10/21-12:57:48.637525 7f8106ffd6c0 Delete type=0 #101
+2023/10/29-23:31:18.169778 7f5610ff96c0 Delete type=0 #141
-2023/10/21-14:16:12.215327 7f7e677006c0 Level-0 table #106: started
+2023/10/29-23:37:49.296947 7f56037fe6c0 Level-0 table #146: started
-2023/10/21-14:16:12.215350 7f7e677006c0 Level-0 table #106: 0 bytes OK
+2023/10/29-23:37:49.296972 7f56037fe6c0 Level-0 table #146: 0 bytes OK
-2023/10/21-14:16:12.221803 7f7e677006c0 Delete type=0 #104
+2023/10/29-23:37:49.304142 7f56037fe6c0 Delete type=0 #144
-2023/10/21-14:16:12.242395 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.310795 7f56037fe6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/21-14:16:12.242444 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/29-23:37:49.310843 7f56037fe6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)

packs/weapons/LOG.old

@@ -1,8 +1,8 @@
-2023/10/21-09:46:53.214012 7f8105ffb6c0 Recovering log #97
+2023/10/29-23:18:03.300762 7f56117fa6c0 Recovering log #137
-2023/10/21-09:46:53.225802 7f8105ffb6c0 Delete type=3 #95
+2023/10/29-23:18:03.310829 7f56117fa6c0 Delete type=3 #135
-2023/10/21-09:46:53.225949 7f8105ffb6c0 Delete type=0 #97
+2023/10/29-23:18:03.310884 7f56117fa6c0 Delete type=0 #137
-2023/10/21-10:25:16.639905 7f7e677006c0 Level-0 table #102: started
+2023/10/29-23:22:59.137203 7f56037fe6c0 Level-0 table #142: started
-2023/10/21-10:25:16.639966 7f7e677006c0 Level-0 table #102: 0 bytes OK
+2023/10/29-23:22:59.137245 7f56037fe6c0 Level-0 table #142: 0 bytes OK
-2023/10/21-10:25:16.646212 7f7e677006c0 Delete type=0 #100
+2023/10/29-23:22:59.143514 7f56037fe6c0 Delete type=0 #140
-2023/10/21-10:25:16.646343 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.143853 7f56037fe6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/21-10:25:16.646390 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/10/29-23:22:59.143869 7f56037fe6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)

styles/simple.css

@@ -1334,9 +1334,6 @@ Focus FOC: #ff0084
 .color-class-foc {
   background-color: #ff0084;
 }
-.color-class-common {
-  background: rgba(185, 183, 40, 0.45);
-}
 .status-small-label {
   font-size: 0.65rem;
 }
@@ -1420,26 +1417,31 @@ Focus FOC: #ff0084
 }
 .item-name-label-header-long {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 14rem;
   min-width: 14rem;
 }
 .item-name-label-header-long2 {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 24rem;
   min-width: 24rem;
 }
 .item-name-label {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 10rem;
   min-width: 10rem;
 }
 .item-name-label-long {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 12rem;
   min-width: 12rem;
 }
 .item-name-label-long2 {
   flex-grow:2;
+  margin-top: 4px;
   max-width: 22rem;
   min-width: 22rem;
 }
@@ -1493,7 +1495,9 @@ Focus FOC: #ff0084
   min-width:2rem;
   max-width: 2rem;
 }
-
+.margin-left-4 {
+  margin-left: 4px;
+}
 .dice-pool-stack {
   flex: 1 1 5rem;
   display: flex !important;
@@ -1509,7 +1513,19 @@ Focus FOC: #ff0084
   margin-bottom: 1rem;
   background-color: #403f3e40;
 }
-
+.stat-column-size {
+  max-width: 12rem;
+  min-width: 12rem;
+  margin-right: 4px;
+}
+.derivated-column-size {
+  max-width: 14rem;
+  min-width: 14rem;
+  margin-right: 4px;
+}
+.hplocation-column {
+  margin-left: 4px;
+}
 .dice-pool-image {
   border: 0;
   margin-left: 4px;

system.json

@@ -95,12 +95,21 @@
     },
     {
       "type": "Item",
-      "label": "Cyber&Genetics",
+      "label": "Cybernetics",
       "name": "cybernetics",
       "path": "packs/cybernetics",
       "system": "fvtt-dark-stars",
       "private": false,
       "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Genetics",
+      "name": "genetics",
+      "path": "packs/genetics",
+      "system": "fvtt-dark-stars",
+      "private": false,
+      "flags": {}
     }
   ],
   "primaryTokenAttribute": "secondary.hp",
@@ -109,14 +118,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.9",
+  "version": "11.0.14",
   "compatibility": {
     "minimum": "11",
     "verified": "11"
   },
   "title": "Dark Stars RPG",
   "manifest": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/raw/branch/main/system.json",
-  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.9.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.14.zip",
   "url": "https://www.uberwald.me/gitea/uberwald/",
   "background": "images/ui/dark_stars_welcome_page.webp",
   "id": "fvtt-dark-stars"

template.json

@@ -173,6 +173,7 @@
         "hitlocations": {
           "head": {
             "label": "Head",
+            "ratio": 0.3,
             "dice": [
               1
             ],
@@ -182,6 +183,7 @@
           },
           "chest": {
             "label": "Chest",
+            "ratio": 0.5,
             "dice": [
               2,
               4
@@ -192,6 +194,7 @@
           },
           "abdomen": {
             "label": "Abdomen",
+            "ratio": 0.3,
             "dice": [
               5,
               6
@@ -202,6 +205,7 @@
           },
           "leftarm": {
             "label": "Left Arm",
+            "ratio": 0.2,
             "dice": [
               7
             ],
@@ -211,6 +215,7 @@
           },
           "rightarm": {
             "label": "Right Arm",
+            "ratio": 0.2,
             "dice": [
               8
             ],
@@ -220,6 +225,7 @@
           },
           "rightleg": {
             "label": "Right Leg",
+            "ratio": 0.4,
             "dice": [
               9
             ],
@@ -229,6 +235,7 @@
           },
           "leftleg": {
             "label": "Left Leg",
+            "ratio": 0.4,
             "dice": [
               10
             ],
@@ -279,8 +286,33 @@
       "money",
       "genetic",
       "cyber",
-      "ammo"
+      "ammo",
+      "psychic",
+      "spell"
     ],
+    "spell": {
+      "magictype": "lemurian",
+      "experience": 0,
+      "fatiguepoints": 0,
+      "essenccevalue": 0,
+      "essencestr1": "",
+      "essencestr2": "",
+      "effect": "",
+      "sphere": "",
+      "humanity": "",
+      "level": 0,
+      "wordsofpower": 0,
+      "signs": 0,
+      "cherisheditems": 0
+    },
+    "psychic": {
+      "level": 0,
+      "egocost": 0,
+      "range": 0,
+      "xpcost": 0,
+      "duration": "",
+      "effect": ""
+    },
     "skill": {
       "base": "",
       "value": 0,
@@ -408,6 +440,7 @@
     "weapon": {
       "weapontype": "",
       "associatedskill": "",
+      "skill": "",
       "penetrationmin": "",
       "penetrationmax": "",
       "needammo": false,

templates/actors/actor-sheet.hbs

@@ -16,7 +16,7 @@
   <nav class="sheet-tabs tabs" data-group="primary">
     <a class="item" data-tab="main">Main</a>
     <a class="item" data-tab="skills">Skills</a>
-    <a class="item" data-tab="perks">Perks</a>
+    <a class="item" data-tab="perks">Perks/Powers/Spells</a>
     <a class="item" data-tab="combat">Combat</a>
     <a class="item" data-tab="equipment">Equipment</a>
     <a class="item" data-tab="biodata">Biography</a>
@@ -29,7 +29,7 @@
     <div class="tab main" data-group="primary" data-tab="main">
 
       <div class="flexrow">
-        <ul class="stat-list alternate-list item-list">
+        <ul class="stat-list alternate-list item-list stat-column-size">
           {{#each system.attributes as |attr key|}}
           <li class="item stat flexrow list-item list-item-shadow">
             <label class="item-field-label-medium">{{attr.label}}</label>
@@ -38,7 +38,7 @@
           </li>
         </ul>
 
-        <ul class="stat-list alternate-list item-list">
+        <ul class="stat-list alternate-list item-list derivated-column-size">
           {{#each system.derivated as |deriv key|}}
           <li class="item stat flexrow list-item list-item-shadow">
             <label class="item-field-label-medium">{{deriv.label}}</label>
@@ -60,6 +60,26 @@
               <label class="item-field-label-short">&nbsp;/&nbsp;{{second.max}}</label>
             {{/if}}
             <input type="text" class="item-field-label-short padd-right" name="system.secondary.{{key}}.bonus" value="{{second.bonus}}" data-dtype="Number"/>
+
+            {{#if (eq key "hp")}}
+            <ul class="stat-list alternate-list item-list hplocation-column">
+              <li class="item stat flexrow list-item list-item-shadow">
+                <label class="item-field-label-short">Loc.</label>
+                <label class="item-field-label-short">Cur</label>
+                <label class="item-field-label-short">Max</label>
+                <label class="item-field-label-short">Armor</label>
+              </li>
+              {{#each @root.system.hitlocations as |loc key|}}
+              <li class="item stat flexrow list-item list-item-shadow">
+                <label class="item-field-label-short">{{loc.label}}</label>
+                <input type="text" class="item-field-label-short padd-right" name="system.hitlocations.{{key}}.value" value="{{loc.value}}" data-dtype="Number"/>
+                <label class="item-field-label-short">&nbsp;/&nbsp;{{loc.max}}</label>
+                <input type="text" class="item-field-label-short padd-right" name="system.hitlocations.{{key}}.armor" value="{{loc.armor}}" data-dtype="Number"/>
+              </li>
+              {{/each}}
+            </ul>
+            {{/if}}
+
           {{/each}}
           </li>
           <li class="item stat flexrow list-item list-item-shadow">
@@ -102,7 +122,7 @@
         <li class="item flexrow list-item list-item-shadow" data-item-id="{{skill._id}}">
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{skill.img}}" />
           </a>
-          <span class="item-field-label-vlong2"><a class="roll-skill">{{skill.name}}</a></span>
+          <span class="item-field-label-vlong2"><i class="fa-solid fa-dice-d10"></i><a class="roll-skill">{{skill.name}}</a></span>
           <span class="item-field-label-medium">{{skill.system.value}}</span>
           <span class="item-field-label-long">{{skill.derivated.label}} ({{skill.derivated.value}})</span>
           <span class="item-field-label-medium">{{skill.system.bonus}}</span>
@@ -125,6 +145,11 @@
           <span class="item-name-label-header-long2">
             <h3><label class="items-title-text">Perks</label></h3>
           </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Type</label>
+          </span>
+
+          <div class="item-filler">&nbsp;</div>
           <span class="item-field-label-medium">
             <label class="short-label">&nbsp;</label>
           </span>
@@ -134,6 +159,67 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{perk.img}}" />
           </a>
           <span class="item-field-label-vlong2">{{perk.name}}</span>
+          <span class="item-field-label-medium  margin-left-4"><label>{{perk.system.type}}</label></span>
+
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long2">
+            <h3><label class="items-title-text">Psychic Powers</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Level</label>
+          </span>
+
+          <div class="item-filler">&nbsp;</div>
+          <span class="item-field-label-medium">
+            <label class="short-label">&nbsp;</label>
+          </span>
+        </li>
+        {{#each powers as |power key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{power._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{power.img}}" />
+          </a>
+          <span class="item-field-label-vlong2">{{power.name}}</span>
+          <span class="item-field-label-medium  margin-left-4"><label>{{power.system.level}}</label></span>
+
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="alternate-list item-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header-long2">
+            <h3><label class="items-title-text">Spells</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Level</label>
+          </span>
+
+          <div class="item-filler">&nbsp;</div>
+          <span class="item-field-label-medium">
+            <label class="short-label">&nbsp;</label>
+          </span>
+        </li>
+        {{#each spells as |spell key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{spell._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img" src="{{spell.img}}" />
+          </a>
+          <span class="item-field-label-vlong2">{{spell.name}}</span>
+          <span class="item-field-label-medium  margin-left-4"><label>{{spell.system.level}}</label></span>
+
+          <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
           </div>
@@ -150,7 +236,7 @@
         <div>
           <ul class="stat-list alternate-list">
             <li class="item flexrow list-item items-title-bg">
-              <span class="item-name-label-header-long">
+              <span class="item-name-label-header">
                 <h3><label class="items-title-text">Weapons</label></h3>
               </span>
               <span class="item-field-label-medium">
@@ -162,19 +248,25 @@
               <span class="item-field-label-long">
                 <label class="short-label">Ammo</label>
               </span>
-              <span class="item-field-label-medium">
+              <span class="item-field-label-medium   margin-left-4">
                 <label class="short-label">Damage</label>
               </span>
+              <span class="item-field-label-short">
+                <label class="short-label">BR</label>
+              </span>
+              <span class="item-field-label-medium">
+                <label class="short-label">Penetration</label>
+              </span>
             </li>
             {{#each equippedWeapons as |weapon key|}}
             <li class="item flexrow list-item list-item-shadow" data-item-id="{{weapon._id}}">
               <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
                   src="{{weapon.img}}" /></a>
-              <span class="item-name-label-long"><a class ="roll-weapon">{{weapon.name}}</a></span>
+              <span class="item-name-label"><a class ="roll-weapon"><i class="fa-solid fa-dice-d10"></i>{{weapon.name}}</a></span>
 
               <span class="item-field-label-medium">{{upperFirst weapon.system.weapontype}}</span>
 
-              <span class="item-field-label-long">{{upperFirst weapon.system.associatedskill}}</span>
+              <span class="item-field-label-long">{{upperFirst weapon.system.skill}}</span>
               
               {{#if weapon.system.needammo}}
                 <select class="item-field-label-long edit-weapon-ammo" type="text" data-dtype="String">
@@ -186,19 +278,25 @@
                   {{/select}}
                 </select>
                 {{#if weapon.ammo}}              
-                  <span class="item-field-label-medium"><label>{{weapon.ammo.system.damage}}</label></span>
+                  <span class="item-field-label-medium   margin-left-4"><label>{{weapon.ammo.system.damage}}</label></span>
                 {{else}}
-                  <span class="item-field-label-medium"><label>-</label></span>
+                  <span class="item-field-label-medium  margin-left-4"><label>-</label></span>
                 {{/if}}
               {{else}}
                 <span class="item-field-label-long"><label>N/A</label></span>
-                <span class="item-field-label-medium"><label>{{weapon.system.damage}}</label></span>
+                <span class="item-field-label-medium  margin-left-4"><label>{{weapon.system.damage}}</label></span>
               {{/if}}
 
+              <span class="item-field-label-short">{{weapon.system.br}}</span>
+
+              <span class="item-field-label-medium">{{weapon.system.penetrationmin}} - {{weapon.system.penetrationmax}}</span>
+
               <div class="item-filler">&nbsp;</div>
               <div class="item-controls item-controls-fixed">
                 <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
               </div>
+
+
             </li>
             {{/each}}
           </ul>
@@ -338,7 +436,7 @@
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
 
-          <span class="item-field-label-medium"><label>{{weapon.system.weapontype}}</label></span>
+          <span class="item-field-label-medium"><label>{{upperFirst weapon.system.weapontype}}</label></span>
 
           {{#if weapon.system.needammo}}
             <select class="item-field-label-vlong edit-weapon-ammo" type="text" data-dtype="String">

templates/chat/chat-generic-result.hbs

@@ -24,7 +24,6 @@
         {{/if}}
         {{#if weapon}}
         <li>Weapon : {{weapon.name}}</li>
-        <li>Location hit : {{upperFirst weaponAiming}} ({{locationMalus}})</li>
         {{/if}}
         {{#if isAboveEffectiveRange}}
         <li>Above effective range: yes, -30% applied</li>
@@ -50,18 +49,19 @@
         {{/if}}
 
       {{#if (and weapon isSuccess)}}
+        <li>Location hit : {{upperFirst weaponAiming}} ({{locationMalus}})</li>
         {{#if weapon.ammo}}
-          <li>Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
+          <li>Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}*{{damageMultiplier}}]]</li>
           <li>BR: {{weapon.ammo.system.br}}</li>          
 
         {{else}}
           {{#if weapon.system.hashpdamage}}
-            <li>Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
+            <li>Roll HP Damage: [[/r {{weapon.system.damage}}*{{damageMultiplier}}]]</li>
           {{/if}}
           {{#if weapon.system.hasfatiguedamage}}
-            <li>Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}*{{locationMultiplier}}]]</li>
+            <li>Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}]]</li>
           {{/if}}
-          <li>BR: [[/r {{weapon.system.br}}]]</li>          
+          <li>BR: {{weapon.system.br}}</li>          
         {{/if}}
           <li>Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}</li>          
       {{/if}}

templates/items/item-psychic-sheet.hbs

@@ -0,0 +1,39 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}" />
+    <div class="header-fields">
+      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+    </div>
+  </header>
+
+  {{> systems/fvtt-dark-stars/templates/partials/partial-item-nav.hbs}}
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-dark-stars/templates/partials/partial-item-description.hbs}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+      <ul>
+        <li class="flexrow"><label class="item-field-label-long">Level</label>
+          <input type="text" class="item-field-label-short" name="system.level" value="{{system.level}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">EGO cost</label>
+          <input type="text" class="item-field-label-short" name="system.egocost" value="{{system.egocost}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Range</label>
+          <input type="text" class="item-field-label-short" name="system.range" value="{{system.range}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Experience Cost</label>
+          <input type="text" class="item-field-label-short" name="system.xpcost" value="{{system.xpcost}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Duration</label>
+          <input type="text" class="item-field-label-vlong" name="system.duration" value="{{system.duration}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Effects</label>
+          <input type="text" class="item-field-label-vlong" name="system.effect" value="{{system.effect}}" data-dtype="String" />
+        </li>
+      </ul>
+    </div>
+  </section>
+</form>

templates/items/item-spell-sheet.hbs

@@ -0,0 +1,70 @@
+<form class="{{cssClass}}" autocomplete="off">
+  <header class="sheet-header">
+    <img class="item-sheet-img" src="{{img}}" data-edit="img" title="{{name}}" />
+    <div class="header-fields">
+      <h1 class="charname"><input name="name" type="text" value="{{name}}" placeholder="Name" /></h1>
+    </div>
+  </header>
+
+  {{> systems/fvtt-dark-stars/templates/partials/partial-item-nav.hbs}}
+
+  {{!-- Sheet Body --}}
+  <section class="sheet-body">
+
+    {{> systems/fvtt-dark-stars/templates/partials/partial-item-description.hbs}}
+
+    <div class="tab details" data-group="primary" data-tab="details">
+      <ul>
+        <li class="flexrow">
+          <label class="item-field-label-long">Magic Type</label>
+          <select class="item-field-label-vlong" type="text" name="system.magictype" value="{{system.magictype}}"
+            data-dtype="String">
+            {{#select system.magictype}}
+            {{#each config.magicTypes as |type key|}}
+            <option value="{{key}}">{{type}}</option>
+            {{/each}}
+            {{/select}}
+          </select>
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Experience</label>
+          <input type="text" class="item-field-label-short" name="system.experience" value="{{system.experience}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Fatigue Points</label>
+          <input type="text" class="item-field-label-short" name="system.fatiguepoints" value="{{system.fatiguepoints}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Essence</label>
+          <input type="text" class="item-field-label-short" name="system.essencevalue" value="{{system.essencevalue}}" data-dtype="Number" />
+          <input type="text" class="item-field-label-vlong" name="system.essencestr1" value="{{system.essencestr1}}" data-dtype="String" />
+          <input type="text" class="item-field-label-vlong" name="system.essencestr2" value="{{system.essencestr2}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Effects</label>
+          <input type="text" class="item-field-label-vlong" name="system.effect" value="{{system.effect}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Spheres</label>
+          <input type="text" class="item-field-label-vlong" name="system.sphere" value="{{system.sphere}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Humanity</label>
+          <input type="text" class="item-field-label-vlong" name="system.humanity" value="{{system.humanity}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Level</label>
+          <input type="text" class="item-field-label-short" name="system.level" value="{{system.level}}" data-dtype="Number" />
+        </li>
+        {{#if (eq system.magictype "lemurian")}}
+          <li class="flexrow"><label class="item-field-label-long">Words of Power</label>
+            <input type="text" class="item-field-label-short" name="system.wordsofpower" value="{{system.wordsofpower}}" data-dtype="Number" />
+          </li>
+          <li class="flexrow"><label class="item-field-label-long">Signs</label>
+            <input type="text" class="item-field-label-short" name="system.signs" value="{{system.signs}}" data-dtype="Number" />
+          </li>
+          <li class="flexrow"><label class="item-field-label-long">Cherished Items</label>
+            <input type="text" class="item-field-label-short" name="system.cherisheditems" value="{{system.cherisheditems}}" data-dtype="Number" />
+          </li>
+        {{/if}}
+        <!--<li class="flexrow"><label class="item-field-label-long">Equipped ?</label>
+          <label class="attribute-value checkbox"><input type="checkbox" name="system.equipped" {{checked
+              system.equipped}} /></label>
+        </li>-->
+      </ul>
+    </div>
+  </section>
+</form>