Merge remote-tracking branch 'Sicaa/master'

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/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