Made adding empty bottles optional

This commit is contained in:
Eddoursul 2022-07-27 21:22:30 +02:00
parent f4fcea01bf
commit 548ccd2d01
4 changed files with 16 additions and 6 deletions

Binary file not shown.

View File

@ -2,3 +2,4 @@
iFillBottleDelay = 1 iFillBottleDelay = 1
bReplenishableCanteen = 1 bReplenishableCanteen = 1
iReplenishableCanteenMaxSips = 4 iReplenishableCanteenMaxSips = 4
bAddEmptyBottlesOnConsumption = 1

View File

@ -29,9 +29,10 @@ begin function {}
let EBxFillBottleDelay := GetINIFloat "Settings:iFillBottleDelay" "Bottle Rinse Repeat.ini" let EBxFillBottleDelay := GetINIFloat "Settings:iFillBottleDelay" "Bottle Rinse Repeat.ini"
let EBxReplenishableCanteen := GetINIFloat "Settings:bReplenishableCanteen" "Bottle Rinse Repeat.ini" let EBxReplenishableCanteen := GetINIFloat "Settings:bReplenishableCanteen" "Bottle Rinse Repeat.ini"
let EBxCanteenSipsMax := GetINIFloat "Settings:iReplenishableCanteenMaxSips" "Bottle Rinse Repeat.ini" let EBxCanteenSipsMax := GetINIFloat "Settings:iReplenishableCanteenMaxSips" "Bottle Rinse Repeat.ini"
if EBxCanteenSipsMax < 1 endif
let EBxCanteenSipsMax := 4
endif if EBxCanteenSipsMax < 1
let EBxCanteenSipsMax := 4
endif endif
; Add new items to form lists ; Add new items to form lists

View File

@ -8,6 +8,7 @@ ref rEntry
ref rBottleUp ref rBottleUp
ref rBottleDown ref rBottleDown
int iCounter int iCounter
int bAddEmpties
begin function { i } begin function { i }
@ -93,7 +94,7 @@ begin function { i }
ListAddForm EBxUpgradableToPurifiedList rItem ListAddForm EBxUpgradableToPurifiedList rItem
endif endif
set rItem to GetFormFromMod "BrokenSteel.esm" "104F" ; DLC03AquaPura let rItem := GetFormFromMod "BrokenSteel.esm" "104F" ; DLC03AquaPura
if IsFormValid rItem if IsFormValid rItem
ListAddForm EBxUpgradableToPurifiedList rItem ListAddForm EBxUpgradableToPurifiedList rItem
endif endif
@ -107,9 +108,16 @@ begin function { i }
let rBottleDown := ITMBottleDown let rBottleDown := ITMBottleDown
endif endif
let bAddEmpties := 1
if FileExists "config\Bottle Rinse Repeat.ini"
let bAddEmpties := GetINIFloat "Settings:bAddEmptyBottlesOnConsumption" "Bottle Rinse Repeat.ini"
endif
let i := 0 let i := 0
while rItem := ListGetNthForm EBxDrinkLists i while rItem := ListGetNthForm EBxDrinkLists i
SetOnUseAidItemEventHandler EBxOnDrink 1 rItem if bAddEmpties
SetOnUseAidItemEventHandler EBxOnDrink 1 rItem
endif
if GetType rItem == 85 ; form list if GetType rItem == 85 ; form list
let n := 0 let n := 0