Merge remote-tracking branch 'master/master'

locations/pushkin_ballet_class.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 
 	!! Random trivia - Terpsichore is one of the nine Greecian muses. Her sphere was dance, rhythm and choral music.
 
-	if (month=7 and day = 9) and hour = 7:
+	if (month=7 and day = 9) and (hour =  6 or hour = 7):
 		gt $loc, 'assessment'
 	elseif ballet_day = 6 and balletqw['school'] = 1:
 		gs 'stat'
@@ -59,6 +59,7 @@ if $ARGS[0] = 'start':
 		'You grab a shower before you leave to catch the bus that is waiting for you outside. Standing next to it is <<$npc_firstname[''A284'']>>, who addresses you all once you''ve gathered. "I wish you all the best for your future." With that, Birserka returns back into the school.'
 		dynamic $showerdin
 		gs 'stat'
+		gs 'homes_properties', 'set_home', 'parents_home'
 		act 'Return home' : gt 'pav_commcenter'
 
 	elseif balletqw['school'] ! 1 and ballet_day = 1:

locations/pushkin_ballet_init.qsrc

@@ -78,6 +78,14 @@ if $ARGS[0] = 'start':
 	end
 end
 
+if $ARGS[0] = 'reputation':
+	!! Check reputation to have a conversation with the warden
+	if fame['pav_modelling'] >= 10 or fame['pav_slut'] > 9  or fame['city_prostitute'] > 0 or fame['ciy_sexind'] > 0 or fame['city_modelling'] >= 10 or fame['city_slut'] > 30  or fame['city_prostitute'] > 19 or fame['city_sexind'] > 19 or fame['pushkin_modelling'] >= 10 or fame['pushkin_slut'] > 0  fame['pushkin_sex'] > 0 or fame['pushkin_prostitute'] > 0 or fame['pushkin_sexind'] > 0:
+
+		!! gt 'pushkin_ballet_res', 'warden', 'reputation'
+	end
+end
+
 if $ARGS[0] = 'daily_assessment':
 	!! Grade appearance, behaviour and other factors.
 	!! Daily Appearance

locations/pushkin_ballet_res.qsrc

@@ -124,9 +124,9 @@ if $ARGS[0] = 'hallway':
 	nclass = 0
 	gs 'shortgs', 'clothing_status'
 	if $apparel['status'] ! 'nude' and ($apparel['status'] = 'sport' or $apparel['status'] = 'dance'):
-		if (hour = 6 or (hour = 7 and minut <= 30)) and $apparel['status'] = 'sport':
+		if hour = 7 and minut <= 30 and $apparel['status'] = 'sport':
 			act '<b>Attend Ballet Classes</b>': gt 'pushkin_ballet_class', 'start'
-		elseif hour = 7 and (minut > 30 and minut <= 59):
+		elseif (hour = 7 and (minut > 30 and minut <= 59)) or hour >=8 :
 			$balletEv['trigger'] = 'late'
 			gs 'npc_274_init', 'summer_school'
 		else
@@ -268,6 +268,10 @@ if $ARGS[0] = 'warden_room':
 	gs 'stat'
 	gs 'core_library', 'stage_title'
 
+	if $ARGS[1] = 'reputation':
+		!! TODO:
+		"That Talk"
+	end
 	! Punishment or plot
 	act 'Go to the hallway': minut += 5 & ballet_awol = 0 & gt $loc, 'hallway'
 end

locations/sex_ev_after.qsrc

@@ -2237,7 +2237,7 @@ if $ARGS[0] = 'smoke_phone':
 		end
 	end
 	sex_ev['cigarette'] = 1
-	gs'sex_ev_after', 'smoke_phone'
+	gs'sex_ev_after', 'smoke_ciga_react'
 end
 
 if $ARGS[0] = 'smoke_ciga_react':