Merge remote-tracking branch 'bgkjdgbizgblzdgbr/master'

locations/gschool_socialchg.qsrc

@@ -332,7 +332,7 @@ if $ARGS[0] = 'nerd':
 		nerd_game['invite_day'] = daystart
 		nerd_game['game_day'] = daystart
 		
-		gs 'gschool_socialchg', 'group_rel_change','nerds', -5
+		gs 'gschool_socialchg', 'group_rel_change','nerds', 5
 		gs 'stat'
 
 		act 'Go to morning class': school_period = 0 & gt 'gschool_lessons', 'schedule'

locations/natbelapt.qsrc

@@ -508,8 +508,9 @@ if $ARGS[0] = 'natroom':
 
 		if lernHome ! 0: act 'Study together': gs 'natbelapt', 'study_together'
 
+		if NatbelQW['QWstage'] >= 2 and lernHome ! 0 and NatbelQW['Debt'] > 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
+
 		if NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart:
-			if NatbelQW['QWstage'] >= 2 and lernHome ! 0: act 'Make her do your homework': gs 'natbelapt', 'make_her_do_homework'
 
 			if NatbelQW['QWstage'] >= 5:
 				gs 'willpower', 'humiliation', 'force', 'easy'
@@ -760,7 +761,7 @@ if $ARGS[0] = 'make_her_do_homework':
 	menu_off = 1
 	lernHome = 0
 	NatbelQW['homework'] += 1
-	if NatbelQW['homework'] = 3 and NatbelQW['QWstage'] = 3: NatbelQW['QWstage'] = 4
+	if NatbelQW['homework'] >= 3 and NatbelQW['QWstage'] = 3: NatbelQW['QWstage'] = 4
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/study.jpg"></center>'
 	if NatbelQW['QWstage'] = 3:

locations/stripclub.qsrc

@@ -161,6 +161,7 @@ if $ARGS[0] = 'forman':
 		if money >= 5000:
 			act 'Order a special show (5,000 <b>₽</b>)':
 				stprrand = rand(0, 1)
+				money -= 5000
 
 				if stprrand = 0:gt 'stripclub', 'stpr1'
 				if stprrand = 1:gt 'stripclub', 'stpr2'

locations/vanrPar.qsrc

@@ -61,19 +61,15 @@ if $ARGS[0] = 'peek':
 			stepdadqw += 1
 			act 'Finish': gt 'vanrPar'
 		else
-			if stepdadqw < 5 or pcs_vag = 0 or mesec > 0 or mother_go = 0 or hour < 16:
+			if npc_sex['A28'] = 0 or stepdadqw < 5 or pcs_vag = 0 or mesec > 0 or mother_go = 0 or hour < 16:
 				gs 'vanrPar', 'stepdad_nosex'
 			else
-				if npc_sex['A28'] = 0 and stepdadqw < 5:
-					gs 'vanrPar', 'stepdad_nosex'
-				else
-					*clr & cla
-					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
-					'Suddenly you hear the sound of the bathroom door as it creaks open. Turning around, you see your stepfather. He is standing outside the door, devouring your naked body with his eyes. In that instant, all the little moments the two of you have shared flash through your mind, while it dawns on you that your <<$npc_nickname[''A29'']>> is at work... .'
-					'You feel your core tighten with desire, and smirk.'
-					'"Daddy, do you want to join me?"'
-					act 'Daddy wants to join?': gs 'vanrPar', 'stepdad_sex'
-				end
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/sex/bath_voyer_3.jpg"></center>'
+				'Suddenly you hear the sound of the bathroom door as it creaks open. Turning around, you see your stepfather. He is standing outside the door, devouring your naked body with his eyes. In that instant, all the little moments the two of you have shared flash through your mind, while it dawns on you that your <<$npc_nickname[''A29'']>> is at work... .'
+				'You feel your core tighten with desire, and smirk.'
+				'"Daddy, do you want to join me?"'
+				act 'Daddy wants to join?': gs 'vanrPar', 'stepdad_sex'
 			end
 		end
 	elseif ((hour >= 18 and hour < 23 and week < 6) or (hour >= 20 and hour < 23 and week >= 6)) and brother_ev1 ! daystart and rand(0,4) < 2 and indorf = 0: