From 1f629f3468b9f1421b55a67d5dae852040052927 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Thu, 22 Jul 2021 04:06:29 +0200
Subject: [PATCH] Rename "Special Creature Abilities" tab to "Abilities"

---
 src/lang/de.json                                      |  1 -
 src/lang/en.json                                      |  1 -
 src/module/actor/sheets/actor-sheet.ts                | 11 +----------
 src/module/handlebars/handlebars-partials.ts          |  4 ++--
 src/templates/sheets/actor/character-sheet.hbs        |  2 +-
 src/templates/sheets/actor/creature-sheet.hbs         |  9 ++++-----
 .../tabs/{abilities.hbs => character-abilities.hbs}   |  0
 ...-creature-abilities.hbs => creature-abilities.hbs} |  2 +-
 8 files changed, 9 insertions(+), 21 deletions(-)
 rename src/templates/sheets/actor/tabs/{abilities.hbs => character-abilities.hbs} (100%)
 rename src/templates/sheets/actor/tabs/{special-creature-abilities.hbs => creature-abilities.hbs} (87%)

diff --git a/src/lang/de.json b/src/lang/de.json
index 62b6bd3..e18c8ac 100644
--- a/src/lang/de.json
+++ b/src/lang/de.json
@@ -19,7 +19,6 @@
     "DS4.HeadingAbilities": "Fähigkeiten",
     "DS4.HeadingSpells": "Zaubersprüche",
     "DS4.HeadingDescription": "Beschreibung",
-    "DS4.HeadingSpecialCreatureAbilities": "Besondere Fähigkeiten",
     "DS4.AttackType": "Angriffsart",
     "DS4.AttackTypeAbbr": "AA",
     "DS4.DialogAttackTypeSelection": "Welche Angriffsart?",
diff --git a/src/lang/en.json b/src/lang/en.json
index c68a490..9715833 100644
--- a/src/lang/en.json
+++ b/src/lang/en.json
@@ -19,7 +19,6 @@
     "DS4.HeadingAbilities": "Abilities",
     "DS4.HeadingSpells": "Spells",
     "DS4.HeadingDescription": "Description",
-    "DS4.HeadingSpecialCreatureAbilities": "Special Abilities",
     "DS4.AttackType": "Attack Type",
     "DS4.AttackTypeAbbr": "AT",
     "DS4.DialogAttackTypeSelection": "Which Attack Type?",
diff --git a/src/module/actor/sheets/actor-sheet.ts b/src/module/actor/sheets/actor-sheet.ts
index fed07c4..4ec6878 100644
--- a/src/module/actor/sheets/actor-sheet.ts
+++ b/src/module/actor/sheets/actor-sheet.ts
@@ -22,16 +22,7 @@ export class DS4ActorSheet extends ActorSheet<ActorSheet.Options, DS4ActorSheetD
         return foundry.utils.mergeObject(super.defaultOptions, {
             classes: ["ds4", "sheet", "actor"],
             height: 620,
-            scrollY: [
-                ".values",
-                ".inventory",
-                ".spells",
-                ".abilities",
-                ".profile",
-                ".biography",
-                ".special-creature-abilities",
-                ".effects",
-            ],
+            scrollY: [".values", ".inventory", ".spells", ".abilities", ".effects", ".biography", ".description"],
             tabs: [{ navSelector: ".sheet-tabs", contentSelector: ".sheet-body", initial: "values" }],
             dragDrop: [
                 { dragSelector: ".item-list .item", dropSelector: null },
diff --git a/src/module/handlebars/handlebars-partials.ts b/src/module/handlebars/handlebars-partials.ts
index 478c4a5..28e4da1 100644
--- a/src/module/handlebars/handlebars-partials.ts
+++ b/src/module/handlebars/handlebars-partials.ts
@@ -28,13 +28,13 @@ export default async function registerHandlebarsPartials(): Promise<void> {
         "systems/ds4/templates/sheets/actor/components/profile.hbs",
         "systems/ds4/templates/sheets/actor/components/rollable-image.hbs",
         "systems/ds4/templates/sheets/actor/components/talent-rank-equation.hbs",
-        "systems/ds4/templates/sheets/actor/tabs/abilities.hbs",
         "systems/ds4/templates/sheets/actor/tabs/biography.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/character-abilities.hbs",
         "systems/ds4/templates/sheets/actor/tabs/character-inventory.hbs",
+        "systems/ds4/templates/sheets/actor/tabs/creature-abilities.hbs",
         "systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs",
         "systems/ds4/templates/sheets/actor/tabs/description.hbs",
         "systems/ds4/templates/sheets/actor/tabs/effects.hbs",
-        "systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs",
         "systems/ds4/templates/sheets/actor/tabs/spells.hbs",
         "systems/ds4/templates/sheets/actor/tabs/values.hbs",
         "systems/ds4/templates/sheets/item/components/body.hbs",
diff --git a/src/templates/sheets/actor/character-sheet.hbs b/src/templates/sheets/actor/character-sheet.hbs
index 8dcc5a2..70455a9 100644
--- a/src/templates/sheets/actor/character-sheet.hbs
+++ b/src/templates/sheets/actor/character-sheet.hbs
@@ -36,7 +36,7 @@ SPDX-License-Identifier: MIT
 {{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}}
 
 {{!-- Abilities Tab --}}
-{{> systems/ds4/templates/sheets/actor/tabs/abilities.hbs}}
+{{> systems/ds4/templates/sheets/actor/tabs/character-abilities.hbs}}
 
 {{!-- Effects Tab --}}
 {{> systems/ds4/templates/sheets/actor/tabs/effects.hbs}}
diff --git a/src/templates/sheets/actor/creature-sheet.hbs b/src/templates/sheets/actor/creature-sheet.hbs
index de12472..ebd9f43 100644
--- a/src/templates/sheets/actor/creature-sheet.hbs
+++ b/src/templates/sheets/actor/creature-sheet.hbs
@@ -17,9 +17,8 @@ SPDX-License-Identifier: MIT
     <nav class="ds4-sheet-tab-nav sheet-tabs tabs" data-group="primary">
         <a class="ds4-sheet-tab-nav__item item" data-tab="values">{{localize 'DS4.HeadingValues'}}</a>
         <a class="ds4-sheet-tab-nav__item item" data-tab="inventory">{{localize 'DS4.HeadingInventory'}}</a>
-        <a class="ds4-sheet-tab-nav__item item" data-tab="special-creature-abilities">{{localize
-            'DS4.HeadingSpecialCreatureAbilities'}}</a>
         <a class="ds4-sheet-tab-nav__item item" data-tab="spells">{{localize 'DS4.HeadingSpells'}}</a>
+        <a class="ds4-sheet-tab-nav__item item" data-tab="abilities">{{localize 'DS4.HeadingAbilities'}}</a>
         <a class="ds4-sheet-tab-nav__item item" data-tab="effects">{{localize 'DS4.HeadingEffects'}}</a>
         <a class="ds4-sheet-tab-nav__item item" data-tab="description">{{localize 'DS4.HeadingDescription'}}</a>
     </nav>
@@ -32,12 +31,12 @@ SPDX-License-Identifier: MIT
         {{!-- Inventory Tab --}}
         {{> systems/ds4/templates/sheets/actor/tabs/creature-inventory.hbs}}
 
-        {{!-- Special Creature Abilities Tab --}}
-        {{> systems/ds4/templates/sheets/actor/tabs/special-creature-abilities.hbs}}
-
         {{!-- Spells Tab --}}
         {{> systems/ds4/templates/sheets/actor/tabs/spells.hbs}}
 
+        {{!-- Abilities Tab --}}
+        {{> systems/ds4/templates/sheets/actor/tabs/creature-abilities.hbs}}
+
         {{!-- Effects Tab --}}
         {{> systems/ds4/templates/sheets/actor/tabs/effects.hbs}}
 
diff --git a/src/templates/sheets/actor/tabs/abilities.hbs b/src/templates/sheets/actor/tabs/character-abilities.hbs
similarity index 100%
rename from src/templates/sheets/actor/tabs/abilities.hbs
rename to src/templates/sheets/actor/tabs/character-abilities.hbs
diff --git a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs b/src/templates/sheets/actor/tabs/creature-abilities.hbs
similarity index 87%
rename from src/templates/sheets/actor/tabs/special-creature-abilities.hbs
rename to src/templates/sheets/actor/tabs/creature-abilities.hbs
index 81c627f..ef9c81b 100644
--- a/src/templates/sheets/actor/tabs/special-creature-abilities.hbs
+++ b/src/templates/sheets/actor/tabs/creature-abilities.hbs
@@ -5,7 +5,7 @@ SPDX-FileCopyrightText: 2021 Gesina Schwalbe
 SPDX-License-Identifier: MIT
 --}}
 
-<div class="tab special-creature-abilities" data-group="primary" data-tab="special-creature-abilities">
+<div class="tab abilities" data-group="primary" data-tab="abilities">
     {{#unless (isEmpty itemsByType.specialCreatureAbility)}}
     <ol class="ds4-item-list ds4-item-list--special-creature-ability item-list">
         {{> systems/ds4/templates/sheets/actor/components/item-list-header.hbs}}