From 7885b8c75e4d127576e74248cb69c8330299bfe5 Mon Sep 17 00:00:00 2001 From: Capostrophic Date: Mon, 4 Nov 2019 20:34:06 +0300 Subject: [PATCH] Sheathing-related changes Add weapon and shield sheathing and use additional anim sources checkboxes into the Advanced tab of the launcher Remove outdated information from the documentation --- apps/launcher/advancedpage.cpp | 6 +++++ docs/source/reference/modding/extended.rst | 4 --- files/ui/advancedpage.ui | 30 ++++++++++++++++++++++ 3 files changed, 36 insertions(+), 4 deletions(-) diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp index fe3afc6a8..dc0866f74 100644 --- a/apps/launcher/advancedpage.cpp +++ b/apps/launcher/advancedpage.cpp @@ -82,6 +82,9 @@ bool Launcher::AdvancedPage::loadSettings() loadSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game"); loadSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game"); loadSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game"); + loadSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game"); + loadSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game"); + loadSettingBool(animSourcesCheckBox, "use additional anim sources", "Game"); // Input Settings loadSettingBool(grabCursorCheckBox, "grab cursor", "Input"); @@ -142,6 +145,9 @@ void Launcher::AdvancedPage::saveSettings() saveSettingBool(requireAppropriateAmmunitionCheckBox, "only appropriate ammunition bypasses resistance", "Game"); saveSettingBool(magicItemAnimationsCheckBox, "use magic item animations", "Game"); saveSettingBool(normaliseRaceSpeedCheckBox, "normalise race speed", "Game"); + saveSettingBool(weaponSheathingCheckBox, "weapon sheathing", "Game"); + saveSettingBool(shieldSheathingCheckBox, "shield sheathing", "Game"); + saveSettingBool(animSourcesCheckBox, "use additional anim sources", "Game"); // Input Settings saveSettingBool(grabCursorCheckBox, "grab cursor", "Input"); diff --git a/docs/source/reference/modding/extended.rst b/docs/source/reference/modding/extended.rst index c17afcf79..bf2b2b74f 100644 --- a/docs/source/reference/modding/extended.rst +++ b/docs/source/reference/modding/extended.rst @@ -197,10 +197,6 @@ The appearance and count of shown ammunition depends on type and count of equipp It is important to make sure the names of empty nodes start with ``"Bip01 "``, or the engine will optimize them out. -4. Shields - -Shield holstering is not supported at the moment since it conflicts with any mods which use pseudo-shields as held items (such as Animated Morrowind and Hold It). - An example of a mod which uses this feature is `Weapon Sheathing`_. diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui index 7421f7f78..b22b2d9ea 100644 --- a/files/ui/advancedpage.ui +++ b/files/ui/advancedpage.ui @@ -169,6 +169,36 @@ + + + + <html><head/><body><p>Render holstered weapons (with quivers and scabbards), requires modded assets</p></body></html> + + + Weapon sheathing + + + + + + + <html><head/><body><p>Render holstered shield, requires modded assets</p></body></html> + + + Shield sheathing + + + + + + + <html><head/><body><p>Load per-group KF-files and skeleton files from Animations folder</p></body></html> + + + Use additional animation sources + + +