diff --git a/modules/dark-stars-actor-sheet.js b/modules/dark-stars-actor-sheet.js index 31b1399..c9a8724 100644 --- a/modules/dark-stars-actor-sheet.js +++ b/modules/dark-stars-actor-sheet.js @@ -40,6 +40,7 @@ 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()) ), armors: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getArmors())), shields: this.actor.checkAndPrepareEquipments( duplicate(this.actor.getShields())), equipments: this.actor.checkAndPrepareEquipments(duplicate(this.actor.getEquipmentsOnly()) ), @@ -109,6 +110,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 ); diff --git a/modules/dark-stars-actor.js b/modules/dark-stars-actor.js index c7c46c2..f952b3b 100644 --- a/modules/dark-stars-actor.js +++ b/modules/dark-stars-actor.js @@ -158,6 +158,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) + } + } } /* -------------------------------------------- */ @@ -177,6 +184,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; } @@ -188,7 +201,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) @@ -391,12 +410,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 } /* -------------------------------------------- */ @@ -622,6 +643,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 { diff --git a/modules/dark-stars-combat.js b/modules/dark-stars-combat.js index e13d1d8..9444b9f 100644 --- a/modules/dark-stars-combat.js +++ b/modules/dark-stars-combat.js @@ -2,17 +2,29 @@ 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, 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; } @@ -20,11 +32,4 @@ export class DarkStarsCombat extends Combat { _onUpdate(changed, options, userId) { } - /* -------------------------------------------- */ - static async checkTurnPosition() { - while (game.combat.turn > 0) { - await game.combat.previousTurn() - } - } - } diff --git a/packs/armor/000088.log b/packs/armor/000100.log similarity index 100% rename from packs/armor/000088.log rename to packs/armor/000100.log diff --git a/packs/armor/CURRENT b/packs/armor/CURRENT index a43fb19..95395b2 100644 --- a/packs/armor/CURRENT +++ b/packs/armor/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/armor/LOG b/packs/armor/LOG index 772fb08..148d235 100644 --- a/packs/armor/LOG +++ b/packs/armor/LOG @@ -1,8 +1,8 @@ -2023/10/19-14:23:17.464021 7f8105ffb6c0 Recovering log #84 -2023/10/19-14:23:17.473986 7f8105ffb6c0 Delete type=3 #82 -2023/10/19-14:23:17.474084 7f8105ffb6c0 Delete type=0 #84 -2023/10/19-14:23:44.289799 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.289832 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.296197 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.308133 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) -2023/10/19-14:23:44.315305 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.172622 7f8106ffd6c0 Recovering log #96 +2023/10/21-09:46:53.183332 7f8106ffd6c0 Delete type=3 #94 +2023/10/21-09:46:53.183472 7f8106ffd6c0 Delete type=0 #96 +2023/10/21-10:25:16.591050 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.591087 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.597356 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.608021 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.619288 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) diff --git a/packs/armor/LOG.old b/packs/armor/LOG.old index 459c681..e036603 100644 --- a/packs/armor/LOG.old +++ b/packs/armor/LOG.old @@ -1,8 +1,8 @@ -2023/10/19-14:21:21.592351 7f81067fc6c0 Recovering log #80 -2023/10/19-14:21:21.605971 7f81067fc6c0 Delete type=3 #78 -2023/10/19-14:21:21.606020 7f81067fc6c0 Delete type=0 #80 -2023/10/19-14:21:29.423091 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.423116 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.429490 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.429754 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) -2023/10/19-14:21:29.429781 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.542041 7f8105ffb6c0 Recovering log #92 +2023/10/21-09:05:36.602565 7f8105ffb6c0 Delete type=3 #90 +2023/10/21-09:05:36.602727 7f8105ffb6c0 Delete type=0 #92 +2023/10/21-09:46:38.900681 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.900730 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.908919 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.909203 7f7e677006c0 Manual compaction at level-0 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) +2023/10/21-09:46:38.909242 7f7e677006c0 Manual compaction at level-1 from '!items!3O3MjRkrmX4HeaPY' @ 72057594037927935 : 1 .. '!items!q9JGWL4y4udYrzvD' @ 0 : 0; will stop at (end) diff --git a/packs/armor/MANIFEST-000086 b/packs/armor/MANIFEST-000086 deleted file mode 100644 index 5c9f2be..0000000 Binary files a/packs/armor/MANIFEST-000086 and /dev/null differ diff --git a/packs/armor/MANIFEST-000098 b/packs/armor/MANIFEST-000098 new file mode 100644 index 0000000..582ad0f Binary files /dev/null and b/packs/armor/MANIFEST-000098 differ diff --git a/packs/conditions/000088.log b/packs/conditions/000100.log similarity index 100% rename from packs/conditions/000088.log rename to packs/conditions/000100.log diff --git a/packs/conditions/CURRENT b/packs/conditions/CURRENT index a43fb19..95395b2 100644 --- a/packs/conditions/CURRENT +++ b/packs/conditions/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/conditions/LOG b/packs/conditions/LOG index dfff9c1..5e54d65 100644 --- a/packs/conditions/LOG +++ b/packs/conditions/LOG @@ -1,7 +1,7 @@ -2023/10/19-14:23:17.514181 7f8105ffb6c0 Recovering log #84 -2023/10/19-14:23:17.524402 7f8105ffb6c0 Delete type=3 #82 -2023/10/19-14:23:17.524492 7f8105ffb6c0 Delete type=0 #84 -2023/10/19-14:23:44.349622 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.349700 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.359464 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.366187 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.229244 7f8106ffd6c0 Recovering log #96 +2023/10/21-09:46:53.239724 7f8106ffd6c0 Delete type=3 #94 +2023/10/21-09:46:53.239823 7f8106ffd6c0 Delete type=0 #96 +2023/10/21-10:25:16.646538 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.646627 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.654130 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674543 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/LOG.old b/packs/conditions/LOG.old index f7750ec..2db826c 100644 --- a/packs/conditions/LOG.old +++ b/packs/conditions/LOG.old @@ -1,7 +1,7 @@ -2023/10/19-14:21:21.649569 7f81067fc6c0 Recovering log #80 -2023/10/19-14:21:21.659028 7f81067fc6c0 Delete type=3 #78 -2023/10/19-14:21:21.659086 7f81067fc6c0 Delete type=0 #80 -2023/10/19-14:21:29.450398 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.450420 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.457998 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.458158 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.797969 7f8105ffb6c0 Recovering log #92 +2023/10/21-09:05:36.849645 7f8105ffb6c0 Delete type=3 #90 +2023/10/21-09:05:36.849750 7f8105ffb6c0 Delete type=0 #92 +2023/10/21-09:46:38.929884 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.929933 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.937826 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.938170 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/conditions/MANIFEST-000086 b/packs/conditions/MANIFEST-000086 deleted file mode 100644 index 6ddee89..0000000 Binary files a/packs/conditions/MANIFEST-000086 and /dev/null differ diff --git a/packs/conditions/MANIFEST-000098 b/packs/conditions/MANIFEST-000098 new file mode 100644 index 0000000..502185b Binary files /dev/null and b/packs/conditions/MANIFEST-000098 differ diff --git a/packs/currency/000088.log b/packs/currency/000100.log similarity index 100% rename from packs/currency/000088.log rename to packs/currency/000100.log diff --git a/packs/currency/CURRENT b/packs/currency/CURRENT index a43fb19..95395b2 100644 --- a/packs/currency/CURRENT +++ b/packs/currency/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/currency/LOG b/packs/currency/LOG index 96ba786..abbda2b 100644 --- a/packs/currency/LOG +++ b/packs/currency/LOG @@ -1,7 +1,7 @@ -2023/10/19-14:23:17.526061 7f81067fc6c0 Recovering log #84 -2023/10/19-14:23:17.536635 7f81067fc6c0 Delete type=3 #82 -2023/10/19-14:23:17.536706 7f81067fc6c0 Delete type=0 #84 -2023/10/19-14:23:44.359668 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.359693 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.365782 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.374031 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.241977 7f81067fc6c0 Recovering log #96 +2023/10/21-09:46:53.252607 7f81067fc6c0 Delete type=3 #94 +2023/10/21-09:46:53.252753 7f81067fc6c0 Delete type=0 #96 +2023/10/21-10:25:16.654235 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.654260 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.660290 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674565 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/currency/LOG.old b/packs/currency/LOG.old index 2644c42..f194f1c 100644 --- a/packs/currency/LOG.old +++ b/packs/currency/LOG.old @@ -1,7 +1,7 @@ -2023/10/19-14:21:21.661284 7f8105ffb6c0 Recovering log #80 -2023/10/19-14:21:21.672219 7f8105ffb6c0 Delete type=3 #78 -2023/10/19-14:21:21.672266 7f8105ffb6c0 Delete type=0 #80 -2023/10/19-14:21:29.471453 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.471474 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.477920 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.485644 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.852656 7f81067fc6c0 Recovering log #92 +2023/10/21-09:05:36.913271 7f81067fc6c0 Delete type=3 #90 +2023/10/21-09:05:36.913385 7f81067fc6c0 Delete type=0 #92 +2023/10/21-09:46:38.952342 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.952387 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.959129 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.966401 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/currency/MANIFEST-000086 b/packs/currency/MANIFEST-000086 deleted file mode 100644 index 6ddee89..0000000 Binary files a/packs/currency/MANIFEST-000086 and /dev/null differ diff --git a/packs/currency/MANIFEST-000098 b/packs/currency/MANIFEST-000098 new file mode 100644 index 0000000..502185b Binary files /dev/null and b/packs/currency/MANIFEST-000098 differ diff --git a/packs/cybernetics/000016.log b/packs/cybernetics/000028.log similarity index 100% rename from packs/cybernetics/000016.log rename to packs/cybernetics/000028.log diff --git a/packs/cybernetics/CURRENT b/packs/cybernetics/CURRENT index 23b73d9..8b15215 100644 --- a/packs/cybernetics/CURRENT +++ b/packs/cybernetics/CURRENT @@ -1 +1 @@ -MANIFEST-000014 +MANIFEST-000026 diff --git a/packs/cybernetics/LOG b/packs/cybernetics/LOG index 424fce7..f486bbf 100644 --- a/packs/cybernetics/LOG +++ b/packs/cybernetics/LOG @@ -1,8 +1,8 @@ -2023/10/19-14:23:17.564165 7f8105ffb6c0 Recovering log #12 -2023/10/19-14:23:17.574763 7f8105ffb6c0 Delete type=3 #10 -2023/10/19-14:23:17.574939 7f8105ffb6c0 Delete type=0 #12 -2023/10/19-14:23:44.381284 7f7e677006c0 Level-0 table #17: started -2023/10/19-14:23:44.381329 7f7e677006c0 Level-0 table #17: 0 bytes OK -2023/10/19-14:23:44.388649 7f7e677006c0 Delete type=0 #15 -2023/10/19-14:23:44.388809 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) -2023/10/19-14:23:44.388823 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.283509 7f8106ffd6c0 Recovering log #24 +2023/10/21-09:46:53.293910 7f8106ffd6c0 Delete type=3 #22 +2023/10/21-09:46:53.294097 7f8106ffd6c0 Delete type=0 #24 +2023/10/21-10:25:16.674800 7f7e677006c0 Level-0 table #29: started +2023/10/21-10:25:16.674835 7f7e677006c0 Level-0 table #29: 0 bytes OK +2023/10/21-10:25:16.680984 7f7e677006c0 Delete type=0 #27 +2023/10/21-10:25:16.681147 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.681203 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) diff --git a/packs/cybernetics/LOG.old b/packs/cybernetics/LOG.old index d32180c..7d40463 100644 --- a/packs/cybernetics/LOG.old +++ b/packs/cybernetics/LOG.old @@ -1,8 +1,8 @@ -2023/10/19-14:21:21.698718 7f81067fc6c0 Recovering log #8 -2023/10/19-14:21:21.708742 7f81067fc6c0 Delete type=3 #6 -2023/10/19-14:21:21.708788 7f81067fc6c0 Delete type=0 #8 -2023/10/19-14:21:29.478169 7f7e677006c0 Level-0 table #13: started -2023/10/19-14:21:29.478226 7f7e677006c0 Level-0 table #13: 0 bytes OK -2023/10/19-14:21:29.485516 7f7e677006c0 Delete type=0 #11 -2023/10/19-14:21:29.485668 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) -2023/10/19-14:21:29.485692 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-09:05:37.030189 7f8105ffb6c0 Recovering log #20 +2023/10/21-09:05:37.086732 7f8105ffb6c0 Delete type=3 #18 +2023/10/21-09:05:37.086828 7f8105ffb6c0 Delete type=0 #20 +2023/10/21-09:46:38.959328 7f7e677006c0 Level-0 table #25: started +2023/10/21-09:46:38.959384 7f7e677006c0 Level-0 table #25: 0 bytes OK +2023/10/21-09:46:38.966078 7f7e677006c0 Delete type=0 #23 +2023/10/21-09:46:38.966424 7f7e677006c0 Manual compaction at level-0 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) +2023/10/21-09:46:38.966478 7f7e677006c0 Manual compaction at level-1 from '!items!0JlVJvgxQQWY8lpO' @ 72057594037927935 : 1 .. '!items!zjxV4mcELwbZU8Et' @ 0 : 0; will stop at (end) diff --git a/packs/cybernetics/MANIFEST-000014 b/packs/cybernetics/MANIFEST-000014 deleted file mode 100644 index f064cd5..0000000 Binary files a/packs/cybernetics/MANIFEST-000014 and /dev/null differ diff --git a/packs/cybernetics/MANIFEST-000026 b/packs/cybernetics/MANIFEST-000026 new file mode 100644 index 0000000..a305beb Binary files /dev/null and b/packs/cybernetics/MANIFEST-000026 differ diff --git a/packs/equipment/000088.log b/packs/equipment/000100.log similarity index 100% rename from packs/equipment/000088.log rename to packs/equipment/000100.log diff --git a/packs/equipment/CURRENT b/packs/equipment/CURRENT index a43fb19..95395b2 100644 --- a/packs/equipment/CURRENT +++ b/packs/equipment/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/equipment/LOG b/packs/equipment/LOG index c677a98..80278c8 100644 --- a/packs/equipment/LOG +++ b/packs/equipment/LOG @@ -1,7 +1,7 @@ -2023/10/19-14:23:17.476233 7f81067fc6c0 Recovering log #84 -2023/10/19-14:23:17.486711 7f81067fc6c0 Delete type=3 #82 -2023/10/19-14:23:17.486835 7f81067fc6c0 Delete type=0 #84 -2023/10/19-14:23:44.308192 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.308251 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.315142 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.327450 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.186412 7f81067fc6c0 Recovering log #96 +2023/10/21-09:46:53.197532 7f81067fc6c0 Delete type=3 #94 +2023/10/21-09:46:53.197674 7f81067fc6c0 Delete type=0 #96 +2023/10/21-10:25:16.619385 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.619433 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.626151 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.646310 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/LOG.old b/packs/equipment/LOG.old index 3c078cc..1bfed74 100644 --- a/packs/equipment/LOG.old +++ b/packs/equipment/LOG.old @@ -1,7 +1,7 @@ -2023/10/19-14:21:21.608294 7f8105ffb6c0 Recovering log #80 -2023/10/19-14:21:21.621354 7f8105ffb6c0 Delete type=3 #78 -2023/10/19-14:21:21.621556 7f8105ffb6c0 Delete type=0 #80 -2023/10/19-14:21:29.429880 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.429923 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.436342 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.458121 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.606696 7f81067fc6c0 Recovering log #92 +2023/10/21-09:05:36.670021 7f81067fc6c0 Delete type=3 #90 +2023/10/21-09:05:36.670242 7f81067fc6c0 Delete type=0 #92 +2023/10/21-09:46:38.909319 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.909373 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.916048 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.938073 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/equipment/MANIFEST-000086 b/packs/equipment/MANIFEST-000086 deleted file mode 100644 index 6ddee89..0000000 Binary files a/packs/equipment/MANIFEST-000086 and /dev/null differ diff --git a/packs/equipment/MANIFEST-000098 b/packs/equipment/MANIFEST-000098 new file mode 100644 index 0000000..502185b Binary files /dev/null and b/packs/equipment/MANIFEST-000098 differ diff --git a/packs/perks/000088.log b/packs/perks/000100.log similarity index 100% rename from packs/perks/000088.log rename to packs/perks/000100.log diff --git a/packs/perks/CURRENT b/packs/perks/CURRENT index a43fb19..95395b2 100644 --- a/packs/perks/CURRENT +++ b/packs/perks/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/perks/LOG b/packs/perks/LOG index 6d853a6..d28d526 100644 --- a/packs/perks/LOG +++ b/packs/perks/LOG @@ -1,8 +1,8 @@ -2023/10/19-14:23:17.550892 7f81077fe6c0 Recovering log #84 -2023/10/19-14:23:17.561350 7f81077fe6c0 Delete type=3 #82 -2023/10/19-14:23:17.561430 7f81077fe6c0 Delete type=0 #84 -2023/10/19-14:23:44.366215 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.366274 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.373732 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.381253 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) -2023/10/19-14:23:44.388799 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.269089 7f8105ffb6c0 Recovering log #96 +2023/10/21-09:46:53.280127 7f8105ffb6c0 Delete type=3 #94 +2023/10/21-09:46:53.280264 7f8105ffb6c0 Delete type=0 #96 +2023/10/21-10:25:16.667464 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.667505 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.674303 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674595 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.674627 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) diff --git a/packs/perks/LOG.old b/packs/perks/LOG.old index 18192ff..30748bf 100644 --- a/packs/perks/LOG.old +++ b/packs/perks/LOG.old @@ -1,8 +1,8 @@ -2023/10/19-14:21:21.686224 7f81077fe6c0 Recovering log #80 -2023/10/19-14:21:21.695950 7f81077fe6c0 Delete type=3 #78 -2023/10/19-14:21:21.696001 7f81077fe6c0 Delete type=0 #80 -2023/10/19-14:21:29.464823 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.464848 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.471318 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.485633 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) -2023/10/19-14:21:29.485659 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.976673 7f81077fe6c0 Recovering log #92 +2023/10/21-09:05:37.026203 7f81077fe6c0 Delete type=3 #90 +2023/10/21-09:05:37.026297 7f81077fe6c0 Delete type=0 #92 +2023/10/21-09:46:38.945662 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.945728 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.952174 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.966374 7f7e677006c0 Manual compaction at level-0 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) +2023/10/21-09:46:38.966462 7f7e677006c0 Manual compaction at level-1 from '!items!0LA7gMBDogO56AZK' @ 72057594037927935 : 1 .. '!items!zwZoHMkWYtMCNx9f' @ 0 : 0; will stop at (end) diff --git a/packs/perks/MANIFEST-000086 b/packs/perks/MANIFEST-000086 deleted file mode 100644 index a5cf359..0000000 Binary files a/packs/perks/MANIFEST-000086 and /dev/null differ diff --git a/packs/perks/MANIFEST-000098 b/packs/perks/MANIFEST-000098 new file mode 100644 index 0000000..aeb78ae Binary files /dev/null and b/packs/perks/MANIFEST-000098 differ diff --git a/packs/shields/000088.log b/packs/shields/000100.log similarity index 100% rename from packs/shields/000088.log rename to packs/shields/000100.log diff --git a/packs/shields/CURRENT b/packs/shields/CURRENT index a43fb19..95395b2 100644 --- a/packs/shields/CURRENT +++ b/packs/shields/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/shields/LOG b/packs/shields/LOG index a3446c4..643952a 100644 --- a/packs/shields/LOG +++ b/packs/shields/LOG @@ -1,7 +1,7 @@ -2023/10/19-14:23:17.488686 7f8106ffd6c0 Recovering log #84 -2023/10/19-14:23:17.499250 7f8106ffd6c0 Delete type=3 #82 -2023/10/19-14:23:17.499317 7f8106ffd6c0 Delete type=0 #84 -2023/10/19-14:23:44.315318 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.315347 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.327312 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.359651 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.199962 7f81077fe6c0 Recovering log #96 +2023/10/21-09:46:53.211394 7f81077fe6c0 Delete type=3 #94 +2023/10/21-09:46:53.211491 7f81077fe6c0 Delete type=0 #96 +2023/10/21-10:25:16.626403 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.626435 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.633066 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.646322 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/shields/LOG.old b/packs/shields/LOG.old index 6b8cf7f..1e9b48f 100644 --- a/packs/shields/LOG.old +++ b/packs/shields/LOG.old @@ -1,7 +1,7 @@ -2023/10/19-14:21:21.623245 7f8106ffd6c0 Recovering log #80 -2023/10/19-14:21:21.634568 7f8106ffd6c0 Delete type=3 #78 -2023/10/19-14:21:21.634612 7f8106ffd6c0 Delete type=0 #80 -2023/10/19-14:21:29.436593 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.436653 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.443853 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.458132 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.672950 7f8106ffd6c0 Recovering log #92 +2023/10/21-09:05:36.722365 7f8106ffd6c0 Delete type=3 #90 +2023/10/21-09:05:36.722463 7f8106ffd6c0 Delete type=0 #92 +2023/10/21-09:46:38.916263 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.916316 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.923082 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.938109 7f7e677006c0 Manual compaction at level-0 from 'undefined' @ 72057594037927935 : 1 .. 'undefined' @ 0 : 0; will stop at (end) diff --git a/packs/shields/MANIFEST-000086 b/packs/shields/MANIFEST-000086 deleted file mode 100644 index 6ddee89..0000000 Binary files a/packs/shields/MANIFEST-000086 and /dev/null differ diff --git a/packs/shields/MANIFEST-000098 b/packs/shields/MANIFEST-000098 new file mode 100644 index 0000000..502185b Binary files /dev/null and b/packs/shields/MANIFEST-000098 differ diff --git a/packs/skills/000088.log b/packs/skills/000100.log similarity index 100% rename from packs/skills/000088.log rename to packs/skills/000100.log diff --git a/packs/skills/CURRENT b/packs/skills/CURRENT index a43fb19..95395b2 100644 --- a/packs/skills/CURRENT +++ b/packs/skills/CURRENT @@ -1 +1 @@ -MANIFEST-000086 +MANIFEST-000098 diff --git a/packs/skills/LOG b/packs/skills/LOG index b7ce6a0..a7ff36f 100644 --- a/packs/skills/LOG +++ b/packs/skills/LOG @@ -1,8 +1,8 @@ -2023/10/19-14:23:17.538148 7f8106ffd6c0 Recovering log #84 -2023/10/19-14:23:17.548230 7f8106ffd6c0 Delete type=3 #82 -2023/10/19-14:23:17.548293 7f8106ffd6c0 Delete type=0 #84 -2023/10/19-14:23:44.374140 7f7e677006c0 Level-0 table #89: started -2023/10/19-14:23:44.374218 7f7e677006c0 Level-0 table #89: 0 bytes OK -2023/10/19-14:23:44.380552 7f7e677006c0 Delete type=0 #87 -2023/10/19-14:23:44.388786 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) -2023/10/19-14:23:44.388816 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.254913 7f81077fe6c0 Recovering log #96 +2023/10/21-09:46:53.266376 7f81077fe6c0 Delete type=3 #94 +2023/10/21-09:46:53.266469 7f81077fe6c0 Delete type=0 #96 +2023/10/21-10:25:16.660405 7f7e677006c0 Level-0 table #101: started +2023/10/21-10:25:16.660579 7f7e677006c0 Level-0 table #101: 0 bytes OK +2023/10/21-10:25:16.667324 7f7e677006c0 Delete type=0 #99 +2023/10/21-10:25:16.674581 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.674617 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) diff --git a/packs/skills/LOG.old b/packs/skills/LOG.old index 5132835..6b0a17f 100644 --- a/packs/skills/LOG.old +++ b/packs/skills/LOG.old @@ -1,8 +1,8 @@ -2023/10/19-14:21:21.674379 7f8106ffd6c0 Recovering log #80 -2023/10/19-14:21:21.684244 7f8106ffd6c0 Delete type=3 #78 -2023/10/19-14:21:21.684289 7f8106ffd6c0 Delete type=0 #80 -2023/10/19-14:21:29.458222 7f7e677006c0 Level-0 table #85: started -2023/10/19-14:21:29.458243 7f7e677006c0 Level-0 table #85: 0 bytes OK -2023/10/19-14:21:29.464567 7f7e677006c0 Delete type=0 #83 -2023/10/19-14:21:29.485621 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) -2023/10/19-14:21:29.485652 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.915510 7f8106ffd6c0 Recovering log #92 +2023/10/21-09:05:36.973675 7f8106ffd6c0 Delete type=3 #90 +2023/10/21-09:05:36.973827 7f8106ffd6c0 Delete type=0 #92 +2023/10/21-09:46:38.938371 7f7e677006c0 Level-0 table #97: started +2023/10/21-09:46:38.938498 7f7e677006c0 Level-0 table #97: 0 bytes OK +2023/10/21-09:46:38.945449 7f7e677006c0 Delete type=0 #95 +2023/10/21-09:46:38.966340 7f7e677006c0 Manual compaction at level-0 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) +2023/10/21-09:46:38.966443 7f7e677006c0 Manual compaction at level-1 from '!items!5YJWuGaagmi1dgbv' @ 72057594037927935 : 1 .. '!items!yo7mOkfbbOogx8na' @ 0 : 0; will stop at (end) diff --git a/packs/skills/MANIFEST-000086 b/packs/skills/MANIFEST-000086 deleted file mode 100644 index 0480386..0000000 Binary files a/packs/skills/MANIFEST-000086 and /dev/null differ diff --git a/packs/skills/MANIFEST-000098 b/packs/skills/MANIFEST-000098 new file mode 100644 index 0000000..c7461d9 Binary files /dev/null and b/packs/skills/MANIFEST-000098 differ diff --git a/packs/weapons/000089.log b/packs/weapons/000101.log similarity index 100% rename from packs/weapons/000089.log rename to packs/weapons/000101.log diff --git a/packs/weapons/CURRENT b/packs/weapons/CURRENT index d05b681..b86155c 100644 --- a/packs/weapons/CURRENT +++ b/packs/weapons/CURRENT @@ -1 +1 @@ -MANIFEST-000087 +MANIFEST-000099 diff --git a/packs/weapons/LOG b/packs/weapons/LOG index eb2d870..b61e304 100644 --- a/packs/weapons/LOG +++ b/packs/weapons/LOG @@ -1,8 +1,8 @@ -2023/10/19-14:23:17.501171 7f81077fe6c0 Recovering log #85 -2023/10/19-14:23:17.512341 7f81077fe6c0 Delete type=3 #83 -2023/10/19-14:23:17.512406 7f81077fe6c0 Delete type=0 #85 -2023/10/19-14:23:44.327463 7f7e677006c0 Level-0 table #90: started -2023/10/19-14:23:44.327490 7f7e677006c0 Level-0 table #90: 0 bytes OK -2023/10/19-14:23:44.349170 7f7e677006c0 Delete type=0 #88 -2023/10/19-14:23:44.366131 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) -2023/10/19-14:23:44.374062 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/21-09:46:53.214012 7f8105ffb6c0 Recovering log #97 +2023/10/21-09:46:53.225802 7f8105ffb6c0 Delete type=3 #95 +2023/10/21-09:46:53.225949 7f8105ffb6c0 Delete type=0 #97 +2023/10/21-10:25:16.639905 7f7e677006c0 Level-0 table #102: started +2023/10/21-10:25:16.639966 7f7e677006c0 Level-0 table #102: 0 bytes OK +2023/10/21-10:25:16.646212 7f7e677006c0 Delete type=0 #100 +2023/10/21-10:25:16.646343 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/21-10:25:16.646390 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/LOG.old b/packs/weapons/LOG.old index 4e4ab15..371258d 100644 --- a/packs/weapons/LOG.old +++ b/packs/weapons/LOG.old @@ -1,8 +1,8 @@ -2023/10/19-14:21:21.636140 7f81077fe6c0 Recovering log #81 -2023/10/19-14:21:21.647041 7f81077fe6c0 Delete type=3 #79 -2023/10/19-14:21:21.647106 7f81077fe6c0 Delete type=0 #81 -2023/10/19-14:21:29.443983 7f7e677006c0 Level-0 table #86: started -2023/10/19-14:21:29.444004 7f7e677006c0 Level-0 table #86: 0 bytes OK -2023/10/19-14:21:29.450269 7f7e677006c0 Delete type=0 #84 -2023/10/19-14:21:29.458143 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) -2023/10/19-14:21:29.458168 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/21-09:05:36.724936 7f81077fe6c0 Recovering log #93 +2023/10/21-09:05:36.794933 7f81077fe6c0 Delete type=3 #91 +2023/10/21-09:05:36.795073 7f81077fe6c0 Delete type=0 #93 +2023/10/21-09:46:38.923258 7f7e677006c0 Level-0 table #98: started +2023/10/21-09:46:38.923308 7f7e677006c0 Level-0 table #98: 0 bytes OK +2023/10/21-09:46:38.929697 7f7e677006c0 Delete type=0 #96 +2023/10/21-09:46:38.938140 7f7e677006c0 Manual compaction at level-0 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) +2023/10/21-09:46:38.938202 7f7e677006c0 Manual compaction at level-1 from '!items!265V8wzrrH3EEgtM' @ 72057594037927935 : 1 .. '!items!zx96NZdE3GrK999G' @ 0 : 0; will stop at (end) diff --git a/packs/weapons/MANIFEST-000087 b/packs/weapons/MANIFEST-000099 similarity index 74% rename from packs/weapons/MANIFEST-000087 rename to packs/weapons/MANIFEST-000099 index 6983bdc..96bfbb6 100644 Binary files a/packs/weapons/MANIFEST-000087 and b/packs/weapons/MANIFEST-000099 differ diff --git a/system.json b/system.json index 51bb278..f7b1198 100644 --- a/system.json +++ b/system.json @@ -109,14 +109,14 @@ "styles": [ "styles/simple.css" ], - "version": "11.0.7", + "version": "11.0.8", "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.7.zip", + "download": "https://www.uberwald.me/gitea/uberwald/fvtt-dark-stars/archive/fvtt-dark-stars-v11.0.8.zip", "url": "https://www.uberwald.me/gitea/uberwald/", "background": "images/ui/dark_stars_welcome_page.webp", "id": "fvtt-dark-stars" diff --git a/template.json b/template.json index 16232ab..96e46ad 100644 --- a/template.json +++ b/template.json @@ -278,7 +278,8 @@ "weapon", "money", "genetic", - "cyber" + "cyber", + "ammo" ], "skill": { "base": "", @@ -394,11 +395,23 @@ "quantity": 0, "description": "" }, + "ammo": { + "ava": "", + "damage": "", + "bulk": 0, + "br": 0, + "cost": 0, + "sp": 0, + "quantity": 0, + "properties": "" + }, "weapon": { "weapontype": "", "associatedskill": "", "penetrationmin": "", "penetrationmax": "", + "needammo": false, + "ammoid": "", "hashpdamage": true, "damage": "", "hasfatiguedamage": false, diff --git a/templates/actors/actor-sheet.hbs b/templates/actors/actor-sheet.hbs index 8f63c86..4a10031 100644 --- a/templates/actors/actor-sheet.hbs +++ b/templates/actors/actor-sheet.hbs @@ -153,12 +153,15 @@

- + + + + @@ -169,13 +172,28 @@ src="{{weapon.img}}" /> {{weapon.name}} - {{upperFirst weapon.system.weapontype}} - - {{weapon.system.skill}} - - {{weapon.system.damage}} - + {{upperFirst weapon.system.weapontype}} + {{upperFirst weapon.system.associatedskill}} + + {{#if weapon.system.needammo}} + + {{#if weapon.ammo}} + + {{else}} + + {{/if}} + {{else}} + + + {{/if}}
 
@@ -296,12 +314,20 @@

- + + - - + + + + + + + + +
 
@@ -311,8 +337,27 @@ {{weapon.name}} - - + + + + {{#if weapon.system.needammo}} + + {{#if weapon.ammo}} + + {{else}} + + {{/if}} + {{else}} + + + {{/if}}
 
@@ -324,15 +369,47 @@ {{/each}} +
    +
  • + +

    +     + + + + + + +
     
    +
    + +
    +
    • + {{#each ammos as |ammo key|}} +
  • + + {{ammo.name}} + + + +
     
    +
    + +
    +
    • + {{/each}} +
+

  • - + - + @@ -346,8 +423,8 @@ {{armor.name}} - {{upper armor.system.armortype}} - {{armor.system.absorprionroll}} + {{upper armor.system.armortype}} + {{armor.system.absorprionroll}}
     
    diff --git a/templates/chat/chat-generic-result.hbs b/templates/chat/chat-generic-result.hbs index 000c582..30b6829 100644 --- a/templates/chat/chat-generic-result.hbs +++ b/templates/chat/chat-generic-result.hbs @@ -50,11 +50,15 @@ {{/if}} {{#if (and weapon isSuccess)}} - {{#if weapon.system.hashpdamage}} -
  • Roll HP Damage: [[/r {{weapon.system.damage}}]]
    • - {{/if}} - {{#if weapon.system.hasfatiguedamage}} -
  • Roll Fatigue Damage: [[/r {{weapon.system.fatiguedamage}}]]
    • + {{#if weapon.ammo}} +
  • Roll Ammo Damage ({{weapon.ammo.name}}): [[/r {{weapon.ammo.system.damage}}]]
    • + {{else}} + {{#if weapon.system.hashpdamage}} +
  • Roll HP Damage: [[/r {{weapon.system.damage}}]]
    • + {{/if}} + {{#if weapon.system.hasfatiguedamage}} +
  • Roll Fatigue Damage: [[/r {{weapon.system.fatiguedamage}}]]
    • + {{/if}} {{/if}} {{/if}} diff --git a/templates/items/item-ammo-sheet.hbs b/templates/items/item-ammo-sheet.hbs new file mode 100644 index 0000000..d783356 --- /dev/null +++ b/templates/items/item-ammo-sheet.hbs @@ -0,0 +1,56 @@ +
    +
    + +
    +

    +
    +
    + + {{> systems/fvtt-dark-stars/templates/partials/partial-item-nav.hbs}} + + + {{!-- Sheet Body --}} +
    + + {{> systems/fvtt-dark-stars/templates/partials/partial-item-description.hbs}} + +
    + +
    +
      + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    • + +
      • + +
    +
    +
    + +
    +
    diff --git a/templates/items/item-weapon-sheet.hbs b/templates/items/item-weapon-sheet.hbs index 47ffd73..0dc6319 100644 --- a/templates/items/item-weapon-sheet.hbs +++ b/templates/items/item-weapon-sheet.hbs @@ -47,22 +47,30 @@ -
  • - +
  • +
    • - {{#if system.hashpdamage}} -
  • - -
    • - {{/if}} -
  • - -
    • - {{#if system.hasfatiguedamage}} -
  • - -
    • + {{#if system.needammo}} + + {{else}} +
  • + +
    • + {{#if system.hashpdamage}} +
  • + +
    • + {{/if}} + +
  • + +
    • + {{#if system.hasfatiguedamage}} +
  • + +
    • + {{/if}} {{/if}}