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

locations/AlbStars.qsrc

@@ -1251,7 +1251,25 @@ if $ARGS[0] = 'StarletsEnd':
 	minut += 2
 	gs 'stat'
 	
-	act 'Leave':AlbinaQW['StarletsJoined'] = 0 & gt 'pav_commcenter'
+	act 'Leave':AlbinaQW['StarletsJoined'] = -1 & gt 'pav_commcenter'
+end
+
+if $ARGS[0] = 'StarletsPracticeMissed':
+	cla
+	menu_off = 1
+	minut += 5
+	gs 'stat'
+	
+	if starlet_practice_skipped = 1:
+		'Text for Albina angry you missed your first practice'
+		act 'Train with Starlets': gt 'AlbStars', 'starlets'
+	elseif starlet_practice_skipped = 2:
+		'Text for Albina telling you this is your last chance'
+		act 'Train with Starlets': gt 'AlbStars', 'starlets'
+	else
+		'Text about Albina murdering you'
+		act 'Leave':AlbinaQW['StarletsJoined'] = -1 & gt 'pav_commcenter'
+	end
 end
 
 --- AlbStars ---------------------------------

locations/cikl.qsrc

@@ -1880,6 +1880,16 @@ cheerleaders_on = iif( ( (week = 5 and odd_week = 1) or (week = 2 or week = 4) )
 
 !!------------------------------------------------------------------------------------------------------------
 
+!!---------- Starlet Practice Check --------------------------------------------------------------------------
+if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0:
+	if starlets_practice = daystart - 1: 
+		starlets_missed = 1
+		starlets_practice = 0
+	end
+	if starlets_on = 1: starlets_practice = daystart
+end
+
+!!------------------------------------------------------------------------------------------------------------
 
 !!-------------Music career related variables and calculations------------------------------------------------
 

locations/gdksport.qsrc

@@ -20,6 +20,8 @@ if $ARGS[0] = 'start':
 	'In the locker room is a <a href="exec: gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec: gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
 	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	*nl
+	if cheerleaders_on = 1: 'Today is a cheerleading day, so the Starlets wont be here training.'
 
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'
@@ -121,11 +123,22 @@ if $ARGS[0] = 'start':
 				end
 			end
 		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
-			if (pregtime >= 90) or (grupTipe = 5):
-				if pregtime >= 90: act 'Train with Starlets': gt 'AlbStars', 'Starletsreact'
-				if grupTipe = 5: act 'Train with Starlets': gt 'AlbStars', 'StarletsEnd' 
+			if hour = 15 and starlets_on = 1:
+				if pregtime >= 90 or grupTipe = 5 or starlets_missed = 1:
+					if pregtime >= 90: act 'Train with Starlets': gt 'AlbStars', 'Starletsreact'
+					if grupTipe = 5: act 'Train with Starlets': gt 'AlbStars', 'StarletsEnd'
+					if starlets_missed = 1:
+						act 'Train with Starlets': 
+							starlets_missed = 0
+							starlet_practice_skipped += 1
+							gt 'AlbStars', 'StarletsPracticeMissed'
+						end
+					end
+				else
+					act 'Train with Starlets': gt 'AlbStars', 'starlets'
+				end
 			else
-				act 'Train with Starlets': gt 'AlbStars', 'starlets'
+				act 'Train with Starlets': '<br><font color="red"> The Starlets are not training right now.</font>'
 			end
 		end
 	elseif pcs_stam <= 20:

locations/gschool_grounds.qsrc

@@ -441,6 +441,20 @@ if $ARGS[0] = 'bulding':
 		His words fill you with dread as you make your way to class.'
 	end
 
+	if starlets_missed = 1:
+		menu_off = 1
+		starlets_missed = 0
+		starlet_practice_skipped += 1
+		if starlet_practice_skipped = 1:
+			'Text about Albina chewing you out for missing Starlet practice'
+		elseif starlet_practice_skipped = 2:
+			'Text about Albina giving you your last warning'
+		else
+			AlbinaQW['StarletsJoined'] = -1
+			'Text with Albina murdering you'
+		end
+	end
+
 	if week <= 5 and christinaQW['dompath'] = 6:
 		menu_off = 1
 		npc_rel['A18'] = 0

locations/journal_quests.qsrc

@@ -72,6 +72,27 @@ if $ARGS[0] = 'start':
 		end
 		*nl
 		*nl
+		'<center><h1>Ivan Prokhorov</h1></center>'
+		*nl
+		if npc_rel['A3'] >= 80:
+			if kotovVSprohorov = 2:
+				if IvanShowerQW = 11:
+					'Ivan joins me sometimes in the showers at the sports center now. If I want it to happen for sure then I need to talk with him about it at school.'
+				elseif IvanShowerQW = 1:
+					'I should talk to Ivan about what happened in the sports center the next time I am at school.'
+				else
+					'I need to not chicken out the next time Ivan tries to join my in the sports center shower.'
+				end
+			elseif kotovVSprohorov = 1:
+				'I am feeling dirty, I should take a shower at the sports center.'
+			else
+				'I see Ivan at the sports center around 17:00 a lot. I should try and chat with him then.'
+			end
+		else
+			'If I want to get to know Ivan better, I should spend some time chatting with him during school.'
+		end
+		*nl
+		*nl
 		'<center><h1>Julia Milov</h1></center>'
 		*nl
 		if pav_slut < 200:
@@ -111,9 +132,9 @@ if $ARGS[0] = 'start':
 		*nl
 		if LariskaQW['story'] = 8:
 			'This is the end of current storyline content for now'
-		if LariskaQW['story'] = 7:
+		elseif LariskaQW['story'] = 7:
 			'I should try to flirt with Lariska afterschool, when I get the chance.'
-		if LariskaQW['story'] = 6:
+		elseif LariskaQW['story'] = 6:
 			'I should do my homework with Lariska afterschool.'
 		elseif LariskaQW['story'] = 5:
 			'Lariska invited me to come over afterschool and do our homework together.'

locations/kuhr.qsrc

@@ -73,13 +73,6 @@ if husband > 0 and husbandrink ! 10:
 	if hour = 7 or hour = 17:'<a href="exec:gt ''husb'', ''start''">Your husband is eating at the table.</a>'
 end
 
-dynamic $fill_bottle
-dynamic $edaD
-dynamic $pranik
-dynamic $fatdel
-dynamic $driwater
-
-
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook a meal for your husband and yourself, 2 servings (1:00)':
 		cla
@@ -96,6 +89,14 @@ if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	end
 end
 
+dynamic $edasnack
+dynamic $sandwich
+dynamic $driwater
+dynamic $dritea
+dynamic $fill_bottle
+dynamic $edaD
+dynamic $pranik
+dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin
 

locations/kuhr2x.qsrc

@@ -77,12 +77,6 @@ if husband > 0 and husbandrink ! 10:
 	end
 end
 
-dynamic $fill_bottle
-dynamic $edaD
-dynamic $pranik
-dynamic $fatdel
-dynamic $driwater
-
 if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	act 'Cook meal for your husband and yourself (1hr, 2 potions of food)':
 		cla
@@ -103,6 +97,14 @@ if husband > 0 and husbanday > 0 and huseatday ! daystart and eda >= 2:
 	end
 end
 
+dynamic $edasnack
+dynamic $sandwich
+dynamic $driwater
+dynamic $dritea
+dynamic $fill_bottle
+dynamic $edaD
+dynamic $pranik
+dynamic $fatdel
 dynamic $lekarstvo
 dynamic $vitamin
 

locations/pav_shared_apt.qsrc

@@ -641,13 +641,15 @@ if $ARGS[0] = 'kitchen':
 	if hour = 6 or hour = 18:'<a href="exec: gt ''pav_shared_apt'', ''cookForGuys''">Cook meals for the guys (1:30)</a>'
 	
 	dynamic $edasnack
+	dynamic $sandwich
 	dynamic $driwater
 	dynamic $dritea
 	dynamic $fill_bottle
-	dynamic $pranik
 	dynamic $edaD
+	dynamic $pranik
 	dynamic $fatdel
 	dynamic $lekarstvo
+	dynamic $vitamin
 
 	act 'Leave':gt 'pav_shared_apt', 'start'
 end