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

locations/NatBelGo.qsrc

@@ -8,7 +8,7 @@ gs 'stat'
 'You go up to Natasha and she asks you, "Will you come to my house to do our homework?"'
 
 act 'Go with Natasha':
-	cls
+	*clr & cla
 	minut += 15
 	BeInNatBelHome = 1
 	gs 'stat'
@@ -16,7 +16,12 @@ act 'Go with Natasha':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/16.jpg"></center>'
 	'It takes you 15 minutes to walk to Natasha''s home. You discuss all the small stuff in your lives that amuse you.'
 
-	act 'Go into the apartment': gt 'natbelapt', 'study_together'
+	if NatashaQW < 2:
+		act 'Go into the apartment': gt 'natbelapt', 'study_together'
+	else
+		act 'Study together': gt 'natbelapt', 'study_together'
+		act 'Make her do your homework': gt 'natbelapt', 'make_her_do_homework'
+	end
 end
 
 --- NatBelGo ---------------------------------

locations/ParChurch2.qsrc

@@ -732,12 +732,12 @@ if $ARGS[0] = 'secrets':
 								else
 									'"Hmmm." Father Kirill almost sounds like he is moaning, "What a naughty thing to do. And did he cum, I mean, did he ejaculate in your mouth?"'
 									'"No, he pulled out and squirted his stuff all over my face," you say recalling the feel of his hot semen splashing on you.'
-									act 'Finish':
-										*clr & cla
-										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
-										'After confessing, Father Kirill kneels next to you and drapes the end of his stole over your head. Together, you chant the prayer of absolution. Father Kirill admonishes you to be a good girl and tells you to come back to see him anytime you feel the need.'
-										act 'Return to Narthex': gt 'ParChurch', 'Narthex'
-									end
+								end
+								act 'Finish':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/church/confession.jpg"></center>'
+									'After confessing, Father Kirill kneels next to you and drapes the end of his stole over your head. Together, you chant the prayer of absolution. Father Kirill admonishes you to be a good girl and tells you to come back to see him anytime you feel the need.'
+									act 'Return to Narthex': gt 'ParChurch', 'Narthex'
 								end
 							end
 						else

locations/gschool_detention.qsrc

@@ -54,14 +54,15 @@ if $ARGS[0] = 'start':
 end
 
 if $ARGS[0] = 'wedgie':
+	wedgie_counter = 0
 	:wedgie_girl
 	gs 'gschool_events', 'rand_girl_arg', 1, 1, 0, 1, 1, 0
-	if grupTipe = 4:
-		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona': jump 'wedgie_girl'
-	elseif grupTipe = 2:
-		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina': jump 'wedgie_girl'
-	else
-		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina' and $rand_girl ! 'Lina' and $rand_girl ! 'Lariska' and $rand_girl ! 'Stasya': jump 'wedgie_girl'
+	if grupTipe = 4 and wedgie_counter < 1000:
+		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona': wedgie_counter += 1 & jump 'wedgie_girl'
+	elseif grupTipe = 2 and wedgie_counter < 1000:
+		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina': wedgie_counter += 1 & jump 'wedgie_girl'
+	elseif wedgie_counter < 1000:
+		if $rand_girl ! 'Paulina' and $rand_girl ! 'Lena' and $rand_girl ! 'Lera' and $rand_girl ! 'Alyona' and $rand_girl ! 'Christina' and $rand_girl ! 'Lina' and $rand_girl ! 'Lariska' and $rand_girl ! 'Stasya': wedgie_counter += 1 & jump 'wedgie_girl'
 	end
 	'<center><b><font color="maroon">Detention</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/detention/wedgie.jpg"></center>'

locations/stat_sklattrib.qsrc

@@ -140,6 +140,7 @@ if attsklupdate = 0:
 	dynamic "
 		if pcs_<<$attskltmp>> > 0 and <<$attskltmp>>_lvl = 0:
 			<<$attskltmp>>_exp = (expadj * (pcs_<<$attskltmp>> - 1) * (pcs_<<$attskltmp>> - 1) / 180) + 1
+			<<$attskltmp>>_mem = <<$attskltmp>>_exp - 1
 			<<$attskltmp>>_lvl = pcs_<<$attskltmp>>
 			<<$attskltmp>>_lvlst = <<$attskltmp>>_lvl
 		end