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

locations/gschool_lessons.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'morning':
 	$location_type = 'public_indoors'
 	killvar '$locclass'
 	menu_off = 0
-	
+
 	if school_check_day ! daystart:
 		school_check_day = daystart
 		schoolprogul -= 1
@@ -24,7 +24,7 @@ if $ARGS[0] = 'morning':
 		if runnerQW['pav_racetype'] = 1: runnerQW['pav_racetype'] = 0
 		if hour < 8: gs 'gschool_socialchg', 'test'
 	end
-		
+
 	if $breaktype ! 'first':
 		if detention_set = 1 and week = 1:
 			detention_set = 2
@@ -39,7 +39,7 @@ if $ARGS[0] = 'morning':
 			act 'Continue down the hall': gt 'gschool_lessons', 'morning'
 		elseif week < 4 and class['first_grade_check'] = 0:
 			gt 'gschool_lessons', 'grade_check'
-		elseif (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
+		elseif week > 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
 			gt 'nerd_game_night', 'invite', 'morning'
 		else
 			gs 'gschool_gossip', 'morning'
@@ -82,7 +82,7 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="red">This uniform complies with the regulations but is too risqué.</font>'
 		elseif PCloStyle = 2:
 			grupvalue[4] += 1
-			'<font color="blue">This uniform follows the school regulation on skirt length and is of a style that appeals to Gopniks.</font>'	
+			'<font color="blue">This uniform follows the school regulation on skirt length and is of a style that appeals to Gopniks.</font>'
 		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
@@ -100,7 +100,7 @@ if $ARGS[0] = 'uniform_check':
 			'<font color="red">This uniform slightly breaches the school regulations and it is too risqué.</font>'
 		elseif PCloStyle = 2:
 			grupvalue[4] += 1
-			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'	
+			'<font color="blue">This uniform slightly breaches the school regulations on skirt length and is of a style that appeals to Gopniks.</font>'
 		elseif PCloQuality >= 4:
 			grupvalue[1] += 1
 			grupvalue[2] += 1
@@ -251,11 +251,11 @@ if $ARGS[0] = 'short_break':
 		act 'Go to next class': gt 'gschool_lessons', 'schedule'
 
 		act 'Skip next class': school_period += 1 & gt 'gschool_lessons', 'skip'
-		
+
 		if cheerleadingQW['skipped_ev'] + cheerleadingQW['skipped_g_ev'] > 0:
 			gs 'gschool_cheerleading', 'skipped_ev'
 			act 'Continue down the hall': gt 'gschool_lessons', 'short_break'
-		elseif (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
+		elseif week > 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
 			gt 'nerd_game_night', 'invite', 'short_break'
 		end
 	elseif Kuznetsov_punishment = 1:
@@ -371,61 +371,61 @@ if $ARGS[0] = 'grade_check':
 	end
 	*nl
 	gs 'grades', 'assing_grade_description', 'school'
-	
-	'Math: <<$class[''school_math_grade'']>> (<<class[''school_math_grade'']>>) Russian: <<$class[''school_rus_grade'']>> (<<class[''school_rus_grade'']>>) Literature: <<$class[''school_lit_grade'']>> (<<class[''school_lit_grade'']>>) Art: <<$class[''school_art_grade'']>> (<<class[''school_art_grade'']>>) Biology: <<$class[''school_bio_grade'']>> (<<class[''school_bio_grade'']>>) English: <<$class[''school_eng_grade'']>> (<<class[''school_eng_grade'']>>) Geography: <<$class[''school_geo_grade'']>> (<<class[''school_geo_grade'']>>) Science: <<$class[''school_sci_grade'']>> (<<class[''school_sci_grade'']>>) History: <<$class[''school_his_grade'']>> (<<class[''school_his_grade'']>>) Shop: <<$class[''school_shop_grade'']>> (<<class[''school_shop_grade'']>>) Computer: <<$class[''school_comp_grade'']>> (<<class[''school_comp_grade'']>>) Music: <<$class[''school_mus_grade'']>> (<<class[''school_mus_grade'']>>) P.E.: <<$class[''school_pe_grade'']>> (<<class[''school_pe_grade'']>>)' 
+
+	'Math: <<$class[''school_math_grade'']>> (<<class[''school_math_grade'']>>) Russian: <<$class[''school_rus_grade'']>> (<<class[''school_rus_grade'']>>) Literature: <<$class[''school_lit_grade'']>> (<<class[''school_lit_grade'']>>) Art: <<$class[''school_art_grade'']>> (<<class[''school_art_grade'']>>) Biology: <<$class[''school_bio_grade'']>> (<<class[''school_bio_grade'']>>) English: <<$class[''school_eng_grade'']>> (<<class[''school_eng_grade'']>>) Geography: <<$class[''school_geo_grade'']>> (<<class[''school_geo_grade'']>>) Science: <<$class[''school_sci_grade'']>> (<<class[''school_sci_grade'']>>) History: <<$class[''school_his_grade'']>> (<<class[''school_his_grade'']>>) Shop: <<$class[''school_shop_grade'']>> (<<class[''school_shop_grade'']>>) Computer: <<$class[''school_comp_grade'']>> (<<class[''school_comp_grade'']>>) Music: <<$class[''school_mus_grade'']>> (<<class[''school_mus_grade'']>>) P.E.: <<$class[''school_pe_grade'']>> (<<class[''school_pe_grade'']>>)'
 	*nl
 	'A grade of 1 means "Very Poor" and is generally only used for absence. 2 means "Unsatisfactory" and is also a falling grade. 3 means "Satisfactory" and is a passing grade. 4 means "Good". 5 means "Excellent" and is only given to the best students. (The number in the parenthesis is the variable grade, which is changed by your in-class actions and translated into the actual grade)'
 	*nl
-	
+
 	gs 'grades', 'grade above', 'school', 90
 	gs 'grades', 'grade above', 'school', 70
 	gs 'grades', 'grade above', 'school', 50
 	gs 'grades', 'grade above', 'school', 40
-	
+
 	if class['school_grades_above_90'] = 13:
 		'You''re getting top marks in all your classes. You''re one of the best, if not the best student in the entire school.'
-	elseif class['school_grades_above_90'] > 6 and class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_90'] > 6 and class['school_grades_above_40'] = 13:
 		'You''re getting top marks in more than half your classes and aren''t failing any of the others. You''re one of the best students in the school.'
-	elseif class['school_grades_above_90'] > 6: 
+	elseif class['school_grades_above_90'] > 6:
 		'Even if you''re failing some of your classes, you''re getting top marks in more than half of them and are still one of the best students in the school. You should have no trouble getting into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] = 13: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] = 13:
 		'You''re only getting top marks in a few of your classes, but the rest of your grades are still good. You should have no trouble getting into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10 and class['school_grades_above_40'] =13: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10 and class['school_grades_above_40'] =13:
 		'You''re only getting top marks in some of your classes, but only a few of your grades are bad and you''re not failing any classes. You should have no trouble getting into university, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_70'] > 10:
 		'You''re only getting top marks in a few of your classes and are failing others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] = 13:
 		'You''re only getting top marks in some of your classes and a lot of bad grades, but you''re not failing any classes. You need to improve your bad grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 10:
 		'You''re getting top marks in a few of your classes, but are failing some of the others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6: 
+	elseif class['school_grades_above_90'] > 0 and class['school_grades_above_40'] > 6:
 		'You''re getting top marks in a few of your classes, but are failing a lot of the others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_90'] > 0: 
+	elseif class['school_grades_above_90'] > 0:
 		'Even a top mark or two won''t help when you''re failing more than half of your classes. You''ll have to put a lot of work in if you want to go to university.'
-	elseif class['school_grades_above_70'] = 13: 
+	elseif class['school_grades_above_70'] = 13:
 		'You''re getting good grades in all of your classes, but nothing impressive. You should have no trouble getting into university, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] =13: 
+	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] =13:
 		'You''re getting good grades in over half of your classes, but nothing impressive. You''re not failing any classes, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] >10: 
+	elseif class['school_grades_above_70'] > 6 and class['school_grades_above_40'] >10:
 		'You''re getting good grades in over half of your classes, but are failing others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] = 13:
 		'You''re getting good grades in a few of your classes, but nothing impressive. You''re not failing any classes, but improving your grades wouldn''t hurt.'
-	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >10: 
+	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >10:
 		'You''re getting good grades in a few of your classes, but are failing others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >6: 
+	elseif class['school_grades_above_70'] > 0 and class['school_grades_above_40'] >6:
 		'You''re getting good grades in a few of your classes, but are failing a lot of the others. You should improve your grades if you want to get into university.'
-	elseif class['school_grades_above_70'] > 0: 
+	elseif class['school_grades_above_70'] > 0:
 		'A good grade or two isn''t enough when you''re failing more than half of your classes. It will require a lot of work for you to turn this around.'
-	elseif class['school_grades_above_40'] = 13: 
+	elseif class['school_grades_above_40'] = 13:
 		'You are not getting any good grades, but at least you are not failing any classes. It will require a lot of work if you want to go to university.'
-	elseif class['school_grades_above_40']  > 10: 
+	elseif class['school_grades_above_40']  > 10:
 		'Your grades are terrible and you''re in danger of not graduating high school.'
-	elseif class['school_grades_above_40']  > 6: 
+	elseif class['school_grades_above_40']  > 6:
 		'You''re failing a lot of classes and barely passing the rest. You won''t graduate at this rate unless you get your grades up.'
 	else
 		'You''re failing high school and need to do something about it right now if you want to graduate.'
 	end
-	
+
 	act 'Continue': gt 'gschool_lessons', 'morning'
 end
 --- gschool_lessons ---------------------------------

locations/gschool_lunch.qsrc

@@ -128,7 +128,7 @@ if $ARGS[0] = 'break':
 		gs 'gschool_cheerleading', 'skipped_ev'
 		act 'Continue down the hall': gt 'gschool_events', 'leave_break_events2'
 		exit
-	elseif (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
+	elseif week > 1 and (grupTipe = 3 or nerd_game['stage'] > 0 or rand(80,npc_rel['A152']) > 95) and nerd_game['invite_day'] < daystart - week:
 		gt 'nerd_game_night', 'invite', 'lunch'
 	end
 
@@ -160,10 +160,10 @@ if $ARGS[0] = 'break':
 			gt 'NikoPayback', 'Payback 2'
 		elseif NikoVolkovQW = 10 and NikoEv = 14:
 			lunch_event = daystart
-			gt 'NikoEv2', 'Vicky Talk'	
+			gt 'NikoEv2', 'Vicky Talk'
 		elseif NikoVolkovQW = 10 and NikoEv = 16:
 			lunch_event = daystart
-			gt 'NikoEv2', 'Natalia Talk'		
+			gt 'NikoEv2', 'Natalia Talk'
 		end
 
 		if school_period = 6:
@@ -348,7 +348,7 @@ if $ARGS[0] = 'events':
 				act 'Eat Katja out':
 					*clr & cla
 					KatjaQW['dom'] += 1
-					if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1 
+					if katjaQW['school_sex'] = 0: katjaQW['school_sex'] = 1
 					katjaQW['slut'] += 1
 					katjaQW['horny'] = 0
 					gs 'stat'
@@ -470,7 +470,7 @@ if $ARGS[0] = 'events':
 	elseif rand(1,100) < 3:
 		cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/lunchdhump.jpg"></center>'
-		'While in the cafeteria, you see a couple of the gopnik girls hanging out by one of the tables. One of them is slightly bent over with her skirt hiked almost all the way up to her breasts, her panties and tight ass exposed to anyone who cares to look. The second girl stands behind her with her hands on her hips. She thrusts her hips forward hard, bouncing off the panty-clad ass of the first girl, pretending like she''s giving her a pounding fuck. Both girls let out loud fake moans with each slap of their bodies.' 
+		'While in the cafeteria, you see a couple of the gopnik girls hanging out by one of the tables. One of them is slightly bent over with her skirt hiked almost all the way up to her breasts, her panties and tight ass exposed to anyone who cares to look. The second girl stands behind her with her hands on her hips. She thrusts her hips forward hard, bouncing off the panty-clad ass of the first girl, pretending like she''s giving her a pounding fuck. Both girls let out loud fake moans with each slap of their bodies.'
 		'The quite public fake fucking gets laughs from all the other gopniks, while most of the other boys and more than one teacher watch with a gleam of lust in their eyes at their antics. The raunchy display has an obvious effect and many of the boys in the audience do their best to inconspicuously cover their groins with whatever happens to be available. Even a few the girls seem to be lightly rubbing their legs together, their faces slightly flushed.'
 		gs 'arousal', 'erotic', 10
 		act 'Continue your break': gt 'gschool_lunch', 'break'

locations/katja_city_sex.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines':
 							*clr & cla
 							minut += 5
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'You take the tube and snort two lines as Katja watches with wide-open eyes.'
@@ -134,7 +134,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines line, but don''t push Katja':
 							*clr & cla
 							minut += 5
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/shared/drugs/cocaine.jpg"></center>'
 							'"I''ll take some, but I don''t think my friend will," you say as you take the tube and Katja shakes her head. You put one end of the tube to your nose and the other to the first of the lines he has prepared for you.' 
@@ -156,7 +156,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 									gs 'willpower', 'drugs', 'force'
 								end
 								gs 'willpower', 'pay', 'force'
-								gs 'drugs', 'cocaine'
+								gs 'drugs', 'cocaine', 1
 								gs 'stat'
 								gs 'katja_procedural', 'take_cocaine'
 								gs 'stat'										
@@ -235,7 +235,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines with Katja (<<will_cost>> Willpower)':
 							*clr & cla
 							minut += 8
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										
@@ -321,7 +321,7 @@ if $ARGS[0] = 'walking_home_with_a_guy':
 						act 'Do some lines with Katja (<<will_cost>> Willpower)':
 							*clr & cla
 							minut += 8
-							gs 'drugs', 'cocaine'
+							gs 'drugs', 'cocaine', 1
 							gs 'stat'
 							gs 'katja_procedural', 'take_cocaine'
 							gs 'stat'										

locations/katja_nightclub.qsrc

@@ -258,7 +258,7 @@ if $ARGS[0] = 'dance_guy_approach':
 						katjaQW['horny'] += 20
 						'Katja clearly enjoys the attention she''s getting and starts to get closer to him as well, almost grinding her body against his.'
 					end
-					if (katjaQW['liberated'] = 1 and (katjaQW['simultanous_boys'] = 0 and rand(1,10)) or (katjaQW['simultanous_boys'] > 0 and rand(1,5))) or (katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and rand(1,10) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and rand(1,5) <= (min(katjaQW['horny'], 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and (katjaQW['faithful'] = 0 or katjaQW['cheat_warning'] = 2)):
+					if (katjaQW['liberated'] = 1 and ((katjaQW['simultanous_boys'] = 0 and rand(1,10)) or (katjaQW['simultanous_boys'] > 0 and rand(1,5)))) or (katjaQW['QWstage'] >= 6 and katjaQW['boy_block'] = 0 and rand(1,10) <= (min(func('katja_procedural', 'willing_to_be_naughty'), 100) - 50)/10 and rand(1,5) <= (min(katjaQW['horny'], 100) - 50)/10 and katjaQW['relationship_talk'] = 1 and (katjaQW['faithful'] = 0 or katjaQW['cheat_warning'] = 2)):
 						!! The conditions is such that only if Katja is liberated or the player has introduced her to sex with a boy is there a chance that she will go with the guy. In the later case she won''t go until after the the player has had the relationship talk, and then only if they agreed on an open relationship or if she has warned the player because she has caught the player cheating. She also won''t go if the player said they''re not into boys.
 						katjaQW['nightclub_private_room_boy'] = 1
 						katjaQW['disco_loc'] = 7

locations/praiders_garage_chat.qsrc

@@ -683,7 +683,7 @@ if $ARGS[0] = 'chat_valentin1':
 										'You snort and shake your head as he continues. "Yeah okay, we tend to get carried away sometimes, but most of us want the girl to enjoy it as much as we do, if for no other reason than to make sure she''s willing to continue having sex with us," he responds. "Anyway, that wasn''t as bad as what he did next."'
 										'"And what''s that?" you reply.'
 										'"He started cheating on her with any chick he could nail."'
-										act 'Continue': gt 'praiders_garage', 'radcheated'
+										act 'Continue': gt 'praiders_garage_chat', 'radcheated'
 									end
 								end
 							end