Merge pull request #12 from rux616/working

Update to v1.2.0
rux616 · Jul 31, 2022 · 3a4da87 · 3a4da87
2 parents 380676d + e854a68
commit 3a4da87
Show file tree

Hide file tree

Showing 22 changed files with 124 additions and 27 deletions.
diff --git a/.version b/.version
@@ -1,9 +1,9 @@
 declare -i version_major='1'
-declare -i version_minor='1'
-declare -i version_patch='3'
+declare -i version_minor='2'
+declare -i version_patch='0'
 declare -i version_prerelease=''
 declare is_rc='false'
 declare is_beta='false'
 declare is_alpha='false'
 declare include_build_in_version='false'
-declare -i build_number='330'
+declare -i build_number='342'
diff --git a/Docs/Portable Junk Recycler Mk 2/CHANGELOG.md b/Docs/Portable Junk Recycler Mk 2/CHANGELOG.md
@@ -6,6 +6,7 @@ Table Of Contents
 - [Portable Junk Recycler Mk 2](#portable-junk-recycler-mk-2)
     - [Table Of Contents](#table-of-contents)
 - [Changelogs](#changelogs)
+    - [v1.2.0](#v120)
     - [v1.1.3](#v113)
     - [v1.1.2](#v112)
     - [v1.1.1](#v111)
@@ -29,6 +30,13 @@ Table Of Contents
 Changelogs
 ==========
 
+v1.2.0
+------
+- Added MCM setting: 'Use Simple Crafting Recipe' ('Recycler Interface' page) - when set to 'ON', changes the recipe to craft the device to one that only requires standard components; thanks to [IgorVoltage](https://www.nexusmods.com/fallout4/users/5093759) on Nexus Mods for the [suggestion](https://forums.nexusmods.com/index.php?showtopic=10434043/#entry111224563)
+- Slightly refined uninstall functions
+
+([TOC](#table-of-contents))
+
 v1.1.3
 ------
 - Added MCM setting: 'Modifier Hotkey Read Delay' ('Recycler Interface' page) - adds a small delay to compensate for the fact that you can't use the behavior modifier hotkeys in combination with the device usage hotkey

diff --git a/Docs/Portable Junk Recycler Mk 2/CHANGELOG.txt b/Docs/Portable Junk Recycler Mk 2/CHANGELOG.txt
@@ -6,6 +6,7 @@ Table Of Contents
 - Portable Junk Recycler Mk 2
     - Table Of Contents
 - Changelogs
+    - v1.2.0
     - v1.1.3
     - v1.1.2
     - v1.1.1
@@ -29,6 +30,11 @@ Table Of Contents
 Changelogs
 ==========
 
+v1.2.0
+------
+- Added MCM setting: 'Use Simple Crafting Recipe' ('Recycler Interface' page) - when set to 'ON', changes the recipe to craft the device to one that only requires standard components; thanks to IgorVoltage (https://www.nexusmods.com/fallout4/users/5093759) on Nexus Mods for the suggestion (https://forums.nexusmods.com/index.php?showtopic=10434043/#entry111224563)
+- Slightly refined uninstall functions
+
 v1.1.3
 ------
 - Added MCM setting: 'Modifier Hotkey Read Delay' ('Recycler Interface' page) - adds a small delay to compensate for the fact that you can't use the behavior modifier hotkeys in combination with the device usage hotkey

diff --git a/Docs/Portable Junk Recycler Mk 2/README.md b/Docs/Portable Junk Recycler Mk 2/README.md
@@ -342,6 +342,7 @@ Plugin FormID Layout
 - `FExxx84*` Ingestible
 - `FExxx85*` Transform
 - `FExxx86*` Constructable Object
+- `FExxx87*` Keyword
 - `FExxx9**` Message
 
 **Note:** "xxx" is the load order position of the mod.
@@ -438,6 +439,7 @@ Settings Layout in MCM
     - Return Items Silently [Default = `ON`, Possible Values = `OFF`/`ON`]
     - Inventory Removal Protection [Default = `OFF`, Possible Values = `OFF`/`Ask First`/`Automatic`]
 - Crafting
+    - Use Simple Crafting Recipe [Default = `OFF`, Possible Values = `OFF`/`ON`]
     - Crafting Station [Default = `Dynamic`, Possible Values = `Dynamic`/`Chemistry Station (Vanilla)`/`Electronics Workbench (SW)`/`Engineering Workbench (SW)`/`Manufacturing Workbench (SW)`/`Utility Workbench (SW)`/`Adv. Engineering Workbench AWKCR)`/`Electronics Workstation (AWKCR)`/`Utility Workbench (AWKCR)`/`Utility Station (ECO)`]
 - Hotkeys
     - Activate Portable Junk Recycler Mk 2 [Default = `None`]

diff --git a/Docs/Portable Junk Recycler Mk 2/README.nexusbbcode b/Docs/Portable Junk Recycler Mk 2/README.nexusbbcode
@@ -273,6 +273,7 @@ Submit yourself to the will of RNGesus.
 - [font=Courier New][color=#b2b2b2]FExxx84*[/color][/font] Ingestible
 - [font=Courier New][color=#b2b2b2]FExxx85*[/color][/font] Transform
 - [font=Courier New][color=#b2b2b2]FExxx86*[/color][/font] Constructable Object
+- [font=Courier New][color=#b2b2b2]FExxx87*[/color][/font] Keyword
 - [font=Courier New][color=#b2b2b2]FExxx9**[/color][/font] Message
 
 [b]Note:[/b] "xxx" is the load order position of the mod.
@@ -358,6 +359,7 @@ These lists are reread every time a game is loaded.
     - Return Items Silently [Default = [font=Courier New][color=#b2b2b2]ON[/color][/font], Possible Values = [font=Courier New][color=#b2b2b2]OFF[/color][/font]/[font=Courier New][color=#b2b2b2]ON[/color][/font]]
     - Inventory Removal Protection [Default = [font=Courier New][color=#b2b2b2]OFF[/color][/font], Possible Values = [font=Courier New][color=#b2b2b2]OFF[/color][/font]/[font=Courier New][color=#b2b2b2]Ask First[/color][/font]/[font=Courier New][color=#b2b2b2]Automatic[/color][/font]]
 - Crafting
+    - Use Simple Crafting Recipe [Default = [font=Courier New][color=#b2b2b2]OFF[/color][/font], Possible Values = [font=Courier New][color=#b2b2b2]OFF[/color][/font]/[font=Courier New][color=#b2b2b2]ON[/color][/font]]
     - Crafting Station [Default = [font=Courier New][color=#b2b2b2]Dynamic[/color][/font], Possible Values = [font=Courier New][color=#b2b2b2]Dynamic[/color][/font]/[font=Courier New][color=#b2b2b2]Chemistry Station (Vanilla)[/color][/font]/[font=Courier New][color=#b2b2b2]Electronics Workbench (SW)[/color][/font]/[font=Courier New][color=#b2b2b2]Engineering Workbench (SW)[/color][/font]/[font=Courier New][color=#b2b2b2]Manufacturing Workbench (SW)[/color][/font]/[font=Courier New][color=#b2b2b2]Utility Workbench (SW)[/color][/font]/[font=Courier New][color=#b2b2b2]Adv. Engineering Workbench AWKCR)[/color][/font]/[font=Courier New][color=#b2b2b2]Electronics Workstation (AWKCR)[/color][/font]/[font=Courier New][color=#b2b2b2]Utility Workbench (AWKCR)[/color][/font]/[font=Courier New][color=#b2b2b2]Utility Station (ECO)[/color][/font]]
 - Hotkeys
     - Activate Portable Junk Recycler Mk 2 [Default = [font=Courier New][color=#b2b2b2]None[/color][/font]]

diff --git a/Docs/Portable Junk Recycler Mk 2/README.txt b/Docs/Portable Junk Recycler Mk 2/README.txt
@@ -300,6 +300,7 @@ General FormIDs:
 - `FExxx84*` Ingestible
 - `FExxx85*` Transform
 - `FExxx86*` Constructable Object
+- `FExxx87*` Keyword
 - `FExxx9**` Message
 
 Note: "xxx" is the load order position of the mod.
@@ -388,6 +389,7 @@ Recycler Interface:
     - Return Items Silently [Default = `ON`, Possible Values = `OFF`/`ON`]
     - Inventory Removal Protection [Default = `OFF`, Possible Values = `OFF`/`Ask First`/`Automatic`]
 - Crafting
+    - Use Simple Crafting Recipe [Default = `OFF`, Possible Values = `OFF`/`ON`]
     - Crafting Station [Default = `Dynamic`, Possible Values = `Dynamic`/`Chemistry Station (Vanilla)`/`Electronics Workbench (SW)`/`Engineering Workbench (SW)`/`Manufacturing Workbench (SW)`/`Utility Workbench (SW)`/`Adv. Engineering Workbench AWKCR)`/`Electronics Workstation (AWKCR)`/`Utility Workbench (AWKCR)`/`Utility Station (ECO)`]
 - Hotkeys
     - Activate Portable Junk Recycler Mk 2 [Default = `None`]

diff --git a/Interface/Translations/Portable Junk Recycler Mk 2_En.txt b/Interface/Translations/Portable Junk Recycler Mk 2_En.txt
diff --git a/MCM/Config/Portable Junk Recycler Mk 2/Portable Junk Recycler Mk 2.jsonnet b/MCM/Config/Portable Junk Recycler Mk 2/Portable Junk Recycler Mk 2.jsonnet
@@ -59,7 +59,7 @@ local threads_step = 1;
   local mod = {
     name: 'Portable Junk Recycler Mk 2',
     localized_name: '$PortableJunkRecyclerMk2',
-    version: '1.1.3',
+    version: '1.2.0',
     plugin_name: mod.name + '.esp',
     quest_form: mod.plugin_name + '|800',
     control_script: 'PortableJunkRecyclerMk2:PJRM2_ControlManager',
@@ -150,6 +150,7 @@ local threads_step = 1;
 
           // recycler interface - crafting
           mcm.control.section(text='$Crafting'),
+          mcm.control.switcher(text='$UseSimpleCraftingRecipeText', source=mcm.helper.source.mod_setting.int(id='bUseSimpleCraftingRecipe:Crafting'), help='$UseSimpleCraftingRecipeHelp'),
           mcm.control.dropdown(text='$CraftingStationText', options=['$Dynamic', '$VanillaChemistry', '$SWElectronics', '$SWEngineering', '$SWManufacturing', '$SWUtility', '$AWKCRAdvEngineering', '$AWKCRElectronics', '$AWKCRUtility', '$ECOUtility'], source=mcm.helper.source.mod_setting.int(id='iCraftingStation:Crafting'), help='$CraftingStationHelp'),
           mcm.control.text(text='$CraftingStationNote'),
           mcm.control.spacer(lines=1),

diff --git a/MCM/Config/Portable Junk Recycler Mk 2/config.json b/MCM/Config/Portable Junk Recycler Mk 2/config.json
@@ -12,7 +12,7 @@
       },
       {
          "html": true,
-         "text": "<p align=\"center\">v1.1.3</p>",
+         "text": "<p align=\"center\">v1.2.0</p>",
          "type": "text"
       },
       {
@@ -345,6 +345,15 @@
                "text": "$Crafting",
                "type": "section"
             },
+            {
+               "help": "$UseSimpleCraftingRecipeHelp",
+               "id": "bUseSimpleCraftingRecipe:Crafting",
+               "text": "$UseSimpleCraftingRecipeText",
+               "type": "switcher",
+               "valueOptions": {
+                  "sourceType": "ModSettingInt"
+               }
+            },
             {
                "help": "$CraftingStationHelp",
                "id": "iCraftingStation:Crafting",

diff --git a/MCM/Config/Portable Junk Recycler Mk 2/settings.ini b/MCM/Config/Portable Junk Recycler Mk 2/settings.ini
@@ -26,6 +26,7 @@ bReturnItemsSilently=1
 iInventoryRemovalProtection=0
 
 [Crafting]
+bUseSimpleCraftingRecipe=0
 iCraftingStation=0
 
 [MultiplierAdjustments]

diff --git a/PJRM2 Crafting Category Override - AWKCR Devices.esp b/PJRM2 Crafting Category Override - AWKCR Devices.esp
diff --git a/PJRM2 Crafting Category Override - AWKCR Other.esp b/PJRM2 Crafting Category Override - AWKCR Other.esp
diff --git a/PJRM2 Crafting Category Override - AWKCR Tools.esp b/PJRM2 Crafting Category Override - AWKCR Tools.esp
diff --git a/PJRM2 Crafting Category Override - LKR Devices.esp b/PJRM2 Crafting Category Override - LKR Devices.esp
diff --git a/PJRM2 Crafting Category Override - LKR Utility.esp b/PJRM2 Crafting Category Override - LKR Utility.esp
diff --git a/Portable Junk Recycler Mk 2.esp b/Portable Junk Recycler Mk 2.esp
diff --git a/Scripts/Source/User/Portable Junk Recycler Mk 2 - Release.ppj b/Scripts/Source/User/Portable Junk Recycler Mk 2 - Release.ppj
@@ -18,8 +18,8 @@
         <Variable Name="ModNameShort" Value="PJRM2"/>
         <Variable Name="ModNameRelease" Value="Portable_Junk_Recycler_Mk_2"/>
         <Variable Name="ModResourceName" Value="PortableJunkRecyclerMk2"/>
-        <Variable Name="ModVersion" Value="1.1.3"/>
-        <Variable Name="ModVersionWithBuild" Value="1.1.3+330"/>
+        <Variable Name="ModVersion" Value="1.2.0"/>
+        <Variable Name="ModVersionWithBuild" Value="1.2.0+342"/>
         <Variable Name="ModPath" Value="..\..\.."/>
         <Variable Name="BuildPath" Value="@ModPath\Build"/>
         <Variable Name="CompilePath" Value="@BuildPath\Scripts"/>

diff --git a/Scripts/Source/User/PortableJunkRecyclerMk2/PJRM2_ControlManager.psc b/Scripts/Source/User/PortableJunkRecyclerMk2/PJRM2_ControlManager.psc
@@ -135,7 +135,7 @@ int Property iSaveFileMonitor Auto Hidden ; Do not mess with ever - this is used
 
 PJRM2_SettingManager SettingManager
 PJRM2_ThreadManager ThreadManager
-string ModVersion = "1.1.3" const
+string ModVersion = "1.2.0" const
 SettingChangeType AvailableChangeTypes
 string ModName
 bool EnableLogging = false
@@ -939,7 +939,7 @@ Function Uninstall()
         SettingManager.Uninstall()
 
         ; remove recycler devices in inventory, if any
-        PlayerRef.RemoveItem(Game.GetFormFromFile(0x840, SettingManager.ModName + ".esp"), -1, true)
+        PlayerRef.RemoveItem(PortableRecyclerItem, -1, true)
 
         ; properties
         ; group Components