src/module/dialog/meditatingDialog.mjs

@@ -1,135 +0,0 @@
-import {XmlImport} from "../xml-import/xml-import.mjs";
-import {SpecialAbility} from "../documents/specialAbility.mjs";
-
-const {
-    ApplicationV2, 
-    HandlebarsApplicationMixin
-} = foundry.applications.api
-
-export class MeditatingDialog extends HandlebarsApplicationMixin(ApplicationV2) {
-
-    static DEFAULT_OPTIONS = {
-        classes: ['dsa41', 'dialog', 'meditating'],
-        tag: "form",
-        position: {
-            width: 320,
-            height: 433
-        },
-        window: {
-            resizable: false,
-            title: 'Meditieren'
-        },
-        form: {
-            submitOnChange: true,
-            closeOnSubmit: false,
-        },
-    }
-
-    static PARTS = {
-        form: {
-            template: 'systems/DSA_4-1/templates/dialog/meditating-dialog.hbs',
-        }
-    }
-
-    /**
-     * @type {Actor}
-     * @private
-     */
-    _actor = null
-
-    constructor(actor) {
-        super();
-        this._actor = actor
-    }
-
-    static async #onSubmitForm(event, form, formData) {
-        event.preventDefault()
-
-    }
-
-    #hatSonderfertigkeit(name) {
-        return this._actor.itemTypes["SpecialAbility"]?.find(p => p.name === name) != null
-    }
-
-    async _prepareContext(options) {
-        const context = await super._prepareContext(options)
-
-        context.hasAstraleMeditation = this.#hatSonderfertigkeit("Astrale Meditation")
-        context.hasThonnys = false
-
-
-
-        context.rituale = {}
-
-        this._actor.itemTypes["SpecialAbility"]?.filter(p => p.name.startsWith("Ritualkenntnis")).forEach( p => {
-            context.rituale[p.name] = p.name.split("Ritualkenntnis:")[1].trim()
-        })
-
-        context.duration = "0"
-        context.costs = "0 + 1d3"
-        context.result = 0
-
-        return context
-    }
-
-
-    #update(context) {
-        // params
-        const aspregain = this.element.querySelector('[name="aspRegain"]').value
-        const thonnys = !!this.element.querySelector('[name="thonnys"]:checked')
-        const astralmeditation = !!this.element.querySelector('[name="astralmeditation"]:checked')
-        const talent = this.element.querySelector('[name="skill"]').value
-        const rituale = this._actor.itemTypes["SpecialAbility"]?.filter(p => p.name.startsWith("Ritualkenntnis"))
-
-        let wert = rituale.find( p => context.rituale[talent])?.system.value.split(talent + ": ")[1].trim() ?? null
-
-        let ritualWert = 0
-
-        if (!wert) {
-            console.log("Ritualkenntniswert nicht gefunden für", talent)
-            // maybe its actually a talent?
-
-            const actualTalent = this._actor.itemTypes["Skill"].find(p => p.name === talent)
-            if (actualTalent) {
-                wert = actualTalent.system.taw
-                ritualWert = wert + "/2"
-            }
-        } else {
-            ritualWert = Number(wert)
-        }
-
-        // outputs
-        const probe = this.element.querySelector("[name='talentprobe']")
-        const dauer = this.element.querySelector("[name='duration']")
-        const costs = this.element.querySelector("[name='costs']")
-        const result = this.element.querySelector("[name='result']")
-
-        let penalty
-        let bonus = " +"+ ritualWert
-
-        if (astralmeditation && thonnys) {
-            bonus = " +" + ritualWert + " +3"
-        }
-
-        if (astralmeditation && thonnys) {
-            penalty = ""
-        } else {
-            penalty = " +1d3"
-        }
-
-        probe.value = "IN/CH/KO " + bonus
-        costs.value = ""+aspregain + penalty + " LeP"
-        dauer.value = aspregain + " Spielrunden"
-        result.value = aspregain + " AsP"
-
-    }
-
-    _onRender(context, options) {
-        this.#update(context)
-
-        this.element.querySelectorAll('[name="thonnys"], [name="astralmeditation"], [name="skill"], [name="aspRegain"]').forEach(e => e.addEventListener('change', (event) => {
-            this.#update(context)
-        }))
-
-    }
-}

src/module/dialog/restingDialog.mjs

@@ -33,7 +33,7 @@ export class RestingDialog extends HandlebarsApplicationMixin(ApplicationV2) {
     }
 
     /**
-     * @type {Character}
+     * @type {Actor}
      * @private
      */
     _actor = null
@@ -159,7 +159,7 @@ export class RestingDialog extends HandlebarsApplicationMixin(ApplicationV2) {
         this.badWeather = -1
         this.woundTreated = false
         this.woundRegenerationModifier = 0
-        this.wounds = this._actor.getWoundModel().current
+        this.wounds = 1
         this.badCamp = false
         this.watch = false
         this.interrupted = false
@@ -176,14 +176,13 @@ export class RestingDialog extends HandlebarsApplicationMixin(ApplicationV2) {
 
     static async #regenerate() {
         const context = this.#updateData()
-        const rollData = this._actor.system
+        const rollData = this._actor.getRollData()
 
         // regenerate LeP
 
         const targetBonusLep = rollData.attribute.ko.aktuell + context.koRoll
         const targetBonusAsp = rollData.attribute.in.aktuell + context.inRoll
 
-        // TODO: needs to be situational (not every character has AsP for example) and not a compound roll statement
         const regenerationRoll = await new Roll("1d20[Konstitution]+1d20[Intuition]+1d20[Konstitution] + 2d6").evaluate()
 
         const [koRoll, _, inRoll, __, woundRoll, ___, lepAndAsp] = regenerationRoll.terms // the 3d20s
@@ -192,7 +191,6 @@ export class RestingDialog extends HandlebarsApplicationMixin(ApplicationV2) {
         const woundHealed = woundRoll.results[0].result <= rollData.attribute.ko.aktuell + (context.woundMod * -1)
         const [regLep, regAsp] = lepAndAsp.results // the 2d6s
 
-        // TODO: message needs to be better structured, and also include Buttons to heal LeP and restore AsP
         await regenerationRoll.toMessage({
             speaker: ChatMessage.getSpeaker({actor: this.actor}),
             flavor:
@@ -247,6 +245,8 @@ export class RestingDialog extends HandlebarsApplicationMixin(ApplicationV2) {
         context.hasAsP = true
         context.wounds = this.wounds
 
+        // TODO count wounds
+
         let lepRestModifier = 0
         let aspRestModifier = 0
 

src/module/documents/character.mjs

@@ -621,38 +621,4 @@ export class Character extends Actor {
         }
         await this.update({system: {lep: {aktuell: previousLeP - damage}}})
     }
-
-    getWoundModel() {
-        if (this.type === "Character") {
-            const actorData = this;
-            const systemData = actorData.system;
-            let returnValue = {
-                max: 0,
-                current: 0,
-                ws: 0
-            }
-
-            returnValue.max = systemData.wunden.max;
-            console.log("spiel mit trefferzonen: ", game.settings.get("DSA_4-1", "optional_trefferzonen"));
-            if (game.settings.get("DSA_4-1", "optional_trefferzonen")) {
-                returnValue.current =
-                    systemData.wunden.kopf +
-                    systemData.wunden.brust +
-                    systemData.wunden.bauch +
-                    systemData.wunden.ruecken +
-                    systemData.wunden.armlinks +
-                    systemData.wunden.armrechts +
-                    systemData.wunden.beinlinks +
-                    systemData.wunden.beinrechts +
-                    systemData.wunden.gesamt;
-            } else {
-                returnValue.current = systemData.wunden.aktuell;
-            }
-
-            returnValue.ws = systemData.ws;
-            return returnValue;
-        } else {
-            return null;
-        }
-    }
 }

src/module/sheets/characterSheet.mjs

@@ -26,7 +26,6 @@ import {SpellDialog} from "../dialog/spellDialog.mjs";
 import {displayRoll} from "../globals/displayRoll.js";
 import {ResourceType} from "../data/character.mjs";
 import {EditResourceDialog} from "../dialog/resourceDialog.mjs";
-import {MeditatingDialog} from "../dialog/meditatingDialog.mjs";
 
 const {HandlebarsApplicationMixin, DocumentSheetV2} = foundry.applications.api
 const {ActorSheetV2} = foundry.applications.sheets
@@ -65,7 +64,6 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
             cancelCooldown: CharacterSheet.#cancelCooldown,
             activateCooldown: CharacterSheet.#activateCooldown,
             rest: CharacterSheet.#startResting,
-            meditate: CharacterSheet.#startMeditating,
             removeEffect: CharacterSheet.#removeEffect,
             rollDamage: CharacterSheet.#rollDamage,
             openItemBrowser: CharacterSheet.openItemBrowser,
@@ -339,11 +337,6 @@ class CharacterSheet extends HandlebarsApplicationMixin(ActorSheetV2) {
         dialog.render(true)
     }
 
-    static #startMeditating(event, target) {
-        const dialog = new MeditatingDialog(this.document)
-        dialog.render(true)
-    }
-
     static async #removeEffect(event, target) {
         const {actorId, effectId} = target.dataset
 

src/module/sheets/specialAbilitySheet.mjs

@@ -302,7 +302,7 @@ export class SpecialAbilitySheet extends HandlebarsApplicationMixin(DocumentShee
 
     _onRender(context, options) {
         if (this._selectedVariant == null) {
-            this._selectedVariant = this.document.system.auswahl[0]?.name ?? ""
+            this._selectedVariant = this.document.system.auswahl[0].name
             this._currentSelectedVariant = this.document.system.auswahl?.find(p => p.name === this._selectedVariant)
             this._currentSelectedVariantIndex = this.document.system.auswahl?.findIndex(p => p.name === this._selectedVariant)
         }

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

@@ -16,8 +16,6 @@ export class XmlImport {
     #unknownSpecialAbilities = []
     #unknownAdvantage = []
 
-    #ritualkenntnisse = {}
-
     #months = [
         "Praios",
         "Rondra",
@@ -240,24 +238,19 @@ export class XmlImport {
             json.attribute.ko = this.#getAttributeJson(attributes, "Konstitution")
             json.attribute.kk = this.#getAttributeJson(attributes, "Körperkraft")
             json.mr = {
-                mod: Number(this.#filterAttribute(attributes, "Magieresistenz").mod) +
+                mod: this.#filterAttribute(attributes, "Magieresistenz").mod
-                     Number(this.#filterAttribute(attributes, "Magieresistenz").value) // bought points
             }
             json.lep = {
-                mod: Number(this.#filterAttribute(attributes, "Lebensenergie").mod) +
+                mod: this.#filterAttribute(attributes, "Lebensenergie").mod
-                     Number(this.#filterAttribute(attributes, "Lebensenergie").value) // bought points
             }
             json.aup = {
-                mod: Number(this.#filterAttribute(attributes, "Ausdauer").mod) +
+                mod: this.#filterAttribute(attributes, "Ausdauer").mod
-                     Number(this.#filterAttribute(attributes, "Ausdauer").value) // bought points
             }
             json.asp = {
-                mod: Number(this.#filterAttribute(attributes, "Astralenergie").mod) +
+                mod: this.#filterAttribute(attributes, "Astralenergie").mod
-                     Number(this.#filterAttribute(attributes, "Astralenergie").value) // bought points
             }
             json.kap = {
-                mod: Number(this.#filterAttribute(attributes, "Karmaenergie").mod) +
+                mod: this.#filterAttribute(attributes, "Karmaenergie").mod
-                     Number(this.#filterAttribute(attributes, "Karmaenergie").value) // bought points
             }
             let attribute = this.#filterAttribute(attributes, "ini")
             json.ini = {
@@ -304,6 +297,7 @@ export class XmlImport {
                 }
             }
         }
+        this.#mapSpecialAbilities(actor, specialAbilities)
         json.liturgien = liturgies
 
         let combatValues = []
@@ -321,7 +315,7 @@ export class XmlImport {
         if (!options.skipSpells) this.#mapSpells(actor, held)
         if (!options.skipLiturgies) this.#mapLiturgies(actor, liturgies)
         if (!options.skipEquipment) this.#mapEquipment(actor, held)
-        if (!options.skipSpecialAbilities) this.#mapSpecialAbilities(actor, specialAbilities)
+
         let notes = []
         for (let note in held.kommentare) {
             note = held.kommentare[note]
@@ -471,10 +465,8 @@ export class XmlImport {
         for (let talent in held.talentliste.talent) {
             talent = held.talentliste.talent[talent]
 
-
+            // hook liturgy
-        if (talent.name.startsWith("Ritualkenntnis")) { // hook Ritualkenntnisse
+            if (talent.name.startsWith("Liturgiekenntnis")) {
-            this.#ritualkenntnisse[talent.name] =  talent.value;
-        } else if (talent.name.startsWith("Liturgiekenntnis")) { // hook liturgy
 
                 actor.createEmbeddedDocuments('Item', [
                     new Blessing({
@@ -635,32 +627,15 @@ export class XmlImport {
                     })
                 })
             } else {
-
+                actor.createEmbeddedDocuments('Item', [
-
+                    new SpecialAbility({
-                if (specialAbility.name.startsWith("Ritualkenntnis")) {
+                        name: specialAbility.name,
-                    actor.createEmbeddedDocuments('Item', [
+                        type: "SpecialAbility",
-                        new SpecialAbility({
+                        system: {
-                            name: specialAbility.name,
+                            description: specialAbility.auswahl?.wahl?.join("\n"),
-                            type: "SpecialAbility",
+                        }
-                            system: {
+                    })
-                                name: specialAbility.name,
+                ])
-                                value: specialAbility.name + "(" + this.#ritualkenntnisse[specialAbility.name] + ")",
-                                description: specialAbility.auswahl?.wahl?.join("\n"),
-                            }
-                        })
-                    ])
-                } else {
-                    actor.createEmbeddedDocuments('Item', [
-                        new SpecialAbility({
-                            name: specialAbility.name,
-                            type: "SpecialAbility",
-                            system: {
-                                name: specialAbility.name,
-                                description: specialAbility.auswahl?.wahl?.join("\n"),
-                            }
-                        })
-                    ])
-                }
 
                 this.#unknownSpecialAbilities.push(specialAbility.name)
             }

src/style/molecules/_sidebar-elements.scss

@@ -95,8 +95,7 @@
     .button {
 
       margin-bottom: 8px;
-      display: flex;
+
-      justify-content: space-between;
     }
 
     .attack {

src/style/organisms/_resting-dialog.scss

@@ -1,5 +1,4 @@
-.application.dsa41.dialog.resting,
+.application.dsa41.dialog.resting {
-.application.dsa41.dialog.meditating {
 
   section {
 
@@ -14,7 +13,6 @@
       div.setting {
         margin-left: 32px;
         padding-bottom: 16px;
-        position: relative;
 
         &.setting-nest-1 {
           margin-left: 64px;
@@ -25,14 +23,6 @@
           margin-left: 34px;
         }
 
-        input[type="checkbox"] {
-          margin-left: -32px;
-
-          &+span {
-            margin-left: 6px;
-          }
-        }
-
         &.combined {
           input[type="checkbox"], input[type="radio"] {
             margin-left: -32px;
@@ -53,8 +43,6 @@
           input[type="checkbox"], input[type="radio"] {
             margin-left: -32px;
             padding-right: 8px;
-            position: absolute;
-            left: 0;
           }
 
           span {

src/templates/actor/character/main-sheet.hbs

@@ -38,7 +38,8 @@
 
         {{#if ausdauer}}
         <div class="sidebar-element resource-bar" data-action="editAup">
-            <label>AuP:</label> <input type="number" name="system.aup.aktuell" value="{{this.system.aup.aktuell}}"><span class="resource-fill aup" style="width: {{this.aupper}}%"></span>
+            <label>AuP:</label> <input type="number" name="system.aup.aktuell" value="{{this.system.aup.aktuell}}><span class="resource-fill aup"
+                                                         style="width: {{this.aupper}}%"></span>
         </div>
         {{/if}}
 
@@ -56,9 +57,6 @@
 
         <div class="sidebar-element button">
             <button type="button" data-action="rest"><i class="fa-solid fa-bed"></i> Rasten</button>
-            {{#if this.hasSpells}}
-                <button type="button" data-action="meditate"><i class="fa-solid fa-person-praying"></i> Meditieren</button>
-            {{/if}}
         </div>
 
         {{#each attacks}}

src/templates/dialog/meditating-dialog.hbs

@@ -1,46 +0,0 @@
-<section>
-    <div class="options">
-        <label>
-            <span>Ritual der Meditation</span>
-            <select name="skill">
-                {{selectOptions rituale}}
-                <option value="Musizieren">Elfisch</option>
-                <option value="Selbstbeherrschung">Schelmisch</option>
-            </select>
-        </label>
-    </div>
-    <div class="options">
-        <label>
-            <input type="checkbox" name="astralmeditation" {{checked this.hasAstraleMeditation}}/>
-            <span>Astrale Meditation erlernt</span>
-        </label>
-    </div>
-    <div class="options">
-        <label>
-            <input type="checkbox" name="thonnys" {{checked this.hasThonnys}}/>
-            <span>Thonnys verfügbar</span>
-        </label>
-    </div>
-    <div class="options">
-        <label>
-            <span>Lebenspunkte Umwandeln</span>
-            <input name="aspRegain" type="number"/>
-        </label>
-    </div>
-
-    <fieldset>
-        <legend>Modifikatoren</legend>
-        <div class="results">
-            <span id="header_skill">Probe</span>
-            <output name="talentprobe">{{talentprobe}}</output>
-            <span>Dauer</span>
-            <output name="duration">{{duration}}</output>
-            <span>Kosten</span>
-            <output name="costs">{{costs}}</output>
-            <span>Bei Erfolg</span>
-            <output name="result">{{result}}</output>
-
-        </div>
-    </fieldset>
-    <button type="button" class="actions" data-action="regenerate"><i class="fa-solid fa-person-praying"></i> Meditieren</button>
-</section>

src/templates/dialog/resting-dialog.hbs

@@ -1,25 +1,24 @@
 <section>
-    {{!-- TODO: Refactor dialog and explain more what each and every knob and input does --}}
+
     <div class="options">
 
         <div class="setting">
             <label>
                 <span>Dauer der Rast</span>
-                <input type="number" name="length" placeholder="6" value="{{length}}"/><span>Stunden</span>
+                <input type="number" name="length" placeholder="6" value="{{length}}"/>
             </label>
         </div>
 
         <div class="setting">
             <label>
-                <span>Anzahl Wunden</span>
+                <span>Wunden</span>
                 <input type="number" name="wounds" placeholder="0" value="{{wounds}}"/>
             </label>
         </div>
 
-        <div class="setting">
+        <div class="setting combined">
             <label>
-                <input type="checkbox" name="wound_treated"/>
+                <input type="checkbox" name="wound_treated"/><span>Wunde behandelt</span>
-                <span>Wunde behandelt (Modifikator)</span>
                 <input type="number" name="wound_treat_modifier" placeholder="0" value="{{wound_treat_modifier}}"/>
             </label>
         </div>

systems/DSA_4-1

@@ -1 +0,0 @@
-../src