diff --git a/mod/Unfound Loot.esp b/mod/Unfound Loot.esp index a7f5f36..519a1a0 100644 Binary files a/mod/Unfound Loot.esp and b/mod/Unfound Loot.esp differ diff --git a/src/EULxDelootifyCellItems.gek b/src/EULxDelootifyCellItems.gek index 170bb78..b37c060 100644 --- a/src/EULxDelootifyCellItems.gek +++ b/src/EULxDelootifyCellItems.gek @@ -136,8 +136,8 @@ begin function { rCell, aUniques } continue endif if GetWeight rBase - DebugPrint "%n is trash, cutting removal chance in half." rBase - set fRemovalChance to fRemovalChance / 2 + DebugPrint "%n is trash, applying multiplier %.1f" rBase EULxWorldTrashRemovalMod + let fRemovalChance *= EULxWorldTrashRemovalMod endif endif diff --git a/src/EULxDelootifyContainer.gek b/src/EULxDelootifyContainer.gek index e450e70..ae7b64a 100644 --- a/src/EULxDelootifyContainer.gek +++ b/src/EULxDelootifyContainer.gek @@ -93,8 +93,8 @@ begin function { rCell, rContainer, aUniques, fRemovalChanceMult } continue endif if GetWeight rBase > 0 - DebugPrint "%n is trash, cutting removal chance in half." rBase - set fRemovalChance to fRemovalChance / 2 + DebugPrint "%n is trash, applying multiplier %.1f" rBase EULxWorldTrashRemovalMod + let fRemovalChance *= EULxWorldTrashRemovalMod endif endif diff --git a/src/EULxDelootifyNPC.gek b/src/EULxDelootifyNPC.gek index c243b19..4eb3523 100644 --- a/src/EULxDelootifyNPC.gek +++ b/src/EULxDelootifyNPC.gek @@ -147,8 +147,8 @@ begin function { rNPC, bDisintegrated } continue endif if GetWeight rBase > 0 - DebugPrint "%n is trash, cutting removal chance in half." rBase - set fRemovalChance to fRemovalChance / 2 + DebugPrint "%n is trash, applying multiplier %.1f" rBase EULxWorldTrashRemovalMod + let fRemovalChance *= EULxWorldTrashRemovalMod endif endif diff --git a/src/EULxINILoadSettings.gek b/src/EULxINILoadSettings.gek index 7e78424..918228e 100644 --- a/src/EULxINILoadSettings.gek +++ b/src/EULxINILoadSettings.gek @@ -40,6 +40,7 @@ begin function {} set EULxWorldMedsRemovalMod to GetINIFloat "World:MedsRemovalMod" $sFile set EULxWorldFoodRemovalMod to GetINIFloat "World:FoodRemovalMod" $sFile set EULxWorldMiscRemovalMod to GetINIFloat "World:MiscRemovalMod" $sFile + set EULxWorldTrashRemovalMod to GetINIFloat "World:TrashRemovalMod" $sFile ; Actors diff --git a/src/EULxINISaveSettings.gek b/src/EULxINISaveSettings.gek index 2c76fb5..3195954 100644 --- a/src/EULxINISaveSettings.gek +++ b/src/EULxINISaveSettings.gek @@ -34,6 +34,7 @@ begin function {} SetINIFloat "World:MedsRemovalMod" EULxWorldMedsRemovalMod $sFile SetINIFloat "World:FoodRemovalMod" EULxWorldFoodRemovalMod $sFile SetINIFloat "World:MiscRemovalMod" EULxWorldMiscRemovalMod $sFile + SetINIFloat "World:TrashRemovalMod" EULxWorldTrashRemovalMod $sFile ; Actors diff --git a/src/EULxOnGameLoad.gek b/src/EULxOnGameLoad.gek index 7a9e6bb..7834f00 100644 --- a/src/EULxOnGameLoad.gek +++ b/src/EULxOnGameLoad.gek @@ -52,6 +52,7 @@ begin function { iSuccess } SetINIFloat "World:ContRemovalChance" EULxWorldContRemovalChance "Unfound Loot.ini" SetINIFloat "World:OwnedRemovalMod" EULxWorldOwnedRemovalMod "Unfound Loot.ini" SetINIFloat "World:LockedRemovalMod" EULxWorldLockedRemovalMod "Unfound Loot.ini" + SetINIFloat "World:TrashRemovalMod" EULxWorldTrashRemovalMod "Unfound Loot.ini" endif endif endif diff --git a/src/EULxPresetSetterFUNCTION.gek b/src/EULxPresetSetterFUNCTION.gek index 91c1e06..a97f9fc 100644 --- a/src/EULxPresetSetterFUNCTION.gek +++ b/src/EULxPresetSetterFUNCTION.gek @@ -37,6 +37,7 @@ begin function { iPreset, bAll } set EULxWorldFoodRemovalMod to 1.3 set EULxWorldMiscRemovalMod to .60 ; keep interiors pretty + set EULxWorldTrashRemovalMod to .5 set EULxWorldAmmoRemovalMod to 1.0 set EULxWorldCurrencyRemovalMod to 1.2 @@ -86,6 +87,7 @@ begin function { iPreset, bAll } set EULxWorldContRemovalChance to 95 set EULxWorldArmorRemovalMod to 1.0 set EULxWorldMiscRemovalMod to .80 ;sparse interiors + set EULxWorldTrashRemovalMod to .5 set EULxWorldAmmoRemovalMod to 2.0 ;too much ammo as is set EULxWorldCurrencyRemovalMod to 1.0 @@ -119,6 +121,7 @@ begin function { iPreset, bAll } set EULxWorldWeaponRemovalMod to 1.5 set EULxWorldArmorRemovalMod to 0.6 set EULxWorldMiscRemovalMod to 0.33 ; junk doesnt get picked up + set EULxWorldTrashRemovalMod to .5 set EULxWorldAmmoRemovalMod to 1.3 set EULxWorldCurrencyRemovalMod to 1.5 diff --git a/src/EULxQuestScript.gek b/src/EULxQuestScript.gek index 0d0ecaa..4804b7c 100644 --- a/src/EULxQuestScript.gek +++ b/src/EULxQuestScript.gek @@ -158,7 +158,7 @@ begin MenuMode 1013 call EULxMCMAddElement 2.5 "Meds" EULxWorldMedsRemovalMod call EULxMCMAddElement 2.5 "Food" EULxWorldFoodRemovalMod call EULxMCMAddElement 2.5 "Misc items" EULxWorldMiscRemovalMod - + call EULxMCMAddElement 2.5 "Trash" EULxWorldTrashRemovalMod elseif iSubMenu == 3 @@ -290,6 +290,8 @@ begin MenuMode 1013 set EULxWorldFoodRemovalMod to fValue elseif iOption == 21 set EULxWorldMiscRemovalMod to fValue + elseif iOption == 22 + set EULxWorldTrashRemovalMod to fValue endif elseif iSubMenu == 3 @@ -438,6 +440,8 @@ begin MenuMode 1013 elseif iOption == 21 call EULxMCMAddScale "Misc items multiplier" EULxWorldMiscRemovalMod "x" 0 10 1 0.1 + elseif iOption == 22 + call EULxMCMAddScale "Trash multiplier" EULxWorldTrashRemovalMod "x" 0 10 1 0.1 endif elseif iSubMenu == 3 @@ -534,6 +538,8 @@ begin MenuMode 1013 elseif iOption == 21 ; misc SetUIFloat "StartMenu/MCM/_Value" 0.3 + elseif iOption == 22 ; trash + SetUIFloat "StartMenu/MCM/_Value" 0.5 endif @@ -651,6 +657,8 @@ begin MenuMode 1013 elseif iMouseover == 21 SetUIString "StartMenu/MCM/*:9/string" "Removal chance multiplier for misc items. Higher = greater chance of these items being removed." + elseif iMouseover == 22 + SetUIString "StartMenu/MCM/*:9/string" "Removal chance multiplier for trash (junk items < 5 caps and non-zero weight). Higher = greater chance of these items being removed." else SetUIFloat "StartMenu/MCM/*:9/visible" 0