Merge remote-tracking branch 'netuttki/master'

locations/office.qsrc

@@ -105,46 +105,34 @@ if $ARGS[0] = 'work_floor':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/lobby.jpg"></center>'
 	'This is the main hall for your work floor. It is nicely decorated and you can hear other people working in the office.'
 	if workSec = 1:
-		if sek['atwork'] = daystart and hour = 12:
-			act 'Go back to work station':
-				sekDay += 1
-				if hour = 12: minut += 60 - minut
-				gs 'stat'
-				gt 'office', 'work'
-			end
-		elseif hour >= 8 and hour < 17:
-			if hour = 8:
-				act 'Go to work':
-					sek['atwork'] = daystart
-					minut = 60 - minut
-					gt 'office', 'secretary_office'
-				end
-			else
-				'You''re too late for work, so you''re told to take the day off.'
-			end
-			act 'Go to the breakroom':gt 'office', 'work_floor'
-			act 'Go to restrooms':gt 'office', 'restrooms'
-		end
 		if CloStyle3 ! 4:
 			'You are not dressed according to the corporate dress code.'
 		else
 			if hour >= 8 and hour < 17:
-				act 'Resign':
-					*clr & cla
-					menu_off = 1
-					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
-					'You walk into Mrs Torbica''s office and tell her. "I am resigning."'
-					'"Are you sure?" She asks obviously a little surprised you are quiting.'
-					act 'Yes, I quit.':
-						*clr & cla
-						minut += 30
-						work = 0
-						workSec = 0
-						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
-						'"Yes I am sure." You tender your resignation and then leave.'
-						act 'Leave': minut += 15 & gt 'city_center'
+				!! If it''s 8, then go to work option
+				if hour = 8:
+					act 'Go to work':
+						sek['atwork'] = daystart	
+						minut = 60 - minut    				
+						gt 'office', 'secretary_office'
+					end
+				!! Otherwise it''s return to work if already at work
+				elseif sek['atwork'] = daystart:
+					act 'Go back to work station':
+						sekDay += 1
+						if hour = 12: minut += 60 - minut 
+						gs 'stat'
+						gt 'office', 'work'
 					end
-					act 'Nevermind': gt 'office', 'work_floor'
+				!! Except if didn''t start the day at 8
+				else
+					'You''re too late for work, so you''re told to take the day off.'
+				end
+				!! The remaining actions are always available				
+				act 'Go to the breakroom':gt 'office', 'break_room'
+				act 'Go to restrooms':gt 'office', 'restrooms'
+				act 'Resign':
+					gt 'office', 'resign'
 				end
 			end
 		end
@@ -189,7 +177,7 @@ if $ARGS[0] = 'break_room':
 	'The room is neat and clean. Across from the door is a couch along one wall with a few comfortable chairs. With a large table in the middle of the room and along one wall is a set of cabinets, with a sink, some appliances and a fridge to store your lunch in, if you bring one.'
 	dynamic $driwater
 	if buterbrod > 0 and hour = 12:
-		act 'eat brought lunch':
+		act 'Eat brought lunch':
 			*clr & cla
 			minut += 20
 			buterbrod = 0
@@ -792,4 +780,22 @@ if $ARGS[0] = 'interview':
 	end
 end
 
+if $ARGS[0] = 'resign':
+	*clr & cla
+	menu_off = 1
+	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
+	'You walk into Mrs Torbica''s office and tell her. "I am resigning."'
+	'"Are you sure?" She asks obviously a little surprised you are quiting.'
+	act 'Yes, I quit.':
+		*clr & cla
+		minut += 30
+		work = 0
+		workSec = 0
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
+		'"Yes I am sure." You tender your resignation and then leave.'
+		act 'Leave': minut += 15 & gt 'city_center'
+	end
+	act 'Nevermind': gt 'office', 'work_floor'
+end					
+
 --- office ---------------------------------

locations/pav_residential.qsrc

@@ -190,7 +190,7 @@ if (hour > 20 or hour < 4) and succubusQW = 5 and suchuntday ! daystart:
 end
 
 !!Uncle Misha is npcstatic number 54
-if StoryLine ! 0 and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
+if mid($start_type,1,2) = 'sg' and (hour >= 8 or hour < 23) and cumloc[11] = 1 and rand(0, 3) = 0 and npcdaycheck[54] ! daystart:
 	menu_off = 1
 	*clr & cla
 	npcdaycheck[54] = daystart
@@ -220,7 +220,7 @@ if pcs_magik >= 1 and mainQW = 0 and mid($start_type,1,2) = 'sg':
 	exit
 end
 
-if storyline ! 0 and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 90 and AndRevstart ! daystart:
+if mid($start_type,1,2) = 'sg' and AndRev = 1 and (hour >=22 or hour <=2) and rand(1,100) >= 90 and AndRevstart ! daystart:
 	menu_off = 1
 	*clr & cla
 	gs 'stat'