From d3eba25f83d117499061164a3338ec46c20d116a Mon Sep 17 00:00:00 2001 From: sladecraven Date: Sun, 30 May 2021 00:21:00 +0200 Subject: [PATCH] Fix stuff --- css/frostgrave.css | 2 +- packs/armour.db | 6 +++--- packs/potions.db | 2 +- packs/weapons.db | 18 +++++++++--------- system.json | 6 +++--- template.json | 1 + templates/actor/partials/actor-tab-items.html | 7 +++++-- 7 files changed, 23 insertions(+), 19 deletions(-) diff --git a/css/frostgrave.css b/css/frostgrave.css index 442026a..a13f0a5 100644 --- a/css/frostgrave.css +++ b/css/frostgrave.css @@ -36,7 +36,7 @@ input[type="datetime-local"]:focus { .editor-edit { display: none; - font-size: 1.25em; + font-size: 1.0em; position: absolute; top: 5px; right: 5px; diff --git a/packs/armour.db b/packs/armour.db index d112983..dae03ff 100644 --- a/packs/armour.db +++ b/packs/armour.db @@ -1,3 +1,3 @@ -{"name":"Light Armour","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"","category":"Armour","subcategory":"Light","damage":null,"armour":1,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/armor/leather.png","_id":"I51JRohC7U9QZQf4"} -{"name":"Shield","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

May not be carried with a two-handed weapon or staff.

","category":"Armour","subcategory":"Shield","damage":null,"armour":1,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/armor/shield.png","_id":"XdYmXpKWziTu3TsF"} -{"name":"Heavy Armour","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

-1 Move.

","category":"Armour","subcategory":"Heavy","damage":null,"armour":2,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/armor/scale.png","_id":"nQ5smVtqMU2hduea"} +{"_id":"I51JRohC7U9QZQf4","name":"Light Armour","type":"item","img":"icons/equipment/chest/breastplate-layered-leather-brown.webp","data":{"description":null,"category":"Armour","subcategory":"Light","damage":null,"armour":1,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.armour.I51JRohC7U9QZQf4"}}} +{"_id":"XdYmXpKWziTu3TsF","name":"Shield","type":"item","img":"icons/equipment/shield/kite-wooden-axe-blue-black.webp","data":{"description":"

May not be carried with a two-handed weapon or staff.

","category":"Armour","subcategory":"Shield","damage":null,"armour":1,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.armour.XdYmXpKWziTu3TsF"}}} +{"_id":"nQ5smVtqMU2hduea","name":"Heavy Armour","type":"item","img":"icons/equipment/chest/breastplate-layered-steel-grey.webp","data":{"description":"

-1 Move.

","category":"Armour","subcategory":"Heavy","damage":null,"armour":2,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.armour.nQ5smVtqMU2hduea"}}} diff --git a/packs/potions.db b/packs/potions.db index ee940d1..69f45f9 100644 --- a/packs/potions.db +++ b/packs/potions.db @@ -1 +1 @@ -{"name":"Potion of Healing","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

This potion restores up to 5 lost points of Health. It may not take a figure above its normal starting Health.

","category":"Potion","subcategory":"Lesser Potion","damage":null,"armour":null,"range":null,"effect":null,"price":75,"sale":50,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/potions/minor-red.jpg","_id":"gOvnL5aOzyEOO0s8"} +{"_id":"gOvnL5aOzyEOO0s8","name":"Potion of Healing","type":"item","img":"icons/consumables/potions/bottle-round-corked-green.webp","data":{"description":"

This potion restores up to 5 lost points of Health. It may not take a figure above its normal starting Health.

","category":"Potion","subcategory":"Lesser Potion","damage":null,"armour":null,"range":null,"effect":null,"price":75,"sale":50,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.potions.gOvnL5aOzyEOO0s8"}}} diff --git a/packs/weapons.db b/packs/weapons.db index 019209a..26ce266 100644 --- a/packs/weapons.db +++ b/packs/weapons.db @@ -1,9 +1,9 @@ -{"_id":"3znr4S0pBxvsjHfT","name":"Staff","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

-1 damage modifier to opponent in hand-to-hand combat.

","category":"Weapon","subcategory":"Staff","damage":-1,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/quarterstaff.jpg"} -{"_id":"I5dzIblASNnXm6wP","name":"Hand Weapon","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"","category":"Weapon","subcategory":"Hand Weapon","damage":0,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/sword-short.jpg"} -{"_id":"J2MgKDjl7PnzfFk7","name":"Quiver","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"","category":"Weapon","subcategory":"Quiver","damage":null,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/arrows.jpg"} -{"_id":"NCVtlHqckthPSqQT","name":"Bow","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

Load and fire as a single action. Must have a quiver.

","category":"Weapon","subcategory":"Bow","damage":0,"armour":null,"range":24,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/bow-long.jpg"} -{"_id":"bc8K2X35HyZ3ilLv","name":"Crossbow","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

Load and fire as separate actions. May reload in place of movement. Must have a quiver.

","category":"Weapon","subcategory":"Crossbow","damage":2,"armour":null,"range":24,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/crossbow-light.jpg"} -{"_id":"pIUgVtBi8HY0wWad","name":"Two-Handed Weapon","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

Takes up two item slots.

","category":"Weapon","subcategory":"Two-Handed Weapon","damage":2,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/glaive.png"} -{"_id":"tepMTpdLsYToTt6Q","name":"Unarmed","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

-2 Fight.

","category":"Weapon","subcategory":"Unarmed","damage":-2,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/skills/blood_11.jpg"} -{"_id":"xdAmMNWwT945pgHx","name":"Dagger","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"

First dagger does not take up an item slot.

","category":"Weapon","subcategory":"Dagger","damage":-1,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/items/weapons/dagger.jpg"} -{"name":"Natural Weapon","permission":{"default":0,"t4s6NRodQrHWaAMD":3},"type":"item","data":{"description":"","category":"Weapon","subcategory":"Natural Weapon","damage":0,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"flags":{},"img":"systems/dnd5e/icons/skills/blood_06.jpg","_id":"xiMhRBKLUKy5wHFY"} +{"_id":"3znr4S0pBxvsjHfT","name":"Staff","type":"item","img":"icons/weapons/staves/staff-simple-carved.webp","data":{"description":"

-1 damage modifier to opponent in hand-to-hand combat.

","category":"Weapon","subcategory":"Staff","damage":-1,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.3znr4S0pBxvsjHfT"}}} +{"_id":"I5dzIblASNnXm6wP","name":"Hand Weapon","type":"item","img":"icons/weapons/swords/greatsword-blue.webp","data":{"description":null,"category":"Weapon","subcategory":"Hand Weapon","damage":0,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.I5dzIblASNnXm6wP"}}} +{"_id":"J2MgKDjl7PnzfFk7","name":"Quiver","type":"item","img":"icons/containers/ammunition/arrows-quiver-brown-grey.webp","data":{"description":null,"category":"Weapon","subcategory":"Quiver","damage":null,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.J2MgKDjl7PnzfFk7"}}} +{"_id":"NCVtlHqckthPSqQT","name":"Bow","type":"item","img":"icons/weapons/bows/shortbow-leather.webp","data":{"description":"

Load and fire as a single action. Must have a quiver.

","category":"Weapon","subcategory":"Bow","damage":0,"armour":null,"range":24,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.NCVtlHqckthPSqQT"}}} +{"_id":"bc8K2X35HyZ3ilLv","name":"Crossbow","type":"item","img":"icons/weapons/crossbows/crossbow-purple.webp","data":{"description":"

Load and fire as separate actions. May reload in place of movement. Must have a quiver.

","category":"Weapon","subcategory":"Crossbow","damage":2,"armour":null,"range":24,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.bc8K2X35HyZ3ilLv"}}} +{"_id":"pIUgVtBi8HY0wWad","name":"Two-Handed Weapon","type":"item","img":"icons/weapons/polearms/halberd-curved-steel.webp","data":{"description":"

Takes up two item slots.

","category":"Weapon","subcategory":"Two-Handed Weapon","damage":2,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.pIUgVtBi8HY0wWad"}}} +{"_id":"tepMTpdLsYToTt6Q","name":"Unarmed","type":"item","img":"icons/skills/melee/unarmed-punch-fist.webp","data":{"description":"

-2 Fight.

","category":"Weapon","subcategory":"Unarmed","damage":-2,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.tepMTpdLsYToTt6Q"}}} +{"_id":"xdAmMNWwT945pgHx","name":"Dagger","type":"item","img":"icons/weapons/daggers/dagger-straight-cracked.webp","data":{"description":"

First dagger does not take up an item slot.

","category":"Weapon","subcategory":"Dagger","damage":-1,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.xdAmMNWwT945pgHx"}}} +{"_id":"xiMhRBKLUKy5wHFY","name":"Natural Weapon","type":"item","img":"icons/creatures/claws/claw-hooked-curved.webp","data":{"description":null,"category":"Weapon","subcategory":"Natural Weapon","damage":0,"armour":null,"range":null,"effect":"","price":null,"sale":null,"ingredient":null},"effects":[],"folder":null,"sort":0,"permission":{"default":0,"t4s6NRodQrHWaAMD":3},"flags":{"core":{"sourceId":"Compendium.foundryvtt-frostgrave.weapons.xiMhRBKLUKy5wHFY"}}} diff --git a/system.json b/system.json index 4208bd4..a0a9f16 100644 --- a/system.json +++ b/system.json @@ -2,11 +2,11 @@ "name": "foundryvtt-frostgrave", "title": "Frostgrave", "description": "The Frostgrave system for Foundry VTT", - "version": "2.0.0", + "version": "2.0.1", "minimumCoreVersion": "0.8.0", "compatibleCoreVersion": "0.8.5", - "templateVersion": 2, - "author": "Phenomen", + "templateVersion": 3, + "author": "LeRatierBretonnien/Phenomen", "esmodules": [ "module/frostgrave.js" ], diff --git a/template.json b/template.json index cf5d38a..e3640b6 100644 --- a/template.json +++ b/template.json @@ -15,6 +15,7 @@ "expscenario": 0, "exptotal": 0, "level": 0, + "money":0, "levellog": "", "mod": 0, "health": { diff --git a/templates/actor/partials/actor-tab-items.html b/templates/actor/partials/actor-tab-items.html index 1b1e06d..7397236 100644 --- a/templates/actor/partials/actor-tab-items.html +++ b/templates/actor/partials/actor-tab-items.html @@ -29,8 +29,11 @@
-
{{item.name}}
- + {{#if (ne item.data.data.damage null)}} +
{{item.name}}
+ {{else}} +
{{item.name}}
+ {{/if}}