Browse Source

[fixed] Display for work at city cafe didn't change to say you had missed your shift and kept reminding you when at work.

Kevin_Smarts 2 years ago
parent
commit
e56c4a6ab5
2 changed files with 8 additions and 1 deletions
  1. 3 0
      locations/city_kafe.qsrc
  2. 5 1
      locations/stat_display.qsrc

+ 3 - 0
locations/city_kafe.qsrc

@@ -204,6 +204,7 @@ if $ARGS[0] = 'work':
 	$location_type = 'event'
 	*clr & cla
 	minut += 5
+	workKafe['at_work'] = 1
 	gs 'stat'
 	smenaKafe += 1
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
@@ -222,6 +223,7 @@ if $ARGS[0] = 'work':
 		cla
 		work = 0
 		workKafe = 0
+		workKafe['at_work'] = 0
 		pay = smenaKafe * 600
 		money += pay
 		smenaKafe = 0
@@ -828,6 +830,7 @@ if $ARGS[0] = 'workPred':
 		end
 	elseif hour >= 22:
 		act 'Finish shift and go home':
+			workKafe['at_work'] = 0
 			cla
 			if GiviSex = 0 and npc_rel['A41'] < 90 or pcs_apprnc < 0:
 				'Givi nods his head at you, "Goodbye, <<$pcs_nickname>>."'

+ 5 - 1
locations/stat_display.qsrc

@@ -2143,7 +2143,11 @@ if enable_extra_msg = 1:
 	end
 	
 	
-	if hour < 22 and week >= 2 and week <= 4 and workKafe = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
+!! Work at city cafe, workKafe is having the job and at_work is set when she is at work
+	if hour < 22 and week >= 2 and week <= 4 and workKafe = 1 and workKafe['at_work'] = 0:
+		if hour >= 12: $stat_msg += '<BR><b><font color="red">You missed your shift at The Roadhouse cafe today.</font></b>'
+		if hour < 12: $stat_msg += '<BR><b><font color="red">Today you have a shift at The Roadhouse cafe starting at 11:00.</font></b>'
+	end
 	if hour < 17 and week < 5 and workSec >= 1 or hour < 17 and week < 5 and workSec = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Titran-Express from 9:00 to 17:00</font></b>'
 	if hour < 17 and week < 5 and BurgerQW['Secretary'] = 1:$stat_msg += '<BR><b><font color="red">Today you have a shift as a secretary at Diner Bystroeshka from 9:00 to 17:00</font></b>'
 	if hour < 20 and week => 1 and week <= 5 and age < 18 and workFabrika = 1:$stat_msg += '<BR><b><font color = red>Today you have work in the garment factory in Pavlovsk. Shift starts at 16:00.</font></b>'