Browse Source

[added] New exercise clothing using new variable so old exercise clothing is now defunct

KevinSmarts 3 years ago
parent
commit
fbee580518

+ 3 - 0
glife.qproj

@@ -99,6 +99,8 @@
 		<Location name="$short_description"/>
 		<Location name="$attributes_gm_outfits"/>
 		<Location name="$attributes_gm_dress"/>
+		<Location name="$attributes_gm_maid"/>
+		<Location name="$attributes_gm_server"/>
 		<Location name="$attributes_office"/>
 		<Location name="$attributes_uniform"/>
 		<Location name="$attributes_school"/>
@@ -127,6 +129,7 @@
 		<Location name="$attributes_bomba_dress"/>
 		<Location name="$attributes_market_clothes"/>
 		<Location name="$attributes_exercise"/>
+		<Location name="$attributes_danilovich"/>
 		<Location name="$attributes_danilovich_swim_one"/>
 		<Location name="$attributes_misc_outfits"/>
 		<Location name="lost_clothes_here"/>

+ 2 - 2
locations/_clothing_image.qsrc

@@ -29,8 +29,8 @@ elseif $ARGS[0] = 'gm_office':
 	$RESULT = 'images/pc/clothing/5office/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'gm_school':
 	$RESULT = 'images/pc/clothing/6school/<<ARGS[1]>>.jpg'
-elseif $ARGS[0] = 'exercise':
-	$RESULT = 'images/pc/clothing/7exercise/<<ARGS[1]>>.jpg'
+elseif $ARGS[0] = 'danilovich':
+	$RESULT = 'images/pc/items/danilovich/outfits/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'eroto_dress':
 	$RESULT = 'images/pc/items/eroto/dress/<<ARGS[1]>>.jpg'
 elseif $ARGS[0] = 'eroto_outfits':

+ 2 - 2
locations/_short_description.qsrc

@@ -26,8 +26,8 @@ elseif $ARGS[0] = 'office':
 	$RESULT = 'Office wear number '
 elseif $ARGS[0] = 'school':
 	$RESULT = 'School uniform number '
-elseif $ARGS[0] = 'exercise':
-	$RESULT = 'Exercise outfit number '
+elseif $ARGS[0] = 'danilovich':
+	$RESULT = 'Danilovich outfit number '
 elseif $ARGS[0] = 'fetish':
 	$RESULT = 'Fetish outfit number '
 elseif $ARGS[0] = 'exhibit':

+ 1 - 1
locations/brother.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = 'start':
 				act 'Go watch porn':minut += 5 & gt 'seeporn'
 			elseif evgenQW < 4 or kolkaseepornday = daystart:
 				'Your brother grins, "Hi, <<$pcs_nickname>>. Fancy a game of football?"'
-				if $clothingworntype ! 'exercise':
+				if $clothingworntype ! 'danilovich':
 					'Kolka points at your outfit, "Oh, you can''t play dressed like that! Go put on some sportswear, or just watch us play if you want."'
 				else
 					'He adds, "Or you could just watch us."'

+ 1 - 1
locations/city_market.qsrc

@@ -230,7 +230,7 @@ if $ARGS[0] = 'tailor':
 					cla
 					*clr
 					minut += 15
-					if CloStyle = 5 or $clothingworntype = 'exercise':
+					if CloStyle = 5 or $clothingworntype = 'danilovich':
 						'What are you wasting my time for? This type of clothing does not need to be resized.'
 					else
 						money -= 500

+ 2 - 2
locations/city_park.qsrc

@@ -116,7 +116,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and parkrunday ! daystart:
+	if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and parkrunday ! daystart:
 		act 'Go for a run in the park (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -176,7 +176,7 @@ if $ARGS[0] = 'start':
 				end
 			end
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype = 'danilovich') and hour > 5 and hour < 23 and parkrunday ! daystart:
+	elseif hour > 5 and hour < 23 and parkrunday ! daystart:
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 

+ 10 - 10
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] ! 'exercise' and $ARGS[1] ! 'coat' and CloStyle ! 5:
+		if $ARGS[1] ! 'danilovich' 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] ! 'exercise' 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' 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>'
@@ -231,7 +231,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/oldtown/bomba/shop_name.png"></a></center>'
 
-		if ARRSIZE('exercise') > 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') > 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('market_outfits') > 0:'<center><a href="exec:$ward_list_store = ''market'' & gt ''clothing'', ''view_clothing_list'', ''<<$ward_list_page>>'', ''market''">Clothes from the market</a></center>'
 	else
@@ -557,10 +557,10 @@ if $ARGS[0] = 'view_clothing_list':
 		if $ARGS[2] = 'sports':
 			$ward_list_store = $ARGS[2]
 			i = 1
-			:loopexercise
-				if exercise[i] = 1 and exercise_s[i] = cloc and ($clothingworntype ! 'exercise' or clothingwornnumber ! i):*P dyneval($clothing_list_line, $ARGS[1], 'exercise', i)
+			: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)
 				i += 1
-			if i <= ARRSIZE('exercise'):jump 'loopexercise'
+			if i <= ARRSIZE('danilovich'):jump 'loopdanilovich'
 
 			i = 1
 			:loopdanilovich_swimsuit
@@ -665,7 +665,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] ! 'exercise' and $ARGS[2] ! 'coat' and CloStyle ! 5:
+		if $ARGS[2] ! 'danilovich' and $ARGS[2] ! 'coat' and CloStyle ! 5:
 			$RESULT += ', hip size '
 			dynamic '$RESULT += <<$ARGS[2]>>_b[<<ARGS[3]>>]'
 		end
@@ -751,7 +751,7 @@ if $ARGS[0] = 'view_clothing_item':
 			end
 
 			!! if the clothing is a type that checks for hip size
-			if $ARGS[2] ! 'exercise' and CloStyle ! 5:
+			if $ARGS[2] ! 'danilovich' 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:
@@ -855,7 +855,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] ! 'exercise' and $ARGS[2] ! 'coat' and CloStyle ! 5:
+		if $ARGS[2] ! 'danilovich' 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':
@@ -880,7 +880,7 @@ if $ARGS[0] = 'view_clothing_item_buy':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 35 + <<h>>'
 	elseif $ARGS[2] = 'gm_school' or $ARGS[2] = 'gm_uniform':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 120 + <<h>>'
-	elseif $ARGS[2] = 'exercise':
+	elseif $ARGS[2] = 'danilovich':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 100 + <<h>>'
 	elseif $ARGS[2] = 'coat':
 		dynamic $ARGS[2] + '_h[<<ARGS[3]>>] = 250 + <<h>>'

+ 11 - 11
locations/clothing_QV.qsrc

@@ -55,7 +55,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/oldtown/bomba/shop_name.png"></a></center>'
 
-	if ARRSIZE('exercise') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''"><img src="images/locations/city/citycenter/mall/sports.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('loopmarket_outfits') > 0:'<center><a href="exec:gt ''clothing_QV'', ''list'', ''sports''">Clothing from the market</a></center>'
 
@@ -615,15 +615,15 @@ if $ARGS[0] = 'list':
 		*nl
 
 		i = 1
-		:loopexercise
-		if exercise[i] = 1:
-			gs 'clothing_attributes', 'exercise', i
+		:loopdanilovich
+		if danilovich[i] = 1:
+			gs 'clothing_attributes', 'danilovich', i
 			if CloInhibit <= pcs_inhib:
-				if exercise_s[i] = 0 and exercise_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
+				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>'
 			end
 		end
 		i += 1
-		if i <= ARRSIZE('exercise'):jump 'loopexercise'
+		if i <= ARRSIZE('danilovich'):jump 'loopdanilovich'
 
 		act 'Return': killvar '$ward_list_store' & gt 'clothing_QV', 'list'
 	end
@@ -667,15 +667,15 @@ if $ARGS[0] = 'gym':
 	'<center><img src="images/locations/city/citycenter/mall/sports.png"></center>'
 
 	i = 1
-	:loopexercise2
-	if exercise[i] = 1:
-		gs 'clothing_attributes', 'exercise', i
+	:loopdanilovich2
+	if danilovich[i] = 1:
+		gs 'clothing_attributes', 'danilovich', i
 		if CloInhibit <= pcs_inhib:
-			if exercise_s[i] = 0 and exercise_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''exercise'', <<i>>"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
+			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>'
 		end
 	end
 	i += 1
-	if i <= ARRSIZE('exercise'):jump 'loopexercise2'
+	if i <= ARRSIZE('danilovich'):jump 'loopdanilovich2'
 
 	act 'Return': gt $loc, $loc_arg
 

+ 3 - 3
locations/clothing_attributes.qsrc

@@ -114,8 +114,8 @@ elseif $ARGS[0] = 'gm_office':
 	*P FUNC('$attributes_office', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'gm_school':
 	*P FUNC('$attributes_school', $ARGS[0], ARGS[1])
-elseif $ARGS[0] = 'exercise':
-	*P FUNC('$attributes_exercise', $ARGS[0], ARGS[1])
+elseif $ARGS[0] = 'danilovich':
+	*P FUNC('$attributes_danilovich_outfits', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'eroto_dress':
 	*P FUNC('$attributes_eroto_dress', $ARGS[0], ARGS[1])
 elseif $ARGS[0] = 'eroto_outfits':
@@ -156,7 +156,7 @@ elseif $ARGS[0] = 'market_outfits':
 	*P FUNC('$attributes_market_clothes', $ARGS[0], ARGS[1])
 end
 
-if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimsuit' and $ARGS[0] ! 'danilovich_swimsuits' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'exercise':
+if $ARGS[0] ! 'allure_swimsuit' and $ARGS[0] ! 'allure_bikinis' and $ARGS[0] ! 'scandalicious_swimsuit' and $ARGS[0] ! 'danilovich_swimsuits' and $ARGS[0] ! 'coat' and $ARGS[0] ! 'danilovich':
 	if CloSkirtShortness = 6:
 		CloInhibit = 35
 	elseif CloSkirtShortness = 5 or CloPantsShortness = 6:

+ 1 - 1
locations/dachamy.qsrc

@@ -21,7 +21,7 @@ act 'Go into the house':gt 'dachain'
 
 if sunWeather = 1:
 	if pcs_stam >=15 or (pcs_stam >= 10 and bookYog + obruch > 0):
-		if $clothingworntype = 'exercise':
+		if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich':
 			*nl
 			'You can do some exercises here.'
 			act 'Exercise': gt 'exercise', 'workout'

+ 3 - 1
locations/dom_gor.qsrc

@@ -16,7 +16,7 @@ gs 'themes', 'indoors'
 *nl
 'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
 
-if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
+if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
 	act 'Go for a jog around the park (1:00)':
 		cla
 		*clr
@@ -75,6 +75,8 @@ if $clothingworntype = 'exercise' and teachlevel > 20 and parkrunday ! daystart
 
 		act 'Complete run':gt 'pav_park', 'start'
 	end
+elseif teachlevel > 20 and parkrunday ! daystart and hour < 21 and hour > 6:
+	'You could go for a jog around the park if you were wearinf sports clothing and shoes.'
 end
 
 if hour < 23:

+ 1 - 1
locations/exercise.qsrc

@@ -653,7 +653,7 @@ if $ARGS[0] = 'get_sport_clothes_exercise_bonus':
 	if $pantyworntype = 'sport':
 		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
 	end
-	if $clothingworntype = 'exercise':
+	if $clothingworntype = 'danilovich':
 		sport_clothes_exercise_bonus = sport_clothes_exercise_bonus + 1
 	end
 	if $shoeworntype = 'danilovich':

+ 2 - 2
locations/fit.qsrc

@@ -157,7 +157,7 @@ if $ARGS[0] = 'dressing room':
 	gs 'wardrobe', 'sports_outfit'
 
 	if abonement > 0:
-		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
+		if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to the gym':
 				cla
 				gt 'fit', 'gym'
@@ -184,7 +184,7 @@ if $ARGS[0] = 'dressing room':
 
 				act 'Leave':gt 'fit', 'dressing room'
 			end
-		elseif $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
+		elseif $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and pcs_stam >= 40:
 			act 'Go to team practice':gt 'beg', 'start'
 			if week = 6 and pcs_run >= 20 and run_comp_day ! daystart:
 				act '<b>Enter competition race</b>':run_comp_day = daystart & gt 'beg1', 'start'

+ 2 - 2
locations/gadroad.qsrc

@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 	act 'Walk down to the river (0:10)':minut += 10 & gt 'gadriver', 'start'
 	act 'Go into the woods (0:15)':minut += 15 & gt'gadforest','forest_edge'
 	act 'Go to the fields (0:10)':minut += 10 & gt'gadfield','field'
-	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour >= 6 and hour < 22 and gadrunday ! daystart:
+	if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		act 'Go for a run (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -89,7 +89,7 @@ if $ARGS[0] = '':
 
 			act 'Finish':gt'gadroad'
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich') and hour >= 6 and hour < 22 and gadrunday ! daystart:
+	elseif ($clothingworntype ! 'danilovich' or $shoeworntype ! 'danilovich') and hour >= 6 and hour < 22 and gadrunday ! daystart:
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 end

+ 2 - 2
locations/gdksport.qsrc

@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 	end
 
 	*nl
-	if $clothingworntype ! 'exercise': 'You are not dressed in sports clothes.'
+	if $clothingworntype ! 'danilovich': 'You are not dressed in sports clothes.'
 	if $shoeworntype ! 'danilovich': 'You are not wearing training shoes.'
 
 	act 'Go outside':
@@ -89,7 +89,7 @@ if $ARGS[0] = 'start':
 
 	*nl
 
-	if pcs_stam > 20 and $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour < 18:
+	if pcs_stam > 20 and $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and hour < 18:
 		if gsAboBeg > 0 and npc_pregtalk['A131'] = 0:
 			act 'Take a track lesson. You have <<gsAboBeg>> lessons remaining': gt 'gdksport', 'racing2'
 		end

+ 12 - 12
locations/glake.qsrc

@@ -143,10 +143,10 @@ if month >= 5 and month <= 9:
 					act 'Pay 3,000 <b>₽</b>':
 						*clr & cla
 						money -= 3000
-						exercise[1] = 1
-						exercise_s[1] = 0
-						exercise_h[1] = 100
-						gs 'clothing', 'wear', 'exercise', 1
+						danilovich[1] = 1
+						danilovich_s[1] = 0
+						danilovich_h[1] = 100
+						gs 'clothing', 'wear', 'danilovich', 1
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 						'So... there''s the catch. The guy looks at your naked body while you mull over his proposition, and you come to the conclusion that you really don''t have any other choice. You can''t walk home through town naked! You silently nod and give him the money, quickly putting the clothes on when he hands them over. You feel relieved in the knowledge that at least you won''t have to go home naked... hopefully your clothes will turn up later.'
 						act'Continue':gt'glake'
@@ -185,10 +185,10 @@ if month >= 5 and month <= 9:
 							act 'Pay 3,000 <b>₽</b>':
 								*clr & cla
 								money -= 3000
-								exercise[1] = 1
-								exercise_s[1] = 0
-								exercise_h[1] = 100
-								gs 'clothing', 'wear', 'exercise', 1
+								danilovich[1] = 1
+								danilovich_s[1] = 0
+								danilovich_h[1] = 100
+								gs 'clothing', 'wear', 'danilovich', 1
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/event/nakedcar.jpg"></center>'
 								'You don''t want to have sex with him... but you also don''t want to go home naked! Not seeing any other option, you decide to pay him the 3,000 <b>₽</b> after all. You quickly put on the clothes as he hands them over, feeling relieved in the knowledge that at least you don''t have to walk through town in the nude. Now that you''re clothed, you feel more confident in searching the beach a bit more; hopefully your clothes will turn up after all.'
 								act 'Continue': gt 'glake'
@@ -430,10 +430,10 @@ end
 
 if $ARGS[0] = 'car_sex': 
 	*clr & cla
-	exercise[1] = 1
-	exercise_s[1] = 0
-	exercise_h[1] = 100
-	gs 'clothing', 'wear', 'exercise', 1
+	danilovich[1] = 1
+	danilovich_s[1] = 0
+	danilovich_h[1] = 100
+	gs 'clothing', 'wear', 'danilovich', 1
 	'<center><img <<$set_imgh>> src="images/locations/shared/sex/car/sexcar1.jpg"></center>'
 	'He wastes no time for you to second guess yourself, and immediately throws you down on the back seat of his car when you agree. He quickly pulls down his pants and, after quickly putting a condom on, quickly guides his cock to your pussy lips. He obviously doesn''t plan on spending a lot of time with you and sinks it in one firm thrust, fucking you with rapid, short strokes. Soon he shoots his load in the condom, ties a knot in it and throws it away. Seconds after he hands you the clothes as promised, he drives off.'
 	*nl

+ 4 - 4
locations/gschool_grounds.qsrc

@@ -347,7 +347,7 @@ if $ARGS[0] = 'sports':
 
 	act 'Leave the sports field': minut += 1 & gt 'gschool_grounds', 'main'
 
-	if schoolrunday ! daystart and $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
+	if schoolrunday ! daystart and $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich':
 		act 'Go for a run (1 hour)':
 			*clr & cla
 			menu_off = 1
@@ -366,7 +366,7 @@ if $ARGS[0] = 'sports':
 
 			act 'Continue': gt 'gschool_grounds', 'sports'
 		end
-	elseif schoolrunday ! daystart and ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich'):
+	elseif schoolrunday ! daystart and ($clothingworntype ! 'danilovich' or $shoeworntype ! 'danilovich'):
 		'You could go for a run here if you were wearing sports clothes and shoes.'
 	end
 
@@ -375,7 +375,7 @@ if $ARGS[0] = 'sports':
 	if week = 6 and SchoolSorev = 2 and hour = 10 and SchoolBlock = 0:
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
-		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
+		if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich':
 			act 'Participate in the 400m sprint event': gt 'gschool_grounds', 'SchoolRun2'
 		else
 			'You need to wear exercise clothes to participate.'
@@ -386,7 +386,7 @@ if $ARGS[0] = 'sports':
 		*nl
 		'Athletic students of your school and other schools in the area have gathered at the athletics track near your school. Everyone is getting ready for the running competition.'
 
-		if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich':
+		if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich':
 			act 'Participate in the 400m sprint race': gt 'gschool_grounds', 'SchoolRun'
 		else
 			'You need to wear exercise clothes to participate.'

+ 1 - 1
locations/meadow.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 
 	if sunWeather = 1:
 		if pcs_stam >= 15 or (pcs_stam >= 10 and bookYog + obruch > 0):
-			if $clothingworntype ! 'exercise':
+			if $clothingworntype ! 'danilovich':
 				*nl
 				'Your meadow is a perfect place to workout if you were wearing exercise clothes'
 			   if temper >= 10:

+ 2 - 2
locations/park_walkevents.qsrc

@@ -833,7 +833,7 @@ if $ARGS[0] = '9':
 end
 
 if $ARGS[0] = 'run':
-	if $clothingworntype = 'exercise' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and daybegskver ! daystart:
+	if $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and hour > 5 and hour < 23 and daybegskver ! daystart:
 		act 'Go for a run in the park (1:00)':
 			*clr & cla
 			menu_off = 1
@@ -865,7 +865,7 @@ if $ARGS[0] = 'run':
 				end
 			end
 		end
-	elseif ($clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich') and hour > 5 and hour < 23 and daybegskver ! daystart:
+	elseif ($clothingworntype ! 'danilovich' or $shoeworntype ! 'danilovich') and hour > 5 and hour < 23 and daybegskver ! daystart:
 		'You could go for a run in the park if you were wearing sports clothes and shoes.'
 	end
 end

+ 1 - 1
locations/pav_factory.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'tailor':
 		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 			*clr & cla
 			minut += 15
-			if CloStyle = 5 or $clothingworntype = 'exercise':
+			if CloStyle = 5 or $clothingworntype = 'danilovich':
 				'The tailor is looking irritatingly at you, "Why are you wasting my time with exercise clothing? That type of clothing does not need to be resized..."'
 			else
 				money -= 500

+ 3 - 3
locations/portnoi.qsrc

@@ -130,10 +130,10 @@ selltot = 0
 	if i <= ARRSIZE('school'):jump 'schoolmet'
 
 	i = 1
-	:exercisemet
-		if exercise[i] = 1 and exercise_s[i] = 2:dynamic($batch_sell, 'exercise', i)
+	:danilovichmet
+		if danilovich[i] = 1 and danilovich_s[i] = 2:dynamic($batch_sell, 'danilovich', i)
 		i += 1
-	if i <= ARRSIZE('exercise'):jump 'exercisemet'
+	if i <= ARRSIZE('danilovich'):jump 'danilovichmet'
 
 	i = 1
 	:eroto_dressmet

+ 46 - 46
locations/preCUST.qsrc

@@ -388,15 +388,15 @@ if $ARGS[0] = 'Done':
 		gm_outfits[50] = 1
 		gm_outfits_h[50] = 100
 		gm_outfits_b[50] = pcs_hips
-		exercise[29] = 1
-		exercise_h[29] = 100
+		danilovich[81] = 1
+		danilovich_h[81] = 100
 		gm_dress[11] = 1
 		gm_dress_h[11] = 100
 		gm_dress_b[11] = pcs_hips
 		swimwear[3] = 1
 		swimwear_h[3] = 60
 		swimwear_b[3] = pcs_hips
-		sportsclothingnumber = 29
+		sportsclothingnumber = 81
 		gs 'clothing', 'wear', 'gm_dress', 370
 	elseif goth_clothing = 1:
 		kats_panties[44] = 1
@@ -405,8 +405,8 @@ if $ARGS[0] = 'Done':
 		pantywornnumber = 44
 		$braworntype = 'kats'
 		brawornnumber = 28
-		exercise[45] = 1
-		exercise_h[45] = 100
+		danilovich[91] = 1
+		danilovich_h[91] = 100
 		sdanilovich[21] = 1
 		sgm[9] = 1
 		shoewornnumber = 9
@@ -417,7 +417,7 @@ if $ARGS[0] = 'Done':
 		bomba_outfits[37] = 1
 		bomba_outfits_h[37] = 100
 		bomba_outfits_b[37] = pcs_hips
-		sportsclothingnumber = 45
+		sportsclothingnumber = 91
 		gs 'clothing', 'wear', 'bomba_outfits', 37
 	elseif $ARGS[1] = 'CSB':
 		cheap_panties[5] = 1
@@ -426,8 +426,8 @@ if $ARGS[0] = 'Done':
 		pantywornnumber = 5
 		$braworntype = 'cheap'
 		brawornnumber = 12
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[78] = 1
+		danilovich_h[78] = 100
 		sdanilovich[21] = 1
 		sgm[9] = 1
 		shoewornnumber = 9
@@ -438,131 +438,131 @@ if $ARGS[0] = 'Done':
 		gm_dress[12] = 1
 		gm_dress_h[12] = 100
 		gm_dress_b[12] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 78
 		gs 'clothing', 'wear', 'gm_dress', 12
 	elseif pcs_inhib < 5:
 		gm_outfits[7] = 1
 		gm_outfits_h[7] = 100
 		gm_outfits_b[7] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[86] = 1
+		danilovich_h[86] = 100
 		gm_dress[12] = 1
 		gm_dress_h[12] = 100
 		gm_dress_b[12] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 86
 		gs 'clothing', 'wear', 'gm_dress', 12
 	elseif pcs_inhib < 10:
 		gm_outfits[15] = 1
 		gm_outfits_h[15] = 100
 		gm_outfits_b[15] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[76] = 1
+		danilovich_h[76] = 100
 		gm_dress[4] = 1
 		gm_dress_h[4] = 100
 		gm_dress_b[4] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 76
 		gs 'clothing', 'wear', 'gm_dress', 4
 	elseif pcs_inhib < 15:
 		gm_outfits[58] = 1
 		gm_outfits_h[58] = 100
 		gm_outfits_b[58] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[106] = 1
+		danilovich_h[106] = 100
 		gm_dress[7] = 1
 		gm_dress_h[7] = 100
 		gm_dress_b[7] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 106
 		gs 'clothing', 'wear', 'gm_dress', 7
 	elseif pcs_inhib < 20:
 		gm_outfits[55] = 1
 		gm_outfits_h[55] = 100
 		gm_outfits_b[55] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[43] = 1
+		danilovich_h[43] = 100
 		gm_dress[7] = 1
 		gm_dress_h[7] = 100
 		gm_dress_b[7] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 43
 		gs 'clothing', 'wear', 'gm_dress', 7
 	elseif pcs_inhib < 25:
 		gm_outfits[58] = 1
 		gm_outfits_h[58] = 100
 		gm_outfits_b[58] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[1] = 1
+		danilovich_h[1] = 100
 		gm_dress[39] = 1
 		gm_dress_h[39] = 100
 		gm_dress_b[39] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 1
 		gs 'clothing', 'wear', 'gm_dress', 39
 	elseif pcs_inhib < 30:
 		gm_outfits[91] = 1
 		gm_outfits_h[91] = 100
 		gm_outfits_b[91] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[48] = 1
+		danilovich_h[48] = 100
 		gm_dress[57] = 1
 		gm_dress_h[57] = 100
 		gm_dress_b[57] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 48
 		gs 'clothing', 'wear', 'gm_dress', 57
 	elseif pcs_inhib < 35:
 		gm_outfits[95] = 1
 		gm_outfits_h[95] = 100
 		gm_outfits_b[95] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[40] = 1
+		danilovich_h[40] = 100
 		gm_dress[63] = 1
 		gm_dress_h[63] = 100
 		gm_dress_b[63] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 40
 		gs 'clothing', 'wear', 'gm_dress', 63
 	elseif pcs_inhib < 40:
 		gm_outfits[124] = 1
 		gm_outfits_h[124] = 100
 		gm_outfits_b[124] = pcs_hips
-		exercise[4] = 1
-		exercise_h[4] = 100
+		danilovich[45] = 1
+		danilovich_h[45] = 100
 		gm_dress[89] = 1
 		gm_dress_h[89] = 100
 		gm_dress_b[89] = pcs_hips
-		sportsclothingnumber = 4
+		sportsclothingnumber = 45
 		gs 'clothing', 'wear', 'gm_dress', 89
 	elseif pcs_inhib < 45:
 		gm_outfits[131] = 1
 		gm_outfits_h[131] = 100
 		gm_outfits_b[131] = pcs_hips
-		exercise[95] = 1
-		exercise_h[95] = 100
+		danilovich[38] = 1
+		danilovich_h[38] = 100
 		gm_dress[109] = 1
 		gm_dress_h[109] = 100
 		gm_dress_b[109] = pcs_hips
-		sportsclothingnumber = 95
+		sportsclothingnumber = 38
 		gs 'clothing', 'wear', 'gm_dress', 109
 	elseif pcs_inhib < 50:
 		gm_outfits[145] = 1
 		gm_outfits_h[145] = 100
 		gm_outfits_b[145] = pcs_hips
-		exercise[94] = 1
-		exercise_h[94] = 100
+		danilovich[143] = 1
+		danilovich_h[143] = 100
 		gm_dress[123] = 1
 		gm_dress_h[123] = 100
 		gm_dress_b[123] = pcs_hips
-		sportsclothingnumber = 94
+		sportsclothingnumber = 143
 		gs 'clothing', 'wear', 'gm_dress', 123
 	else
 		gm_outfits[149] = 1
 		gm_outfits_h[149] = 100
 		gm_outfits_b[149] = pcs_hips
-		exercise[58] = 1
-		exercise_h[58] = 100
+		danilovich[15] = 1
+		danilovich_h[15] = 100
 		gm_dress[149] = 1
 		gm_dress_h[149] = 100
 		gm_dress_b[149] = pcs_hips
 		swimwear[24] = 1
 		swimwear_h[24] = 60
 		swimwear_b[24] = pcs_hips
-		sportsclothingnumber = 58
+		sportsclothingnumber = 15
 		gs 'clothing', 'wear', 'gm_dress', 149
 	end
 	if swim_start = 58:
@@ -579,7 +579,7 @@ if $ARGS[0] = 'Done':
 		swimwear_b[69] = pcs_hips
 	end
 	
-!!setting default exercise outfit and setting coats
+!!setting default danilovich outfit and setting coats
 	if school_clothing = 1:
 		killvar 'school_clothing'
 		bomba_outfits[29] = 1
@@ -635,9 +635,9 @@ if $ARGS[0] = 'Done':
 			gm_school[26] = 1
 			gm_school_h[26] = 120
 			gm_school_b[26] = pcs_hips
-			exercise[32] = 1
-			exercise_h[32] = 100			
-			sportsclothingnumber = 32
+			danilovich[4] = 1
+			danilovich_h[4] = 100			
+			sportsclothingnumber = 4
 			sdanilovich[17] = 1
 			sdanilovich[21] = 0
 			sport_bras[1] = 1

+ 6 - 6
locations/sportShop.qsrc

@@ -112,22 +112,22 @@ if $ARGS[0] = 'clo':
 			i = 3
 		end
 
-		:loopexercise
-			if exercise[i] = 0:
-				gs 'clothing_attributes', 'exercise', i
+		:loopdanilovich
+			if danilovich[i] = 0:
+				gs 'clothing_attributes', 'danilovich', i
 				gs 'clothing_QV', 'shop_filter'
 					
 				if clothingfilter['quality'] = 0 or clothingfilter['qualitycheck'] = CloQuality:
 
-					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''exercise''"><img src="images/pc/clothing/7exercise/<<i>>.jpg" 	height="250" /></a>'
+					if clothingfilter_risk = 1 and clothingfilter_pandb = 1 and clothingfilter_norm2 = 1: *p '<a href="exec: i = <<i>> & gt ''sportshop'', ''danilovich''"><img src="images/pc/clothing/danilovich/outfits/<<i>>.jpg" 	height="250" /></a>'
 				end
 			end
 			i += 3
-		if i <= 260:jump 'loopexercise'
+		if i <= 260:jump 'loopdanilovich'
 	if clothingfilter['quality'] = 1 and clothingfilter['qualitycheck'] > 0: clothingfilter['qualitycheck'] -=1 & jump 'loopquality2'
 end
 
-if $ARGS[0] = 'exercise': gt 'clothing', 'view_clothing_item', 'shop', 'exercise',i, 2000
+if $ARGS[0] = 'danilovich': gt 'clothing', 'view_clothing_item', 'shop', 'danilovich',i, 2000
 
 if $ARGS[0] = 'shoes':
 	$loc_arg = 'shoes'

+ 1 - 1
locations/starenie.qsrc

@@ -26,7 +26,7 @@ $loc_clothestypes[23]='dolls_outfits'
 $loc_clothestypes[24]='dolls_dress'
 $loc_clothestypes[25]='bomba_outfits'
 $loc_clothestypes[26]='bomba_dress'
-$loc_clothestypes[27]='exercise'
+$loc_clothestypes[27]='danilovich'
 $loc_clothestypes[28]='swimwear'
 $loc_clothestypes[29]='cats_coats'
 $loc_clothestypes[30]='moncheri_coats'

+ 1 - 1
locations/stat_display.qsrc

@@ -523,7 +523,7 @@ if $clothingworntype = 'nude':
 		end
 	end
 	$stat_clothes_style = 'nude'
-elseif $clothingworntype = 'exercise':
+elseif $clothingworntype = 'danilovich':
 	if PCloBimbo = 1 and cheatBimbo = 0:
 		$stat_clothes_text = '<BR><font color = #FF00FF>You are dressed as a bimbo</font>'
 		$stat_clothes_msg = 'You are wearing a gym outfit a bimbo would wear.'

+ 4 - 4
locations/succubus.qsrc

@@ -641,10 +641,10 @@ if $args[0] = 'sucwalkinginit':
 	if i <= 80:jump 'loopschool'
 
 	i = 1
-	:loopexercise
-		if exercise[i] = 1 and exercise_s[i] = 0 and exercise_h[i] > 0: $succlolistn[x] = 'exercise' & succlolisti[x] = i & x += 1
+	:loopdanilovich
+		if danilovich[i] = 1 and danilovich_s[i] = 0 and danilovich_h[i] > 0: $succlolistn[x] = 'danilovich' & succlolisti[x] = i & x += 1
 		i += 1
-	if i <= 260:jump 'loopexercise'
+	if i <= 260:jump 'loopdanilovich'
 
 	i = 1
 	:loopmoncheri
@@ -689,7 +689,7 @@ if $args[0] = 'sucwalkinginit':
 		$succlocat[11] = 'gm_dress'
 		$succlocat[12] = 'gm_office'
 		$succlocat[13] = 'gm_school'
-		$succlocat[14] = 'exercise'
+		$succlocat[14] = 'danilovich'
 		$succlocat[15] = 'moncheri'
 		$succlocat[16] = 'gm_uniform'
 

+ 8 - 8
locations/wardrobe.qsrc

@@ -249,7 +249,7 @@ if $ARGS[0] = 'default_entry_wear':
 			gt 'wardrobe', 'start'
 		end
 	!! not exercise clothing, and not loose fitting
-	elseif $defclothingtype[default_entry] ! 'exercise' and CloStyle ! 5:
+	elseif $defclothingtype[default_entry] ! 'danilovich' and CloStyle ! 5:
 		!! check for if the hipsize is too far from your hipsize
 		dynamic 'RESULT = <<$defclothingtype[default_entry]>>_b[<<defclothingnumber[default_entry]>>]'
 		if RESULT < pcs_hips - 8 or RESULT > pcs_hips + 8:
@@ -463,7 +463,7 @@ end
 
 if $ARGS[0] = 'sports_entry_set':
 	gs 'stat'
-	if $clothingworntype ! 'exercise' OR $shoeworntype ! 'danilovich':
+	if $clothingworntype ! 'danilovich' OR $shoeworntype ! 'danilovich':
 		MSG 'The sports outfit needs to include exercise clothes and training shoes'
 		gt 'wardrobe', 'start'
 	else
@@ -497,12 +497,12 @@ if $ARGS[0] = 'sports_entry_wear':
 
 	!gs 'wardrobe', 'prev_entry_set' this does not exist
 
-	gs 'clothing_attributes', 'exercise', sportsclothingnumber
+	gs 'clothing_attributes', 'danilovich', sportsclothingnumber
 
-	if ARRPOS('$CloLosTyp', 'exercise') ! -1 and ARRPOS('CloLosNum', sportsclothingnumber) ! -1:
+	if ARRPOS('$CloLosTyp', 'danilovich') ! -1 and ARRPOS('CloLosNum', sportsclothingnumber) ! -1:
 		msg '<center>You''ve lost part of this set, and are unable to wear all items.<br>Maybe you can find the missing clothes somewhere?</center>'
 	else
-		gs 'clothing', 'wear', 'exercise', sportsclothingnumber
+		gs 'clothing', 'wear', 'danilovich', sportsclothingnumber
 	end
 
 	if dyneval('RESULT = <<$sportsbratype>>_bras[<<sportsbranumber>>]') = 0: $sportsbratype = 'none' & sportsbranumber = 0
@@ -517,7 +517,7 @@ if $ARGS[0] = 'sports_entry_wear':
 	gs 'stat'
 
 	!! do not own this clothing anymore
-	if dyneval('RESULT = exercise[<<sportsclothingnumber>>]') = 0:
+	if dyneval('RESULT = danilovich[<<sportsclothingnumber>>]') = 0:
 		cls
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/strip/strip2.jpg"></center>'
 		'As you go to pull your sports outfit out of your wardrobe you remember you don''t own that piece of clothing anymore. Maybe you should buy it again? Guess you will have to find something else to wear.'
@@ -525,7 +525,7 @@ if $ARGS[0] = 'sports_entry_wear':
 		gs 'clothing', 'strip'
 		gs 'stat'
 	!! strength of clothing is less than or equal to 0
-	elseif dyneval('RESULT = exercise_h[<<sportsclothingnumber>>]') <= 0:
+	elseif dyneval('RESULT = danilovich_h[<<sportsclothingnumber>>]') <= 0:
 		cls
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/vicky/event/vika_game_strip16.mp4"></video></center>'
 		'Your sports outfit has worn out and can''t be used anymore. Guess you will have to find something else to wear.'
@@ -559,7 +559,7 @@ end
 
 if $ARGS[0] = 'sports_outfit':
 	gs 'stat'
-	if $clothingworntype ! 'exercise' or $shoeworntype ! 'danilovich':
+	if $clothingworntype ! 'danilovich' or $shoeworntype ! 'danilovich':
 		act 'Change into: <<$sports_clothing_name>>': gs 'wardrobe', 'sports_entry_wear'
 	end
 end