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

locations/city_market.qsrc

@@ -255,7 +255,6 @@ if $ARGS[0] = 'tailor':
 			if money >= 500:
 				act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 					*clr & cla
-					minut += 10
 					if CloStyle = 5 or $clothingworntype = 'danilovich_outfits':
 						'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..."'
 					elseif dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') = pcs_hips:
@@ -263,14 +262,16 @@ if $ARGS[0] = 'tailor':
 					elseif (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') > pcs_hips + 4) or (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') < pcs_hips - 4):
 						'The tailor is looking irritatingly at you, "Why are you wasting my time? Your clothing does not need to be resized. It might not be perfect but it is still fine."'
 					else
+						minut += 10
 						money -= 500
+						gs 'stat'
 						dynamic '<<$clothingworntype>>_b[<<clothingwornnumber>>] = pcs_hips'
 						'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment.'
 						'Jacob quickly measures your waist and hips, then only takes a few minutes to adjust your outfit.'
 						'You are handed your clothes back and quickly get dressed. You''re pleased with the job that the tailor has done.'
 					end
 
-					act 'Continue': minut += 10 & gt 'city_market', 'tailor'
+					act 'Continue': gt 'city_market', 'tailor'
 				end
 
 				act 'Take in different clothes':gt 'clothing', 'view_clothing_list', 'resize'

locations/clothing.qsrc

@@ -1520,31 +1520,31 @@ if $ARGS[0] = 'view_clothing_item':
 						'This item is too large for you to wear.'
 					end
 
-					if (pcs_sewng >= 50 and tkan > 0) or $loc_arg = 'tailor':
+					if pcs_sewng >= 50 and tkan > 0:
 						cla & *nl
-						if $loc_arg = 'tailor':
-							'You can pay to have this resized for (500 <b>₽</b>).'
-						else
-							'You can resize this thanks to your sewing skill.'
-						end
-						
-						act 'Return': gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
-						
+						'You can resize this thanks to your sewing skill.'
 						act 'Resize item':
 							cla
-							if $loc_arg = 'tailor':
+							tkan -= 1
+							minut += 30
+							dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
+							'You spend 30 minutes resizing the outfit.'
+							act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
+						end
+					elseif $loc_arg = 'tailor':
+						cla & *nl
+						if money >= 500:
+							'You can pay to have this resized for (500 <b>₽</b>).'
+							act 'Resize item':
 								minut += 15
 								money -= 500
 								dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
 								*nl
 								'You hand the clothing over to the tailor who takes it into the back. Fifteen minutes later, he presents your clothing back to you, adjusted to fit you perfectly.'
-							else
-								tkan -= 1
-								minut += 30
-								dynamic $ARGS[1] + '_b[<<ARGS[2]>>] = pcs_hips'
-								'You spend 30 minutes resizing the outfit.'
+								act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
 							end
-							act 'Return':gt 'clothing', 'clothing_list', '<<$ward_list_store>>'
+						else
+							'You cannot afford to have this resized.'
 						end
 					end
 				exit

locations/igorhome.qsrc

@@ -125,6 +125,7 @@ if $ARGS[0] = 'igorroom':
 			'You nod to him. "I understand, then I guess I will see you later."'
 			act 'Say goodbye and go home': gt 'pav_residential'
 			act 'Kiss':
+				*clr & cla
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/igor/kiss.mp4"></video></center>'
 				'You lean in and give him a quick kiss, he is a bit surprised at first but then returns it. Once you break the kiss you leave.'
 				act 'Say goodbye and go home': gt 'pav_residential'
@@ -468,15 +469,15 @@ if $ARGS[0] = 'livingroom':
 		'You see Igor''s father Gemorgen is in the living room watching tv. He is well dressed and not bad looking, you don''t think he has noticed you yet.'
 		if Igor_with = 0:
 			if hotcat > 5:
-				gt 'igorhome', 'livingroom1'
+				gs 'igorhome', 'livingroom1'
 			else
-				gt 'igorhome', 'livingroom2'
+				gs 'igorhome', 'livingroom2'
 			end
 		else
 			if hotcat > 5:
-				gt 'igorhome', 'livingroom3'
+				gs 'igorhome', 'livingroom3'
 			else
-				gt 'igorhome', 'livingroom4'
+				gs 'igorhome', 'livingroom4'
 			end
 		end
 	else

locations/pav_factory.qsrc

@@ -21,7 +21,6 @@ if $ARGS[0] = 'tailor':
 	if money >= 500:
 		act 'Resize the clothes you''re wearing (500 <b>₽</b>)':
 			*clr & cla
-			minut += 10
 			if CloStyle = 5 or $clothingworntype = 'danilovich_outfits':
 				'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..."'
 			elseif dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') = pcs_hips:
@@ -29,7 +28,9 @@ if $ARGS[0] = 'tailor':
 			elseif (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') > pcs_hips + 4) or (dyneval('RESULT = <<$clothingworntype>>_b[<<clothingwornnumber>>]') < pcs_hips - 4):
 				'The tailor is looking irritatingly at you, "Why are you wasting my time? Your clothing does not need to be resized. It might not be perfect but it is still fine."'
 			else
+				minut += 10
 				money -= 500
+				gs 'stat'
 				dynamic '<<$clothingworntype>>_b[<<clothingwornnumber>>] = pcs_hips'
 				'You are handed a t-shirt and shorts as you undress and give the clothes to the tailor for adjustment.'
 				'He quickly measures your waist and hips, then only takes a few minutes to adjust your outfit.'