From b0d5f441ee04278b825af70c2b2af43c06cc3ef5 Mon Sep 17 00:00:00 2001 From: sladecraven Date: Sun, 31 Jul 2022 09:16:17 +0200 Subject: [PATCH] Sync with deliveries --- modules/crucible-actor.js | 2 +- modules/crucible-main.js | 4 ++-- modules/crucible-utility.js | 8 +++----- packs/action-tokens.db | 0 packs/armor.db | 0 packs/classpowers.db | 0 packs/conditions.db | 0 packs/equipment.db | 0 packs/feats.db | 0 packs/lore-air.db | 0 packs/lore-earth.db | 0 packs/lore-fire.db | 0 packs/lore-shadow.db | 0 packs/lore-water.db | 0 packs/monster-powers.db | 0 packs/poisons.db | 0 packs/shields.db | 0 packs/skills.db | 1 + packs/trickstraps.db | 0 packs/weapons.db | 0 styles/simple.css | 4 ++-- templates/item-weapon-sheet.html | 2 +- 22 files changed, 10 insertions(+), 11 deletions(-) mode change 100755 => 100644 packs/action-tokens.db mode change 100755 => 100644 packs/armor.db mode change 100755 => 100644 packs/classpowers.db mode change 100755 => 100644 packs/conditions.db mode change 100755 => 100644 packs/equipment.db mode change 100755 => 100644 packs/feats.db mode change 100755 => 100644 packs/lore-air.db mode change 100755 => 100644 packs/lore-earth.db mode change 100755 => 100644 packs/lore-fire.db mode change 100755 => 100644 packs/lore-shadow.db mode change 100755 => 100644 packs/lore-water.db mode change 100755 => 100644 packs/monster-powers.db mode change 100755 => 100644 packs/poisons.db mode change 100755 => 100644 packs/shields.db mode change 100755 => 100644 packs/skills.db mode change 100755 => 100644 packs/trickstraps.db mode change 100755 => 100644 packs/weapons.db diff --git a/modules/crucible-actor.js b/modules/crucible-actor.js index bc86f2a..9d1fa3e 100644 --- a/modules/crucible-actor.js +++ b/modules/crucible-actor.js @@ -44,7 +44,7 @@ export class CrucibleActor extends Actor { if (data.type == 'character') { const skills = await CrucibleUtility.loadCompendium("fvtt-crucible-rpg.skills"); - data.items = skills.map(i => i.toObject()); + data.items = skills.map(i => i.toObject()) } if (data.type == 'npc') { } diff --git a/modules/crucible-main.js b/modules/crucible-main.js index f0b47e7..0f4f91d 100644 --- a/modules/crucible-main.js +++ b/modules/crucible-main.js @@ -86,7 +86,6 @@ function welcomeMessage() { /* -------------------------------------------- */ Hooks.once("ready", function () { - CrucibleUtility.ready(); // User warning if (!game.user.isGM && game.user.character == undefined) { ui.notifications.info("Warning ! No character linked to your user !"); @@ -103,7 +102,8 @@ Hooks.once("ready", function () { } welcomeMessage(); -}); + CrucibleUtility.ready() +}) /* -------------------------------------------- */ /* Foundry VTT Initialization */ diff --git a/modules/crucible-utility.js b/modules/crucible-utility.js index 6f86c24..2adb11a 100644 --- a/modules/crucible-utility.js +++ b/modules/crucible-utility.js @@ -18,8 +18,6 @@ export class CrucibleUtility { }); this.rollDataStore = {} - this.skills = await CrucibleUtility.loadCompendium("fvtt-crucible-rpg.skills"); - this.weaponSkills = this.skills.filter( item => item.data.data.isweaponskill) CrucibleCommands.init(); @@ -59,11 +57,11 @@ export class CrucibleUtility { /* -------------------------------------------- */ static async ready() { - const specs = await CrucibleUtility.loadCompendium("fvtt-crucible-rpg.skills"); - this.specs = specs.map(i => i.toObject()); + const skills = await CrucibleUtility.loadCompendium("fvtt-crucible-rpg.skills") + this.skills = skills.map(i => i.toObject()) + this.weaponSkills = duplicate( this.skills.filter( item => item.data.isweaponskill)) } - /* -------------------------------------------- */ static async loadCompendiumData(compendium) { const pack = game.packs.get(compendium); diff --git a/packs/action-tokens.db b/packs/action-tokens.db old mode 100755 new mode 100644 diff --git a/packs/armor.db b/packs/armor.db old mode 100755 new mode 100644 diff --git a/packs/classpowers.db b/packs/classpowers.db old mode 100755 new mode 100644 diff --git a/packs/conditions.db b/packs/conditions.db old mode 100755 new mode 100644 diff --git a/packs/equipment.db b/packs/equipment.db old mode 100755 new mode 100644 diff --git a/packs/feats.db b/packs/feats.db old mode 100755 new mode 100644 diff --git a/packs/lore-air.db b/packs/lore-air.db old mode 100755 new mode 100644 diff --git a/packs/lore-earth.db b/packs/lore-earth.db old mode 100755 new mode 100644 diff --git a/packs/lore-fire.db b/packs/lore-fire.db old mode 100755 new mode 100644 diff --git a/packs/lore-shadow.db b/packs/lore-shadow.db old mode 100755 new mode 100644 diff --git a/packs/lore-water.db b/packs/lore-water.db old mode 100755 new mode 100644 diff --git a/packs/monster-powers.db b/packs/monster-powers.db old mode 100755 new mode 100644 diff --git a/packs/poisons.db b/packs/poisons.db old mode 100755 new mode 100644 diff --git a/packs/shields.db b/packs/shields.db old mode 100755 new mode 100644 diff --git a/packs/skills.db b/packs/skills.db old mode 100755 new mode 100644 index ec1c869..608ff10 --- a/packs/skills.db +++ b/packs/skills.db @@ -6,6 +6,7 @@ {"_id":"8o812uFRJbtKrbvc","name":"Blessings Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Blessing%20Lore.png","data":{"ability":"cha","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"

Chaplain Class Only

\n

 

\n

You can use the Chaplain Blessings Class Power

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}} {"_id":"BKRHCd3kMfmQ7tcI","name":"Water Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Water%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"

You can cast Water Lore spells.

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}} {"_id":"KR9JDNO8QkeNPa8W","name":"Haggle","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Haggle.png","data":{"ability":"wit","armorpenalty":false,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"

I'll give you half of your asking price and make you like it.

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}} +{"name":"Axe","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/icon_skill.webp","data":{"ability":"agi","armorpenalty":false,"isproficient":true,"isweaponskill":true,"isinnate":false,"bonusdice":"none","level":2,"background":0,"basic":0,"class":0,"exp":0,"description":""},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{"core":{"sourceId":"Item.49wlzRnFpAaOx3A6"}},"_id":"LQD7mPqaM6RizBdu"} {"_id":"SyaqDmAk6PEG2wZI","name":"Air Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Air%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"none","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"

You can cast Air Lore Spells.

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}} {"_id":"T4YzMBGXyDrzEaBA","name":"Earth Lore","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Earth%20Lore.webp","data":{"ability":"int","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"

You can cast Earth Lore spells.

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}} {"_id":"XenGlvxetLv0A92F","name":"Acrobatics","type":"skill","img":"systems/fvtt-crucible-rpg/images/icons/skills/Acrobatics.webp","data":{"ability":"agi","armorpenalty":true,"bonusdice":"","level":0,"background":0,"basic":0,"class":0,"exp":0,"description":"

Handy for swinging from Chandaliers, sliding down stair rails, rolling between the legs of a Giant, and other feats of astonishing balance and agility.

"},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"Up3b6rNa3VKAFQC3":3},"flags":{}} diff --git a/packs/trickstraps.db b/packs/trickstraps.db old mode 100755 new mode 100644 diff --git a/packs/weapons.db b/packs/weapons.db old mode 100755 new mode 100644 diff --git a/styles/simple.css b/styles/simple.css index 619d1cd..b86bfbf 100644 --- a/styles/simple.css +++ b/styles/simple.css @@ -1238,7 +1238,7 @@ ul, li { color: #CCC } #pause > img { - content: url(../images/ui/crucible_logo_v1.webp); + content: url(../images/ui/crucible_game_logo.png); height: 160px; width: 256px; top: -80px; @@ -1246,7 +1246,7 @@ ul, li { } #logo { - content : url(../images/ui/crucible_logo_v1.webp); + content : url(../images/ui/crucible_game_logo.png); width: 100px; height: 60px; } diff --git a/templates/item-weapon-sheet.html b/templates/item-weapon-sheet.html index 76e5a81..7d28af8 100644 --- a/templates/item-weapon-sheet.html +++ b/templates/item-weapon-sheet.html @@ -34,7 +34,7 @@