adds new equipment

gulpfile.mjs

@@ -112,10 +112,17 @@ async function prepareDB() {
         convert("./src/packs/_source/vorteile", "./src/packs/__source/vorteile", "Advantage");
         convert("./src/packs/_source/nachteile", "./src/packs/__source/vorteile", "Advantage", false);
         convert("./src/packs/_source/sonderfertigkeiten", "./src/packs/__source/sonderfertigkeiten", "SpecialAbility");
-        convert("./src/packs/_source/waffen", "./src/packs/__source/waffen", "Equipment");
         convert("./src/packs/_source/waehrungen", "./src/packs/__source/waehrungen", "Equipment");
-        convert("./src/packs/_source/munition", "./src/packs/__source/munition", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Waffen", "./src/packs/__source/Waffen", "Equipment");
-        convert("./src/packs/_source/ruestzeug", "./src/packs/__source/ruestzeug", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Munition", "./src/packs/__source/Munition", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Ruestzeug", "./src/packs/__source/Ruestzeug", "Equipment");
+        convert("./src/packs/_source/Gegenstaende/Behaelter", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Bekleidung", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Beleuchtung", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Buecher", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Essutensilien", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Sonstiges", "./src/packs/__source/Gegenstaende", "Equipment", false);
+        convert("./src/packs/_source/Gegenstaende/Werkzeug", "./src/packs/__source/Gegenstaende", "Equipment", false);
         convert("./src/packs/_source/liturgien-und-segnungen", "./src/packs/__source/liturgien", "Liturgy");
         convert("./src/packs/_source/wunden", "./src/packs/__source/wunden", "ActiveEffect");
 

src/main.mjs

@@ -287,6 +287,26 @@ Hooks.once("init", () => {
         requiresReload: true
     })
 
+    Handlebars.registerHelper("weight", (data) => {
+
+        const baseValue = data * 1000 // to get to gramms (1/1000 Stone)
+
+        const stone = Math.floor(baseValue / 1000)
+        const remainder = baseValue - (stone * 1000)
+        const ounces = remainder / 25
+        let stoneRepresentation = ''
+        let ouncesRepresentation = ''
+        if (stone > 0) {
+            stoneRepresentation = `<span class="stone">${stone}</span>`
+        }
+        if (ounces > 0) {
+            ouncesRepresentation = `<span class="ounces">${ounces}</span>`
+        }
+
+        return new Handlebars.SafeString(`<span class="weight">${stoneRepresentation}${ouncesRepresentation}</span>`)
+
+    })
+
     Handlebars.registerHelper("currency", (data) => {
 
 

src/module/data/character.mjs

@@ -125,6 +125,7 @@ export class PlayerCharacterDataModel extends foundry.abstract.TypeDataModel {
             cooldowns: new ArrayField(new SchemaField({
                 start: new NumberField({required: true, integer: true}),
                 current: new NumberField({required: true, integer: true}),
+                type: new StringField({required: true}), // "MANEUVER", "SPELL", "LITURGY", "TALENT"
                 data: new ObjectField()
             })),
 

src/module/data/cooldown.mjs

@@ -0,0 +1,27 @@
+/**
+ * @typedef ManueverCooldownData
+ * @property {String} weapon
+ * @property {String} skill
+ * @property {String} target
+ * @property {*} maneuver,
+ * @property {Number} mod
+ * @property {Number} circumstance
+ * @property {Number} penalty
+ * @property {Number} targetNumber
+ */
+
+/**
+ * @typedef LiturgyCooldownData
+ * Data that pertains to sustain a Cooldown of a Liturgy, this includes a target if any the liturgy by Id and all applied modifications
+ * @property {String} liturgy the id of the Liturgy to be cast
+ * @property {String} target the id of the target, if any, of the Liturgy
+ * @property {[String]} mod an Array of Mods that are applied to the Liturgy
+ */
+
+/**
+ * @typedef Cooldown
+ * @property {({weapon: Item, skill: Item, target: Actor, mod: Number})=>Number} start
+ * @property {({weapon: Item, skill: Item, target: Actor, mod: Number})=>Number} current
+ * @property {ManueverCooldownData|LiturgyCooldownData} data
+ */
+

src/module/dialog/combatAction.mjs

@@ -99,6 +99,7 @@ export class CombatActionDialog extends HandlebarsApplicationMixin(ApplicationV2
             return true
         } else { // push into cooldown queue
             const cooldowns = this._actor.system.cooldowns
+            /** @type Cooldown */
             const newCooldown = {
                 start: maneuver.cooldown({weapon, skill, target, mod: this._mod}),
                 current: maneuver.cooldown({weapon, skill, target, mod: this._mod}),

src/module/sheets/character/equipment.mjs

@@ -198,7 +198,7 @@ export default {
                                 && key.indexOf(".links") === -1
                                 && key.indexOf(".rechts") === -1
                                 && key.indexOf(".fernkampf") === -1
-                                && key.indexOf(".munition") === -1
+                                && key.indexOf(".Munition") === -1
                         })
                         updateObject[nextUnoccupiedSlot[0]] = target.dataset.itemId
                         thisObject.document.update(updateObject)

src/module/sheets/characterSheet.mjs

@@ -71,7 +71,8 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
             template: Combat.template
         },
         equipment: {
-            template: Equipment.template
+            template: Equipment.template,
+            scrollable: ['']
         },
         skills: {
             template: Skills.template

src/module/xml-import/xml-import.mjs

@@ -498,6 +498,7 @@ export class XmlImport {
             const compendiumOfArmor = game.packs.get('DSA_4-1.Armor');
             const compendiumOfWeapons = game.packs.get('DSA_4-1.Weapons');
             const compendiumOfAmmunition = game.packs.get('DSA_4-1.Ammunition');
+            const compendiumOfItems = game.packs.get('DSA_4-1.Items');
             let eId = null
             let compendium = null
             if (compendiumOfArmor?.index.find(p => p.name === e.name)) {
@@ -512,6 +513,10 @@ export class XmlImport {
                 eId = compendiumOfAmmunition?.index.find(p => p.name === e.name)
                 compendium = compendiumOfAmmunition
             }
+            if (compendiumOfItems?.index.find(p => p.name === e.name)) {
+                eId = compendiumOfItems?.index.find(p => p.name === e.name)
+                compendium = compendiumOfItems
+            }
 
             if (eId && compendium) {
                 compendium.getDocument(eId._id).then(sf => actor.createEmbeddedDocuments('Item', [sf]))

src/packs/_source/Beleuchtung/Duftoel.json

@@ -1,9 +0,0 @@
-{
-  "name": "Duftöl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Feuerstein u Stahl.json

@@ -1,9 +0,0 @@
-{
-  "name": "Feuerstein u Stahl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Gwen-Petryl-Stein.json

@@ -1,9 +0,0 @@
-{
-  "name": "Gwen-Petryl-Stein",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Kerze.json

@@ -1,9 +0,0 @@
-{
-  "name": "Kerze",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Kerzenlaterne, Holz-Pergament.json

@@ -1,9 +0,0 @@
-{
-  "name": "Kerzenlaterne, Holz/Pergament",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Kerzenstaender.json

@@ -1,9 +0,0 @@
-{
-  "name": "Kerzenständer, Zinn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Lampenoel.json

@@ -1,9 +0,0 @@
-{
-  "name": "Lampenöl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Oellampe.json

@@ -1,9 +0,0 @@
-{
-  "name": "Öllampe",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Pechfakel.json

@@ -1,9 +0,0 @@
-{
-  "name": "Pechfakel",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Sturmlaterne.json

@@ -1,9 +0,0 @@
-{
-  "name": "Sturmlaterne, Öl",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Zunderdose-Wasserdicht.json

@@ -1,9 +0,0 @@
-{
-  "name": "Zunderdose, Wasserdicht",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Beleuchtung/Zunderdose.json

@@ -1,9 +0,0 @@
-{
-  "name": "Zunderdose",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Einfaches Trinkhorn.json

@@ -1,9 +0,0 @@
-{
-  "name": "Einfaches Trinkhorn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Eisenpfanne.json

@@ -1,9 +0,0 @@
-{
-  "name": "Eisenpfanne (1,5 Spann)",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Eisentopf.json

@@ -1,9 +0,0 @@
-{
-  "name": "Eisentopf (12 Maß)",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Essebesteck-zinn.json

@@ -1,9 +0,0 @@
-{
-  "name": "Essbesteck, Zinn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Essmesser.json

@@ -1,9 +0,0 @@
-{
-  "name": "Essbesteck, Eisen",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Henkelbecher.json

@@ -1,9 +0,0 @@
-{
-  "name": "Henkelbecher, Zinn",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Holzbecher.json

@@ -1,9 +0,0 @@
-{
-  "name": "Holzbecher, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Holzloeffel.json

@@ -1,9 +0,0 @@
-{
-  "name": "Holzlöffel, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Holzteller.json

@@ -1,9 +0,0 @@
-{
-  "name": "Holzteller, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Karaffe.json

@@ -1,9 +0,0 @@
-{
-  "name": "Karaffe aus Neethaer Glas",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Kessel.json

@@ -1,9 +0,0 @@
-{
-  "name": "Kessel (20 Maß, emailiert)",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Kupferkessel.json

@@ -1,9 +0,0 @@
-{
-  "name": "Kupferkessel",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Silberpokal.json

@@ -1,9 +0,0 @@
-{
-  "name": "Silberpokal",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Essutensilien/Tonkrug.json

@@ -1,9 +0,0 @@
-{
-  "name": "Tonkrug, einfach",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
-  "category": [
-    "Gegenstand"
-  ],
-  "weight": 3,
-  "price": 70
-}

src/packs/_source/Gegenstaende/Behaelter/Dolchscheide.json

@@ -0,0 +1,9 @@
+{
+  "name": "Dolchscheide, versteckt",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Key.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 150
+}

src/packs/_source/Gegenstaende/Behaelter/Futterbeutel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Futterbeutel",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Bag.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 5
+}

src/packs/_source/Gegenstaende/Behaelter/Geldbeutel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Geldbeutel, Leder",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Bag.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 1
+}

src/packs/_source/Gegenstaende/Behaelter/Guerteltasche.json

@@ -0,0 +1,9 @@
+{
+  "name": "Gürteltasche, Hartleder",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Bag.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 4
+}

src/packs/_source/Gegenstaende/Behaelter/Lederrucksack.json

@@ -0,0 +1,9 @@
+{
+  "name": "Lederrucksack (15 Stein)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 40
+}

src/packs/_source/Gegenstaende/Behaelter/Nachthemd.json

@@ -0,0 +1,9 @@
+{
+  "name": "Nachthemd, Leinen",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_192.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 100
+}

src/packs/_source/Gegenstaende/Behaelter/Packsattel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Packsattel, klein",
+  "image": "systems/DSA_4-1/assets/Quivers/SODA_Icons_Quiver_36.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 15,
+  "price": 300
+}

src/packs/_source/Gegenstaende/Behaelter/Quiver.json

@@ -0,0 +1,9 @@
+{
+  "name": "Köcher, Leder (20 Pfeile)",
+  "image": "systems/DSA_4-1/assets/Quivers/SODA_Icons_Quiver_36.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 150
+}

src/packs/_source/Gegenstaende/Behaelter/Schmuckkaestchen.json

@@ -0,0 +1,9 @@
+{
+  "name": "Schmuckkästchen mit Schloss (3 Stein)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Chest.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.125,
+  "price": 150
+}

src/packs/_source/Gegenstaende/Behaelter/Tabakdose.json

@@ -0,0 +1,9 @@
+{
+  "name": "Tabakdose, Silber",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 30
+}

src/packs/_source/Gegenstaende/Behaelter/Trinkflasche.json

@@ -0,0 +1,9 @@
+{
+  "name": "Trinkflasche (5 Schank)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 20
+}

src/packs/_source/Gegenstaende/Behaelter/Zunderdose-Wasserdicht.json

@@ -0,0 +1,9 @@
+{
+  "name": "Zunderdose, Wasserdicht",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 70
+}

src/packs/_source/Gegenstaende/Behaelter/Zunderdose.json

@@ -0,0 +1,9 @@
+{
+  "name": "Zunderdose",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Backpack.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 20
+}

src/packs/_source/Gegenstaende/Bekleidung/Bluse.json

@@ -0,0 +1,9 @@
+{
+  "name": "Bluse",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_146.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 8
+}

src/packs/_source/Gegenstaende/Bekleidung/Hose.json

@@ -0,0 +1,9 @@
+{
+  "name": "Hose",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBoots.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 10
+}

src/packs/_source/Gegenstaende/Bekleidung/Kaftan.json

@@ -0,0 +1,9 @@
+{
+  "name": "Kaftan",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_192.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 3,
+  "price": 70
+}

src/packs/_source/Gegenstaende/Bekleidung/Korsett.json

@@ -0,0 +1,9 @@
+{
+  "name": "Korsett",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_147.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.875,
+  "price": 600
+}

src/packs/_source/Gegenstaende/Bekleidung/Lederguertel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Ledergürtel",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBelt.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.2,
+  "price": 20
+}

src/packs/_source/Gegenstaende/Bekleidung/Lederhandschuhe.json

@@ -0,0 +1,9 @@
+{
+  "name": "Lederhandschuhe",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherGloves.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.15,
+  "price": 30
+}

src/packs/_source/Gegenstaende/Bekleidung/Lederhose.json

@@ -0,0 +1,9 @@
+{
+  "name": "Lederhose",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBoots.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.15,
+  "price": 30
+}

src/packs/_source/Gegenstaende/Bekleidung/Rock.json

@@ -0,0 +1,9 @@
+{
+  "name": "Rock",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Clothing_Scarf.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.125,
+  "price": 10
+}

src/packs/_source/Gegenstaende/Bekleidung/Schwere-Reitstiefel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Schwere Reitstiefel",
+  "image": "systems/DSA_4-1/assets/Armor/SODA_Icon_Armor_LeatherBoots.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2.5,
+  "price": 200
+}

src/packs/_source/Gegenstaende/Bekleidung/Unterkleidung.json

@@ -0,0 +1,9 @@
+{
+  "name": "Unterkleidung",
+  "image": "systems/DSA_4-1/assets/Mage Clothes/SODA_Icons_MageClothes_146.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2.5,
+  "price": 250
+}

src/packs/_source/Gegenstaende/Beleuchtung/Duftoel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Duftöl",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_29.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 10
+}

src/packs/_source/Gegenstaende/Beleuchtung/Feuerstein u Stahl.json

@@ -0,0 +1,9 @@
+{
+  "name": "Feuerstein u Stahl",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Bar2.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 6
+}

src/packs/_source/Gegenstaende/Beleuchtung/Gwen-Petryl-Stein.json

@@ -0,0 +1,9 @@
+{
+  "name": "Gwen-Petryl-Stein",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Gem3.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 10000
+}

src/packs/_source/Gegenstaende/Beleuchtung/Kerze.json

@@ -0,0 +1,9 @@
+{
+  "name": "Kerze",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Candle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 1
+}

src/packs/_source/Gegenstaende/Beleuchtung/Kerzenlaterne, Holz-Pergament.json

@@ -0,0 +1,9 @@
+{
+  "name": "Kerzenlaterne, Holz/Pergament",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Lantern.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 50
+}

src/packs/_source/Gegenstaende/Beleuchtung/Kerzenstaender.json

@@ -0,0 +1,9 @@
+{
+  "name": "Kerzenständer, Zinn",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Candle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 40
+}

src/packs/_source/Gegenstaende/Beleuchtung/Lampenoel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Lampenöl",
+  "image": "systems/DSA_4-1/assets/Condiments/SODA_Icon_Condiments_29.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 10
+}

src/packs/_source/Gegenstaende/Beleuchtung/Oellampe.json

@@ -0,0 +1,9 @@
+{
+  "name": "Öllampe",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Candle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 10
+}

src/packs/_source/Gegenstaende/Beleuchtung/Pechfakel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Pechfakel",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Torch.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 5
+}

src/packs/_source/Gegenstaende/Beleuchtung/Sturmlaterne.json

@@ -0,0 +1,9 @@
+{
+  "name": "Sturmlaterne, Öl",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Lantern.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 120
+}

src/packs/_source/Gegenstaende/Buecher/Buch.json

@@ -1,6 +1,6 @@
 {
   "name": "Buch",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
+  "image": "systems/DSA_4-1/assets/System_Misc/SODA_Icon_System_Misc_Book.png",
   "category": [
     "Gegenstand"
   ],

src/packs/_source/Gegenstaende/Buecher/Pergament.json

@@ -0,0 +1,9 @@
+{
+  "name": "Pergament",
+  "image": "systems/DSA_4-1/assets/Books_Paper/SODA_Icon_Books_Paper_Letter.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.025,
+  "price": 12
+}

src/packs/_source/Gegenstaende/Buecher/Tagebuch.json

@@ -0,0 +1,9 @@
+{
+  "name": "Tagebuch, Papier",
+  "image": "systems/DSA_4-1/assets/Books_Paper/SODA_Icon_Books_Paper_Book1.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 350
+}

src/packs/_source/Gegenstaende/Essutensilien/Bratspieß.json

@@ -1,9 +1,9 @@
 {
   "name": "Bratspieß, Eisen",
-  "image": "systems/DSA_4-1/assets/arsenal/polearm3.png",
+  "image": "systems/DSA_4-1/assets/Meat/SODA_Icons_Meat_2.png",
   "category": [
     "Gegenstand"
   ],
   "weight": 3,
-  "price": 70
+  "price": 50
 }

src/packs/_source/Gegenstaende/Essutensilien/Einfaches Trinkhorn.json

@@ -0,0 +1,9 @@
+{
+  "name": "Einfaches Trinkhorn",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Horn2.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.375,
+  "price": 50
+}

src/packs/_source/Gegenstaende/Essutensilien/Eisenpfanne.json

@@ -0,0 +1,9 @@
+{
+  "name": "Eisenpfanne (1,5 Spann)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 2,
+  "price": 80
+}

src/packs/_source/Gegenstaende/Essutensilien/Eisentopf.json

@@ -0,0 +1,9 @@
+{
+  "name": "Eisentopf (12 Maß)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 3,
+  "price": 100
+}

src/packs/_source/Gegenstaende/Essutensilien/Essebesteck-zinn.json

@@ -0,0 +1,9 @@
+{
+  "name": "Essbesteck, Zinn",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 30
+}

src/packs/_source/Gegenstaende/Essutensilien/Essmesser.json

@@ -0,0 +1,9 @@
+{
+  "name": "Essbesteck, Eisen",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.125,
+  "price": 30
+}

src/packs/_source/Gegenstaende/Essutensilien/Henkelbecher.json

@@ -0,0 +1,9 @@
+{
+  "name": "Henkelbecher, Zinn",
+  "image": "systems/DSA_4-1/assets/Food/SODA_Icon_Food_CupOfTea.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 40
+}

src/packs/_source/Gegenstaende/Essutensilien/Holzbecher.json

@@ -0,0 +1,9 @@
+{
+  "name": "Holzbecher, einfach",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.05,
+  "price": 1
+}

src/packs/_source/Gegenstaende/Essutensilien/Holzloeffel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Holzlöffel, einfach",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.075,
+  "price": 1
+}

src/packs/_source/Gegenstaende/Essutensilien/Holzteller.json

@@ -0,0 +1,9 @@
+{
+  "name": "Holzteller, einfach",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_MortarAndPestle.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.1,
+  "price": 4
+}

src/packs/_source/Gegenstaende/Essutensilien/Karaffe.json

@@ -0,0 +1,9 @@
+{
+  "name": "Karaffe aus Neethaer Glas",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Vase.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.5,
+  "price": 200
+}

src/packs/_source/Gegenstaende/Essutensilien/Kessel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Kessel (20 Maß, emailiert)",
+  "image": "systems/DSA_4-1/assets/Adventure_Items/SODA_Icon_AdventureItems_Vase.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 1.75,
+  "price": 150
+}

src/packs/_source/Gegenstaende/Essutensilien/Kupferkessel.json

@@ -0,0 +1,9 @@
+{
+  "name": "Kupferkessel",
+  "image": "systems/DSA_4-1/assets/Modern/SODA_Icon_Modern_Pot.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 4,
+  "price": 150
+}

src/packs/_source/Gegenstaende/Essutensilien/Silberpokal.json

@@ -0,0 +1,9 @@
+{
+  "name": "Silberpokal",
+  "image": "systems/DSA_4-1/assets/Materials/SODA_Icon_Materials_Coins.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.25,
+  "price": 100
+}

src/packs/_source/Gegenstaende/Essutensilien/Tonkrug.json

@@ -0,0 +1,9 @@
+{
+  "name": "Tonkrug, einfach",
+  "image": "systems/DSA_4-1/assets/Food/SODA_Icon_Food_CupOfTea.png",
+  "category": [
+    "Gegenstand"
+  ],
+  "weight": 0.75,
+  "price": 50
+}