added DP on technique (wip)

2022-02-10 14:30:27 +01:00
parent 1afd85d3e9
commit b35fb852af
31 changed files with 1030 additions and 706 deletions
--- a/system/scripts/actors/base-character-sheet.js
+++ b/system/scripts/actors/base-character-sheet.js
@@ -277,33 +277,14 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e {
            return;
        }

-        // *** Dice event on Skills clic ***
-        html.find(".dice-picker").on("click", (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-            const li = $(event.currentTarget);
-            let skillId = li.data("skill") || null;
+        // Dice event on Skills clic
+        html.find(".dice-picker").on("click", this._openDicePickerForSkill.bind(this));

-            const weaponId = li.data("weapon-id") || null;
-            if (weaponId) {
-                skillId = this._getWeaponSkillId(weaponId);
-            }
-
-            new game.l5r5e.DicePickerDialog({
-                ringId: li.data("ring") || null,
-                skillId: skillId,
-                skillCatId: li.data("skillcat") || null,
-                isInitiativeRoll: li.data("initiative") || false,
-                actor: this.actor,
-            }).render(true);
-        });
+        // Dice event on Technique clic
+        html.find(".dice-picker-tech").on("click", this._openDicePickerForTechnique.bind(this));

        // Prepared (Initiative)
-        html.find(".prepared-control").on("click", (event) => {
-            event.preventDefault();
-            event.stopPropagation();
-            this._switchPrepared();
-        });
+        html.find(".prepared-control").on("click", this._switchPrepared.bind(this));

        // Equipped / Readied
        html.find(".equip-readied-control").on("click", this._switchEquipReadied.bind(this));
@@ -317,9 +298,13 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e {

    /**
     * Switch the state "prepared" (initiative)
+     * @param {Event} event
     * @private
     */
-    _switchPrepared() {
+    _switchPrepared(event) {
+        event.preventDefault();
+        event.stopPropagation();
+
        this.actor.data.data.prepared = !this.actor.data.data.prepared;
        this.actor.update({
            data: {
@@ -594,4 +579,68 @@ export class BaseCharacterSheetL5r5e extends BaseSheetL5r5e {
        }
        return null;
    }
+
+    /**
+     * Open the dice-picker for this skill
+     * @param {Event} event
+     * @private
+     */
+    _openDicePickerForSkill(event) {
+        event.preventDefault();
+        event.stopPropagation();
+        const li = $(event.currentTarget);
+        let skillId = li.data("skill") || null;
+
+        const weaponId = li.data("weapon-id") || null;
+        if (weaponId) {
+            skillId = this._getWeaponSkillId(weaponId);
+        }
+
+        new game.l5r5e.DicePickerDialog({
+            ringId: li.data("ring") || null,
+            skillId: skillId,
+            skillCatId: li.data("skillcat") || null,
+            isInitiativeRoll: li.data("initiative") || false,
+            actor: this.actor,
+        }).render(true);
+    }
+
+    /**
+     * Open the dice-picker for this technique
+     * @param {Event} event
+     * @private
+     */
+    _openDicePickerForTechnique(event) {
+        event.preventDefault();
+        event.stopPropagation();
+
+        const itemId = $(event.currentTarget).data("item-id") || null;
+        const item = this.actor.items.get(itemId);
+        if (!item || item.type !== "technique" || !item.data.data.skill) {
+            return;
+        }
+        const itemData = item.data.data;
+
+        const difficulties = game.l5r5e.DicePickerDialog.parseDifficulty(this.actor, itemData.difficulty);
+        if (!difficulties) {
+            // do not block if no target or not found
+            difficulties.difficulty = null;
+            difficulties.difficultyHidden = null;
+            return;
+        }
+
+        const skills = game.l5r5e.DicePickerDialog.parseSkills(itemData.skill);
+        if (!skills) {
+            return;
+        }
+
+        console.log(difficulties, skills); // todo tmp
+
+        new game.l5r5e.DicePickerDialog({
+            actor: this.actor,
+            ringId: itemData.ring || null,
+            ...difficulties,
+            ...skills,
+        }).render(true);
+    }
 }
--- a/system/scripts/actors/character-generator-dialog.js
+++ b/system/scripts/actors/character-generator-dialog.js
@@ -21,11 +21,11 @@ export class CharacterGeneratorDialog extends FormApplication {
        generate: {
            attributes: true,
            demeanor: true,
+            identity: true,
            items: true,
            name: true,
            narrative: true,
            peculiarities: true,
-            social: true,
            techniques: true,
        },
    };
@@ -40,7 +40,7 @@ export class CharacterGeneratorDialog extends FormApplication {
            classes: ["l5r5e", "character-generator-dialog"],
            template: CONFIG.l5r5e.paths.templates + "actors/character-generator-dialog.html",
            title: game.i18n.localize("l5r5e.char_generator.title"),
-            // width: 600,
+            width: 450,
            // height: 360,
            resizable: false,
            closeOnSubmit: false,
@@ -72,13 +72,9 @@ export class CharacterGeneratorDialog extends FormApplication {
        const actorDatas = this.actor.data.data;

        // Identity
-        //this.object.age = actorDatas.age;
        this.object.clan = actorDatas.identity.clan || "random";
-        this.object.gender = actorDatas.identity.female
-            ? "female"
-            : actorDatas.identity.female === false
-            ? "male"
-            : "random";
+        this.object.gender =
+            actorDatas.identity.female === null ? "random" : actorDatas.identity.female ? "female" : "male";

        // Rings
        this.object.avgRings = CharacterGenerator.sanitizeMinMax(
@@ -106,8 +102,8 @@ export class CharacterGeneratorDialog extends FormApplication {
            clanList: [{ id: "random", label: game.i18n.localize("l5r5e.random") }, ...clans],
            genderList: [
                { id: "random", label: game.i18n.localize("l5r5e.random") },
-                { id: "male", label: game.i18n.localize("l5r5e.gender.male") },
-                { id: "female", label: game.i18n.localize("l5r5e.gender.female") },
+                { id: "male", label: game.i18n.localize("l5r5e.social.gender.male") },
+                { id: "female", label: game.i18n.localize("l5r5e.social.gender.female") },
            ],
            data: this.object,
        };
--- a/system/scripts/actors/character-generator.js
+++ b/system/scripts/actors/character-generator.js
@@ -87,9 +87,6 @@ export class CharacterGenerator {
        family: "",
        gender: "male",
        age: 15,
-        honor: 30,
-        glory: 30,
-        status: 30,
        maritalStatus: "",
    };

@@ -114,27 +111,24 @@ export class CharacterGenerator {
        this.data.clan = clanName;
        this.data.family = CharacterGenerator._getRandomFamily(clanName);
        this.data.gender = gender;
-        this.data.age = CharacterGenerator._randomInt(15, this.data.avgRingsValue * 10 + 15);
-        this.genSocialStanding();
-        this.data.maritalStatus = this.genMaritalStatus();
    }

    /**
-     * Return true if the gender is male
+     * Return true if the gender is Female
     * @return {boolean}
     */
-    get isMale() {
-        return this.data.gender === "male";
+    get isFemale() {
+        return this.data.gender === "female";
    }

    /**
     * Return a random value for this array
     * @param array
-     * @return {*}
+     * @return {String}
     * @private
     */
    static _getRandomArrayValue(array) {
-        return array[Math.floor(Math.random() * array.length)];
+        return array[Math.floor(Math.random() * array.length)] ?? "";
    }

    /**
@@ -203,30 +197,63 @@ export class CharacterGenerator {
     * @return {Promise<string>}
     */
    async getRandomizedName() {
-        let table = `Japanese names (${this.isMale ? "Male" : "Female"})`;
-        // switch (this.data.clan) {
-        //     case "ivory_kingdoms": table = 'Ivory kingdoms names'; break;
-        //     case "qamarist": table = 'Qamarist names'; break;
-        //     case "ujik": table = 'Ujik names'; break;
-        // }
-
+        let table = `Japanese names (${this.isFemale ? "Female" : "Male"})`;
+        switch (this.data.clan) {
+            case "ivory_kingdoms":
+                table = "Ivory Kingdoms names";
+                break;
+            case "qamarist":
+                table = "Qamarist names";
+                break;
+            case "ujik":
+                table = "Ujik names";
+                break;
+        }
        const randomNames = await game.l5r5e.HelpersL5r5e.drawManyFromPack("l5r5e.core-name-tables", table, 1, {
            displayChat: false,
        });
-        return this.data.family + " " + randomNames?.results[0]?.data.text || "";
+        return this.data.family + " " + (randomNames?.results[0]?.data.text || "");
+    }
+
+    /**
+     * Generate the actor age
+     * @param  {number} avgRingsValue
+     * @return {number}
+     */
+    static genAge(avgRingsValue) {
+        return CharacterGenerator._randomInt(15, avgRingsValue * 10 + 15);
+    }
+
+    /**
+     * Return the marriage state
+     * @param  {number} age
+     * @return {string} unmarried|betrothed|married|widowed
+     */
+    static genMaritalStatus(age) {
+        const rng = Math.random();
+        if (age < 20) {
+            return rng < 0.1 ? "married" : rng < 0.4 ? "betrothed" : "unmarried";
+        }
+        if (age < 30) {
+            return rng < 0.4 ? "married" : rng < 0.7 ? "betrothed" : "unmarried";
+        }
+        return rng < 0.8 ? "married" : rng < 0.9 ? "widowed" : "unmarried";
    }

    /**
     * Generate Honor, Glory and Status values
+     * @param {number} age
+     * @param {string} clan
+     * @return {{honor: number, glory: number, status: number}}
     */
-    genSocialStanding() {
+    static genSocialStanding(age, clan) {
        const karma = Math.random() < 0.66 ? 1 : -1;
        const rng = (initial, variation) => {
            return initial + CharacterGenerator._randomInt(5, variation) * karma;
        };

-        let honor = rng(34, this.data.age / 2);
-        switch (this.data.clan) {
+        let honor = rng(34, age / 2);
+        switch (clan) {
            case "lion":
                honor += 10;
                break;
@@ -234,24 +261,11 @@ export class CharacterGenerator {
                honor -= 10;
                break;
        }
-        this.data.honor = honor;
-        this.data.glory = rng(40, this.data.age / 3);
-        this.data.status = rng(30, this.data.age / 4);
-    }
-
-    /**
-     * Return the marriage state
-     * @return {string} unmarried|betrothed|married|widowed
-     */
-    genMaritalStatus() {
-        const rng = Math.random();
-        if (this.data.age < 20) {
-            return rng < 0.1 ? "married" : rng < 0.4 ? "betrothed" : "unmarried";
-        }
-        if (this.data.age < 30) {
-            return rng < 0.4 ? "married" : rng < 0.7 ? "betrothed" : "unmarried";
-        }
-        return rng < 0.8 ? "married" : rng < 0.9 ? "widowed" : "unmarried";
+        return {
+            honor,
+            glory: rng(40, age / 3),
+            status: rng(30, age / 4),
+        };
    }

    /**
@@ -260,8 +274,8 @@ export class CharacterGenerator {
     * @param {ActorL5r5e} actor                 Actor object
     * @param {Object}     generate
     * @param {boolean}    generate.name          If true generate a new name
-     * @param {boolean}    generate.attributes    If true generate rings, attributes, skills and confrontation ranks
-     * @param {boolean}    generate.social        If true generate Social Standing
+     * @param {boolean}    generate.identity      If true generate Clan, Gender, Age, Marital status
+     * @param {boolean}    generate.attributes    If true generate Rings, attributes, skills and confrontation ranks
     * @param {boolean}    generate.demeanor      If true generate Demeanor and rings affinities
     * @param {boolean}    generate.peculiarities If true generate Advantage and Disadvantage
     * @param {boolean}    generate.items         If true generate Armor, Weapons and Items
@@ -274,7 +288,7 @@ export class CharacterGenerator {
        generate = {
            name: true,
            attributes: true,
-            social: true,
+            identity: true,
            demeanor: true,
            peculiarities: true,
            items: true,
@@ -284,36 +298,45 @@ export class CharacterGenerator {
    ) {
        const actorDatas = actor.data.data;

-        console.log(generate); // TODO tmp
+        // Need to set some required values
+        this.data.age = actorDatas.identity.age || CharacterGenerator.genAge(this.data.avgRingsValue);
+        this.data.maritalStatus =
+            actorDatas.identity.marital_status || CharacterGenerator.genMaritalStatus(this.data.age);
+
+        actorDatas.identity.clan = this.data.clan;
+        actorDatas.identity.family = this.data.family;
+        actorDatas.identity.female = this.isFemale;

        // Name
        const newName = generate.name ? await this.getRandomizedName() : actor.data.name;

-        actorDatas.identity.age = this.data.age;
-        actorDatas.identity.clan = this.data.clan;
-        actorDatas.identity.family = this.data.family;
-        actorDatas.identity.female = this.data.gender === "female";
+        // Identity
+        if (generate.identity) {
+            actorDatas.identity.age = CharacterGenerator.genAge(this.data.avgRingsValue);
+            actorDatas.identity.marital_status = CharacterGenerator.genMaritalStatus(this.data.age);
+            this._generateNotes(actorDatas);
+        }

-        // Img (only if default)
+        // Img (only if system defaults)
        const folder = "systems/l5r5e/assets/icons/actors";
        const newImg = [
            `${folder}/npc.svg`,
            `${folder}/traditional-japanese-man.svg`,
            `${folder}/traditional-japanese-woman.svg`,
        ].includes(actor.data.img)
-            ? `${folder}/traditional-japanese-${this.isMale ? "man" : "woman"}.svg`
+            ? `${folder}/traditional-japanese-${this.isFemale ? "woman" : "man"}.svg`
            : actor.data.img;

-        // Generate attributes (rings, attributes, skills, confrontation ranks)
+        // Generate attributes & Social Standing
        if (generate.attributes) {
+            // Generate attributes (rings, attributes, skills, confrontation ranks)
            this._generateAttributes(actorDatas);
-        }

-        // Social Standing
-        if (generate.social) {
-            actorDatas.social.honor = this.data.honor;
-            actorDatas.social.glory = this.data.glory;
-            actorDatas.social.status = this.data.status;
+            // Social Standing
+            const social = CharacterGenerator.genSocialStanding(this.data.age, this.data.clan);
+            actorDatas.social.honor = social.honor;
+            actorDatas.social.glory = social.glory;
+            actorDatas.social.status = social.status;
        }

        // Demeanor (npc only)
@@ -321,7 +344,7 @@ export class CharacterGenerator {
            this._generateDemeanor(actorDatas);
        }

-        // Items types
+        // Item types
        if (generate.peculiarities || generate.items || generate.techniques) {
            const newItemsData = [];

@@ -346,7 +369,7 @@ export class CharacterGenerator {
            }
        }

-        // Narrative
+        // TODO Narrative
        if (generate.narrative) {
            this._generateNarrative(actorDatas);
        }
@@ -358,8 +381,8 @@ export class CharacterGenerator {
            data: actorDatas,
        };
    }
-
    //<editor-fold desc="toActor generators">
+
    /**
     * Generate attributes (rings, attributes, skills, confrontation ranks)
     * @param {DocumentData.data} actorDatas
@@ -386,9 +409,11 @@ export class CharacterGenerator {
            (skillName) => (actorDatas.skills[skillName] = Math.floor(Math.random() * stats.max))
        );

-        // Confrontation ranks
-        actorDatas.conflict_rank.martial = this.data.avgRingsValue + actorDatas.skills.martial;
-        actorDatas.conflict_rank.social = this.data.avgRingsValue + actorDatas.skills.social;
+        // Confrontation ranks (npc only)
+        if (actorDatas.conflict_rank) {
+            actorDatas.conflict_rank.martial = this.data.avgRingsValue + actorDatas.skills.martial;
+            actorDatas.conflict_rank.social = this.data.avgRingsValue + actorDatas.skills.social;
+        }
    }

    /**
@@ -594,27 +619,30 @@ export class CharacterGenerator {
        } // fr techCfg
    }

+    /**
+     * Fill notes with some values that don't appear in sheet
+     * @param {DocumentData.data} actorDatas
+     * @private
+     */
+    _generateNotes(actorDatas) {
+        actorDatas.notes =
+            `<p>${game.i18n.localize("l5r5e.social.age")}: ${this.data.age}</p>` +
+            `<p>${game.i18n.localize("l5r5e.social.gender.title")}: ${game.i18n.localize(
+                "l5r5e.social.gender." + this.data.gender
+            )}</p>` +
+            `<p>${game.i18n.localize("l5r5e.clan")}: ${game.i18n.localize("l5r5e.clans." + this.data.clan)}</p>` +
+            `<p>${game.i18n.localize("l5r5e.social.marital_status.title")}: ${game.i18n.localize(
+                "l5r5e.social.marital_status." + this.data.maritalStatus
+            )}</p>`;
+    }
+
    /**
     * Generate Narrative fluff
     * @param {DocumentData.data} actorDatas
     * @private
     */
    _generateNarrative(actorDatas) {
-        // Fill notes with some values that don't appear in sheet
-        actorDatas.notes =
-            `<p>${game.i18n.localize("l5r5e.char_generator.age")}: ${this.data.age}</p>` +
-            `<p>${game.i18n.localize("l5r5e.gender.title")}: ${game.i18n.localize(
-                "l5r5e.gender." + this.data.gender
-            )}</p>` +
-            `<p>${game.i18n.localize("l5r5e.clan")}: ${game.i18n.localize("l5r5e.clans." + this.data.clan)}</p>` +
-            `<p>${game.i18n.localize("l5r5e.char_generator.marital_status.title")}: ${game.i18n.localize(
-                "l5r5e.char_generator.marital_status." + this.data.maritalStatus
-            )}</p>`;
-
-        // data: {
-        //     "notes": "",
-        //     "description": "",
-        // },
+        // actorDatas.description = '';
    }
    //</editor-fold>
 }