From f4fcea01bfc9c8fa8f9a94c987ceb11bbe89cdad Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Mon, 25 Jul 2022 22:26:10 +0200
Subject: [PATCH] Re-add vanilla Vault 13 Canteen, when it's empty; allow to
 disable canteen replenishing in INI

---
 Bottle Rinse Repeat.esp        | Bin 51622 -> 54870 bytes
 config/Bottle Rinse Repeat.ini |   4 ++-
 src/EBxBootstrap.gek           |  51 ++++++++++++++++++++++-----------
 src/EBxFillFromObject.gek      |   4 +--
 src/EBxOnCrosshair.gek         |   2 +-
 src/EBxOnGameLoad.gek          |  15 ++++++++++
 src/EBxReplenishCanteen.gek    |  16 +++++++++++
 7 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/Bottle Rinse Repeat.esp b/Bottle Rinse Repeat.esp
index d868622765e0e8bd075e1cbc310834761820787c..9142abea2c746425a38eb9c44048701fa8930fd1 100644
GIT binary patch
delta 6973
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
G&c6Ypg=DY*

delta 4131
zcmcIneQZ<L6+id+`7?21JN}9jCyo;*4k?LK0>cSOlQ@Y<mOvXfl<zfwO&ohMIEJRQ
zBS5LdhN_kxt!i1TF%9t#s71U{m2QY^g>BNRb+n9$F?AaIqZ;elP1-bV>y(}QUYr=4
zPSd76<=Mx-d(OS*{?5m}xp_`?230S3H6Z{9m7ehTvcQQ%+W2Dz5FTFNODH%`-2IV;
z3&DPL-EiS`<`4kzE_=&7I`(jk<jDH5b+V>b+9EDzQoE{w;W4#|Iq?<s*|I0UNh+a-
zA5~QNCrHOnZ8K{)XjkKQO<RqDz^$|>{{~>B-`BI1xk)xbF&JU3Bx$^?%}zfU=)e=!
zgD2qW>bI2vQ^TkM1RZP;0rVh3FO-v=nchg~(T!2*FIuO7zj9Tg=Jj$@x-T7{N_YZB
zgFZU7D;~pUg9if|?TbSqUPcqf4Q4G_ikEkr@UWpSJ9OUAkQMJ3wyT2uf)p&;s}%;V
zc+L`-aFNNUw0tRjXWjo)Typ<5jWKeRf!AIF0vtH`3V$v=lvV@ZlSbZ?M&47<Ru0T5
z@1_Vg0(4txcaYXXSO<6_W_|E8uZe*9dHsS;MOqIILKp;Xc3?KHNOnD0yR-psSq~2s
zk!M^@AT=YfV%b^;qs0{2B|s0OMvw^%+KB5S*g#QH6Q|H&bHg2m*B!P^B`~c9&{}mg
zS-2F^4D_;0LYRE3<v7V{6^M&6#YNFE^PvUVk|URqj3xHUN&>A}1p=+akdD$oq^R4l
z!r{Y&-PXdVFoFuw@^n+=WEPO;%mw6$->`>#i_8977aWc*<D#Z)yTj2qVE-KU9Qo`y
zKcBtdi=4g2a+y8JFT3vo*;S&%4mL`EGk7){tUObQjZ$ZYdy=P4VLC9Frdq+PPA^m8
zN6rQ&;)~8@jNxUcvz_ro>g>!71TP6YSZQ7pt)Qw^R#5bEf`p~zKH*}qw5t3~LF%uv
z8%j9&48%xi!>9mpe9qv|F(QMf3?B1WYeCrvzV2_+a+hck{GGp6OBq0aB9=A!G_*T%
z2)h~^cx|oO+*OIm#s@51;PdJs9!l+-%0$!XUY3x~FZ-Jyqzrg=`Ko@(MR=TA3{T!{
zVLdJ=g;h#@VUWg{U;wd5PJg9xC>e4qK#f0WuC-~1-ZGfhK?&`@M@dCB{=K<cR6|&c
z?iSyIN?3cZ%402!tEuC3b~+(QKCA>!jGE78D%P4#MWml3*4KMt24$d=2Dqrlw_2(i
zNupL&MYcQ$L7NL$xm;En2vdbKXfbJdybU<t;$T{I1gb{lCO54#gi0C|OmemufG{~>
z_*6D(cQGw5jLpUHOKUNeg8;rMTAENhxahZ?ibjhc23%!E#V*IjfJLpVZL&SllI@qP
zHPbt%&}^_`vb7B_wQiO+t?-I?$8C|;uHMhI@hPLBL$Akc!3J@7rc#H03^uooOz&Qo
z>P;!ZOozrPmeDDQ3`hE$)Z6ZTSjrQNCzH+iwe~tKuUmTXV!NCgp}>kB{B8Rh?Ce;n
zdjI<j6CJhePxyStgEc$@`l;(!Wdr4e=vObb*jDLI$Jbe)naEm35pK8D0jq_uhFX_~
zx?#V~CZ81A>`76~PYNdBOPyaS(s8Bvc^!35tm=A?>7-A({OlgMru&U<y+Yv>c>y0Z
zloGvZLk@JK!Af(cixwchwJGj(mf3eCQ_qk}jP4&#;)gD~$TJ3w29I>0FQOKACMf-{
z4@Sg)^bx84p$5%)5{R0yp%yKP0h$Sq4~;ES_R&ySq;p6m`M<c`E(q0lY`m$S*GoOU
zd-Oon!5@XGJ$i*HJ)vLHOSi@?jC#e#JDS`!=-~&(8shALcNHa2IYgqFOnhqhbo&lm
zwbQ?Xr`kfl*7F@N$VHGY&dSCdneY+}?6S6zP@1E#D4TfGUOE64W$LwNe05hZv*NFJ
z9bz{0L?2>yJQWQy2g%K7kGTwH2s<gO-Jrv_%Nj5h+lMd3O3N-O1zpaY4)>Q{+&j_4
zT=?2Vh(3QaQSO)g&r`_e=bwRrr%7cgbtX7XjG7!xYz8%EcKfI*myX^F2v-8|GQ4G$
z`=+pP-sV8=?6PvWm7ZQj^JP2kn@Ufw#^QK_RpU(DZLfxDLCKYz3U}byxQ7(pjk}o#
z@5XECvt-ic`zw{v!ZDERS`D9r$h7dx)8oiwC-dU*$!6iA7QZ{Wh1H@X;W2rrRd|8=
zf}5fo^Ez-i;lyYnAY9UsRwv#_1X&%HB)gdp*C+R}dc2mbEv{e8T%k<*bMlPPIvve;
z`g>;vsC;`<nM^X;7fp^o>B*!#;b>-X-QYknHJ<T!bMogWspV4X-fA_j+wZ}>`=3MM
ziI|?oBRkXaJsDi{K$XLj9?V3)O!qP6LYBRlNv#KtFf{MC;U`aYh+GA`X8icbX$L0T
zYVpjBRRQN_f>`a>qVqt7Bt11EvT0<8tU@M*2e)~oFC5x0WG`;rmJ<Bo5wkdUu+oXQ
zk8Bgh4r2Q=e%#_Wp>T8z6GvY&try{)511+v8YSu5R)(9FRp5$e&C<qa+bW!4y6_%X
z0gMbr_=Opq{5YdWYL@zi3m2N1nQQ!vG<t?ZYx#&%I(qRvm2OdS@~4|b+;S;4+iFqQ
z@GD!ZWq8BzdVZ^IwP*?uT>)Y!K#B_xQvp)+oxHVXEsu4p@|NFGfFui$rwWi`1<1t$
zBsP=3R%b<rDQ|hz1gP%iLo7hl3WA@#y`31WKF{*znD^xE(*gxt{CAuh^XHkh6p(5;
zb0>fK{~yb<rweHQPl*4Yc;~q~c#P*Y<@_(ccT_~nm92Q_%4YodN*#LV>hS3~Oa1Pa
z5(-P(Vq&*h?uXzDb6z|(XQ8(aFVHu=zSHOOP49!CG*^pP$%0;=doJJNJ_ueTi<@L|
zb1opMu8!+xn=CIs!jq?I(aR>w$pYjX1<2ZRp2@jZg9XS?0rKj~JS*Jyu5VUhC3mjt
zC;4V_k#EU_<RS_oxrnmiT%`VGUP?_C-i<7DJ`4;;a{v35e^+DtMpC-{{#Ties~x86
W%1D1C%tI@8E8O(+f8rl*r2Yj~^zhgK

diff --git a/config/Bottle Rinse Repeat.ini b/config/Bottle Rinse Repeat.ini
index 9006f18..a78204a 100644
--- a/config/Bottle Rinse Repeat.ini	
+++ b/config/Bottle Rinse Repeat.ini	
@@ -1,2 +1,4 @@
 [Settings]
-bFillBottleDelay = 1
+iFillBottleDelay = 1
+bReplenishableCanteen = 1
+iReplenishableCanteenMaxSips = 4
diff --git a/src/EBxBootstrap.gek b/src/EBxBootstrap.gek
index 251e2f8..aee190b 100644
--- a/src/EBxBootstrap.gek
+++ b/src/EBxBootstrap.gek
@@ -26,7 +26,12 @@ begin function {}
 	; INI settings
 
 	if FileExists "config\Bottle Rinse Repeat.ini"
-		set EBxFillBottleDelay to GetINIFloat "Settings:bFillBottleDelay" "Bottle Rinse Repeat.ini"
+		let EBxFillBottleDelay := GetINIFloat "Settings:iFillBottleDelay" "Bottle Rinse Repeat.ini"
+		let EBxReplenishableCanteen := GetINIFloat "Settings:bReplenishableCanteen" "Bottle Rinse Repeat.ini"
+		let EBxCanteenSipsMax := GetINIFloat "Settings:iReplenishableCanteenMaxSips" "Bottle Rinse Repeat.ini"
+		if EBxCanteenSipsMax < 1
+			let EBxCanteenSipsMax := 4
+		endif
 	endif
 
 	; Add new items to form lists
@@ -61,17 +66,43 @@ begin function {}
 
 	; Vault 13 Canteen
 
-	if IsModLoaded "ClassicPack.esm"
+	if eval EBxReplenishableCanteen && IsModLoaded "ClassicPack.esm"
+	
 		let rItem := GetFormFromMod "FalloutNV.esm" "174095" ; PreordVault13CanteenQuest
 		if IsFormValid rItem
 			RemoveScript rItem
 		endif
+		
 		let rItem := GetFormFromMod "FalloutNV.esm" "1735D2" ; PreordVaultCanteen
 		if IsFormValid rItem
-			SetScript EBxPreordVault13CanteenScript rItem
+			if eval $rItem == "Vault 13 Canteen"
+				SetName "Empty Vault 13 Canteen" rItem
+			endif
 		endif
+		
 	endif
 
+	; Vault 13 Canteen effect
+
+	SetOnUseAidItemEventHandler (begin function { ref rEBxVault13Canteen }
+		if this == playerRef
+			if eval ref rEffect := ListGetNthForm EBxCanteenEffects EBxCanteenDrink
+				playerRef.CIOS rEffect
+			else
+				playerRef.CIOS WaterPurified
+			endif
+			if playerRef.GetItemCount EBxVault13Canteen == 0
+				let ref rCanteen := GetFormFromMod "FalloutNV.esm" "1735D2" ; PreordVaultCanteen
+				if IsFormValid rCanteen
+					playerRef.AddItem rCanteen 1 1
+					if MenuMode
+						RefreshItemsList
+					endif
+				endif
+			endif
+		endif
+	end) 1 EBxVault13Canteen
+
 	; Draining on middle click
 	; Short callback notation with SetOnKeyUp/DownEventHandler currently throws an exception with xNVSE 6.20 + JIP LN 56.31
 
@@ -82,18 +113,6 @@ begin function {}
 	SetOnMenuCloseEventHandler (begin function { i }
 		SetOnKeyUpEventHandler EBxOnMiddleClick 0 258
 	end) 1 1002
-
-	; Vault 13 Canteen effect
-
-	SetOnUseAidItemEventHandler (begin function { rItem }
-		if this == playerRef
-			if eval rItem := ListGetNthForm EBxCanteenEffects EBxCanteenDrink
-				playerRef.CIOS rItem
-			else
-				playerRef.CIOS WaterPurified
-			endif
-		endif
-	end) 1 EBxVault13Canteen
 	
 	; SSBottleEmptyNoFloat
 
@@ -139,7 +158,7 @@ begin function {}
 	; Enable brahmin milking
 
 	if EBxTTW
-		set rBrahminScriptDC to GetFormFromMod "Fallout3.esm" "38705" ; CRBrahminScriptDC
+		let rBrahminScriptDC := GetFormFromMod "Fallout3.esm" "38705" ; CRBrahminScriptDC
 	endif
 
 	GetLoadedType rList 43
diff --git a/src/EBxFillFromObject.gek b/src/EBxFillFromObject.gek
index a75fe64..50f0fe8 100644
--- a/src/EBxFillFromObject.gek
+++ b/src/EBxFillFromObject.gek
@@ -28,8 +28,6 @@ begin function { rSource }
 
 	call EBxReplaceFormListWithItem rDrink rReplaceables
 
-	if EBxCanteenSipsMax > 0
-		call EBxReplenishCanteen rDrink 0
-	endif
+	call EBxReplenishCanteen rDrink 0
 
 end
diff --git a/src/EBxOnCrosshair.gek b/src/EBxOnCrosshair.gek
index 187c817..92a218d 100644
--- a/src/EBxOnCrosshair.gek
+++ b/src/EBxOnCrosshair.gek
@@ -35,7 +35,7 @@ begin function { rSource }
 	
 	if iCount > 0
 		let sBottles := sv_construct "%g bottle%{s%}" iCount (iCount > 1)
-	elseif eval EBxCanteenSipsMax > 0 && call EBxReplenishCanteen rDrink 1
+	elseif call EBxReplenishCanteen rDrink 1
 		let sBottles := "canteen"
 	else
 		return
diff --git a/src/EBxOnGameLoad.gek b/src/EBxOnGameLoad.gek
index f94a027..8d71c81 100644
--- a/src/EBxOnGameLoad.gek
+++ b/src/EBxOnGameLoad.gek
@@ -26,6 +26,21 @@ begin function { i }
 		endif
 	endif
 
+	if EBxVersion < 31
+		let EBxVersion := 31
+		if IsModLoaded "ClassicPack.esm"
+			let ref rPreordQuest := GetFormFromMod "FalloutNV.esm" "17912D" ; VDLCPackQuest
+			if eval IsFormValid rPreordQuest && GetVariable "bClassicItemsGiven" rPreordQuest
+				if playerRef.GetItemCount EBxVault13Canteen == 0
+					let ref rPreordVaultCanteen := GetFormFromMod "FalloutNV.esm" "1735D2" ; PreordVaultCanteen
+					if eval IsFormValid rPreordVaultCanteen && playerRef.GetItemCount rPreordVaultCanteen == 0
+						playerRef.AddItem rPreordVaultCanteen 1 1
+					endif
+				endif
+			endif
+		endif
+	endif
+
 	if GetGameRestarted == 0
 		return
 	endif
diff --git a/src/EBxReplenishCanteen.gek b/src/EBxReplenishCanteen.gek
index 97dd2f7..5c5954d 100644
--- a/src/EBxReplenishCanteen.gek
+++ b/src/EBxReplenishCanteen.gek
@@ -3,12 +3,24 @@ scn EBxReplenishCanteen
 ref rNewDrink
 ref rCurrentDrink
 ref rCanteen
+ref rPreordVaultCanteen
 int iCount
 int iNewDrink
 int bCheckOnly
 
 begin function { rNewDrink, bCheckOnly }
 
+	if EBxReplenishableCanteen == 0
+		return
+	endif
+
+	if playerRef.GetItemCount EBxVault13Canteen == 0
+		let ref rPreordVaultCanteen := GetFormFromMod "FalloutNV.esm" "1735D2" ; PreordVaultCanteen
+		if eval ! IsFormValid rPreordVaultCanteen || playerRef.GetItemCount rPreordVaultCanteen == 0
+			return
+		endif
+	endif
+
 	let iNewDrink := ListGetFormIndex EBxCanteenEffects rNewDrink
 
 	if iNewDrink == -1 ; unknown type, fallback to Purified Water
@@ -38,6 +50,10 @@ begin function { rNewDrink, bCheckOnly }
 	endif
 
 	if iCount > 0
+		let rPreordVaultCanteen := GetFormFromMod "FalloutNV.esm" "1735D2" ; PreordVaultCanteen
+		if IsFormValid rPreordVaultCanteen
+			playerRef.RemoveItem rPreordVaultCanteen 1 1
+		endif
 		playerRef.AddItem EBxVault13Canteen iCount 1
 	endif