[fixed] cum cleanup

locations/cum_cleanup.qsrc

@@ -46,29 +46,29 @@ gs 'cum_cleanup'}
 	16 = 'In your hair'
 	17 = 'In a condom in your vagina'}
 
-if $ARGS[0] = 'cleanloc' and arrsize('ARGS') > 1:
-	i = 0
+if $ARGS[0] = 'cleanloc':
+	l = 0
 	:cleanlocloop
-	if i < arrsize('$sparrnam'):
-		if sparrloc[i] = ARGS[1]:
-			if sparrloc[i] = 0 or sparrloc[i] = 3:
+	if l < arrsize('$sparrnam'):
+		if sparrloc[l] = ARGS[1]:
+			if sparrloc[l] = 0 or sparrloc[l] = 3:
 				if mc_inventory['enema_kit'] = 1 or cheatKlisma = 0:
-					cumsumvag -= iif(sparrloc[i]=0,sparrvol[i],0)
-					cumsumass -= iif(sparrloc[i]=3,sparrvol[i],0)
-					sparrvol[i] = 0
-					sparrslc[i] = 0
+					cumsumvag -= iif(sparrloc[l]=0,sparrvol[l],0)
+					cumsumass -= iif(sparrloc[l]=3,sparrvol[l],0)
+					sparrvol[l] = 0
+					sparrslc[l] = 0
 				else
 					cumspclnt = 15
 					gs 'cum_cleanup'
 				end
 			else
-				gs 'cum_cleanup', 'cleandeposit', i
+				gs 'cum_cleanup', 'cleandeposit', l
 			end
 		end
-		i += 1
+		l += 1
 		jump 'cleanlocloop'
 	end
-elseif $ARGS[0] = 'cleandeposit' and arrsize('ARGS') > 1:
+elseif $ARGS[0] = 'cleandeposit':
 	cumsumbod -= sparrvol[ARGS[1]]
 	cumsumvag -= iif(sparrloc[ARGS[1]]=0,sparrvol[ARGS[1]],0)
 	cumsumass -= iif(sparrloc[ARGS[1]]=3,sparrvol[ARGS[1]],0)
@@ -80,11 +80,10 @@ elseif $ARGS[0] = 'cleandeposit' and arrsize('ARGS') > 1:
 	KILLVAR 'sparrvol',ARGS[1]
 	KILLVAR 'sparrslc',ARGS[1]
 	KILLVAR 'sparrcnt',ARGS[1]
-	cumloc[ARGS[1]] = 0
 	if cumsumbod < 0: cumsumbod = 0
 	if cumsumvag <= 0: cumsumvag = 0 & cum_vol['vagina'] = 0 & cumvol[0] = 0 & cum_loc['vagina'] = 0 & cumloc[0] = 0
 	if cumsumass <= 0: cumsumass = 0 & cum_vol['anus'] = 0   & cumvol[3] = 0 & cum_loc['anus'] = 0   & cumloc[3] = 0
-elseif $ARGS[0] = 'cleanwomb' and arrsize('ARGS') > 1:
+elseif $ARGS[0] = 'cleanwomb':
 	KILLVAR 'cumarrcpt',ARGS[1]
 	KILLVAR 'cumarrppt',ARGS[1]
 	KILLVAR '$cumarrnam',ARGS[1]
@@ -268,66 +267,67 @@ elseif $ARGS[0] = '':
 		KILLVAR 'cum_vol'
 	end
 
-	i = 0
+	l = 0
 	:cumcleanloop
-	if i < arrsize('$sparrnam'):
-		tmp = arrpos('deresidue', sparrloc[i])
+	if l < arrsize('$sparrnam'):
+		tmp = arrpos('deresidue', sparrloc[l])
 		if tmp ! -1 and tmp < arrsize('deresidue'):
 			!! vagina
-			if sparrloc[i] = 0:
+			if sparrloc[l] = 0:
 				!! cannot be completely cleaned with tissues\toilet use\hypno block\no enema kit
-				if FUNC('Cum_Manage', 'check_innards', sparrloc[i]) = 1 _ 
+				if FUNC('Cum_Manage', 'check_innards', sparrloc[l]) = 1 _ 
 				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
 				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
-					cumsumbod -= sparrvol[i] & cumsumvag -= sparrvol[i]
-					sparrslc[i] = 0 & sparrvol[i] = 0
+					cumsumbod -= sparrvol[l] & cumsumvag -= sparrvol[l]
+					sparrslc[l] = 0 & sparrvol[l] = 0
 					isprok = 0 & vibratorIN = 0
 				end
 			!! ass
-			elseif sparrloc[i] = 3:
-				if FUNC('Cum_Manage', 'check_innards', sparrloc[i]) = 1 or cumspclnt = 7 _ 
+			elseif sparrloc[l] = 3:
+				if FUNC('Cum_Manage', 'check_innards', sparrloc[l]) = 1 or cumspclnt = 7 _ 
 				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
 				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
-					cumsumbod -= sparrvol[i] & cumsumass -= sparrvol[i]
-					sparrslc[i] = 0 & sparrvol[i] = 0
+					cumsumbod -= sparrvol[l] & cumsumass -= sparrvol[l]
+					sparrslc[l] = 0 & sparrvol[l] = 0
 					analplugin = 0 & analplugout = 0
 				end
 			else
-				cumsumbod -= sparrvol[i]
-				sparrslc[i] = 0 & sparrvol[i] = 0
+				cumsumbod -= sparrvol[l]
+				sparrslc[l] = 0 & sparrvol[l] = 0
 			end
 		end
 
-		tmp = arrpos('toclean', sparrloc[i])
-		if tmp ! -1 and tmp < arrsize('toclean'):
+		tmp = arrpos('toclean', sparrloc[l])
+		if tmp ! -1 and tmp < arrsize('toclean') and sparrvol[l] > 0:
 			!! vagina
-			if sparrloc[i] = 0:
-				if cumsumvag*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[i], 1) and isprok = 0 and vibratorIN = 0 _ 
+			if sparrloc[l] = 0:
+				if cumsumvag*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and isprok = 0 and vibratorIN = 0 _ 
 				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
 				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
-					gs 'cum_cleanup', 'cleandeposit', i
+					gs 'cum_cleanup', 'cleandeposit', l
 					if cumspclnt = 3: isprok = 0 & vibratorIN = 0
 				end
 			!! ass
-			elseif sparrloc[i] = 3:
-				if (cumsumass*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[i], 1) and analplugin = 0) or cumspclnt = 7 _ 
+			elseif sparrloc[l] = 3:
+				if (cumsumass*rand(6,9)/6 >= FUNC('Cum_Manage', 'check_innards', sparrloc[l], 1) and analplugin = 0) or cumspclnt = 7 _ 
 				or (hypnoAddict = 0 and (mc_inventory['enema_kit'] = 1 or cheatKlisma = 0) _ 
 				and ((cumspclnt = 10 or cumspclnt = 1 or cumspclnt = 3) or cheatKlisma = 0)):
-					gs 'cum_cleanup', 'cleandeposit', i
+					gs 'cum_cleanup', 'cleandeposit', l
 					if cumspclnt = 3 or cumspclnt = 7: analplugin = 0
 				end
 			else
-				gs 'cum_cleanup', 'cleandeposit', i
+				gs 'cum_cleanup', 'cleandeposit', l
 			end
 		else
-			i += 1
+			if sparrvol[l] <= 0 and ($sparrnam[l] = '' or sparrloc[l] ! 0 or (sparrloc[l] = 0 and sparrage[l] > 10)): gs 'cum_cleanup', 'cleandeposit', l
+			l += 1
 		end
 		jump 'cumcleanloop'
 	end
 	killvar 'toclean'
 	killvar 'deresidue'
 	killvar 'tmp'
-	killvar 'i'
+	killvar 'l'
 	killvar 'lubonus'
 	killvar 'anal_slip'
 	killvar 'vaginal_slip'

locations/pav_disco_sex.qsrc

@@ -2318,7 +2318,7 @@ if $ARGS[0] = 'End':
 	'<center><video autoplay loop src="images/pc/activities/misc/dress_2.mp4"></video></center>'
 	'After you relax, you smile at <<$npc_firstname[$npclastsaved]>> and say, "That was fun, but I really should get going..."'
 	'<<$npc_firstname[$npclastsaved]>> stretches lazily on the bed, not bothering to get up. "You were great, <<$pcs_nickname>>! I hope I''ll run into you again next time I''m in Pavlovsk!"'
-	if arrpos('sparrloc', 11) ! -1 and sparrvol > 0:cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
+	if arrpos('sparrloc', 11) ! -1: cumspclnt = 12 & gs 'cum_cleanup' & 'You look around the room and find a packet of wipes. You take one and quickly wipe the sperm off your face to make yourself presentable enough to go outside.'
 	gs 'arousal', 'end'
 	gs 'stat'
 	act 'Leave the hotel': gt 'pav_market'