浏览代码

[Added] Starlets now have a mandatory practice schedule and Sveta can be held accountable for missing practice

Alaratt 3 年之前
父节点
当前提交
6a231f830e
共有 4 个文件被更改,包括 60 次插入5 次删除
  1. 19 1
      locations/AlbStars.qsrc
  2. 10 0
      locations/cikl.qsrc
  3. 17 4
      locations/gdksport.qsrc
  4. 14 0
      locations/gschool_grounds.qsrc

+ 19 - 1
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 ---------------------------------

+ 10 - 0
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------------------------------------------------
 

+ 17 - 4
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:

+ 14 - 0
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