From 090aeab75f7385b5df1ec48b78b3b70465cab5b6 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 9 Jan 2021 14:09:21 +0100 Subject: [PATCH 1/7] added type definitions and translations for spells --- src/lang/en.json | 29 ++++++++++++++++++++++++- src/module/config.ts | 42 ++++++++++++++++++++++++++++++++++++ src/module/item/item-data.ts | 27 +++++++++++++++++++++++ src/template.json | 20 +++++++++++++++++ 4 files changed, 117 insertions(+), 1 deletion(-) diff --git a/src/lang/en.json b/src/lang/en.json index 4f79f7e..c0235a5 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -36,6 +36,8 @@ "DS4.ItemTypeArmorPlural": "Armor", "DS4.ItemTypeShield": "Shield", "DS4.ItemTypeShieldPlural": "Shields", + "DS4.ItemTypeSpell": "Spell", + "DS4.ItemTypeSpellPlural": "Spells", "DS4.ItemTypeTrinket": "Trinket", "DS4.ItemTypeTrinketPlural": "Trinkets", "DS4.ItemTypeEquipment": "Equipment", @@ -72,6 +74,17 @@ "DS4.ArmorMaterialTypeChainAbbr": "Chain", "DS4.ArmorMaterialTypePlate": "Plate", "DS4.ArmorMaterialTypePlateAbbr": "Plate", + "DS4.SpellType": "Spell Type", + "DS4.SpellTypeSpellcasting": "Spellcasting", + "DS4.SpellTypeTargetedSpell": "Targeted Spell", + "DS4.SpellCategory": "Spell Category", + "DS4.SpellCategoryHealing": "Healing", + "DS4.SpellCategoryFire": "Fire", + "DS4.SpellCategoryIce": "Ice", + "DS4.SpellCategoryLight": "Light", + "DS4.SpellCategoryDarkness": "Darkness", + "DS4.SpellCategoryMindAffecting": "Mind Affecting", + "DS4.SpellCategoryElectricity": "Electricity", "DS4.AttributeBody": "Body", "DS4.AttributeMobility": "Mobility", "DS4.AttributeMind": "Mind", @@ -115,5 +128,19 @@ "DS4.ProfileSpecialCharacteristics": "Special Characteristics", "DS4.WarningManageActiveEffectOnOwnedItem": "Managing Active Effects within an Owned Item is not currently supported and will be added in a subsequent update.", "DS4.ErrorDiceCritOverlap": "There's an overlap between Fumbles and Coups", - "DS4.ErrorExplodingRecursionLimitExceeded": "Maximum recursion depth for exploding dice roll exceeded" + "DS4.ErrorExplodingRecursionLimitExceeded": "Maximum recursion depth for exploding dice roll exceeded", + "DS4.UnitRounds": "Rounds", + "DS4.UnitRoundsAbbr": "rnd", + "DS4.UnitMinutes": "Minutes", + "DS4.UnitMinutesAbbr": "min", + "DS4.UnitHours": "Hours", + "DS4.UnitHoursAbbr": "h", + "DS4.UnitDays": "Days", + "DS4.UnitDaysAbbr": "d", + "DS4.UnitMeters": "Meters", + "DS4.UnitMetersAbbr": "m", + "DS4.UnitKilometers": "Kilometers", + "DS4.UnitKilometersAbbr": "km", + "DS4.UnitCustom": "Custom", + "DS4.UnitCustomAbbr": "-" } diff --git a/src/module/config.ts b/src/module/config.ts index 03b2c9d..8805337 100644 --- a/src/module/config.ts +++ b/src/module/config.ts @@ -46,6 +46,7 @@ export const DS4 = { weapon: "DS4.ItemTypeWeapon", armor: "DS4.ItemTypeArmor", shield: "DS4.ItemTypeShield", + spell: "DS4.ItemTypeSpell", trinket: "DS4.ItemTypeTrinket", equipment: "DS4.ItemTypeEquipment", talent: "DS4.ItemTypeTalent", @@ -96,6 +97,21 @@ export const DS4 = { plate: "DS4.ArmorMaterialTypePlateAbbr", }, + spellType: { + spellcasting: "DS4.SpellTypeSpellcasting", + targetedSpell: "DS4.SpellTypeTargetedSpell", + }, + + spellCategory: { + healing: "DS4.SpellCategoryHealing", + fire: "DS4.SpellCategoryFire", + ice: "DS4.SpellCategoryIce", + light: "DS4.SpellCategoryLight", + darkness: "DS4.SpellCategoryDarkness", + mindAffecting: "DS4.SpellCategoryMindAffecting", + electricity: "DS4.SpellCategoryElectricity", + }, + /** * Define the set of attributes a character has */ @@ -188,4 +204,30 @@ export const DS4 = { eyeColor: "String", specialCharacteristics: "String", }, + + /** + * Define translations for available units + */ + units: { + rounds: "DS4.UnitRounds", + minutes: "DS4.UnitMinutes", + hours: "DS4.UnitHours", + days: "DS4.UnitHours", + meter: "DS4.UnitMeters", + kilometer: "DS4.UnitKilometers", + custom: "DS4.UnitCustom", + }, + + /** + * Define abbreviations for available units + */ + unitsAbbr: { + rounds: "DS4.UnitRoundsAbbr", + minutes: "DS4.UnitMinutesAbbr", + hours: "DS4.UnitHoursAbbr", + days: "DS4.UnitHoursAbbr", + meter: "DS4.UnitMetersAbbr", + kilometer: "DS4.UnitKilometersAbbr", + custom: "DS4.UnitCustomAbbr", + }, }; diff --git a/src/module/item/item-data.ts b/src/module/item/item-data.ts index 23105eb..e5be908 100644 --- a/src/module/item/item-data.ts +++ b/src/module/item/item-data.ts @@ -4,6 +4,7 @@ export type DS4ItemDataType = | DS4Weapon | DS4Armor | DS4Shield + | DS4Spell | DS4Trinket | DS4Equipment | DS4Talent @@ -32,6 +33,25 @@ interface DS4TalentRank extends ModifiableData { max: number; } +interface DS4Spell extends DS4ItemBase, DS4ItemEquipable { + spellType: "spellcasting" | "targetedSpell"; + bonus: string; + spellCategory: + | "healing" + | "fire" + | "ice" + | "light" + | "darkness" + | "mindAffecting" + | "electricity" + | "none" + | "unset"; + maxDistance: UnitData; + effectRadius: UnitData; + duration: UnitData; + scrollPrice: number; +} + interface DS4Shield extends DS4ItemBase, DS4ItemPhysical, DS4ItemEquipable, DS4ItemProtective {} interface DS4Trinket extends DS4ItemBase, DS4ItemPhysical, DS4ItemEquipable {} interface DS4Equipment extends DS4ItemBase, DS4ItemPhysical {} @@ -62,3 +82,10 @@ interface DS4ItemEquipable { interface DS4ItemProtective { armorValue: number; } + +interface UnitData { + value: string; + unit: UnitType; +} +type TemporalUnit = "rounds" | "minutes" | "hours" | "days" | "custom"; +type DistanceUnit = "meter" | "kilometer" | "custom"; diff --git a/src/template.json b/src/template.json index eee8ace..17d2cec 100644 --- a/src/template.json +++ b/src/template.json @@ -115,6 +115,7 @@ "weapon", "armor", "shield", + "spell", "trinket", "equipment", "talent", @@ -175,6 +176,25 @@ }, "alphabet": { "templates": ["base"] + }, + "spell": { + "templates": ["base", "equipable"], + "spellType": "spellcasting", + "bonus": "", + "spellCategory": "unset", + "maxDistance": { + "value": "", + "unit": "meter" + }, + "effectRadius": { + "value": "", + "unit": "meter" + }, + "duration": { + "value": "", + "unit": "custom" + }, + "scrollPrice": 0 } } } From a3032968281cfbd95bf3f76028e49c69d0aed583 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 9 Jan 2021 18:23:25 +0100 Subject: [PATCH 2/7] description and body templ accept partial-block --- src/templates/item/alphabet-sheet.hbs | 2 +- src/templates/item/armor-sheet.hbs | 4 +-- src/templates/item/equipment-sheet.hbs | 2 +- src/templates/item/language-sheet.hbs | 2 +- src/templates/item/partials/body.hbs | 4 ++- src/templates/item/partials/description.hbs | 6 +++++ src/templates/item/partials/details.hbs | 27 +++++++++++---------- src/templates/item/racialAbility-sheet.hbs | 2 +- src/templates/item/shield-sheet.hbs | 2 +- src/templates/item/talent-sheet.hbs | 2 +- src/templates/item/trinket-sheet.hbs | 2 +- src/templates/item/weapon-sheet.hbs | 2 +- 12 files changed, 33 insertions(+), 24 deletions(-) diff --git a/src/templates/item/alphabet-sheet.hbs b/src/templates/item/alphabet-sheet.hbs index cfd63f9..5aabb9a 100644 --- a/src/templates/item/alphabet-sheet.hbs +++ b/src/templates/item/alphabet-sheet.hbs @@ -3,6 +3,6 @@ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} {{!-- Common Item body --}} - {{> systems/ds4/templates/item/partials/body.hbs}} + {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}} \ No newline at end of file diff --git a/src/templates/item/armor-sheet.hbs b/src/templates/item/armor-sheet.hbs index 1a2a14b..5fd59fe 100644 --- a/src/templates/item/armor-sheet.hbs +++ b/src/templates/item/armor-sheet.hbs @@ -12,7 +12,7 @@
- + -
-
- - -
+ + +
+ + +
+ \ No newline at end of file diff --git a/src/templates/item/racialAbility-sheet.hbs b/src/templates/item/racialAbility-sheet.hbs index 4077148..e69b5fc 100644 --- a/src/templates/item/racialAbility-sheet.hbs +++ b/src/templates/item/racialAbility-sheet.hbs @@ -3,6 +3,6 @@ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} {{!-- Common Item body --}} - {{> systems/ds4/templates/item/partials/body.hbs}} + {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}} diff --git a/src/templates/item/shield-sheet.hbs b/src/templates/item/shield-sheet.hbs index 1c1092c..4ef9c9f 100644 --- a/src/templates/item/shield-sheet.hbs +++ b/src/templates/item/shield-sheet.hbs @@ -10,5 +10,5 @@ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} {{!-- Common Item body --}} - {{> systems/ds4/templates/item/partials/body.hbs}} + {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}} \ No newline at end of file diff --git a/src/templates/item/talent-sheet.hbs b/src/templates/item/talent-sheet.hbs index 1611bee..22257d8 100644 --- a/src/templates/item/talent-sheet.hbs +++ b/src/templates/item/talent-sheet.hbs @@ -27,6 +27,6 @@ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} {{!-- Common Item body --}} - {{> systems/ds4/templates/item/partials/body.hbs}} + {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}} diff --git a/src/templates/item/trinket-sheet.hbs b/src/templates/item/trinket-sheet.hbs index 3fa5d4a..bbd6640 100644 --- a/src/templates/item/trinket-sheet.hbs +++ b/src/templates/item/trinket-sheet.hbs @@ -3,5 +3,5 @@ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} {{!-- Common Item body --}} - {{> systems/ds4/templates/item/partials/body.hbs}} + {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}} \ No newline at end of file diff --git a/src/templates/item/weapon-sheet.hbs b/src/templates/item/weapon-sheet.hbs index 6914537..b92bf97 100644 --- a/src/templates/item/weapon-sheet.hbs +++ b/src/templates/item/weapon-sheet.hbs @@ -25,5 +25,5 @@ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} {{!-- Common Item body --}} - {{> systems/ds4/templates/item/partials/body.hbs}} + {{#> systems/ds4/templates/item/partials/body.hbs}}{{/systems/ds4/templates/item/partials/body.hbs}} \ No newline at end of file From 4de9d42ee38dc13efd987f23dfa57bb3227c921a Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 9 Jan 2021 18:25:30 +0100 Subject: [PATCH 3/7] added spell cooldownDuration and more localization --- src/lang/en.json | 12 +++++++++--- src/module/config.ts | 35 ++++++++++++++++++++++++----------- src/module/ds4.ts | 6 ++++++ src/module/item/item-data.ts | 1 + src/template.json | 4 ++++ 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/src/lang/en.json b/src/lang/en.json index c0235a5..8e047af 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -77,7 +77,7 @@ "DS4.SpellType": "Spell Type", "DS4.SpellTypeSpellcasting": "Spellcasting", "DS4.SpellTypeTargetedSpell": "Targeted Spell", - "DS4.SpellCategory": "Spell Category", + "DS4.SpellCategory": "Category", "DS4.SpellCategoryHealing": "Healing", "DS4.SpellCategoryFire": "Fire", "DS4.SpellCategoryIce": "Ice", @@ -85,6 +85,12 @@ "DS4.SpellCategoryDarkness": "Darkness", "DS4.SpellCategoryMindAffecting": "Mind Affecting", "DS4.SpellCategoryElectricity": "Electricity", + "DS4.SpellBonus": "Spell Bonus", + "DS4.SpellMaxDistance": "Range", + "DS4.SpellEffectRadius": "Radius", + "DS4.SpellDuration": "Duration", + "DS4.SpellCooldownDuration": "Cooldown", + "DS4.SpellScrollPriceGold": "Scroll Price (Gold)", "DS4.AttributeBody": "Body", "DS4.AttributeMobility": "Mobility", "DS4.AttributeMind": "Mind", @@ -100,8 +106,8 @@ "DS4.CombatValuesMovement": "Movement", "DS4.CombatValuesMeleeAttack": "Melee Attack", "DS4.CombatValuesRangedAttack": "Ranged Attack", - "DS4.CombatValuesSpellcasting": "Spellcasting", - "DS4.CombatValuesTargetedSpellcasting": "Targeted Spellcasting", + "DS4.CombatValuesSpellcasting": "Normal", + "DS4.CombatValuesTargetedSpellcasting": "Targeted", "DS4.BaseInfoRace": "Race", "DS4.BaseInfoClass": "Class", "DS4.BaseInfoHeroClass": "Hero Class", diff --git a/src/module/config.ts b/src/module/config.ts index 8805337..5ce8929 100644 --- a/src/module/config.ts +++ b/src/module/config.ts @@ -97,12 +97,12 @@ export const DS4 = { plate: "DS4.ArmorMaterialTypePlateAbbr", }, - spellType: { + spellTypes: { spellcasting: "DS4.SpellTypeSpellcasting", targetedSpell: "DS4.SpellTypeTargetedSpell", }, - spellCategory: { + spellCategories: { healing: "DS4.SpellCategoryHealing", fire: "DS4.SpellCategoryFire", ice: "DS4.SpellCategoryIce", @@ -206,28 +206,41 @@ export const DS4 = { }, /** - * Define translations for available units + * Define translations for available distance units */ - units: { + distanceUnits: { + meter: "DS4.UnitMeters", + kilometer: "DS4.UnitKilometers", + custom: "DS4.UnitCustom", + }, + /** + * Define abbreviations for available distance units + */ + distanceUnitsAbbr: { + meter: "DS4.UnitMetersAbbr", + kilometer: "DS4.UnitKilometersAbbr", + custom: "DS4.UnitCustomAbbr", + }, + + /** + * Define translations for available distance units + */ + temporalUnits: { rounds: "DS4.UnitRounds", minutes: "DS4.UnitMinutes", hours: "DS4.UnitHours", - days: "DS4.UnitHours", - meter: "DS4.UnitMeters", - kilometer: "DS4.UnitKilometers", + days: "DS4.UnitDays", custom: "DS4.UnitCustom", }, /** * Define abbreviations for available units */ - unitsAbbr: { + temporalUnitsAbbr: { rounds: "DS4.UnitRoundsAbbr", minutes: "DS4.UnitMinutesAbbr", hours: "DS4.UnitHoursAbbr", - days: "DS4.UnitHoursAbbr", - meter: "DS4.UnitMetersAbbr", - kilometer: "DS4.UnitKilometersAbbr", + days: "DS4.UnitDaysAbbr", custom: "DS4.UnitCustomAbbr", }, }; diff --git a/src/module/ds4.ts b/src/module/ds4.ts index a9d46ac..738912f 100644 --- a/src/module/ds4.ts +++ b/src/module/ds4.ts @@ -76,6 +76,8 @@ Hooks.once("setup", function () { "armorMaterialTypes", "armorMaterialTypesAbbr", "armorMaterialTypes", + "spellTypes", + "spellCategories", "attributes", "traits", "combatValues", @@ -83,6 +85,10 @@ Hooks.once("setup", function () { "progression", "language", "profile", + "temporalUnits", + "temporalUnitsAbbr", + "distanceUnits", + "distanceUnitsAbbr", ]; // Exclude some from sorting where the default order matters diff --git a/src/module/item/item-data.ts b/src/module/item/item-data.ts index e5be908..aa77916 100644 --- a/src/module/item/item-data.ts +++ b/src/module/item/item-data.ts @@ -49,6 +49,7 @@ interface DS4Spell extends DS4ItemBase, DS4ItemEquipable { maxDistance: UnitData; effectRadius: UnitData; duration: UnitData; + cooldownDuration: UnitData; scrollPrice: number; } diff --git a/src/template.json b/src/template.json index 17d2cec..0d72390 100644 --- a/src/template.json +++ b/src/template.json @@ -194,6 +194,10 @@ "value": "", "unit": "custom" }, + "cooldownDuration": { + "value": "", + "unit": "custom" + }, "scrollPrice": 0 } } From 7d04ad2309b8793e2f0e8aca4131a8bbdfc3c251 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 9 Jan 2021 18:26:17 +0100 Subject: [PATCH 4/7] added spell sheet; reverted side-prop style change --- src/scss/components/_description.scss | 14 +++++- src/templates/item/spell-sheet.hbs | 72 +++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 src/templates/item/spell-sheet.hbs diff --git a/src/scss/components/_description.scss b/src/scss/components/_description.scss index cc4c132..767fb51 100644 --- a/src/scss/components/_description.scss +++ b/src/scss/components/_description.scss @@ -9,12 +9,13 @@ .side-property { margin: 2px 0; display: grid; - grid-template-columns: minmax(30%, auto) auto; + grid-template-columns: 40% auto; justify-content: left; label { line-height: $default-input-height; font-weight: bold; + padding-right: 3pt; } input, @@ -30,6 +31,17 @@ height: 100%; margin: 0px; } + + .unit-data-pair { + display: flex; + flex-direction: row; + select { + width: 4em; + } + input { + max-width: 7em; + } + } } } diff --git a/src/templates/item/spell-sheet.hbs b/src/templates/item/spell-sheet.hbs new file mode 100644 index 0000000..4dd50f6 --- /dev/null +++ b/src/templates/item/spell-sheet.hbs @@ -0,0 +1,72 @@ +{{!-- ======================================================================== --}} +{{!-- INLINE PARTIAL DEFINITIONS --}} +{{!-- ======================================================================== --}} + + +{{#*inline "unitDatum" }} +
+ +
+ + +
+
+{{/inline}} + + +{{!-- ======================================================================== --}} + + +
+ {{#> systems/ds4/templates/item/partials/sheet-header.hbs}} +
+
+ + +
+
+ + +
+
+ {{/systems/ds4/templates/item/partials/sheet-header.hbs}} + + {{!-- Common Item body --}} + {{#> systems/ds4/templates/item/partials/body.hbs}} +
+ + +
+ {{> unitDatum data=data property='maxDistance' localizeString='DS4.SpellMaxDistance' unitType='distance' }} + {{> unitDatum data=data property='effectRadius' localizeString='DS4.SpellEffectRadius' unitType='distance' }} + {{> unitDatum data=data property='duration' localizeString='DS4.SpellDuration' unitType='temporal' }} + {{> unitDatum data=data property='cooldownDurationj' localizeString='DS4.SpellCooldownDuration' unitType='temporal' }} +
+ + +
+ {{/systems/ds4/templates/item/partials/body.hbs}} + +
From 884327b156a74a368b219bc14c0ed311cb12e5cf Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sat, 9 Jan 2021 23:39:35 +0100 Subject: [PATCH 5/7] added spell tab and sorted tabs --- src/lang/en.json | 10 ++- src/module/actor/actor-sheet.ts | 2 +- src/module/config.ts | 8 ++ src/module/ds4.ts | 1 + src/templates/actor/actor-sheet.hbs | 24 +++--- .../actor/partials/items-overview.hbs | 6 +- .../actor/partials/spells-overview.hbs | 86 +++++++++++++++++++ .../actor/partials/talents-overview.hbs | 2 - src/templates/item/spell-sheet.hbs | 4 +- 9 files changed, 122 insertions(+), 21 deletions(-) create mode 100644 src/templates/actor/partials/spells-overview.hbs diff --git a/src/lang/en.json b/src/lang/en.json index 8e047af..df1033d 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1,12 +1,13 @@ { "DS4.UserInteractionAddItem": "Add item", "DS4.NotOwned": "No owner", - "DS4.HeadingDescription": "Description", + "DS4.HeadingBiography": "Biography", "DS4.HeadingDetails": "Details", "DS4.HeadingEffects": "Effects", "DS4.HeadingInventory": "Inventory", "DS4.HeadingProfile": "Profile", "DS4.HeadingTalents": "Talents & Abilities", + "DS4.HeadingSpells": "Spells", "DS4.AttackType": "Attack Type", "DS4.AttackTypeAbbr": "AT", "DS4.WeaponBonus": "Weapon Bonus", @@ -20,6 +21,7 @@ "DS4.PriceGold": "Price (Gold)", "DS4.StorageLocation": "Stored at", "DS4.ItemEquipped": "Equipped", + "DS4.ItemEquippedAbbr": "E", "DS4.ItemOwner": "Owner", "DS4.ItemAvailability": "Availability", "DS4.ItemAvailabilityHamlet": "Hamlet", @@ -75,6 +77,7 @@ "DS4.ArmorMaterialTypePlate": "Plate", "DS4.ArmorMaterialTypePlateAbbr": "Plate", "DS4.SpellType": "Spell Type", + "DS4.SpellTypeAbbr": "T", "DS4.SpellTypeSpellcasting": "Spellcasting", "DS4.SpellTypeTargetedSpell": "Targeted Spell", "DS4.SpellCategory": "Category", @@ -86,6 +89,7 @@ "DS4.SpellCategoryMindAffecting": "Mind Affecting", "DS4.SpellCategoryElectricity": "Electricity", "DS4.SpellBonus": "Spell Bonus", + "DS4.SpellBonusAbbr": "SB", "DS4.SpellMaxDistance": "Range", "DS4.SpellEffectRadius": "Radius", "DS4.SpellDuration": "Duration", @@ -147,6 +151,6 @@ "DS4.UnitMetersAbbr": "m", "DS4.UnitKilometers": "Kilometers", "DS4.UnitKilometersAbbr": "km", - "DS4.UnitCustom": "Custom", - "DS4.UnitCustomAbbr": "-" + "DS4.UnitCustom": "Custom Unit", + "DS4.UnitCustomAbbr": " " } diff --git a/src/module/actor/actor-sheet.ts b/src/module/actor/actor-sheet.ts index 51eb9e6..caebd89 100644 --- a/src/module/actor/actor-sheet.ts +++ b/src/module/actor/actor-sheet.ts @@ -32,7 +32,7 @@ export class DS4ActorSheet extends ActorSheet - {{localize 'DS4.HeadingDescription'}} + {{localize 'DS4.HeadingInventory'}} + {{localize 'DS4.HeadingSpells'}} {{localize 'DS4.HeadingTalents'}} {{localize "DS4.HeadingProfile"}} - {{localize 'DS4.HeadingInventory'}} + {{localize 'DS4.HeadingBiography'}} {{!-- Sheet Body --}}
- {{!-- Biography Tab --}} -
- {{editor content=data.biography target="data.biography" button=true owner=owner editable=editable}} -
+ {{!-- Items Tab --}} + {{> systems/ds4/templates/actor/partials/items-overview.hbs}} - {{! Profile Tab --}} - {{> systems/ds4/templates/actor/partials/profile.hbs}} + {{!-- Spells Tab --}} + {{> systems/ds4/templates/actor/partials/spells-overview.hbs}} {{!-- Talents Tab --}} {{> systems/ds4/templates/actor/partials/talents-overview.hbs}} - {{!-- Items Tab --}} - {{> systems/ds4/templates/actor/partials/items-overview.hbs}} + {{! Profile Tab --}} + {{> systems/ds4/templates/actor/partials/profile.hbs}} + + {{!-- Biography Tab --}} +
+ {{editor content=data.biography target="data.biography" button=true owner=owner editable=editable}} +
\ No newline at end of file diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/actor/partials/items-overview.hbs index 676a9bf..a27be47 100644 --- a/src/templates/actor/partials/items-overview.hbs +++ b/src/templates/actor/partials/items-overview.hbs @@ -37,7 +37,7 @@
  • {{!-- equipped --}} {{#if (ne dataType 'equipment')}} -
    E
    +
    {{localize 'DS4.ItemEquippedAbbr'}}
    {{/if}} {{!-- image --}}
    @@ -78,10 +78,10 @@ {{!-- amount --}} + data-property="data.quantity" title="{{localize 'DS4.Quantity'}}" /> {{!-- name --}} + data-property="name" title="{{localize 'DS4.ItemName'}}" /> {{!-- item type specifics --}} {{> @partial-block}} {{!-- description --}} diff --git a/src/templates/actor/partials/spells-overview.hbs b/src/templates/actor/partials/spells-overview.hbs new file mode 100644 index 0000000..f801278 --- /dev/null +++ b/src/templates/actor/partials/spells-overview.hbs @@ -0,0 +1,86 @@ +{{!-- ======================================================================== --}} +{{!-- INLINE PARTIAL DEFINITIONS --}} +{{!-- ======================================================================== --}} + + +{{!-- +!-- Two templates for displaying values with unit. +!-- @param unitDatum: the object to display; must have a value and a unit attribute +!-- @param localizationString +!-- @param config: the config object +--}} +{{#*inline "temporalUnit"}} +
    + {{unitDatum.value}}{{lookup config.temporalUnitsAbbr unitDatum.unit}} +
    +{{/inline}} + +{{#*inline "distanceUnit"}} +
    + {{unitDatum.value}}{{lookup config.distanceUnitsAbbr unitDatum.unit}} +
    +{{/inline}} + + +{{!-- ======================================================================== --}} + + +
    +
      +
    1. + {{!-- equipped --}} +
      {{localize 'DS4.ItemEquippedAbbr'}}
      + {{!-- image --}} +
      + {{!-- name --}} +
      {{localize 'DS4.ItemName'}}
      + {{!-- spell type --}} +
      {{localize 'DS4.SpellTypeAbbr'}}
      + {{!-- spell bonus --}} +
      {{localize 'DS4.SpellBonusAbbr'}}
      + {{!-- max. distance --}} +
      + {{!-- duration --}} +
      + {{!-- cooldown duration --}} +
      + {{!-- description --}} + {{!--
      {{localize 'DS4.HeadingDescription'}}
      --}} + {{!-- add button --}} + {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='spell' }} +
      2. + {{#each itemsByType.spell as |item id|}} +
    2. + + {{!-- image --}} +
      + +
      + {{!-- name --}} + + {{!-- spell type --}} +
      + +
      + {{!-- spell bonus --}} + + {{!-- max. distance --}} + {{> distanceUnit localizationString='DS4.SpellMaxDistance' unitDatum=item.data.data.maxDistance config=../config}} + {{!-- duration --}} + {{> temporalUnit localizationString='DS4.SpellDuration' unitDatum=item.data.data.duration config=../config}} + {{!-- cooldown duration --}} + {{> temporalUnit localizationString='DS4.SpellCooldownDuration' unitDatum=item.data.data.cooldownDuration config=../config}} + {{!-- description --}} + {{!--
      {{{item.data.data.description}}}
      --}} + {{!-- control buttons --}} + {{> systems/ds4/templates/actor/partials/overview-control-buttons.hbs }} +
      3. + {{/each}} +
    +
    \ No newline at end of file diff --git a/src/templates/actor/partials/talents-overview.hbs b/src/templates/actor/partials/talents-overview.hbs index f4a0600..593955f 100644 --- a/src/templates/actor/partials/talents-overview.hbs +++ b/src/templates/actor/partials/talents-overview.hbs @@ -1,8 +1,6 @@ {{!-- ======================================================================== --}} {{!-- INLINE PARTIAL DEFINITIONS --}} {{!-- ======================================================================== --}} -{{!-- TODO: remove duplicate add and delete button definition --}} - {{!-- diff --git a/src/templates/item/spell-sheet.hbs b/src/templates/item/spell-sheet.hbs index 4dd50f6..5f2c7a2 100644 --- a/src/templates/item/spell-sheet.hbs +++ b/src/templates/item/spell-sheet.hbs @@ -41,7 +41,7 @@
    - +
    {{/systems/ds4/templates/item/partials/sheet-header.hbs}} @@ -61,7 +61,7 @@ {{> unitDatum data=data property='maxDistance' localizeString='DS4.SpellMaxDistance' unitType='distance' }} {{> unitDatum data=data property='effectRadius' localizeString='DS4.SpellEffectRadius' unitType='distance' }} {{> unitDatum data=data property='duration' localizeString='DS4.SpellDuration' unitType='temporal' }} - {{> unitDatum data=data property='cooldownDurationj' localizeString='DS4.SpellCooldownDuration' unitType='temporal' }} + {{> unitDatum data=data property='cooldownDuration' localizeString='DS4.SpellCooldownDuration' unitType='temporal' }}
    Date: Sun, 10 Jan 2021 00:05:29 +0100 Subject: [PATCH 6/7] added German translation for spell stuff --- src/lang/de.json | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index d5e4d4f..5b9ed87 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -1,12 +1,13 @@ { "DS4.UserInteractionAddItem": "Neu", "DS4.NotOwned": "Nicht besessen", - "DS4.HeadingDescription": "Beschreibung", + "DS4.HeadingBiography": "Biografie", "DS4.HeadingDetails": "Details", "DS4.HeadingEffects": "Effekte", "DS4.HeadingInventory": "Inventar", "DS4.HeadingProfile": "Profil", "DS4.HeadingTalents": "Talente & Fähigkeiten", + "DS4.HeadingSpells": "Zaubersprüche", "DS4.AttackType": "Angriffs Typ", "DS4.AttackTypeAbbr": "AT", "DS4.WeaponBonus": "Waffen Bonus", @@ -20,7 +21,8 @@ "DS4.PriceGold": "Preis (Gold)", "DS4.StorageLocation": "Wo gelagert", "DS4.ItemEquipped": "Ausgerüstet", - "DS4.ItemOwner": "Eigentümer", + "DS4.ItemEquippedAbbr": "A", + "DS4.ItemOwner": "Besitzer", "DS4.ItemAvailability": "Verfügbarkeit", "DS4.ItemAvailabilityHamlet": "Dorf", "DS4.ItemAvailabilityVilage": "Kleinstadt", @@ -36,6 +38,8 @@ "DS4.ItemTypeArmorPlural": "Panzerungen", "DS4.ItemTypeShield": "Schild", "DS4.ItemTypeShieldPlural": "Schilde", + "DS4.ItemTypeSpell": "Zauberspruch", + "DS4.ItemTypeSpellPlural": "Zaubersprüche", "DS4.ItemTypeTrinket": "Schmuckstück", "DS4.ItemTypeTrinketPlural": "Schmuckstücke", "DS4.ItemTypeEquipment": "Ausrüstung", @@ -72,6 +76,25 @@ "DS4.ArmorMaterialTypeChainAbbr": "Ketten", "DS4.ArmorMaterialTypePlate": "Platten", "DS4.ArmorMaterialTypePlateAbbr": "Platten", + "DS4.SpellType": "Zauberspruchtyp", + "DS4.SpellTypeAbbr": "T", + "DS4.SpellTypeSpellcasting": "Zaubern", + "DS4.SpellTypeTargetedSpell": "Zielzaubern", + "DS4.SpellCategory": "Kategorie", + "DS4.SpellCategoryHealing": "Heilung", + "DS4.SpellCategoryFire": "Feuer", + "DS4.SpellCategoryIce": "Eis", + "DS4.SpellCategoryLight": "Licht", + "DS4.SpellCategoryDarkness": "Schatten", + "DS4.SpellCategoryMindAffecting": "Geistensbeeinflussend", + "DS4.SpellCategoryElectricity": "Elektrizität", + "DS4.SpellBonus": "Zauberbonus", + "DS4.SpellBonusAbbr": "ZB", + "DS4.SpellMaxDistance": "Reichweite", + "DS4.SpellEffectRadius": "Effektradius", + "DS4.SpellDuration": "Wirkdauer", + "DS4.SpellCooldownDuration": "Abklingzeit", + "DS4.SpellScrollPriceGold": "Schriftrollenpreis (Gold)", "DS4.AttributeBody": "Körper", "DS4.AttributeMobility": "Agilität", "DS4.AttributeMind": "Geist", @@ -115,5 +138,19 @@ "DS4.ProfileSpecialCharacteristics": "Besondere Eigenschaften", "DS4.WarningManageActiveEffectOnOwnedItem": "Das Verwalten von aktiven Effekten innerhalb eines besessen Items wird derzeit nicht unterstützt und wird in einem nachfolgenden Update hinzugefügt.", "DS4.ErrorDiceCritOverlap": "Es gibt eine Überlappung zwischen Patzern und Immersiegen.", - "DS4.ErrorExplodingRecursionLimitExceeded": "Die maximale Rekursionstiefe für slayende Würfelwürfe wurde überschritten." + "DS4.ErrorExplodingRecursionLimitExceeded": "Die maximale Rekursionstiefe für slayende Würfelwürfe wurde überschritten.", + "DS4.UnitRounds": "Runden", + "DS4.UnitRoundsAbbr": "Rnd", + "DS4.UnitMinutes": "Minuten", + "DS4.UnitMinutesAbbr": "min", + "DS4.UnitHours": "Stunden", + "DS4.UnitHoursAbbr": "h", + "DS4.UnitDays": "Tage", + "DS4.UnitDaysAbbr": "d", + "DS4.UnitMeters": "Meter", + "DS4.UnitMetersAbbr": "m", + "DS4.UnitKilometers": "Kilometer", + "DS4.UnitKilometersAbbr": "km", + "DS4.UnitCustom": "individuell", + "DS4.UnitCustomAbbr": " " } From 0eb447d2795c8f414a9c18ca3178abfaa03d9555 Mon Sep 17 00:00:00 2001 From: Gesina Schwalbe Date: Sun, 10 Jan 2021 00:30:51 +0100 Subject: [PATCH 7/7] added German localization for spells - added missing German localizations - fixed some localizations - renamed targetedSpell -> targetedSpellcasting for consistency --- src/lang/de.json | 5 ++++- src/lang/en.json | 9 ++++++--- src/module/config.ts | 4 ++-- src/module/item/item-data.ts | 2 +- src/templates/actor/partials/items-overview.hbs | 2 +- src/templates/actor/partials/spells-overview.hbs | 2 +- src/templates/actor/partials/talents-overview.hbs | 4 ++-- src/templates/item/partials/body.hbs | 2 +- src/templates/item/partials/description.hbs | 2 +- 9 files changed, 19 insertions(+), 13 deletions(-) diff --git a/src/lang/de.json b/src/lang/de.json index 5b9ed87..2b71928 100644 --- a/src/lang/de.json +++ b/src/lang/de.json @@ -1,5 +1,7 @@ { "DS4.UserInteractionAddItem": "Neu", + "DS4.UserInteractionEditItem": "Bearbeiten", + "DS4.UserInteractionDeleteItem": "Löschen", "DS4.NotOwned": "Nicht besessen", "DS4.HeadingBiography": "Biografie", "DS4.HeadingDetails": "Details", @@ -17,6 +19,7 @@ "DS4.AttackTypeMelee": "Schlagen", "DS4.AttackTypeRanged": "Schießen", "DS4.AttackTypeMeleeRanged": "Schlagen + Schießen", + "DS4.Description": "Beschreibung", "DS4.Quantity": "Menge", "DS4.PriceGold": "Preis (Gold)", "DS4.StorageLocation": "Wo gelagert", @@ -79,7 +82,7 @@ "DS4.SpellType": "Zauberspruchtyp", "DS4.SpellTypeAbbr": "T", "DS4.SpellTypeSpellcasting": "Zaubern", - "DS4.SpellTypeTargetedSpell": "Zielzaubern", + "DS4.SpellTypeTargetedSpellcasting": "Zielzaubern", "DS4.SpellCategory": "Kategorie", "DS4.SpellCategoryHealing": "Heilung", "DS4.SpellCategoryFire": "Feuer", diff --git a/src/lang/en.json b/src/lang/en.json index df1033d..e6136a0 100644 --- a/src/lang/en.json +++ b/src/lang/en.json @@ -1,5 +1,7 @@ { "DS4.UserInteractionAddItem": "Add item", + "DS4.UserInteractionEditItem": "Edit item", + "DS4.UserInteractionDeleteItem": "Delete item", "DS4.NotOwned": "No owner", "DS4.HeadingBiography": "Biography", "DS4.HeadingDetails": "Details", @@ -17,6 +19,7 @@ "DS4.AttackTypeMelee": "Melee", "DS4.AttackTypeRanged": "Ranged", "DS4.AttackTypeMeleeRanged": "Melee / Ranged", + "DS4.Description": "Description", "DS4.Quantity": "Quantity", "DS4.PriceGold": "Price (Gold)", "DS4.StorageLocation": "Stored at", @@ -79,7 +82,7 @@ "DS4.SpellType": "Spell Type", "DS4.SpellTypeAbbr": "T", "DS4.SpellTypeSpellcasting": "Spellcasting", - "DS4.SpellTypeTargetedSpell": "Targeted Spell", + "DS4.SpellTypeTargetedSpellcasting": "Targeted Spellcasting", "DS4.SpellCategory": "Category", "DS4.SpellCategoryHealing": "Healing", "DS4.SpellCategoryFire": "Fire", @@ -110,8 +113,8 @@ "DS4.CombatValuesMovement": "Movement", "DS4.CombatValuesMeleeAttack": "Melee Attack", "DS4.CombatValuesRangedAttack": "Ranged Attack", - "DS4.CombatValuesSpellcasting": "Normal", - "DS4.CombatValuesTargetedSpellcasting": "Targeted", + "DS4.CombatValuesSpellcasting": "Spellcasting", + "DS4.CombatValuesTargetedSpellcasting": "Targeted Spellcasting", "DS4.BaseInfoRace": "Race", "DS4.BaseInfoClass": "Class", "DS4.BaseInfoHeroClass": "Hero Class", diff --git a/src/module/config.ts b/src/module/config.ts index 4f862e8..d8f9b85 100644 --- a/src/module/config.ts +++ b/src/module/config.ts @@ -31,7 +31,7 @@ export const DS4 = { */ spellTypesIcons: { spellcasting: "systems/ds4/assets/official/DS4-SPC.png", - targetedSpell: "systems/ds4/assets/official/DS4-TSC.png", + targetedSpellcasting: "systems/ds4/assets/official/DS4-TSC.png", }, /** @@ -107,7 +107,7 @@ export const DS4 = { spellTypes: { spellcasting: "DS4.SpellTypeSpellcasting", - targetedSpell: "DS4.SpellTypeTargetedSpell", + targetedSpellcasting: "DS4.SpellTypeTargetedSpellcasting", }, spellCategories: { diff --git a/src/module/item/item-data.ts b/src/module/item/item-data.ts index aa77916..45622a6 100644 --- a/src/module/item/item-data.ts +++ b/src/module/item/item-data.ts @@ -34,7 +34,7 @@ interface DS4TalentRank extends ModifiableData { } interface DS4Spell extends DS4ItemBase, DS4ItemEquipable { - spellType: "spellcasting" | "targetedSpell"; + spellType: "spellcasting" | "targetedSpellcasting"; bonus: string; spellCategory: | "healing" diff --git a/src/templates/actor/partials/items-overview.hbs b/src/templates/actor/partials/items-overview.hbs index a27be47..4dbd269 100644 --- a/src/templates/actor/partials/items-overview.hbs +++ b/src/templates/actor/partials/items-overview.hbs @@ -48,7 +48,7 @@ {{!-- item type specifics --}} {{> @partial-block }} {{!-- description --}} -
    {{localize 'DS4.HeadingDescription'}}
    +
    {{localize 'DS4.Description'}}
    {{!-- add button --}} {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }}
    • diff --git a/src/templates/actor/partials/spells-overview.hbs b/src/templates/actor/partials/spells-overview.hbs index f801278..5338955 100644 --- a/src/templates/actor/partials/spells-overview.hbs +++ b/src/templates/actor/partials/spells-overview.hbs @@ -47,7 +47,7 @@ {{!-- cooldown duration --}}
    {{!-- description --}} - {{!--
    {{localize 'DS4.HeadingDescription'}}
    --}} + {{!--
    {{localize 'DS4.Description'}}
    --}} {{!-- add button --}} {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='spell' }} diff --git a/src/templates/actor/partials/talents-overview.hbs b/src/templates/actor/partials/talents-overview.hbs index 593955f..8ef9311 100644 --- a/src/templates/actor/partials/talents-overview.hbs +++ b/src/templates/actor/partials/talents-overview.hbs @@ -108,7 +108,7 @@ {{!-- name --}}
    {{localize 'DS4.ItemName'}}
    {{!-- description --}} -
    {{localize 'DS4.HeadingDescription'}}
    +
    {{localize 'DS4.Description'}}
    {{!-- add button --}} {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType=dataType }} @@ -130,7 +130,7 @@ {{!-- rank info --}}
    {{localize 'DS4.TalentRank'}}
    {{!-- description --}} -
    {{localize 'DS4.HeadingDescription'}}
    +
    {{localize 'DS4.Description'}}
    {{!-- add button --}} {{> systems/ds4/templates/actor/partials/overview-add-button.hbs dataType='talent' }} diff --git a/src/templates/item/partials/body.hbs b/src/templates/item/partials/body.hbs index 2a9eaec..a7ac4d7 100644 --- a/src/templates/item/partials/body.hbs +++ b/src/templates/item/partials/body.hbs @@ -2,7 +2,7 @@ {{!-- Sheet Tab Navigation --}}