Correction sur Items

.gitignore

@@ -8,7 +8,3 @@ todo.md
 /jsconfig.json
 /package.json
 /package-lock.json
-/packs/*/
-/packs/*/CURRENT
-/packs/*/LOG
-/packs/*/LOCK

modules/dark-stars-actor-sheet.js

@@ -40,11 +40,15 @@ export class DarkStarsActorSheet extends ActorSheet {
       skills: this.actor.getSkills( ),
       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()) ),
       equippedWeapons: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquippedWeapons()) ),
       cybers: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getCybers()) ),
+      genetics: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getGenetics()) ),
       equippedArmor: this.actor.getEquippedArmor(),
       equippedShield: this.actor.getEquippedShield(),
       subActors: duplicate(this.actor.getSubActors()),
@@ -108,6 +112,11 @@ export class DarkStarsActorSheet extends ActorSheet {
       this.actor.delSubActor(actorId);
     });
 
+    html.find('.edit-weapon-ammo').change(ev => {
+      const li = $(ev.currentTarget).parents(".item")
+      let weaponId = li.data("item-id")
+      this.actor.setWeaponAmmo( weaponId, ev.currentTarget.value )
+    })
     html.find('.skill-used-id').change(event => {
       const li = $(event.currentTarget).parents(".item");
       this.actor.setSkillUsed( li.data("item-id"), event.currentTarget.checked );

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) {
@@ -138,6 +153,11 @@ export class DarkStarsActor extends Actor {
     DarkStarsUtility.sortArrayObjectsByName(comp)
     return comp;
   }
+  getGenetics() {
+    let comp = duplicate(this.items.filter(item => item.type == 'genetic') || []);
+    DarkStarsUtility.sortArrayObjectsByName(comp)
+    return comp;
+  }
   /* -------------------------------------------- */
   getShields() {
     let comp = duplicate(this.items.filter(item => item.type == 'shield') || []);
@@ -153,6 +173,13 @@ export class DarkStarsActor extends Actor {
   }
   /* -------------------------------------------- */
   checkAndPrepareEquipment(item) {
+    // Dynamic assign ammo for the weapon
+    if (item.type == "weapon" && item.system.needammo) {      
+      let ammo = this.items.find(ammo => ammo.type == "ammo" && item.system.ammoid == ammo.id)
+      if (ammo) {
+        item.ammo = duplicate(ammo)
+      }
+    }
   }
 
   /* -------------------------------------------- */
@@ -172,6 +199,12 @@ export class DarkStarsActor extends Actor {
   /* -------------------------------------------- */
   getWeapons() {
     let comp = duplicate(this.items.filter(item => item.type == 'weapon') || []);
+    DarkStarsUtility.sortArrayObjectsByName(comp)    
+    return comp;
+  }
+  /* -------------------------------------------- */
+  getAmmos() {
+    let comp = duplicate(this.items.filter(item => item.type == 'ammo') || []);
     DarkStarsUtility.sortArrayObjectsByName(comp)
     return comp;
   }
@@ -183,7 +216,13 @@ export class DarkStarsActor extends Actor {
     }
     return item;
   }
-
+  /* -------------------------------------------- */
+  setWeaponAmmo(weaponId, ammoId) {
+    let weapon = this.items.get(weaponId)
+    if(weapon) {
+      this.updateEmbeddedDocuments('Item', [ {_id: weapon.id, 'system.ammoid': ammoId} ])
+    }
+  }  
   /* -------------------------------------------- */
   setSkillUsed( skillId, checked) {
     let skill = this.items.get(skillId)
@@ -386,12 +425,14 @@ export class DarkStarsActor extends Actor {
     }
   }
   /* -------------------------------------------- */
-  getInitiativeScore(combatId, combatantId) {
-    if (this.type == 'character') {
-      this.rollMR(true, combatId, combatantId)
-    }
-    console.log("Init required !!!!")
-    return -1;
+  hasLastWord() {
+    return this.items.find(i => i.type == "perk" && i.name.toLowerCase() === "last word")
+  }
+  /* -------------------------------------------- */
+  getInitiativeScore() {
+    let initFormula = (this.system.derivated.si.value + this.system.derivated.si.bonus) + "d6"
+    let initRoll = new Roll(initFormula).roll({ async: false })
+    return initRoll.total
   }
 
   /* -------------------------------------------- */
@@ -617,6 +658,7 @@ export class DarkStarsActor extends Actor {
         rollData.mode = "weapon"
         rollData.skill = skill
         rollData.weapon = weapon
+        this.checkAndPrepareEquipment(weapon)
         rollData.img = weapon.img
         this.startRoll(rollData)
       } else {

modules/dark-stars-combat.js

@@ -2,29 +2,46 @@ import { DarkStarsUtility } from "./dark-stars-utility.js";
 
 /* -------------------------------------------- */
 export class DarkStarsCombat extends Combat {
-  
-  /* -------------------------------------------- */
-  async rollInitiative(ids, formula = undefined, messageOptions = {} ) {
-    ids = typeof ids === "string" ? [ids] : ids;
-    for (let cId = 0; cId < ids.length; cId++) {
-      const c = this.combatants.get(ids[cId]);
-      let id = c._id || c.id;
-      let initBonus = c.actor ? c.actor.getInitiativeScore( this.id, id ) : -1;
-      await this.updateEmbeddedDocuments("Combatant", [ { _id: id, initiative: initBonus } ]);
-    }
 
+  /* -------------------------------------------- */
+  processOtherTurns(c, initScore) {
+    let toCreate = []
+    let token = canvas.tokens.get(c.tokenId)
+    let hasLastWord = token.actor.hasLastWord()
+    while ( (initScore > 5) || (hasLastWord && initScore >= 5)) {
+      initScore -= 5;
+      toCreate.push({tokenId: c.tokenId, sceneId: c.sceneId, actorId: c.actorId, hidden: c.hidden, initiative: initScore, flags: { world: { isDuplicated: true} } } );
+    }
+    this.createEmbeddedDocuments("Combatant", toCreate);
+  }
+
+  /* -------------------------------------------- */
+  async rollInitiative(ids, formula = undefined, messageOptions = {}) {
+    ids = typeof ids === "string" ? [ids] : ids;
+    for (let cId of ids) {
+      const c = this.combatants.get(cId);
+      let id = c._id || c.id;
+      let initScore = c.actor ? c.actor.getInitiativeScore(this.id, id) : -1;
+      await this.updateEmbeddedDocuments("Combatant", [{ _id: id, initiative: initScore }]);
+      setTimeout(() => this.processOtherTurns(c, initScore), 400)
+    }
     return this;
   }
 
+  /* -------------------------------------------- */
+  nextRound() {
+    super.nextRound()
+    let toDelete = []
+    for (let c of this.combatants) {
+      if (c.flags?.world?.isDuplicated) {
+        toDelete.push(c._id)
+      }
+    }
+    this.deleteEmbeddedDocuments("Combatant", toDelete);
+  }
+
   /* -------------------------------------------- */
   _onUpdate(changed, options, userId) {
   }
 
-  /* -------------------------------------------- */
-  static async checkTurnPosition() {
-    while (game.combat.turn > 0) {
-      await game.combat.previousTurn()
-    }
-  }
-
 }

modules/dark-stars-config.js

@@ -32,7 +32,22 @@ export const DARKSTARS_CONFIG = {
   perktypes: {
     "normal": "Normal",
     "advanced": "Advanced",
-    "role": "Role"
+    "role": "Role",
+    "job": "Job"
+  },
+  magicTypes: {
+    "lemurian": "Lemurian", 
+    "bloodmagic": "Blood Magic Ritual", 
+    "ritual": "Ritual",
+    "miracle": "Miracle"
+  },
+  cyberTypes: {
+    "I": "I",
+    "P": "P",
+    "U": "U",
+    "W": "W",
+    "E": "E",
+    "GS": "GS"
   },
   range: {
     "1": "Close",

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",
   }
 
 /**

modules/dark-stars-utility.js

@@ -42,7 +42,7 @@ export class DarkStarsUtility {
     Handlebars.registerHelper('locationLabel', function (key) {
       return __locationNames[key]
     })
-    
+
 
     this.gameSettings()
 
@@ -240,14 +240,14 @@ export class DarkStarsUtility {
   }
 
   /* -------------------------------------------- */
-  static getAimingMalus(location)  {
+  static getAimingMalus(location) {
     if (location == "arm" || location == "head") {
       return -50
     }
     if (location == "torso" || location == "leg") {
       return -30
     }
-    if (location == "hand" ) {
+    if (location == "hand") {
       return -70
     }
     return 0
@@ -255,14 +255,22 @@ export class DarkStarsUtility {
   /* -------------------------------------------- */
   static getAimingLocation(roll) {
     if (roll == 1) return "head"
-    if (roll >=2 && roll <=4 ) return "chest"
-    if (roll >=5 && roll <=6 ) return "abdomen"
-    if (roll == 7 ) return "leftarm"
-    if (roll == 8 ) return "rightarm"
-    if (roll == 9 ) return "rightleg"
-    if (roll == 10 ) return "leftleg"
+    if (roll >= 2 && roll <= 4) return "chest"
+    if (roll >= 5 && roll <= 6) return "abdomen"
+    if (roll == 7) return "leftarm"
+    if (roll == 8) return "rightarm"
+    if (roll == 9) return "rightleg"
+    if (roll == 10) return "leftleg"
     return "abdomen"
   }
+  /* -------------------------------------------- */
+  static locationMultiplier(location) {
+    if (location == "head") return 0.3
+    if (location.includes("arm")) return 0.2
+    if (location.includes("leg")) return 0.4
+    if (location == "chest") return 0.5
+    return 0.3 // Abdomen case
+  }
 
   /* -------------------------------------------- */
   static async rollDarkStars(rollData) {
@@ -271,13 +279,13 @@ export class DarkStarsUtility {
 
     // ability/save/size => 0
     rollData.percentValue = 0
-    if ( rollData.skill ) {
+    if (rollData.skill) {
       rollData.percentValue = rollData.skill.total
     }
-    rollData.percentValue += rollData.bonusMalus 
+    rollData.percentValue += rollData.bonusMalus
     rollData.diceFormula = "1d100"
 
-    if (rollData.isAboveEffectiveRange)  {
+    if (rollData.isAboveEffectiveRange) {
       rollData.percentValue -= 30
       rollData.percentValue = Math.max(0, rollData.percentValue)
     }
@@ -299,18 +307,23 @@ export class DarkStarsUtility {
     rollData.isCriticalFailure = rollData.diceResult == 100
     rollData.isSuccess = rollData.diceResult == 1 || rollData.diceResult <= rollData.percentValue
     rollData.isFailure = rollData.diceResult == 100 || rollData.diceResult > rollData.percentValue
-    rollData.degrees = Math.floor(rollData.percentValue/10) - Math.floor(rollData.diceResult/10)
-    
+    rollData.degrees = Math.floor(rollData.percentValue / 10) - Math.floor(rollData.diceResult / 10)
+    rollData.damageMultiplier = rollData.isCriticalSuccess ? 2 : 1
+
     if (rollData.reroll) {
       actor.modifyRerolls(-1)
       rollData.rerolls = 0 // DIsable rerolls
     }
 
-    if (rollData.weaponAiming == "none" ) {
-      let rollLoc = new Roll("1d10").roll({async: false})
-      rollData.weaponAiming = this.getAimingLocation(rollLoc.total)
+    if (rollData.mode == "weapon") {
+      if (rollData.weaponAiming == "none") {
+        let rollLoc = new Roll("1d10").roll({ async: false })
+        rollData.weaponAiming = this.getAimingLocation(rollLoc.total)
+      }
+      // Compute
+      rollData.locationMultiplier = this.locationMultiplier(rollData.weaponAiming)
     }
-
+    
     let msg = await this.createChatWithRollMode(rollData.alias, {
       content: await renderTemplate(`systems/fvtt-dark-stars/templates/chat/chat-generic-result.hbs`, rollData)
     })
@@ -418,7 +431,7 @@ export class DarkStarsUtility {
     let rollData = {
       rollId: randomID(16),
       rollMode: game.settings.get("core", "rollMode"),
-      bonusMalus : 0,
+      bonusMalus: 0,
       isAboveEffectiveRange: false,
       weaponAiming: "none"
     }

packs/aldebaran/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000040

packs/aldebaran/LOG

@@ -0,0 +1,7 @@
+2023/11/26-22:58:14.589215 7f3d1f7fe6c0 Recovering log #38
+2023/11/26-22:58:14.599060 7f3d1f7fe6c0 Delete type=3 #36
+2023/11/26-22:58:14.599171 7f3d1f7fe6c0 Delete type=0 #38
+2023/11/26-22:59:30.354804 7f3d1dffb6c0 Level-0 table #43: started
+2023/11/26-22:59:30.354853 7f3d1dffb6c0 Level-0 table #43: 0 bytes OK
+2023/11/26-22:59:30.361332 7f3d1dffb6c0 Delete type=0 #41
+2023/11/26-22:59:30.375157 7f3d1dffb6c0 Manual compaction at level-0 from '!folders!MA6uFJMVebGeayIk' @ 72057594037927935 : 1 .. '!items!zWXriFfWH4wiyUzv' @ 0 : 0; will stop at (end)

packs/aldebaran/LOG.old

@@ -0,0 +1,7 @@
+2023/11/25-11:53:56.148290 7fd092bff6c0 Recovering log #35
+2023/11/25-11:53:56.158572 7fd092bff6c0 Delete type=0 #35
+2023/11/25-11:53:56.158657 7fd092bff6c0 Delete type=3 #34
+2023/11/25-11:54:27.006917 7fd090bfb6c0 Level-0 table #39: started
+2023/11/25-11:54:27.006997 7fd090bfb6c0 Level-0 table #39: 0 bytes OK
+2023/11/25-11:54:27.015085 7fd090bfb6c0 Delete type=0 #37
+2023/11/25-11:54:27.015315 7fd090bfb6c0 Manual compaction at level-0 from '!folders!MA6uFJMVebGeayIk' @ 72057594037927935 : 1 .. '!items!zWXriFfWH4wiyUzv' @ 0 : 0; will stop at (end)

packs/armor/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/armor/LOG

@@ -1,8 +1,8 @@
-2023/10/10-13:02:58.870058 7fb8ba7fc6c0 Recovering log #40
-2023/10/10-13:02:58.880628 7fb8ba7fc6c0 Delete type=3 #38
-2023/10/10-13:02:58.880699 7fb8ba7fc6c0 Delete type=0 #40
-2023/10/10-13:03:57.333218 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.333256 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.369083 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.407449 7fb8b97fa6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/10-13:03:57.476948 7fb8b97fa6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.465883 7f3d1ffff6c0 Recovering log #148
+2023/11/26-22:58:14.475277 7f3d1ffff6c0 Delete type=3 #146
+2023/11/26-22:58:14.475331 7f3d1ffff6c0 Delete type=0 #148
+2023/11/26-22:59:30.270666 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.270697 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.277045 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.283479 7f3d1dffb6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.294416 7f3d1dffb6c0 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/10-12:56:07.885464 7fb8ba7fc6c0 Recovering log #36
-2023/10/10-12:56:07.903712 7fb8ba7fc6c0 Delete type=3 #34
-2023/10/10-12:56:07.903825 7fb8ba7fc6c0 Delete type=0 #36
-2023/10/10-13:02:45.680500 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.680550 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.689407 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.698832 7fb8b97fa6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
-2023/10/10-13:02:45.711385 7fb8b97fa6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:55.987706 7fd091bfd6c0 Recovering log #144
+2023/11/25-11:53:55.997898 7fd091bfd6c0 Delete type=3 #142
+2023/11/25-11:53:55.997959 7fd091bfd6c0 Delete type=0 #144
+2023/11/25-11:54:26.939109 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.939141 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.946683 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:26.959662 7fd090bfb6c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:26.959698 7fd090bfb6c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end)

packs/beyondtheblacksea/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000043

packs/beyondtheblacksea/LOG

@@ -0,0 +1,7 @@
+2023/11/26-22:58:14.601405 7f3d1e7fc6c0 Recovering log #41
+2023/11/26-22:58:14.611967 7f3d1e7fc6c0 Delete type=3 #39
+2023/11/26-22:58:14.612027 7f3d1e7fc6c0 Delete type=0 #41
+2023/11/26-22:59:30.361430 7f3d1dffb6c0 Level-0 table #46: started
+2023/11/26-22:59:30.361451 7f3d1dffb6c0 Level-0 table #46: 0 bytes OK
+2023/11/26-22:59:30.367909 7f3d1dffb6c0 Delete type=0 #44
+2023/11/26-22:59:30.375166 7f3d1dffb6c0 Manual compaction at level-0 from '!folders!Gh3dOV5MWEUqOK83' @ 72057594037927935 : 1 .. '!items!zwMpjsE84sk26eej' @ 0 : 0; will stop at (end)

packs/beyondtheblacksea/LOG.old

@@ -0,0 +1,7 @@
+2023/11/25-11:53:56.161415 7fd0913fc6c0 Recovering log #38
+2023/11/25-11:53:56.170729 7fd0913fc6c0 Delete type=0 #38
+2023/11/25-11:53:56.170780 7fd0913fc6c0 Delete type=3 #37
+2023/11/25-11:54:27.021721 7fd090bfb6c0 Level-0 table #42: started
+2023/11/25-11:54:27.021762 7fd090bfb6c0 Level-0 table #42: 0 bytes OK
+2023/11/25-11:54:27.028409 7fd090bfb6c0 Delete type=0 #40
+2023/11/25-11:54:27.028540 7fd090bfb6c0 Manual compaction at level-0 from '!folders!Gh3dOV5MWEUqOK83' @ 72057594037927935 : 1 .. '!items!zwMpjsE84sk26eej' @ 0 : 0; will stop at (end)

packs/conditions/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/conditions/LOG

@@ -1,7 +1,7 @@
-2023/10/10-13:02:58.920624 7fb8ba7fc6c0 Recovering log #40
-2023/10/10-13:02:58.932301 7fb8ba7fc6c0 Delete type=3 #38
-2023/10/10-13:02:58.932409 7fb8ba7fc6c0 Delete type=0 #40
-2023/10/10-13:03:57.511725 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.511754 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.549885 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.630117 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.515713 7f3d1ffff6c0 Recovering log #148
+2023/11/26-22:58:14.526380 7f3d1ffff6c0 Delete type=3 #146
+2023/11/26-22:58:14.526433 7f3d1ffff6c0 Delete type=0 #148
+2023/11/26-22:59:30.313953 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.313979 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.320020 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.320135 7f3d1dffb6c0 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/10-12:56:07.977477 7fb8ba7fc6c0 Recovering log #36
-2023/10/10-12:56:07.988921 7fb8ba7fc6c0 Delete type=3 #34
-2023/10/10-12:56:07.988993 7fb8ba7fc6c0 Delete type=0 #36
-2023/10/10-13:02:45.737650 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.737688 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.746588 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.746786 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.037176 7fd091bfd6c0 Recovering log #144
+2023/11/25-11:53:56.047186 7fd091bfd6c0 Delete type=3 #142
+2023/11/25-11:53:56.047263 7fd091bfd6c0 Delete type=0 #144
+2023/11/25-11:54:26.966421 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.966444 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.972594 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:26.986318 7fd090bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/currency/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/currency/LOG

@@ -1,7 +1,7 @@
-2023/10/10-13:02:58.934342 7fb8b9ffb6c0 Recovering log #40
-2023/10/10-13:02:58.944542 7fb8b9ffb6c0 Delete type=3 #38
-2023/10/10-13:02:58.944867 7fb8b9ffb6c0 Delete type=0 #40
-2023/10/10-13:03:57.550046 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.550075 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.587073 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.630133 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.528083 7f3d1effd6c0 Recovering log #148
+2023/11/26-22:58:14.537438 7f3d1effd6c0 Delete type=3 #146
+2023/11/26-22:58:14.537516 7f3d1effd6c0 Delete type=0 #148
+2023/11/26-22:59:30.320217 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.320240 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.326969 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.347752 7f3d1dffb6c0 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/10-12:56:07.991428 7fb8bb7fe6c0 Recovering log #36
-2023/10/10-12:56:08.002283 7fb8bb7fe6c0 Delete type=3 #34
-2023/10/10-12:56:08.002401 7fb8bb7fe6c0 Delete type=0 #36
-2023/10/10-13:02:45.721220 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.721260 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.729318 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.746755 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.048914 7fd0923fe6c0 Recovering log #144
+2023/11/25-11:53:56.058887 7fd0923fe6c0 Delete type=3 #142
+2023/11/25-11:53:56.058947 7fd0923fe6c0 Delete type=0 #144
+2023/11/25-11:54:26.959805 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.959829 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.966338 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:26.986308 7fd090bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/cybernetics/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000079

packs/cybernetics/LOG

@@ -0,0 +1,8 @@
+2023/11/26-22:58:14.563668 7f3d1ffff6c0 Recovering log #77
+2023/11/26-22:58:14.573793 7f3d1ffff6c0 Delete type=3 #75
+2023/11/26-22:58:14.573840 7f3d1ffff6c0 Delete type=0 #77
+2023/11/26-22:59:30.341302 7f3d1dffb6c0 Level-0 table #82: started
+2023/11/26-22:59:30.341329 7f3d1dffb6c0 Level-0 table #82: 0 bytes OK
+2023/11/26-22:59:30.347583 7f3d1dffb6c0 Delete type=0 #80
+2023/11/26-22:59:30.347793 7f3d1dffb6c0 Manual compaction at level-0 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.347823 7f3d1dffb6c0 Manual compaction at level-1 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)

packs/cybernetics/LOG.old

@@ -0,0 +1,8 @@
+2023/11/25-11:53:56.123402 7fd091bfd6c0 Recovering log #73
+2023/11/25-11:53:56.133061 7fd091bfd6c0 Delete type=3 #71
+2023/11/25-11:53:56.133163 7fd091bfd6c0 Delete type=0 #73
+2023/11/25-11:54:27.000544 7fd090bfb6c0 Level-0 table #78: started
+2023/11/25-11:54:27.000572 7fd090bfb6c0 Level-0 table #78: 0 bytes OK
+2023/11/25-11:54:27.006700 7fd090bfb6c0 Delete type=0 #76
+2023/11/25-11:54:27.015300 7fd090bfb6c0 Manual compaction at level-0 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:27.015342 7fd090bfb6c0 Manual compaction at level-1 from '!items!0SbSmYdxJSlcNr6x' @ 72057594037927935 : 1 .. '!items!yyCPVVl8vmMOfPcN' @ 0 : 0; will stop at (end)

packs/equipment/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/equipment/LOG

@@ -1,7 +1,8 @@
-2023/10/10-13:02:58.882548 7fb8b9ffb6c0 Recovering log #40
-2023/10/10-13:02:58.892996 7fb8b9ffb6c0 Delete type=3 #38
-2023/10/10-13:02:58.893055 7fb8b9ffb6c0 Delete type=0 #40
-2023/10/10-13:03:57.369324 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.369366 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.407239 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.476916 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.476977 7f3d1effd6c0 Recovering log #148
+2023/11/26-22:58:14.487561 7f3d1effd6c0 Delete type=3 #146
+2023/11/26-22:58:14.487805 7f3d1effd6c0 Delete type=0 #148
+2023/11/26-22:59:30.294449 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.294506 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.300665 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.313940 7f3d1dffb6c0 Manual compaction at level-0 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.320119 7f3d1dffb6c0 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/10-12:56:07.905817 7fb8bb7fe6c0 Recovering log #36
-2023/10/10-12:56:07.922816 7fb8bb7fe6c0 Delete type=3 #34
-2023/10/10-12:56:07.922878 7fb8bb7fe6c0 Delete type=0 #36
-2023/10/10-13:02:45.689545 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.689571 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.698697 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.711360 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.000006 7fd0923fe6c0 Recovering log #144
+2023/11/25-11:53:56.009809 7fd0923fe6c0 Delete type=3 #142
+2023/11/25-11:53:56.009912 7fd0923fe6c0 Delete type=0 #144
+2023/11/25-11:54:26.946787 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.946809 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.952758 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:26.959673 7fd090bfb6c0 Manual compaction at level-0 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:26.959705 7fd090bfb6c0 Manual compaction at level-1 from '!items!05RVU3UcRabogEvL' @ 72057594037927935 : 1 .. '!items!xNmOdMs4rQ0yiVzg' @ 0 : 0; will stop at (end)

packs/genetics/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000027

packs/genetics/LOG

@@ -0,0 +1,8 @@
+2023/11/26-22:58:14.576205 7f3d1effd6c0 Recovering log #25
+2023/11/26-22:58:14.587249 7f3d1effd6c0 Delete type=3 #23
+2023/11/26-22:58:14.587302 7f3d1effd6c0 Delete type=0 #25
+2023/11/26-22:59:30.347856 7f3d1dffb6c0 Level-0 table #30: started
+2023/11/26-22:59:30.347877 7f3d1dffb6c0 Level-0 table #30: 0 bytes OK
+2023/11/26-22:59:30.354594 7f3d1dffb6c0 Delete type=0 #28
+2023/11/26-22:59:30.375145 7f3d1dffb6c0 Manual compaction at level-0 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.375173 7f3d1dffb6c0 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/11/25-11:53:56.135361 7fd0923fe6c0 Recovering log #21
+2023/11/25-11:53:56.145751 7fd0923fe6c0 Delete type=3 #19
+2023/11/25-11:53:56.145806 7fd0923fe6c0 Delete type=0 #21
+2023/11/25-11:54:26.993034 7fd090bfb6c0 Level-0 table #26: started
+2023/11/25-11:54:26.993055 7fd090bfb6c0 Level-0 table #26: 0 bytes OK
+2023/11/25-11:54:27.000358 7fd090bfb6c0 Delete type=0 #24
+2023/11/25-11:54:27.015280 7fd090bfb6c0 Manual compaction at level-0 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:27.015355 7fd090bfb6c0 Manual compaction at level-1 from '!items!56A3sVsiN7KI6a45' @ 72057594037927935 : 1 .. '!items!zJiASbV3QqH2oHb1' @ 0 : 0; will stop at (end)

packs/nightborough/CURRENT

@@ -0,0 +1 @@
+MANIFEST-000043

packs/nightborough/LOG

@@ -0,0 +1,7 @@
+2023/11/26-22:58:14.615228 7f3d1ffff6c0 Recovering log #41
+2023/11/26-22:58:14.625406 7f3d1ffff6c0 Delete type=3 #39
+2023/11/26-22:58:14.625501 7f3d1ffff6c0 Delete type=0 #41
+2023/11/26-22:59:30.368017 7f3d1dffb6c0 Level-0 table #46: started
+2023/11/26-22:59:30.368039 7f3d1dffb6c0 Level-0 table #46: 0 bytes OK
+2023/11/26-22:59:30.375036 7f3d1dffb6c0 Delete type=0 #44
+2023/11/26-22:59:30.375179 7f3d1dffb6c0 Manual compaction at level-0 from '!folders!2iZtDz80npHPIwkS' @ 72057594037927935 : 1 .. '!items!zv07ZCqoczWKdT2b' @ 0 : 0; will stop at (end)

packs/nightborough/LOG.old

@@ -0,0 +1,7 @@
+2023/11/25-11:53:56.174133 7fd091bfd6c0 Recovering log #38
+2023/11/25-11:53:56.184063 7fd091bfd6c0 Delete type=0 #38
+2023/11/25-11:53:56.184110 7fd091bfd6c0 Delete type=3 #37
+2023/11/25-11:54:27.015463 7fd090bfb6c0 Level-0 table #42: started
+2023/11/25-11:54:27.015494 7fd090bfb6c0 Level-0 table #42: 0 bytes OK
+2023/11/25-11:54:27.021563 7fd090bfb6c0 Delete type=0 #40
+2023/11/25-11:54:27.028525 7fd090bfb6c0 Manual compaction at level-0 from '!folders!2iZtDz80npHPIwkS' @ 72057594037927935 : 1 .. '!items!zv07ZCqoczWKdT2b' @ 0 : 0; will stop at (end)

packs/perks/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/perks/LOG

@@ -1,8 +1,8 @@
-2023/10/10-13:02:58.959677 7fb8baffd6c0 Recovering log #40
-2023/10/10-13:02:58.970175 7fb8baffd6c0 Delete type=3 #38
-2023/10/10-13:02:58.970242 7fb8baffd6c0 Delete type=0 #40
-2023/10/10-13:03:57.630235 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.630269 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.672851 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.709398 7fb8b97fa6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/10-13:03:57.709704 7fb8b97fa6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.551254 7f3d1e7fc6c0 Recovering log #148
+2023/11/26-22:58:14.561024 7f3d1e7fc6c0 Delete type=3 #146
+2023/11/26-22:58:14.561528 7f3d1e7fc6c0 Delete type=0 #148
+2023/11/26-22:59:30.333656 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.333697 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.341193 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.347786 7f3d1dffb6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.347830 7f3d1dffb6c0 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/10-12:56:08.021175 7fb8baffd6c0 Recovering log #36
-2023/10/10-12:56:08.030985 7fb8baffd6c0 Delete type=3 #34
-2023/10/10-12:56:08.031047 7fb8baffd6c0 Delete type=0 #36
-2023/10/10-13:02:45.753579 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.753608 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.761146 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.761387 7fb8b97fa6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
-2023/10/10-13:02:45.761412 7fb8b97fa6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.109779 7fd0913fc6c0 Recovering log #144
+2023/11/25-11:53:56.120897 7fd0913fc6c0 Delete type=3 #142
+2023/11/25-11:53:56.120965 7fd0913fc6c0 Delete type=0 #144
+2023/11/25-11:54:26.986457 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.986489 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.992967 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:27.015253 7fd090bfb6c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:27.015329 7fd090bfb6c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end)

packs/shields/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/shields/LOG

@@ -1,7 +1,7 @@
-2023/10/10-13:02:58.894614 7fb8bb7fe6c0 Recovering log #40
-2023/10/10-13:02:58.904547 7fb8bb7fe6c0 Delete type=3 #38
-2023/10/10-13:02:58.904621 7fb8bb7fe6c0 Delete type=0 #40
-2023/10/10-13:03:57.477039 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.477065 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.511617 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.630095 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.491751 7f3d1f7fe6c0 Recovering log #148
+2023/11/26-22:58:14.501842 7f3d1f7fe6c0 Delete type=3 #146
+2023/11/26-22:58:14.501903 7f3d1f7fe6c0 Delete type=0 #148
+2023/11/26-22:59:30.307357 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.307385 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.313810 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.320127 7f3d1dffb6c0 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/10-12:56:07.928078 7fb8b9ffb6c0 Recovering log #36
-2023/10/10-12:56:07.951219 7fb8b9ffb6c0 Delete type=3 #34
-2023/10/10-12:56:07.951274 7fb8b9ffb6c0 Delete type=0 #36
-2023/10/10-13:02:45.729495 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.729530 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.737463 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.746770 7fb8b97fa6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.013578 7fd092bff6c0 Recovering log #144
+2023/11/25-11:53:56.023494 7fd092bff6c0 Delete type=3 #142
+2023/11/25-11:53:56.023547 7fd092bff6c0 Delete type=0 #144
+2023/11/25-11:54:26.952877 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.952930 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.959512 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:26.959683 7fd090bfb6c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end)

packs/skills/CURRENT

@@ -1 +1 @@
-MANIFEST-000042
+MANIFEST-000150

packs/skills/LOG

@@ -1,8 +1,8 @@
-2023/10/10-13:02:58.947342 7fb8bb7fe6c0 Recovering log #40
-2023/10/10-13:02:58.957769 7fb8bb7fe6c0 Delete type=3 #38
-2023/10/10-13:02:58.957853 7fb8bb7fe6c0 Delete type=0 #40
-2023/10/10-13:03:57.673002 7fb8b97fa6c0 Level-0 table #45: started
-2023/10/10-13:03:57.673036 7fb8b97fa6c0 Level-0 table #45: 0 bytes OK
-2023/10/10-13:03:57.709266 7fb8b97fa6c0 Delete type=0 #43
-2023/10/10-13:03:57.709730 7fb8b97fa6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/10-13:03:57.709887 7fb8b97fa6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.538746 7f3d1f7fe6c0 Recovering log #148
+2023/11/26-22:58:14.549532 7f3d1f7fe6c0 Delete type=3 #146
+2023/11/26-22:58:14.549584 7f3d1f7fe6c0 Delete type=0 #148
+2023/11/26-22:59:30.327065 7f3d1dffb6c0 Level-0 table #153: started
+2023/11/26-22:59:30.327089 7f3d1dffb6c0 Level-0 table #153: 0 bytes OK
+2023/11/26-22:59:30.333290 7f3d1dffb6c0 Delete type=0 #151
+2023/11/26-22:59:30.347772 7f3d1dffb6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.347800 7f3d1dffb6c0 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/10-12:56:08.005346 7fb8b9ffb6c0 Recovering log #36
-2023/10/10-12:56:08.015748 7fb8b9ffb6c0 Delete type=3 #34
-2023/10/10-12:56:08.015827 7fb8b9ffb6c0 Delete type=0 #36
-2023/10/10-13:02:45.746905 7fb8b97fa6c0 Level-0 table #41: started
-2023/10/10-13:02:45.746952 7fb8b97fa6c0 Level-0 table #41: 0 bytes OK
-2023/10/10-13:02:45.753418 7fb8b97fa6c0 Delete type=0 #39
-2023/10/10-13:02:45.761349 7fb8b97fa6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
-2023/10/10-13:02:45.761401 7fb8b97fa6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.060684 7fd092bff6c0 Recovering log #144
+2023/11/25-11:53:56.071237 7fd092bff6c0 Delete type=3 #142
+2023/11/25-11:53:56.071323 7fd092bff6c0 Delete type=0 #144
+2023/11/25-11:54:26.980220 7fd090bfb6c0 Level-0 table #149: started
+2023/11/25-11:54:26.980243 7fd090bfb6c0 Level-0 table #149: 0 bytes OK
+2023/11/25-11:54:26.986189 7fd090bfb6c0 Delete type=0 #147
+2023/11/25-11:54:26.986336 7fd090bfb6c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:26.986355 7fd090bfb6c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end)

packs/weapons/CURRENT

@@ -1 +1 @@
-MANIFEST-000043
+MANIFEST-000151

packs/weapons/LOG

@@ -1,8 +1,8 @@
-2023/10/10-13:02:58.906782 7fb8baffd6c0 Recovering log #41
-2023/10/10-13:02:58.917983 7fb8baffd6c0 Delete type=3 #39
-2023/10/10-13:02:58.918205 7fb8baffd6c0 Delete type=0 #41
-2023/10/10-13:03:57.587289 7fb8b97fa6c0 Level-0 table #46: started
-2023/10/10-13:03:57.587326 7fb8b97fa6c0 Level-0 table #46: 0 bytes OK
-2023/10/10-13:03:57.629924 7fb8b97fa6c0 Delete type=0 #44
-2023/10/10-13:03:57.630149 7fb8b97fa6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/10-13:03:57.630181 7fb8b97fa6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/11/26-22:58:14.503529 7f3d1e7fc6c0 Recovering log #149
+2023/11/26-22:58:14.513192 7f3d1e7fc6c0 Delete type=3 #147
+2023/11/26-22:58:14.513247 7f3d1e7fc6c0 Delete type=0 #149
+2023/11/26-22:59:30.300783 7f3d1dffb6c0 Level-0 table #154: started
+2023/11/26-22:59:30.300803 7f3d1dffb6c0 Level-0 table #154: 0 bytes OK
+2023/11/26-22:59:30.307250 7f3d1dffb6c0 Delete type=0 #152
+2023/11/26-22:59:30.320107 7f3d1dffb6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/11/26-22:59:30.320142 7f3d1dffb6c0 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/10-12:56:07.960871 7fb8baffd6c0 Recovering log #37
-2023/10/10-12:56:07.972451 7fb8baffd6c0 Delete type=3 #35
-2023/10/10-12:56:07.972510 7fb8baffd6c0 Delete type=0 #37
-2023/10/10-13:02:45.711546 7fb8b97fa6c0 Level-0 table #42: started
-2023/10/10-13:02:45.711570 7fb8b97fa6c0 Level-0 table #42: 0 bytes OK
-2023/10/10-13:02:45.721031 7fb8b97fa6c0 Delete type=0 #40
-2023/10/10-13:02:45.746738 7fb8b97fa6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
-2023/10/10-13:02:45.746799 7fb8b97fa6c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/11/25-11:53:56.025155 7fd0913fc6c0 Recovering log #145
+2023/11/25-11:53:56.034729 7fd0913fc6c0 Delete type=3 #143
+2023/11/25-11:53:56.034992 7fd0913fc6c0 Delete type=0 #145
+2023/11/25-11:54:26.972747 7fd090bfb6c0 Level-0 table #150: started
+2023/11/25-11:54:26.972787 7fd090bfb6c0 Level-0 table #150: 0 bytes OK
+2023/11/25-11:54:26.980115 7fd090bfb6c0 Delete type=0 #148
+2023/11/25-11:54:26.986328 7fd090bfb6c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end)
+2023/11/25-11:54:26.986362 7fd090bfb6c0 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

@@ -92,6 +92,51 @@
       "system": "fvtt-dark-stars",
       "private": false,
       "flags": {}
+    },
+    {
+      "type": "Item",
+      "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": {}
+    },
+    {
+      "type": "Item",
+      "label": "Aldebaran",
+      "name": "aldebaran",
+      "path": "packs/aldebaran",
+      "system": "fvtt-dark-stars",
+      "private": false,
+      "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Beyond the Black Sea",
+      "name": "beyondtheblacksea",
+      "path": "packs/beyondtheblacksea",
+      "system": "fvtt-dark-stars",
+      "private": false,
+      "flags": {}
+    },
+    {
+      "type": "Item",
+      "label": "Nightborough",
+      "name": "nightborough",
+      "path": "packs/nightborough",
+      "system": "fvtt-dark-stars",
+      "private": false,
+      "flags": {}
     }
   ],
   "primaryTokenAttribute": "secondary.hp",
@@ -100,14 +145,14 @@
   "styles": [
     "styles/simple.css"
   ],
-  "version": "11.0.2",
+  "version": "11.0.17",
   "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.2.zip",
+  "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.17.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
             ],
@@ -278,8 +285,34 @@
       "weapon",
       "money",
       "genetic",
-      "cyber"
+      "cyber",
+      "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,
@@ -299,14 +332,31 @@
       "description": ""
     },
     "genetic": {
-      "hup": 0,
+      "genertictype": "I",
+      "upgrade": "",
+      "upgradelocation": "",
+      "size": "",
+      "power": "",
+      "sp": 0,
+      "sdp": 0,
+      "hup": "",
+      "surgery": "",
+      "availability": "",
+      "cost": 0,
+      "equipped": false,
       "description": ""
     },
     "cyber": {
-      "hup": 0,
-      "bulk": 0,
+      "cybertype": "I",
+      "upgrade": "",
+      "upgradelocation": "",
+      "size": "",
+      "power": "",
       "sp": 0,
-      "runningtime": 0,
+      "sdp": 0,
+      "hup": "",
+      "surgery": "",
+      "availability": "",
       "cost": 0,
       "equipped": false,
       "description": ""
@@ -360,10 +410,12 @@
     },
     "equipment": {
       "equiptype": "",
-      "cost": 0,
       "skillbonus": "",
       "quantity": 0,
       "bulk": 0,
+      "sp": 0,
+      "runningtime": 0,
+      "cost": 0,
       "equipped": false,
       "iscontainer": false,
       "containercapacity": 0,
@@ -375,11 +427,24 @@
       "quantity": 0,
       "description": ""
     },
+    "ammo": {
+      "ava": "",
+      "damage": "",
+      "bulk": 0,
+      "br": 0,
+      "cost": 0,
+      "sp": 0,
+      "quantity": 0,
+      "properties": ""
+    },
     "weapon": {
       "weapontype": "",
       "associatedskill": "",
+      "skill": "",
       "penetrationmin": "",
       "penetrationmax": "",
+      "needammo": false,
+      "ammoid": "",
       "hashpdamage": true,
       "damage": "",
       "hasfatiguedamage": 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,37 +236,67 @@
         <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-short">
+              <span class="item-field-label-medium">
                 <label class="short-label">Type</label>
               </span>
               <span class="item-field-label-long">
                 <label class="short-label">Skill</label>
               </span>
-              <span class="item-field-label-medium">
+              <span class="item-field-label-long">
+                <label class="short-label">Ammo</label>
+              </span>
+              <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-short">{{upperFirst weapon.system.weapontype}}</span>
+              <span class="item-field-label-medium">{{upperFirst weapon.system.weapontype}}</span>
 
-              <span class="item-field-label-long">{{weapon.system.skill}}</span>
-
-              <span class="item-field-label-long">{{weapon.system.damage}}</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">
+                  {{#select system.ammoid}}
+                    <option value="">None</option>
+                    {{#each @root.ammos as |ammo index|}}
+                    <option value="{{ammo._id}}">{{ammo.name}}</option>
+                    {{/each}}
+                  {{/select}}
+                </select>
+                {{#if weapon.ammo}}              
+                  <span class="item-field-label-medium   margin-left-4"><label>{{weapon.ammo.system.damage}}</label></span>
+                {{else}}
+                  <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  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>
@@ -296,12 +412,20 @@
           <span class="item-name-label-header">
             <h3><label class="items-title-text">Weapons</label></h3>
           </span>
-          <span class="item-field-label-short">
+
+          <span class="item-field-label-medium">
             <label class="short-label">Attack</label>
           </span>
-          <span class="item-field-label-short">
-            <label class="short-label">Damage</label>
+
+          <span class="item-field-label-vlong">
+            <label class="short-label">Ammo</label>
           </span>
+
+          <span class="item-field-label-medium">
+            <label class="short-label">Damage</label>
+          </span>          
+          
+          <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
           </div>
@@ -311,8 +435,27 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{weapon.img}}" /></a>
           <span class="item-name-label">{{weapon.name}}</span>
-          <span class="item-field-label-short"><label>{{weapon.system.ability}}</label></span>
-          <span class="item-field-label-short"><label>{{weapon.system.damage}}</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">
+              {{#select system.ammoid}}
+                <option value="">None</option>
+                {{#each @root.ammos as |ammo index|}}
+                <option value="{{ammo._id}}">{{ammo.name}}</option>
+                {{/each}}
+              {{/select}}
+            </select>
+            {{#if weapon.ammo}}              
+              <span class="item-field-label-medium"><label>{{weapon.ammo.system.damage}}</label></span>
+            {{else}}
+              <span class="item-field-label-medium"><label>-</label></span>
+            {{/if}}
+          {{else}}
+            <span class="item-field-label-vlong"><label>N/A</label></span>
+            <span class="item-field-label-medium"><label>{{weapon.system.damage}}</label></span>
+          {{/if}}
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
@@ -324,15 +467,47 @@
         {{/each}}
       </ul>
 
+      <ul class="item-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Ammos</label></h3>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Quantity</label>
+          </span>
+          <span class="item-field-label-short">
+            <label class="short-label">Damage</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="weapon" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+        </li>
+        {{#each ammos as |ammo key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{ammo._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{ammo.img}}" /></a>
+          <span class="item-name-label">{{ammo.name}}</span>
+          <span class="item-field-label-short"><label>{{ammo.system.quantity}}</label></span>
+          <span class="item-field-label-short"><label>{{ammo.system.damage}}</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="item-list alternate-list">
         <li class="item flexrow list-item items-title-bg">
           <span class="item-name-label-header">
             <h3><label class="items-title-text">Armors</label></h3>
           </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-medium">
             <label class="short-label">Type</label>
           </span>
-          <span class="item-field-label-short">
+          <span class="item-field-label-medium">
             <label class="short-label">Absorption</label>
           </span>
 
@@ -346,8 +521,8 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{armor.img}}" /></a>
           <span class="item-name-label">{{armor.name}}</span>
-          <span class="item-field-label-short">{{upper armor.system.armortype}}</span>
-          <span class="item-field-label-short">{{armor.system.absorprionroll}}</span>
+          <span class="item-field-label-medium">{{upper armor.system.armortype}}</span>
+          <span class="item-field-label-medium">{{armor.system.absorprionroll}}</span>
 
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
@@ -394,11 +569,14 @@
           <span class="item-name-label-header">
             <h3><label class="items-title-text">Cyber</label></h3>
           </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Location</label>
+          </span>
           <span class="item-field-label-medium">
             <label class="short-label">SP</label>
           </span>
           <span class="item-field-label-medium">
-            <label class="short-label">Running time</label>
+            <label class="short-label">HUP</label>
           </span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
@@ -410,8 +588,46 @@
           <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
               src="{{cyber.img}}" /></a>
           <span class="item-name-label">{{cyber.name}}</span>
+          <span class="item-field-label-medium">{{cyber.system.upgradelocation}}</span>
           <span class="item-field-label-medium">{{cyber.system.sp}}</span>
-          <span class="item-field-label-medium">{{cyber.system.runningtime}}</span>
+          <span class="item-field-label-medium">{{cyber.system.hup}}</span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-equip" title="Worn">{{#if cyber.system.equipped}}<i
+                class="fas fa-circle"></i>{{else}}<i class="fas fa-genderless"></i>{{/if}}</a>
+            <a class="item-control item-delete" title="Delete Item"><i class="fas fa-trash"></i></a>
+          </div>
+        </li>
+        {{/each}}
+      </ul>
+
+      <ul class="item-list alternate-list">
+        <li class="item flexrow list-item items-title-bg">
+          <span class="item-name-label-header">
+            <h3><label class="items-title-text">Genetics</label></h3>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Location</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">SP</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">HUP</label>
+          </span>
+          <div class="item-filler">&nbsp;</div>
+          <div class="item-controls item-controls-fixed">
+            <a class="item-control item-add" data-type="genetic" title="Create Item"><i class="fas fa-plus"></i></a>
+          </div>
+        </li>
+        {{#each genetics as |cyber key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{cyber._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{cyber.img}}" /></a>
+          <span class="item-name-label">{{cyber.name}}</span>
+          <span class="item-field-label-medium">{{cyber.system.upgradelocation}}</span>
+          <span class="item-field-label-medium">{{cyber.system.sp}}</span>
+          <span class="item-field-label-medium">{{cyber.system.hup}}</span>
           <div class="item-filler">&nbsp;</div>
           <div class="item-controls item-controls-fixed">
             <a class="item-control item-equip" title="Worn">{{#if cyber.system.equipped}}<i
@@ -428,7 +644,13 @@
           <span class="item-name-label-header">
             <h3><label class="items-title-text">Equipment</label></h3>
           </span>
-          <span class="item-field-label-long">
+          <span class="item-field-label-medium">
+            <label class="short-label">SP</label>
+          </span>
+          <span class="item-field-label-medium">
+            <label class="short-label">Running Time</label>
+          </span>
+          <span class="item-field-label-medium">
             <label class="short-label">Quantity</label>
           </span>
           <div class="item-filler">&nbsp;</div>
@@ -437,13 +659,19 @@
           </div>
 
         </li>
-        {{#each containersTree as |equip key|}}
-        {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=equip level=1}}
-        <ul class="item-list list-item-shadow2 list-item-margin1">
-          {{#each equip.data.contents as |subgear key|}}
-          {{> systems/fvtt-crucible-rpg/templates/partial-actor-equipment.html equip=subgear level=2}}
-          {{/each}}
-        </ul>
+        {{#each equipments as |equip key|}}
+        <li class="item flexrow list-item list-item-shadow" data-item-id="{{equip._id}}">
+          <a class="item-edit item-name-img" title="Edit Item"><img class="sheet-competence-img"
+              src="{{equip.img}}" /></a>
+          <span class="item-name-label">{{equip.name}}</span>
+          <span class="item-field-label-medium">{{equip.system.sp}}</span>
+          <span class="item-field-label-medium">{{equip.system.runningtime}}</span>
+          <span class="item-field-label-medium">{{equip.system.quantity}}</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>
 

templates/chat/chat-generic-result.hbs

@@ -24,14 +24,13 @@
         {{/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>
         {{/if}}
 
         <li>Bonus/Malus: {{bonusMalus}}% </li>
-        <li>Final score: {{percentValue}}% </li>
+        <li>Target Number: {{percentValue}}% </li>
         <li>Result: {{diceResult}} </li>
         <li>Degrees: {{degrees}} </li>
         
@@ -50,12 +49,21 @@
         {{/if}}
 
       {{#if (and weapon isSuccess)}}
-        {{#if weapon.system.hashpdamage}}
-          <li>Roll HP Damage: [[/r {{weapon.system.damage}}]]</li>
-        {{/if}}
-        {{#if weapon.system.hasfatiguedamage}}
-          <li>Roll Fatigue Damage: [[/r {{weapon.system.fatiguedamage}}]]</li>
+        <li>Location hit : {{upperFirst weaponAiming}} ({{locationMalus}})</li>
+        {{#if weapon.ammo}}
+          <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}}]]</li>
+          {{/if}}
+          {{#if weapon.system.hasfatiguedamage}}
+            <li>Roll Fatigue Damage: [[/r {{weapon.ammo.system.fatiguedamage}}*{{damageMultiplier}}]]</li>
+          {{/if}}
+          <li>BR: {{weapon.system.br}}</li>          
         {{/if}}
+          <li>Penetration : {{mul weapon.system.penetrationmin damageMultiplier}} - {{mul weapon.system.penetrationmax damageMultiplier}}</li>          
       {{/if}}
 
       {{#if (and (not isSuccess) rerolls)}}

templates/items/item-ammo-sheet.hbs

@@ -0,0 +1,56 @@
+<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">
+
+      <div class="tab" data-group="primary">
+        <ul>
+
+          <li class="flexrow"><label class="item-field-label-long">Damage formula</label>
+            <input type="text" class="right item-field-label-long" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long">Bulk</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{system.bulk}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long">BR</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.br" value="{{system.br}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long">SP</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.sp" value="{{system.sp}}" data-dtype="Number"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long">Properties</label>
+            <input type="text" class="right item-field-label-long" name="system.properties" value="{{system.properties}}" data-dtype="String"/>
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long">Quantity</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}"
+              data-dtype="Number" />
+          </li>
+
+          <li class="flexrow"><label class="item-field-label-long">Cost</label>
+            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+          </li>
+
+        </ul>
+    </div>
+  </div>
+
+  </section>
+</form>

templates/items/item-cyber-sheet.hbs

@@ -15,24 +15,51 @@
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
-        <li class="flexrow"><label class="generic-label">Bulk</label>
-          <input type="text" class="" name="system.bulk" value="{{system.bulk}}" data-dtype="Number" />
+        <li class="flexrow">
+          <label class="item-field-label-long">Cyber Type</label>
+          <select class="item-field-label-vlong" type="text" name="system.cybertype" value="{{system.cybertype}}"
+            data-dtype="String">
+            {{#select system.cybertype}}
+            {{#each config.cyberTypes as |type key|}}
+            <option value="{{key}}">{{type}}</option>
+            {{/each}}
+            {{/select}}
+          </select>
         </li>
-        <li class="flexrow"><label class="generic-label">SP</label>
-          <input type="text" class="" name="system.sp" value="{{system.sp}}" data-dtype="Number" />
+        <li class="flexrow"><label class="item-field-label-long">Upgrade</label>
+          <input type="text" class="item-field-label-vlong" name="system.upgrade" value="{{system.upgrade}}" data-dtype="String" />
         </li>
-        <li class="flexrow"><label class="generic-label">Running time (hours)</label>
-          <input type="text" class="" name="system.runningtime" value="{{system.runningtime}}" data-dtype="Number" />
+        <li class="flexrow"><label class="item-field-label-long">Upgrade Location</label>
+          <input type="text" class="item-field-label-vlong" name="system.upgradelocation" value="{{system.upgradelocation}}" data-dtype="String" />
         </li>
-        <li class="flexrow"><label class="generic-label">Cost</label>
-          <input type="text" class="" name="system.cost" value="{{system.cost}}" data-dtype="Number" />
+        <li class="flexrow"><label class="item-field-label-long">Size</label>
+          <input type="text" class="item-field-label-vlong" name="system.size" value="{{system.size}}" data-dtype="String" />
         </li>
-        <li class="flexrow"><label class="generic-label">HUP</label>
-          <input type="text" class="" name="system.hup" value="{{system.hup}}" data-dtype="Number" />
+        <li class="flexrow"><label class="item-field-label-long">Power</label>
+          <input type="text" class="item-field-label-vlong" name="system.power" value="{{system.power}}" data-dtype="String" />
         </li>
-          <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>
+        <li class="flexrow"><label class="item-field-label-long">SP</label>
+          <input type="text" class="item-field-label-short" name="system.sp" value="{{system.sp}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">SDP</label>
+          <input type="text" class="item-field-label-short" name="system.sdp" value="{{system.sdp}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">HUP</label>
+          <input type="text" class="item-field-label-vlong" name="system.hup" value="{{system.hup}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Surgery</label>
+          <input type="text" class="item-field-label-vlong" name="system.surgery" value="{{system.surgery}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Availability</label>
+          <input type="text" class="item-field-label-vlong" name="system.availability" value="{{system.availability}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Cost</label>
+          <input type="text" class="item-field-label-short" name="system.cost" value="{{system.cost}}" data-dtype="Number" />
+        </li>
+        <!--<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>

templates/items/item-equipment-sheet.hbs

@@ -1,9 +1,9 @@
 <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>
+    <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}}
@@ -15,20 +15,32 @@
 
     <div class="tab details" data-group="primary" data-tab="details">
       <ul>
-          <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>
-          <li class="flexrow"><label class="item-field-label-long">Quantity</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}" data-dtype="Number"/>
-          </li>
-          <li class="flexrow"><label class="item-field-label-long">Bulk</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{system.bulk}}" data-dtype="Number"/>
-          </li>
-          <li class="flexrow"><label class="item-field-label-long">Cost</label>
-            <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
-          </li>
+        <li class="flexrow"><label class="item-field-label-long">Bulk</label>
+          <input type="text" class="input-numeric-short padd-right" name="system.bulk" value="{{system.bulk}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">SP</label>
+          <input type="text" class="item-field-label-short" name="system.sp" value="{{system.sp}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Running time</label>
+          <input type="text" class="item-field-label-short" name="system.runningtime" value="{{system.runningtime}}"
+            data-dtype="Number" />
+        </li>
+        <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>
+        <li class="flexrow"><label class="item-field-label-long">Quantity</label>
+          <input type="text" class="input-numeric-short padd-right" name="system.quantity" value="{{system.quantity}}"
+            data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Cost</label>
+          <input type="text" class="input-numeric-short padd-right" name="system.cost" value="{{system.cost}}"
+            data-dtype="Number" />
+        </li>
       </ul>
     </div>
 
   </section>
-</form>
+</form>

templates/items/item-genetic-sheet.hbs

@@ -14,12 +14,53 @@
       {{> 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="generic-label">HUP</label>
-              <input type="text" class="" name="system.hup" value="{{system.hup}}" data-dtype="Number"/>
-            </li>
-
-          </ul>
+      <ul>
+        <li class="flexrow">
+          <label class="item-field-label-long">Genetic Type</label>
+          <select class="item-field-label-vlong" type="text" name="system.cybertype" value="{{system.cybertype}}"
+            data-dtype="String">
+            {{#select system.cybertype}}
+            {{#each config.cyberTypes as |type key|}}
+            <option value="{{key}}">{{type}}</option>
+            {{/each}}
+            {{/select}}
+          </select>
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Upgrade</label>
+          <input type="text" class="item-field-label-vlong" name="system.upgrade" value="{{system.upgrade}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Upgrade Location</label>
+          <input type="text" class="item-field-label-vlong" name="system.upgradelocation" value="{{system.upgradelocation}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Size</label>
+          <input type="text" class="item-field-label-vlong" name="system.size" value="{{system.size}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Power</label>
+          <input type="text" class="item-field-label-vlong" name="system.power" value="{{system.power}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">SP</label>
+          <input type="text" class="item-field-label-short" name="system.sp" value="{{system.sp}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">SDP</label>
+          <input type="text" class="item-field-label-short" name="system.sdp" value="{{system.sdp}}" data-dtype="Number" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">HUP</label>
+          <input type="text" class="item-field-label-vlong" name="system.hup" value="{{system.hup}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Surgery</label>
+          <input type="text" class="item-field-label-vlong" name="system.surgery" value="{{system.surgery}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Availability</label>
+          <input type="text" class="item-field-label-vlong" name="system.availability" value="{{system.availability}}" data-dtype="String" />
+        </li>
+        <li class="flexrow"><label class="item-field-label-long">Cost</label>
+          <input type="text" class="item-field-label-short" name="system.cost" value="{{system.cost}}" data-dtype="Number" />
+        </li>
+        <!--<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>

templates/items/item-job-sheet.hbs

@@ -0,0 +1,54 @@
+<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">
+
+        <li class="flexrow"><label class="item-field-label-long">Perk Type</label>
+          <select class="item-field-label-vlong" type="text" name="system.perktype" value="{{system.perktype}}" data-dtype="String">
+            {{#select system.perktype}}
+              {{#each config.perktypes as |type key|}}
+              <option value="{{key}}">{{type}}</option>
+              {{/each}}
+            {{/select}}
+          </select> 
+        </li>
+
+        {{#if (eq system.perktype "normal")}}
+        <li class="flexrow">
+          <label class="item-field-label-long">Starting Skill Cost</label>
+          <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.cost" value="{{system.cost}}" data-dtype="Number"/>
+        </li>
+        {{else}}
+
+          {{#if (eq system.perktype "role")}}
+          <li class="flexrow">
+            <label class="item-field-label-long">Role</label>
+            <input type="text" class="item-field-label-vlong" name="system.role" value="{{system.role}}" data-dtype="String"/>
+          </li>
+          {{/if}}
+
+          <li class="flexrow">
+            <label class="item-field-label-long">Requirements</label>
+            <input type="text" class="item-field-label-vlong" name="system.requirements" value="{{system.requirements}}" data-dtype="String"/>
+          </li>
+          <li class="flexrow">
+            <label class="item-field-label-long">XP Cost</label>
+            <input type="text" class="item-field-label-medium input-numeric-short padd-right" name="system.xpcost" value="{{system.xpcost}}" data-dtype="Number"/>
+          </li>
+        {{/if}}
+
+        </div>
+    </section>
+</form>

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>

templates/items/item-weapon-sheet.hbs

@@ -47,22 +47,30 @@
             <input type="text" class="right item-field-label-long" name="system.penetrationmax" value="{{system.penetrationmax}}" data-dtype="String"/>
           </li>
 
-          <li class="flexrow"><label class="item-field-label-vlong">HP damage ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="system.hashpdamage" {{checked system.hashpdamage}}/></label>
+          <li class="flexrow"><label class="item-field-label-vlong">Needs Ammunition ?</label>
+            <label class="attribute-value checkbox"><input type="checkbox" name="system.needammo" {{checked system.needammo}}/></label>
           </li>
-          {{#if system.hashpdamage}}
-          <li class="flexrow"><label class="item-field-label-vlong">HP Damage formula</label>
-            <input type="text" class="right item-field-label-long" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
-          </li>
-          {{/if}}
 
-          <li class="flexrow"><label class="item-field-label-vlong">Fatigue damage ?</label>
-            <label class="attribute-value checkbox"><input type="checkbox" name="system.hasfatiguedamage" {{checked system.hasfatiguedamage}}/></label>
-          </li>
-          {{#if system.hasfatiguedamage}}
-          <li class="flexrow"><label class="item-field-label-vlong">Fatigue damage formula</label>
-            <input type="text" class="right item-field-label-long" name="system.fatiguedamage" value="{{system.fatiguedamage}}" data-dtype="String"/>
-          </li>
+          {{#if system.needammo}}
+
+          {{else}}
+            <li class="flexrow"><label class="item-field-label-vlong">HP damage ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.hashpdamage" {{checked system.hashpdamage}}/></label>
+            </li>
+            {{#if system.hashpdamage}}
+            <li class="flexrow"><label class="item-field-label-vlong">HP Damage formula</label>
+              <input type="text" class="right item-field-label-long" name="system.damage" value="{{system.damage}}" data-dtype="String"/>
+            </li>
+            {{/if}}
+
+            <li class="flexrow"><label class="item-field-label-vlong">Fatigue damage ?</label>
+              <label class="attribute-value checkbox"><input type="checkbox" name="system.hasfatiguedamage" {{checked system.hasfatiguedamage}}/></label>
+            </li>
+            {{#if system.hasfatiguedamage}}
+            <li class="flexrow"><label class="item-field-label-vlong">Fatigue damage formula</label>
+              <input type="text" class="right item-field-label-long" name="system.fatiguedamage" value="{{system.fatiguedamage}}" data-dtype="String"/>
+            </li>
+            {{/if}}  
           {{/if}}  
 
           <li class="flexrow"><label class="item-field-label-long">Bulk</label>

templates/partials/partial-options-equipment-types.hbs

@@ -10,4 +10,5 @@
 <option value="vehicle">Vehicles</option>
 <option value="clothing">Clothing</option>
 <option value="ammo">Ammo</option>
+<option value="program">Program</option>
 <option value="misc">Misc</option>