From 525292b18418989c6ae37351bffb17cd30f42b4e Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Thu, 10 Dec 2020 19:02:38 +0100 Subject: [PATCH] Add graphic herbalism to the launcher --- CHANGELOG.md | 1 + apps/launcher/advancedpage.cpp | 2 ++ docs/source/reference/modding/settings/game.rst | 11 +++++++++++ files/ui/advancedpage.ui | 10 ++++++++++ 4 files changed, 24 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b09c60abb..b16480b02 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -94,6 +94,7 @@ Feature #5649: Skyrim SE compressed BSA format support Feature #5672: Make stretch menu background configuration more accessible Feature #5692: Improve spell/magic item search to factor in magic effect names + Feature #5730: Add graphic herbalism option to the launcher and documents Task #5480: Drop Qt4 support Task #5520: Improve cell name autocompleter implementation diff --git a/apps/launcher/advancedpage.cpp b/apps/launcher/advancedpage.cpp index b35e78639..ed0407235 100644 --- a/apps/launcher/advancedpage.cpp +++ b/apps/launcher/advancedpage.cpp @@ -153,6 +153,7 @@ bool Launcher::AdvancedPage::loadSettings() if (showOwnedIndex >= 0 && showOwnedIndex <= 3) showOwnedComboBox->setCurrentIndex(showOwnedIndex); loadSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI"); + loadSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game"); } // Bug fixes @@ -279,6 +280,7 @@ void Launcher::AdvancedPage::saveSettings() if (showOwnedCurrentIndex != mEngineSettings.getInt("show owned", "Game")) mEngineSettings.setInt("show owned", "Game", showOwnedCurrentIndex); saveSettingBool(stretchBackgroundCheckBox, "stretch menu background", "GUI"); + saveSettingBool(graphicHerbalismCheckBox, "graphic herbalism", "Game"); } // Bug fixes diff --git a/docs/source/reference/modding/settings/game.rst b/docs/source/reference/modding/settings/game.rst index fd93eba61..4e1fe1318 100644 --- a/docs/source/reference/modding/settings/game.rst +++ b/docs/source/reference/modding/settings/game.rst @@ -428,3 +428,14 @@ even if the fighting NPC is knocked out. This setting allows the player to steal items from fighting NPCs that were knocked out if enabled. This setting can be controlled in Advanced tab of the launcher. + +graphic herbalism +----------------- + +:Type: boolean +:Range: True/False +:Default: True + +Some mods add harvestable container models. When this setting is enabled, activating a container using a harvestable model will visually harvest from it instead of opening the menu. + +When this setting is turned off or when activating a regular container, the menu will open as usual. diff --git a/files/ui/advancedpage.ui b/files/ui/advancedpage.ui index 3f53180da..a3601ce94 100644 --- a/files/ui/advancedpage.ui +++ b/files/ui/advancedpage.ui @@ -724,6 +724,16 @@ True: In non-combat mode camera is positioned behind the character's shoulder. C + + + + <html><head/><body><p>If this setting is true, containers supporting graphic herbalism will do so instead of opening the menu.</p></body></html> + + + Enable graphic herbalism + + +