From 3d23807820d182a5a92fa34bc7329065d36e472d Mon Sep 17 00:00:00 2001 From: sladecraven Date: Sat, 22 May 2021 23:42:53 +0200 Subject: [PATCH] Start 0.8 support --- module/actor-sheet.js | 4 ++-- module/actor.js | 24 +++++++++++----------- module/item-sheet.js | 29 ++++++++++++++++++++------- templates/actor-sheet.html | 24 +++++++++++----------- templates/item-consequence-sheet.html | 10 ++++----- templates/item-skill-sheet.html | 8 ++++---- 6 files changed, 57 insertions(+), 42 deletions(-) diff --git a/module/actor-sheet.js b/module/actor-sheet.js index d3f261e..e69b79d 100644 --- a/module/actor-sheet.js +++ b/module/actor-sheet.js @@ -175,9 +175,9 @@ export class SoSActorSheet extends ActorSheet { }); html.find('.consequence-severity').click((event) => { const li = $(event.currentTarget).parents(".item"); - const item = this.actor.getOwnedItem(li.data("item-id")); + const item = this.actor.items.get(li.data("item-id")); let severity = $(event.currentTarget).val(); - this.actor.updateOwnedItem( { id: item.id, 'data.severity': severity}); + this.actor.updateEmbeddedDocuments( "Item", [ { _id: item.id, 'data.severity': severity} ] ); this.render(true); }); html.find('.lock-unlock-sheet').click((event) => { diff --git a/module/actor.js b/module/actor.js index ce86f31..e648d41 100644 --- a/module/actor.js +++ b/module/actor.js @@ -171,8 +171,8 @@ export class SoSActor extends Actor { async wornObject( itemID) { let item = this.getOwnedItem(itemID); if (item && item.data.data) { - let update = { _id: item._id, "data.worn": !item.data.data.worn }; - await this.updateEmbeddedEntity("OwnedItem", update); + let update = { _id: item.id, "data.worn": !item.data.data.worn }; + await this.updateEmbeddedDocuments("Item", [update]); } } @@ -180,8 +180,8 @@ export class SoSActor extends Actor { async equipObject(itemID) { let item = this.getOwnedItem(itemID); if (item && item.data.data) { - let update = { _id: item._id, "data.equiped": !item.data.data.equiped }; - await this.updateEmbeddedEntity("OwnedItem", update); + let update = { _id: item.id, "data.equiped": !item.data.data.equiped }; + await this.updateEmbeddedDocuments("Item", [update]); } } @@ -222,16 +222,16 @@ export class SoSActor extends Actor { async updateSkill(skillName, value) { let skill = this.data.items.find( item => item.name == skillName); if (skill) { - const update = { _id: skill._id, 'data.value': value }; - const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity + const update = { _id: skill.id, 'data.value': value }; + const updated = await this.updateEmbeddedDocuments("Item", [ update] ); // Updates one EmbeddedEntity } } /* -------------------------------------------- */ async updateSkillExperience(skillName, value) { let skill = this.data.items.find( item => item.name == skillName); if (skill) { - const update = { _id: skill._id, 'data.xp': value }; - const updated = await this.updateEmbeddedEntity("OwnedItem", update); // Updates one EmbeddedEntity + const update = { _id: skill.id, 'data.xp': value }; + const updated = await this.updateEmbeddedDocuments("Item", [update]); // Updates one EmbeddedEntity } } @@ -387,10 +387,10 @@ export class SoSActor extends Actor { if ( alreadyInside.length >= container.data.container ) { ui.notifications.warn("Container is already full !"); } else { - await this.updateOwnedItem( { _id: object._id, 'data.containerid':containerId }); + await this.updateOwnedItem( { _id: object.id, 'data.containerid':containerId }); } } else if ( object && object.data.containerid) { // remove from container - await this.updateOwnedItem( { _id: object._id, 'data.containerid':"" }); + await this.updateOwnedItem( { _id: object.id, 'data.containerid':"" }); } } @@ -416,7 +416,7 @@ export class SoSActor extends Actor { if ( sumWound >= this.data.data.scores.wound.value) { let bleeding = this.data.items.find( item => item.type == 'consequence' && item.name == 'Bleeding'); let newSeverity = SoSUtility.increaseConsequenceSeverity( bleeding.severity ); - await this.updateOwnedItem( { _id: bleeding._id, 'data.severity': newSeverity}); + await this.updateOwnedItem( { _id: bleeding.id, 'data.severity': newSeverity}); flipData.isBleeding = newSeverity; } // Stun consequence @@ -426,7 +426,7 @@ export class SoSActor extends Actor { for(i=0; i foundry.utils.deepClone(e.data)), + limited: this.object.limited, + options: this.options, + owner: this.document.isOwner + }; + + formData.isGM = game.user.isGM; + if ( objectData.type == 'skillexperience') { + formData.skillList = await SoSUtility.loadCompendiumNames("foundryvtt-shadows-over-sol.skills"); } - if ( data.item.type == 'skill' && this.object.options?.actor) { - data.skillExperienceList = this.object.options.actor.getSkillExperience( data.item.name ); + if ( objectData.type == 'skill' && this.object.options?.actor) { + formData.skillExperienceList = this.object.options.actor.getSkillExperience( data.item.name ); } - return data; + return formData; } /* -------------------------------------------- */ diff --git a/templates/actor-sheet.html b/templates/actor-sheet.html index 1b441f9..b2d1ea9 100644 --- a/templates/actor-sheet.html +++ b/templates/actor-sheet.html @@ -130,8 +130,8 @@ {{else}} {{skill.name}} {{/if}} - - + +
@@ -158,8 +158,8 @@ {{else}} {{skill.name}} {{/if}} - - + +
@@ -182,16 +182,16 @@

  • Wounds :

  • Light : - +
  • Moderate : - +
  • Severe : - +
  • Critical : - +
  • Total : {{data.currentWounds}} / {{data.totalWounds}} @@ -204,8 +204,8 @@
  • {{conseq.name}} - + {{#select conseq.data.data.severity}} @@ -390,12 +390,12 @@

    Biography :

    - {{editor content=data.history target="data.history" button=true owner=owner editable=editable}} + {{editor content=data.data.history target="data.history" button=true owner=owner editable=editable}}

    Notes :

    - {{editor content=data.notes target="data.notes" button=true owner=owner editable=editable}} + {{editor content=data.data.notes target="data.notes" button=true owner=owner editable=editable}}
    {{>"systems/foundryvtt-shadows-over-sol/templates/editor-notes-gm.html"}} diff --git a/templates/item-consequence-sheet.html b/templates/item-consequence-sheet.html index 774bb95..d6cae1d 100644 --- a/templates/item-consequence-sheet.html +++ b/templates/item-consequence-sheet.html @@ -1,8 +1,8 @@
    - +
    -

    +

    @@ -13,8 +13,8 @@
    - + {{#select data.data.severity}} @@ -27,7 +27,7 @@
    - {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} + {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}
    diff --git a/templates/item-skill-sheet.html b/templates/item-skill-sheet.html index 5061aa5..5e5f07e 100644 --- a/templates/item-skill-sheet.html +++ b/templates/item-skill-sheet.html @@ -1,8 +1,8 @@
    - +
    -

    +

    @@ -11,7 +11,7 @@
      -
      • +
      • Experiences list : @@ -27,7 +27,7 @@ {{/each}}
      - {{editor content=data.description target="data.description" button=true owner=owner editable=editable}} + {{editor content=data.data.description target="data.description" button=true owner=owner editable=editable}}