[fixed] Sports wear was using 2 different variables which was breaking stuff and gaping code was making recovery far too long with save updates for both

locations/clothing.qsrc

@@ -25,7 +25,7 @@ $clothing_list_line = {
 	if $ARGS[1] ! 'gm_school' or ARGS[2] ! 6:
 		$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>_h[<<ARGS[2]>>]' + '</TD>'
 
-		if $ARGS[1] ! 'danilovich' and $ARGS[1] ! 'coat' and CloStyle ! 5:
+		if $ARGS[1] ! 'danilovich_outfits' and $ARGS[1] ! 'coat' and CloStyle ! 5:
 			$RESULT += '<TD>' + dyneval '$RESULT += <<$ARGS[1]>>_b[<<ARGS[2]>>]' + '</TD>'
 		else
 			$RESULT += '<TD></TD>'
@@ -61,7 +61,7 @@ $clothing_list_line = {
 		if StoryLine = 1 and SchoolAtestat = 0 and SchoolBlock = 0 and $ARGS[1] = 'gm_school' and ARGS[2] = 6:
 			$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
 		elseif $ARGS[2] ! 'danilovich_swimsuit' and $ARGS[2] ! 'scandalicious_bikinis' and $ARGS[2] ! 'scandalicious_swimsuit' and $ARGS[2] ! 'allure_bikinis' and $ARGS[2] ! 'allure_bikinis' and dyneval('RESULT = <<$ARGS[1]>>_h[<<ARGS[2]>>]') > 0:
-			if $ARGS[1] ! 'danilovich' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
+			if $ARGS[1] ! 'danilovich_outfits' and CloStyle ! 5 and (dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') < (pcs_hips - 8) or dyneval('RESULT = <<$ARGS[1]>>_b[<<ARGS[2]>>]') > (pcs_hips + 8)) or (ARRPOS('$CloLosTyp', $ARGS[1]) ! -1 and ARRPOS('CloLosNum',ARGS[2]) ! -1):
 				$RESULT += '</TD>'
 			else
 				$RESULT += ' <a href="exec:gs ''clothing'', ''wear'', ''<<$ARGS[1]>>'', <<ARGS[2]>> & gt ''clothing'', ''view_clothing_list'', ''wardrobe'', ''<<$ward_list_store>>''">Wear</a></TD>'
@@ -233,7 +233,7 @@ if $ARGS[0] = 'view_clothing_list':
 
 		if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:$ward_list_store = ''bomba'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
 
-		if ARRSIZE('danilovich') > 0:'<center><a href="exec:$ward_list_store = ''sports'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
+		if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:$ward_list_store = ''sports'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 		if ARRSIZE('materinstvo_dress') > 0:'<center><a href="exec:$ward_list_store = ''materinstvo'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
 
@@ -579,10 +579,10 @@ if $ARGS[0] = 'view_clothing_list':
 		if $ARGS[2] = 'sports':
 			$ward_list_store = $ARGS[2]
 			i = 1
-			:loopdanilovich
-				if danilovich[i] = 1 and danilovich_s[i] = cloc and ($clothingworntype ! 'danilovich' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'danilovich', i)
+			:loopdanilovich_outfits
+				if danilovich_outfits[i] = 1 and danilovich_outfits_s[i] = cloc and ($clothingworntype ! 'danilovich_outfits' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'danilovich_outfits', i)
 				i += 1
-			if i <= ARRSIZE('danilovich'):jump 'loopdanilovich'
+			if i <= ARRSIZE('danilovich_outfits'):jump 'loopdanilovich_outfits'
 
 			i = 1
 			:loopdanilovich_swimsuit
@@ -694,7 +694,7 @@ if $ARGS[0] = 'view_clothing_item':
 	if $ARGS[1] ! 'shop' and ($ARGS[2] ! 'gm_school' or ARGS[3] ! 6):
 		$RESULT = '(strength '
 		dynamic '$RESULT += <<$ARGS[2]>>_h[<<ARGS[3]>>]'
-		if $ARGS[2] ! 'danilovich' and $ARGS[2] ! 'coat' and CloStyle ! 5:
+		if $ARGS[2] ! 'danilovich_outfits' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			$RESULT += ', hip size '
 			dynamic '$RESULT += <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 		end
@@ -780,7 +780,7 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 
 			!! if the clothing is a type that checks for hip size
-			if $ARGS[2] ! 'danilovich' and CloStyle ! 5:
+			if $ARGS[2] ! 'danilovich_outfits' and CloStyle ! 5:
 				!! if the hipsize is too far from your hipsize
 				dynamic 'RESULT = <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 				if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
@@ -884,7 +884,7 @@ if $ARGS[0] = 'view_clothing_item':
 	elseif $ARGS[1] = 'resize':
 		act 'Leave item alone':gt 'clothing', 'view_clothing_list', '<<$ward_list_page>>', '<<$ward_list_store>>'
 
-		if $ARGS[2] ! 'danilovich' and $ARGS[2] ! 'coat' and CloStyle ! 5:
+		if $ARGS[2] ! 'danilovich_outfits' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			if dyneval('RESULT = <<$ARGS[2]>>_b[<<ARGS[3]>>]') ! pcs_hips and money >= 500:
 				'You can have this resized for 500 <b>₽</b>.'
 				act 'Resize':
@@ -909,7 +909,7 @@ if $ARGS[0] = 'view_clothing_item_buy':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 40 + <<h>>'
 	elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_maid' or $ARGS[2] = 'gm_server':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 120 + <<h>>'
-	elseif $ARGS[2] = 'danilovich':
+	elseif $ARGS[2] = 'danilovich_outfits':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 100 + <<h>>'
 	else
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 60 + <<h>>'

locations/clothing_QV.qsrc

@@ -57,7 +57,7 @@ if $ARGS[0] = 'list':
 
 	if ARRSIZE('bomba_outfits') > 0 or ARRSIZE('bomba_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''bomba''"><img src="images/locations/pushkin/bomba/shop_name.png"></a></center>'
 
-	if ARRSIZE('danilovich') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
+	if ARRSIZE('danilovich_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.png"></a></center>'
 
 	if ARRSIZE('loopmaterinstvo_dress') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''materinstvo''"><img src="images/locations/city/citycenter/mall/mommy.png"></a></center>'
 
@@ -668,15 +668,15 @@ if $ARGS[0] = 'list':
 		*nl
 
 		i = 1
-		:loopdanilovich
-		if danilovich[i] = 1:
+		:loopdanilovich_outfits
+		if danilovich_outfits[i] = 1:
 			gs 'clothing_attributes', 'danilovich_outfits', i
 			if CloInhibit <= pcs_inhib:
-				if danilovich_s[i] = 0 and danilovich_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''danilovich'', <<i>>"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
+				if danilovich_outfits_s[i] = 0 and danilovich_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''danilovich_outfits'', <<i>>"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('danilovich'):jump 'loopdanilovich'
+		if i <= ARRSIZE('danilovich_outfits'):jump 'loopdanilovich_outfits'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
@@ -746,14 +746,14 @@ if $ARGS[0] = 'gym':
 
 	i = 1
 	:loopdanilovich2
-	if danilovich[i] = 1:
+	if danilovich_outfits[i] = 1:
 		gs 'clothing_attributes', 'danilovich_outfits', i
 		if CloInhibit <= pcs_inhib:
-			if danilovich_s[i] = 0 and danilovich_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''danilovich'', <<i>>"><img src="images/pc/clothing/7danilovich/<<i>>.jpg" 	height="250" /></a>'
+			if danilovich_outfits_s[i] = 0 and danilovich_outfits_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''danilovich_outfits'', <<i>>"><img src="images/pc/items/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
 		end
 	end
 	i += 1
-	if i <= ARRSIZE('danilovich'):jump 'loopdanilovich2'
+	if i <= ARRSIZE('danilovich_outfits'):jump 'loopdanilovich2'
 
 	act 'Return': gt $loc, $loc_arg
 

locations/saveupdater.qsrc

@@ -1032,6 +1032,28 @@ end
 		gs 'shoes', 'wear', 'sgm', 5
 	end
 
+!!updater for sports clothing variable to unify it and fix bug
+i = 1
+
+:danilovichfix
+	if danilovich[i] = 1:
+		danilovich_outfits[i] = 1
+		danilovich_outfits_s[i] = danilovich_s[i]
+		danilovich_outfits_h[i] = danilovich_h[i]
+		danilovich_outfits_b[i] = danilovich_b[i]
+		killvar 'danilovich', i
+		killvar 'danilovich_s', i
+		killvar 'danilovich_h', i
+		killvar 'danilovich_b', i
+	end
+	i += 1
+if i <= 170:jump 'danilovichfix'
+
+!! New setting for gaping time per stage in minutes that can be made user definable
+if agape[4] = 0: agape[4] = 10
+if agape[4] = 0: vgape[4] = 10
+	
+	
 	gs 'saveg'
 --- saveupdater ---------------------------------
 

locations/sportShop.qsrc

@@ -113,8 +113,8 @@ if $ARGS[0] = 'clo':
 			i = 3
 		end
 
-		:loopdanilovich
-			if danilovich[i] = 0:
+		:loopdanilovich_outfits
+			if danilovich_outfits[i] = 0:
 				gs 'clothing_attributes', 'danilovich_outfits', i
 				gs 'clothing_QV', 'shop_filter'
 					
@@ -124,11 +124,11 @@ if $ARGS[0] = 'clo':
 				end
 			end
 			i += 3
-		if i <= 170:jump 'loopdanilovich'
+		if i <= 170:jump 'loopdanilovich_outfits'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich',i, 2000
+if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich_outfits',i, 2000
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'

locations/stat.qsrc

@@ -294,15 +294,25 @@ end
 if daystart = 0: daystart = 1
 
 !!Gaping of vagina recovery time
-if vgape > 0:
-	if vgapetime = 0: vgapetime = totminut
-	if (vgapetime + 60) <= totminut:vgape -= 1 & vgapetime = 0
+
+if vgape > vgape[1]:
+	vgape[3] = totminut
+	vgape = vgape[1]
+elseif vgape > 0:
+	if vgape - (totminut - vgape[3])/vgape[4]
+	if vgape = 0: killvar 'vgape', 3
+	vgape[1] = vgape
 end
 
 !!Gaping of anus recovery time
-if agape > 0:
-	if agapetime = 0: agapetime = totminut
-	if (agapetime + 90) <= totminut:agape -= 1 & agapetime = 0
+
+if agape > agape[1]:
+	agape[3] = totminut
+	agape = agape[1]
+elseif agape > 0:
+	if agape - (totminut - agape[3])/agape[4]
+	if agape = 0: killvar 'agape', 3
+	agape[1] = agape
 end
 
 !!Recovery from spanking - will be superseded by pain system