Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife into mymod

locations/gschool.qsrc

@@ -63,7 +63,7 @@ end
 
 if $ARGS[0] = 'weekly grade update':
 	if kanikuli = 0 and week = 1 and SchoolAtestat = 0:
-		if lernHome > 0 and petka['homework'] = 1: gs 'grades', 'homework', 'school', 'yes', lernHome, 2, 'A6'
+		if lernHome > 0 and petka['homework'] = 1: gs 'grades', 'homework', 'school', 'yes', rand(0, lernHome), 2, 'A6'
 		pcs_traits['nerd_points'] -= lernHome		
 		if lernHome = 0:
 			pcs_traits['nerd_points'] += pcs_traits['nerd_lernHome'] 

locations/gschool_events.qsrc

@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'break_events':
 	elseif break_rand <= 35 and cheerleadingQW['quest_stage'] = -1 and cheerleadingQW['reject'] + 30 => daystart:
 	 !! 'repeat' event that reminds the player of cheerleading if they rejected it the first time or failed the tryouts.
 		gt 'gschool_cheerleading', 'poster_repeat'
-	elseif break_rand <= 36 and petka_homework_day ! daystart and week > 1:
+	elseif break_rand <= 36 + lernHome*2 + petka['homework']*rand(10,20) and petka_homework_day ! daystart and week > 1:
 		*clr & cla
 		petka_homework_day = daystart
 		gs 'stat'

locations/petkaEv.qsrc

@@ -5,7 +5,20 @@ if $ARGS[0] = 'follow_petka':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/nerdtalk.jpg"></center>'
-	if petka_homework = 0:
+	if petka['homework'] = 1 and (petkasub > 0 or npc_sex['A6'] = 0):
+		gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A6'
+		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you he looks a little eager. "Do you need my homework?" he asks you.'
+		'You nod your head. "Yes."'
+		'He quickly pulls out his homework. "Here, take it."'
+		act 'Take the homework': gt 'gschool_events', 'leave_break_events2'
+	elseif petka_homework = 2 or petka['homework'] = 1:
+		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" he asks you.'
+		'You nod your head. "Yes."'
+		'He licks his lips a bit and you can already see the bulge in his pants growing. "Same as last time?" he asks, sounding hopeful.'
+		'You nod your head as you walk over to him.'
+		act 'Change your mind': gt 'gschool_events', 'leave_break_events2'
+		act 'Bribe him with sex again': gt 'petkaev', 'homework_sex_bribe'
+	elseif petka_homework = 0:
 		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you, he looks a little confused but also a little leary of you. "Hey this is the boys bathroom! You shouldn''t be in here."'
 		'You ignore him. "Petka, I was wondering if you could do me a favor. How about you give me your homework so I can copy it?"'
 		'He is already shaking his head before you even finish. "I can''t do that. That would be cheating and I could get expelled for helping you cheat! I''m sorry, but I can''t help you."'
@@ -83,13 +96,6 @@ if $ARGS[0] = 'follow_petka':
 		else
 			act 'Bribe him with sex (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-	elseif petka_homework = 2:
-		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you he looks a little eager, obviously hoping you want to repeat last time. "Do you need my homework again?" he asks you.'
-		'You nod your head. "Yes."'
-		'He licks his lips a bit and you can already see the bulge in his pants growing. "Same as last time?" he asks, sounding hopeful.'
-		'You nod your head as you walk over to him.'
-		act 'Change your mind': gt 'gschool_events', 'leave_break_events2'
-		act 'Bribe him with sex again': gt 'petkaev', 'homework_sex_bribe'
 	else
 		gs 'grades', 'homework', 'school', 'yes', 1, 2, 'A6'
 		'You follow Petka into the bathroom and as the door closes, he quickly turns around alarmed. When he sees you he looks a little afraid and crest fallen. "What do you want this time?" he asks.'