Merge branch 'master' of https://git.catrenelle.com/Kevin_Smarts/glife

locations/AlbStars.qsrc

@@ -363,7 +363,7 @@ if $ARGS[0] = 'starlets':
 					'You see an older blonde haired woman wearing a skirt and blouse talking to Albina.'
 				end
 
-				if AlbinaQW['StarletCustomer'] <= 6:
+				if AlbinaQW['StarletCustomer'] <= 8:
 					'Albina walks up to you. "<<$pcs_nickname>>, we... We need to... to talk." she quietly stammers.'
 					act 'About what?':
 						*clr & cla

locations/body.qsrc

@@ -56,37 +56,47 @@ if $ARGS[0] = '':
 	if pcs_breath = 1:$pcs_throat += ' Last you checked, your breath smelled fresh and minty.'
 
 
-	if pcs_vag = 0:
-		$pcs_vag = 'Your virgin <a href="exec:view''images/pc/body/pussy/stage0/' + rand(1,5) + '.jpg''">pussy</a> still has its hymen intact.'
-		$pcdesc_pussyrandom = 'virgin'
-		$pcdesc_pussy = 'virgin'
-		$pcdesc_pussywordy = 'virgin'
-		$vaginatipe = 'virgin'
-	elseif pcs_vag <= 5:
-		$pcs_vag = 'You have an inexperienced <a href="exec:view''images/pc/body/pussy/stage1/' + rand(1,5) + '.jpg''">pussy</a>.'
-		rand_pussy = rand(0,2)
+	if vgape >= 4:
+		if rand(0,1) = 0:
+			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there.'
+		else
+			$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">pussy</a> is so used to being over-stuffed that it takes a huge member just to get off.'
+		end
+		rand_pussy = rand(0,6)
 		if rand_pussy = 0:
-			$pcdesc_pussyrandom = 'narrow'
+			$pcdesc_pussyrandom = 'eager and hungry'
 		elseif rand_pussy = 1:
-			$pcdesc_pussyrandom = 'vice-like'
+			$pcdesc_pussyrandom = 'routinely-fucked'
 		elseif rand_pussy = 2:
-			$pcdesc_pussyrandom = 'inexperienced'
+			$pcdesc_pussyrandom = 'cock-starved'
+		elseif rand_pussy = 3:
+			$pcdesc_pussyrandom = 'seemingly constantly-fucked'
+		elseif rand_pussy = 4:
+			$pcdesc_pussyrandom = 'always-ready'
+		elseif rand_pussy = 5:
+			$pcdesc_pussyrandom = 'near daily-stuffed'
+		elseif rand_pussy = 6:
+			$pcdesc_pussyrandom = 'overeager, ever-popular'
 		end
-		$pcdesc_pussy = 'narrow'
-		$pcdesc_pussywordy = 'squeezingly tight and narrow'
-		$vaginatipe = 'narrow'
-	elseif pcs_vag <= 10:
-		$pcs_vag = 'You have a tight <a href="exec:view''images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg''">pussy</a>.'
-		rand_pussy = rand(0,1)
+		$pcdesc_pussy = 'overeager'
+		$pcdesc_pussywordy = 'cock-tamed and ever-ready'
+		$vaginatipe = 'oft-fucked'
+	elseif vgape = 3:
+		$pcs_vag = 'You have a well-developed <a href="exec:view''images/pc/body/pussy/stage4/' + rand(1,5) + '.jpg''">vagina</a>.'
+		rand_pussy = rand(0,3)
 		if rand_pussy = 0:
-			$pcdesc_pussyrandom = 'snug'
+			$pcdesc_pussyrandom = 'welcoming'
 		elseif rand_pussy = 1:
-			$pcdesc_pussyrandom = 'tight'
+			$pcdesc_pussyrandom = 'invitingly ready'
+		elseif rand_pussy = 2:
+			$pcdesc_pussyrandom = 'amply-practiced'
+		elseif rand_pussy = 3:
+			$pcdesc_pussyrandom = 'plenty experienced'
 		end
-		$pcdesc_pussy = 'tight'
-		$pcdesc_pussywordy = 'youthfully tight'
-		$vaginatipe = 'tight'
-	elseif pcs_vag <= 15:
+		$pcdesc_pussy = 'experienced'
+		$pcdesc_pussywordy = 'experienced, welcoming'
+		$vaginatipe = 'experienced'
+	elseif vgape = 2:
 		$pcs_vag = 'Your <a href="exec:view''images/pc/body/pussy/stage3/' + rand(1,5) + '.jpg''">vagina</a> is used to taking normal sized insertions.'
 		rand_pussy = rand(0,2)
 		if rand_pussy = 0:
@@ -99,86 +109,83 @@ if $ARGS[0] = '':
 		$pcdesc_pussy = 'pliable'
 		$pcdesc_pussywordy = 'seasoned, pliable and tight'
 		$vaginatipe = 'pliable'
-	elseif pcs_vag <= 25:
-		$pcs_vag = 'You have a well-developed <a href="exec:view''images/pc/body/pussy/stage4/' + rand(1,5) + '.jpg''">vagina</a>.'
-		rand_pussy = rand(0,3)
+	elseif vgape = 1:
+		$pcs_vag = 'You have a tight <a href="exec:view''images/pc/body/pussy/stage2/' + rand(1,5) + '.jpg''">pussy</a>.'
+		rand_pussy = rand(0,1)
 		if rand_pussy = 0:
-			$pcdesc_pussyrandom = 'welcoming'
+			$pcdesc_pussyrandom = 'snug'
 		elseif rand_pussy = 1:
-			$pcdesc_pussyrandom = 'invitingly ready'
-		elseif rand_pussy = 2:
-			$pcdesc_pussyrandom = 'amply-practiced'
-		elseif rand_pussy = 3:
-			$pcdesc_pussyrandom = 'plenty experienced'
-		end
-		$pcdesc_pussy = 'experienced'
-		$pcdesc_pussywordy = 'experienced, welcoming'
-		$vaginatipe = 'experienced'
-	else
-		if rand(0,1) = 0:
-			$pcs_vag = 'Your regularly-fucked <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">playground</a> can take most things you force up there.'
-		else
-			$pcs_vag = 'Your poor little <a href="exec:view''images/pc/body/pussy/stage5/' + rand(1,5) + '.jpg''">pussy</a> is so used to being over-stuffed that it takes a huge member just to get off.'
+			$pcdesc_pussyrandom = 'tight'
 		end
-		rand_pussy = rand(0,6)
+		$pcdesc_pussy = 'tight'
+		$pcdesc_pussywordy = 'youthfully tight'
+		$vaginatipe = 'tight'
+	elseif pcs_vag > 0:
+		$pcs_vag = 'You have an inexperienced <a href="exec:view''images/pc/body/pussy/stage1/' + rand(1,5) + '.jpg''">pussy</a>.'
+		rand_pussy = rand(0,2)
 		if rand_pussy = 0:
-			$pcdesc_pussyrandom = 'eager and hungry'
+			$pcdesc_pussyrandom = 'narrow'
 		elseif rand_pussy = 1:
-			$pcdesc_pussyrandom = 'routinely-fucked'
+			$pcdesc_pussyrandom = 'vice-like'
 		elseif rand_pussy = 2:
-			$pcdesc_pussyrandom = 'cock-starved'
-		elseif rand_pussy = 3:
-			$pcdesc_pussyrandom = 'seemingly constantly-fucked'
-		elseif rand_pussy = 4:
-			$pcdesc_pussyrandom = 'always-ready'
-		elseif rand_pussy = 5:
-			$pcdesc_pussyrandom = 'near daily-stuffed'
-		elseif rand_pussy = 6:
-			$pcdesc_pussyrandom = 'overeager, ever-popular'
+			$pcdesc_pussyrandom = 'inexperienced'
 		end
-		$pcdesc_pussy = 'overeager'
-		$pcdesc_pussywordy = 'cock-tamed and ever-ready'
-		$vaginatipe = 'oft-fucked'
+		$pcdesc_pussy = 'narrow'
+		$pcdesc_pussywordy = 'squeezingly tight and narrow'
+		$vaginatipe = 'narrow'
+	else
+		$pcs_vag = 'Your virgin <a href="exec:view''images/pc/body/pussy/stage0/' + rand(1,5) + '.jpg''">pussy</a> still has its hymen intact.'
+		$pcdesc_pussyrandom = 'virgin'
+		$pcdesc_pussy = 'virgin'
+		$pcdesc_pussywordy = 'virgin'
+		$vaginatipe = 'virgin'
 	end
 
 	!! The original variables are all named for ass, but really, this is just all about the asshole.
 	if analplugIN = 0:
-		if pcs_ass = 0:
-			anpic = 0
-			$pcs_ass = 'You have a virgin <a href="exec:view''images/pc/body/anus/stage0/' + rand(1,5) + '.jpg''">anus</a>.'
-			$pcdesc_anusrandom = 'virgin'
-			$pcdesc_anus = 'virgin'
-			$pcdesc_anuswordy = 'virgin'
-			$anustipe = 'virgin'
-		elseif pcs_ass <= 5:
-			anpic = 1
-			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage1/' + rand(1,5) + '.jpg''">anus</a> looks to have never been penetrated.'
-			rand_anus = rand(0,2)
+		if agape >= 4:
+			anpic = 5
+			if rand(0,1) = 0:
+				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage5/' + rand(1,5) + '.jpg''">anus</a> genuinely doesn''t fully close on its own anymore. You could put a fist through it and it would scarcely stretch at all.'
+			else
+				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage5/' + rand(1,5) + '.jpg''">anus</a> is almost completely wrecked. Even with conscious effort it''s hard to close it.'
+			end
+			rand_anus = rand(0,7)
 			if rand_anus = 0:
-				$pcdesc_anusrandom = 'tight'
+				$pcdesc_anusrandom = 'gaping'
 			elseif rand_anus = 1:
-				$pcdesc_anusrandom = 'snug'
+				$pcdesc_anusrandom = 'yawning'
 			elseif rand_anus = 2:
-				$pcdesc_anusrandom = 'tightly-clenching'
+				$pcdesc_anusrandom = 'obscenely yawning'
+			elseif rand_anus = 3:
+				$pcdesc_anusrandom = 'destroyed'
+			elseif rand_anus = 4:
+				$pcdesc_anusrandom = 'demolished'
+			elseif rand_anus = 5:
+				$pcdesc_anusrandom = 'uselessly loose'
+			elseif rand_anus = 6:
+				$pcdesc_anusrandom = 'ruined'
+			elseif rand_anus = 7:
+				$pcdesc_anusrandom = 'wrecked'
 			end
-			$pcdesc_anus = 'tight'
-			$pcdesc_anuswordy = 'tight, scarcely-used'
-			$anustipe = 'tight'
-		elseif pcs_ass <= 10:
-			anpic = 2
-			$pcs_ass = 'Your pliable <a href="exec:view''images/pc/body/anus/stage2/' + rand(1,5) + '.jpg''">anus</a> has the shape of an asterisk.'
+			$pcdesc_anus = 'gaping'
+			$pcdesc_anuswordy = 'gaping, seemingly constantly-fucked'
+			$anustipe = 'gaping'
+		elseif agape = 3:
+			anpic = 4
+			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage4/' + rand(1,5) + '.jpg''">anus</a> often looks like a wide hole; anyone would think that the only thing you do is anal sex.'
 			rand_anus = rand(0,2)
 			if rand_anus = 0:
-				$pcdesc_anusrandom = 'flexible'
+				$pcdesc_anusrandom = 'loose'
 			elseif rand_anus = 1:
-				$pcdesc_anusrandom = 'slightly experienced'
+				$pcdesc_anusrandom = 'casually open'
 			elseif rand_anus = 2:
-				$pcdesc_anusrandom = 'pliable'
+				$pcdesc_anusrandom = 'routinely-fucked'
 			end
-			$pcdesc_anus = 'flexible'
-			$pcdesc_anuswordy = 'flexible, still-snug'
-			$anustipe = 'flexible'
-		elseif pcs_ass <= 15:
+			$pcdesc_anus = 'loose'
+			$pcdesc_anuswordy = 'loose, open'
+			$anustipe = 'loose'
+		elseif agape = 2:
 			anpic = 3
 			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage3/' + rand(1,5) + '.jpg''">anus</a> has been used quite often.'
 			rand_anus = rand(0,2)
@@ -192,48 +199,41 @@ if $ARGS[0] = '':
 			$pcdesc_anus = 'stretchy'
 			$pcdesc_anuswordy = 'stretchy, regularly-fucked'
 			$anustipe = 'stretchy'
-		elseif pcs_ass <= 25:
-			anpic = 4
-			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage4/' + rand(1,5) + '.jpg''">anus</a> often looks like a wide hole; anyone would think that the only thing you do is anal sex.'
+		elseif agape = 1:
+			anpic = 2
+			$pcs_ass = 'Your pliable <a href="exec:view''images/pc/body/anus/stage2/' + rand(1,5) + '.jpg''">anus</a> has the shape of an asterisk.'
 			rand_anus = rand(0,2)
 			if rand_anus = 0:
-				$pcdesc_anusrandom = 'loose'
+				$pcdesc_anusrandom = 'flexible'
 			elseif rand_anus = 1:
-				$pcdesc_anusrandom = 'casually open'
+				$pcdesc_anusrandom = 'slightly experienced'
 			elseif rand_anus = 2:
-				$pcdesc_anusrandom = 'routinely-fucked'
-			end
-			$pcdesc_anus = 'loose'
-			$pcdesc_anuswordy = 'loose, open'
-			$anustipe = 'loose'
-		else
-			anpic = 5
-			if rand(0,1) = 0:
-				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage5/' + rand(1,5) + '.jpg''">anus</a> genuinely doesn''t fully close on its own anymore. You could put a fist through it and it would scarcely stretch at all.'
-			else
-				$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage5/' + rand(1,5) + '.jpg''">anus</a> is almost completely wrecked. Even with conscious effort it''s hard to close it.'
+				$pcdesc_anusrandom = 'pliable'
 			end
-			rand_anus = rand(0,7)
+			$pcdesc_anus = 'flexible'
+			$pcdesc_anuswordy = 'flexible, still-snug'
+			$anustipe = 'flexible'
+		elseif pcs_ass > 0:
+			anpic = 1
+			$pcs_ass = 'Your <a href="exec:view''images/pc/body/anus/stage1/' + rand(1,5) + '.jpg''">anus</a> looks to have never been penetrated.'
+			rand_anus = rand(0,2)
 			if rand_anus = 0:
-				$pcdesc_anusrandom = 'gaping'
+				$pcdesc_anusrandom = 'tight'
 			elseif rand_anus = 1:
-				$pcdesc_anusrandom = 'yawning'
+				$pcdesc_anusrandom = 'snug'
 			elseif rand_anus = 2:
-				$pcdesc_anusrandom = 'obscenely yawning'
-			elseif rand_anus = 3:
-				$pcdesc_anusrandom = 'destroyed'
-			elseif rand_anus = 4:
-				$pcdesc_anusrandom = 'demolished'
-			elseif rand_anus = 5:
-				$pcdesc_anusrandom = 'uselessly loose'
-			elseif rand_anus = 6:
-				$pcdesc_anusrandom = 'ruined'
-			elseif rand_anus = 7:
-				$pcdesc_anusrandom = 'wrecked'
+				$pcdesc_anusrandom = 'tightly-clenching'
 			end
-			$pcdesc_anus = 'gaping'
-			$pcdesc_anuswordy = 'gaping, seemingly constantly-fucked'
-			$anustipe = 'gaping'
+			$pcdesc_anus = 'tight'
+			$pcdesc_anuswordy = 'tight, scarcely-used'
+			$anustipe = 'tight'
+		else
+			anpic = 0
+			$pcs_ass = 'You have a virgin <a href="exec:view''images/pc/body/anus/stage0/' + rand(1,5) + '.jpg''">anus</a>.'
+			$pcdesc_anusrandom = 'virgin'
+			$pcdesc_anus = 'virgin'
+			$pcdesc_anuswordy = 'virgin'
+			$anustipe = 'virgin'
 		end
 	!! This below was originally missing even the original reference for $anustipe, so I added it in simplistically. Also, tanga means panties, or more specifically, a thong. A lot of duplication on descriptions, but not much to change, the logic is for images.
 	else

locations/cikl.qsrc

@@ -682,15 +682,12 @@ if TriperOnce = 1: Venera += 1
 
 
 if pcs_ass > 1 and ashrink > 0 and analplugIN = 0:
-	if anusK < 0:anusK = 0
-	if anusK < ashrinkdays:anusK += 1
-	if anusK >= ashrinkdays:pcs_ass -= ashrink & anusK = 0
+	if daystart mod(ashrinkdays) = 0: pcs_ass -= ashrink
 	if pcs_ass < 0: pcs_ass = 0
 end
 if pcs_vag > 10 and vshrink > 0:
-	if vaginaK < 0:vaginaK = 0
-	if vaginaK < vshrinkdays:vaginaK += 1
-	if vaginaK >= vshrinkdays:vaginaK = 0 & pcs_vag -= vshrink
+	if daystart mod(vshrinkdays) = 0: pcs_vag -= vshrink
+	if pcs_vag < 0: pcs_vag = 0
 end
 
 lipkoef -= rand(0,1)

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/rasputin_host.qsrc

@@ -43,7 +43,7 @@ if $ARGS[0] = 'start':
 			'You ask the woman after you introduce yourself. "Excuse me, would you mind tell me a little bit about this place?"'
 			'The woman''s eyes light up and she takes few steps closer to you.'
 			'She smiles then answers your question.'
-			'Of course, "PC_name". I am Nadia Titova but you can call me Nadia. What would you like to know?'
+			'Of course, <<$pcs_firstname>>. I am Nadia Titova but you can call me Nadia. What would you like to know?'
 
 			act 'Nothing':
 				*clr & cla
@@ -168,7 +168,7 @@ if $ARGS[0] = 'options':
 							'"Sure, the shows starts at 6:30 but we start to admit customers at 5:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minute += 1
-							karta + bankDebtLimit -= 3000
+							karta -= 3000
 							rasputin['burlesque_ticket'] = 1
 							act	'Smile back and walk back to the entrance': gt 'rasputin_entrance'
 						end
@@ -218,7 +218,7 @@ if $ARGS[0] = 'options':
 							'"Sure, the shows starts at 10:30 but we start to admit customers at 9:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minute += 1
-							karta + bankDebtLimit -= 4000
+							karta -= 4000
 							rasputin['variety_ticket'] = 1
 							act	'Smile back and walk back to the entrance': gt 'rasputin_entrance'
 						end
@@ -268,7 +268,7 @@ if $ARGS[0] = 'options':
 							'"Sure, the shows starts at 6:30 but we start to admit customers at 5:30."'
 							'"Thank you!" Nadia smiles back as she hands you the ticket.'
 							minute += 1
-							karta + bankDebtLimit -= 7000
+							karta -= 7000
 							rasputin['burlesque_ticket'] = 1
 							rasputin['variety_ticket'] = 1
 							act	'Smile back and walk back to the entrance': gt 'rasputin_entrance'

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

locations/stat_display.qsrc

@@ -1065,7 +1065,7 @@ if cheatStatusIcons = 0:
 		if starlets_missed > 0:
 			$stat_starlet_msg = 'You missed practice with the Starlets today!'
 		else
-			$stat_starlet_msg = 'You have practice with the Starlets at 15:00 today.'
+			$stat_starlet_msg = 'You must be at Starlets practice between 15:00 and 16:00 today.'
 		end
 		if (hour < 16 or starlets_missed > 0) and starlets['late_message'] = 0:
 			if starlets_missed > 0: