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

# Conflicts:
#	locations/mother.qsrc

locations/ParChurch.qsrc

@@ -186,10 +186,12 @@ if $ARGS[0] = 'candle':
 		money -= 10
 		'You approach the deacon selling candles and he hands you a candle in exchange for your money.'
 	elseif money >= 10 and money < 20 and owechurch = 1:
+		owechurch = 0
 		money -= 10
 		pcs_mood -= 10
 		'You approach the deacon selling candles and hope that he doesn''t recognize you since you couldn''t pay for your last candle. You give him 10 rubles and he hands you a candle. You hustle away from the counter while guilt gnaws at you.'
 	elseif money >= 20 and owechurch = 1:
+		owechurch = 0
 		money -= 20
 		pcs_mood += 5
 		'You approach the deacon selling candles. He seems confused when you hand him 20 rubles, then he smiles in understanding. You feel relieved that the debt is paid.'

locations/_attributes_cheap.qsrc

@@ -1998,7 +1998,7 @@ elseif ARGS[1] = 321:
 elseif ARGS[1] = 322:
 	CloQuality = 1
 	CloThinness = 3
-	CloTopCut = 2
+	CloTopCut = 4
 	CloPantsShortness = 4
 	CloExhibit = 15
 elseif ARGS[1] = 323:
@@ -2311,11 +2311,10 @@ elseif ARGS[1] = 373:
 	CloPantsShortness = 1
 	CloExhibit = 5
 elseif ARGS[1] = 374:
-	CloQuality = 2
-	CloThinness = 2
-	CloTopCut = 2
-	CloPantsShortness = 1
-	CloExhibit = 0
+	CloQuality = 1
+	CloThinness = 3
+	CloTopCut = 4
+	CloPantsShortness = 5
 elseif ARGS[1] = 375:
 	CloQuality = 1
 	CloThinness = 2

locations/gschool_grounds.qsrc

@@ -12,10 +12,10 @@ if $ARGS[0] = 'main':
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">Outside School</font></b></center>'
-	if month > 2 and month < 9:
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
-	else
+	if month >= 11 or month <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/schoolwinter.jpg"></center>'
+	else
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/building/gschool.jpg"></center>'
 	end
 	'Pavlovsk''s only school, all the local children go here for their education. Next to the school is the athletic field, a parking lot for the teachers, just beyond the parking lot is a grove of trees, and past that is the old school building. After the new school was built the old one was supposed to get renovated and used for advance classes but budget cuts meant the project was canceled and now the old school building stands empty. Though many of the kids use it to skip class or as a place to sneak off to drink or have sex.'
 

locations/mother.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = '':
 		act 'Ask for a tampon':
 			cla
 			sanpad += 3
-			gs 'npc_relationship', 'modify', 'A29', 'dislike', 5
+			gs 'npc_relationship', 'modify', 'A29', -15
 			minut += 3
 			'You tell your <<$npc_nickname[''A29'']>> you''re menstruating and ran out of tampons, but really need one right now. She looks at you knowingly, gives you three sanitary pads from her own supply and sternly tells you to next time take care of this in advance.'
 
@@ -262,7 +262,7 @@ if $ARGS[0] = '':
 	if hour > 5:
 		if unintendedabort = 1 and pregTalkFamily = 1:
 			pregTalkFamily = 2
-			gs 'npc_relationship', 'modify', 'A29', 10
+			gs 'npc_relationship', 'modify', 'A29', 20
 			'<br>'
 			'Your <<$npc_nickname[''A29'']>> looks at you in shock." <<$pcs_nickname>>, did you get an abortion?"'
 			'You break down crying and tell your <<$npc_nickname[''A29'']>> you had a miscarriage.'
@@ -535,7 +535,7 @@ if $ARGS[0] = '':
 
 							act 'Leave her be for now':gt $loc, $metka
 						elseif mqwtRand > 2 and mqwtRand <= 8:
-							gs 'npc_relationship', 'modify', 'A29', rand(0,1)
+							gs 'npc_relationship', 'modify', 'A29', 'like'
 							minut += 30
 							'You try to have a talk with your <<$npc_nickname[''A29'']>>, to try and patch up your horrible relationship. Despite your best efforts, the whole half-hour conversation consists mainly of a fairly aggressive monologue from your <<$npc_nickname[''A29'']>> about morality, diseases and what awaits you in the future, if you do not change your ways. Still, there is some improvement in your relationship.'
 
@@ -584,7 +584,7 @@ if $ARGS[0] = '':
 
 			act 'Move away':gt $loc, $metka
 		elseif (motherKnowWhore > 0 or motherKnowSpravka > 0) and npc_QW['A29'] = 1:
-			gs 'npc_relationship', 'modify', 'A29', 'dislike', 0
+			gs 'npc_relationship', 'modify', 'A29', -20
 
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
@@ -599,7 +599,7 @@ if $ARGS[0] = '':
 
 			act 'Move away':gt $loc, $metka
 		elseif npc_QW['A29'] >= 2:
-			gs 'npc_relationship', 'modify', 'A29', 'dislike', 0
+			gs 'npc_relationship', 'modify', 'A29', -20
 
 			if motherKnowWhore = 0:motherKnowWhore = 1
 
@@ -700,7 +700,7 @@ if $ARGS[0] = 'referral_fail':
 			act 'Walk home': gt 'korrPar'
 		end
 	elseif motherKnowWhore > 0 and npc_QW['A29'] < 2:
-		gs 'npc_relationship', 'modify', 'A29', 'dislike', 0
+		gs 'npc_relationship', 'modify', 'A29', -10
 		motherKnowSpravka = 1
 		!counter for getting sent to Gadukino for the summer
 		delin_beh += 1
@@ -749,7 +749,7 @@ if $ARGS[0] = 'pregreact':
 			act 'Tell your <<$npc_nickname[''A29'']>> you are pregnant':
 				*clr & cla
 				minut += 5
-				gs 'npc_relationship', 'modify', 'A29', 'dislike', 0
+				gs 'npc_relationship', 'modify', 'A29', -20
 				pregTalkFamily = 1
 				npc_pregtalk['A29'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer
@@ -769,7 +769,7 @@ if $ARGS[0] = 'pregreact':
 			act 'Tell your <<$npc_nickname[''A29'']>> you are pregnant':
 				*clr & cla
 				minut += 5
-				gs 'npc_relationship', 'modify', 'A29', 'dislike', 0
+				gs 'npc_relationship', 'modify', 'A29', -20
 				pregTalkFamily = 1
 				npc_pregtalk['A29'] = 1
 				delin_beh += 1 &!counter for getting sent to Gadukino for the summer

locations/postmaster.qsrc

@@ -67,6 +67,7 @@ if $ARGS[0] = 'start':
 	elseif postjobQW = 2 and postworkday ! daystart:
 !!when you go to work on Saturday, first time
 		if week = 6 and hour = 11:
+			minut += 60 - minut
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"Ah good, you''re here!" the postmaster smiles when you enter the post office. "And right on time, too. Please, follow me."'

locations/sistersleep.qsrc

@@ -13,11 +13,12 @@ if $ARGS[0] = 'sister_sleep':
 		act 'Move away': gt 'bedrPar'
 	else
 		if sisterQW['lesbDay'] = daystart:
+			'You want to touch her again but you change your mind at the last minute. Doing this more than once a day could make her really angry. Better try again tomorrow.'
 			act 'Move away': gt 'bedrPar'
 		else
-			sisterQW['lesbDay'] = daystart
 			act 'Move away': gt 'bedrPar'
-			if sisterbfspy = 4:
+			if sisterbfspy >= 4:
+				sisterQW['lesbDay'] = daystart
 				if sisterLesb = 0:
 					gs 'willpower', 'foreplay', 'self'
 				else