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

locations/cikl.qsrc

@@ -9,11 +9,7 @@ if masseuse['jobtype'] < 1:
 	masseuse['<<week>>_shift_3'] = 0
 end
 
-if masseuse['jobtype'] > 0 and week = 5 and masseuse['weeks_pay'] > 0:
-	masseuse['payday'] = 1
-end
-
-if masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or masseuse['<<week>>_shift_3'] ! 0:
+if (masseuse['<<week>>_shift_1'] ! 0 or masseuse['<<week>>_shift_2'] ! 0 or masseuse['<<week>>_shift_3'] ! 0) and masseuse['last_worked_day'] ! daystart:
 	masseuse['missed_shift2'] = 1
 end
 
@@ -88,6 +84,12 @@ end
 !! masseuse paycheck
 if masseuse['weeks_pay'] > 0 and week = 5:masseuse['paycheck'] = 1
 
+if masseuse['jobtype'] > 0 and week = 5 and masseuse['weeks_pay'] > 0:
+	masseuse['payday'] = 1
+end
+
+if week = 7 and masseuse['schedule_update'] ! daystart: gs 'masseuse_schedule','schedule_reset'
+
 !!modelling check
 if model_week ! (daystart - week) / 7:model_job_week = 0
 
@@ -1883,6 +1885,8 @@ end
 starlets_on     = iif( ( (week = 5 and odd_week = 0) or (week = 1 or week = 3 or week >= 6) ) and natholi = 0,1,0)
 cheerleaders_on = iif( ( (week = 5 and odd_week = 1) or (week = 2 or week = 4) ) and (natholi = 0 and (month >9 or month <6)) ,1,0)
 
+if starlets['late_message'] = 1: starlets['late_message'] = 0
+
 !!------------------------------------------------------------------------------------------------------------
 
 !!---------- Starlet Content ---------------------------------------------------------------------------------

locations/stat_display.qsrc

@@ -1046,6 +1046,21 @@ if cheatStatusIcons = 0:
 		$statusIconBarTab += '<td><a href="exec: msg $stat_model_msg"><img title="<<$stat_model_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/model_'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), 'white', 'black')+'.png"></a></td>'
 	end
 	
+	if AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and starlets_on = 1: 
+		if starlets_missed > 0:
+			$stat_starlet_msg = 'You missed practice with the Starlets today!'
+		else:
+			$stat_starlet_msg = 'You have practice with the Starlets at 15:00 today.'
+		end
+		if (hour < 16 or starlets_missed > 0) and starlets['late_message'] = 0:
+			if starlets_missed > 0:
+				$statusIconBarTab += '<td><a href="exec:msg $stat_starlet_msg"><img title="<<$stat_starlet_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/starlets_'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), 'white', 'black')+'.png"></a></td>'
+			else
+				$statusIconBarTab += '<td><a href="exec: starlets[''late_message''] = 1 & msg $stat_starlet_msg"><img title="<<$stat_starlet_msg>>" height = <<set_siconht>> src="images/system/icon/status_icons/starlets_'+iif(night_mode ! 3 and (($location_type = 'public_outdoors' and daystage = 5) or night_mode = 1 or night_mode = 2), 'white', 'black')+'.png"></a></td>'
+			end
+		end
+	end
+	
 	if pornstar['icon'] = 1 and pornstar['icon_disable'] ! daystart:
        if hour < 11:
             $stat_porn_msg = 'You are starring in a porno today at 10:00.'