ソースを参照

[Added] contributions from nutluck - #blamekevin if anything doesn't work

Alaratt 2 年 前
コミット
70dde3fd0e

+ 0 - 2
glife.qproj

@@ -965,8 +965,6 @@
 		<Location name="shop_dolls"/>
 		<Location name="shop_nerdvana"/>
 		<Location name="vecher"/>
-		<Location name="obkitchen"/>
-		<Location name="obroom"/>
 		<Location name="djibril"/>
 		<Location name="djibrilev1"/>
 		<Location name="Vika"/>

+ 73 - 12
locations/djibril.qsrc

@@ -1,4 +1,5 @@
 # djibril
+!!2021/08/13
 
 if $ARGS[0] = 'djibril_room':
 	*clr & cla
@@ -8,7 +9,7 @@ if $ARGS[0] = 'djibril_room':
 	gs 'boyStat', 'A82'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/djibrilroom/room.jpg"></center>'
 	'His room is bigger than you expected. There is just one bed over by the windows, and next to that is a desk and a laptop. Closer to the door is a couch and a recliner, with a small tv and playstation across from them. It is clean and tastefully decorated.'
-	if african_gangbang >= 1 or rand(0,3) > 0 and DjibrilQW['gangbang'] ! daystart:
+	if african_gangbang >= 1 and rand(0,3) = 0 and DjibrilQW['gangbang'] ! daystart:
 		DjibrilQW['gangbang'] = daystart
 		'As you enter, he looks you over hungrily and asks you "Would you like me to invite my friends over?" You know he is talking about inviting his friends over to gangbang you again.'
 		act 'No, let''s just talk': gt 'djibril', 'djibril_chat'
@@ -19,7 +20,17 @@ if $ARGS[0] = 'djibril_room':
 			'He grins at that and grabs his phone. He starts sending out text messages. Once he finishes, he sits down in the reclining chair. "They should be here shortly" he tells you, and sure enough within a few minutes the first one arrives. Not long after the other two do as well. They take a seat on the couch with you.'
 			act 'Continue': gt 'djibrilev1', 'djibrilgb'
 		end
-	elseif djibril_sex >= 1 or rand(0,3) > 0 and DjibrilQW['seduce'] ! daystart:
+		if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
+			act 'How about I invite someone else?':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+				'You smile to him "Actually I was thinking I could invite over someone else, if you are up for it?"'
+				'He pauses only a moment to process what you just said and then he grins "Hey if you are up for it and you think she would be up for it, I''m up for it, is she pretty?" He asks.'
+				'You nod "Yes she is pretty, let me text her and see if she is around."'
+				gs 'djibril', 'invite'
+			end
+		end
+	elseif djibril_sex >= 1 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
 		DjibrilQW['seduce'] = daystart
 		'As you enter, he pulls you over towards the couch. "I want you, I want you right now." Before you can respond he pulls you into a kiss.'
 		gs 'arousal', 'kiss', 3
@@ -46,7 +57,17 @@ if $ARGS[0] = 'djibril_room':
 					npc_rel['A82'] -= 1
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 					'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-					act 'Leave':gt 'dorm', 'korr'
+					act 'Leave': gt 'dorm', 'eighth_floor'
+				end
+				if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
+					act 'How about I invite someone else?':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+						'You smile to him "Actually I was thinking I could invite over someone else, if you are up for it?"'
+						'He pauses only a moment to process what you just said and then he grins "Hey if you are up for it and you think she would be up for it, I''m up for it, is she pretty?" He asks.'
+						'You nod "Yes she is pretty, let me text her and see if she is around."'
+						gs 'djibril', 'invite'
+					end
 				end
 			end
 		end
@@ -64,7 +85,17 @@ if $ARGS[0] = 'djibril_room':
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 				'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
+			end
+			if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
+				act 'How about I invite someone else?':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+					'You smile to him "Actually I was thinking I could invite over someone else, if you are up for it?"'
+					'He pauses only a moment to process what you just said and then he grins "Hey if you are up for it and you think she would be up for it, I''m up for it, is she pretty?" He asks.'
+					'You nod "Yes she is pretty, let me text her and see if she is around."'
+					gs 'djibril', 'invite'
+				end
 			end
 		end
 	else
@@ -87,7 +118,7 @@ if $ARGS[0] = 'djibril_room':
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 				'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		else
 			'As you enter, he takes a seat on the couch and pats the seat next to him. As he sits down, he asks you "So... what do you want to do? We can play some games," He points to the Playstation. "or just talk."'
@@ -98,7 +129,7 @@ if $ARGS[0] = 'djibril_room':
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 				'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		end
 	end
@@ -116,7 +147,7 @@ if $ARGS[0] = 'djibril_playgames':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	'You walk over and take a seat on the couch, picking up one of the controllers. "Sure, let''s play." He grins and turns the playstation on. He joins you on the couch, after grabbing the other controller. It is some sports game about football, you have played it before but not too often. He is a much better player than you are, he must play it a lot. You don''t mind, the two of you laugh and talk as you play. After an hour he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
 	'You nod and put the controller down as you gather up your stuff. "Sure, I''d love to. Well, have fun studying." He laughs at that and then escorts you to the door.'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'djibril_chat':
@@ -128,13 +159,13 @@ if $ARGS[0] = 'djibril_chat':
 	chrsm_exp += rand(1,2)
 	'<center><img <<$set_imgh>> src="images/characters/city/island/university/boy/djibril/djibriltalk.jpg"></center>'
 	'The two of you sit on the couch together he talks about a few different things, but you could ask him about something or just make small talk.'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'eighth_floor'
 	act 'Make small talk':
 		*clr & cla
 		minut += 5
 		gs 'npc_relationship', 'modify', 'A82', 'like'
 		'<center><img <<$set_imgh>> src="images/characters/city/island/university/boy/djibril/djibriltalk.jpg"></center>'
-		if djibril_sex = 0 and hotcat >= 5 or rand(0,3) > 0 and DjibrilQW['seduce'] ! daystart:
+		if djibril_sex = 0 and hotcat >= 5 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
 			DjibrilQW['seduce'] = daystart
 			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation. At one point he gets up, you think to go get something but instead he reaches down and pulls you up as well and starts kissing you.'
 			act 'Return the kiss':
@@ -157,7 +188,7 @@ if $ARGS[0] = 'djibril_chat':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 						'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-						act 'Leave':gt 'dorm', 'korr'
+						act 'Leave': gt 'dorm', 'eighth_floor'
 					end
 				end
 			end
@@ -173,12 +204,12 @@ if $ARGS[0] = 'djibril_chat':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 					'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-					act 'Leave':gt 'dorm', 'korr'
+					act 'Leave': gt 'dorm', 'eighth_floor'
 				end
 			end
 		else
 			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation.'
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Leave': gt 'dorm', 'eighth_floor'
 			act 'Keep talking': gt 'djibril', 'djibril_chat'
 		end
 	end
@@ -244,11 +275,41 @@ if $ARGS[0] = 'djibril_chat':
 			'"Do you know Kendra? She on the floor below." You ask him, as you describe her.'
 			'He shakes his head a bit. "Yeah I know her, not to well. We have gone to a few parties together and we have several friends in common, but I don''t know her really well. Why do you ask?"'
 			'You shrug a little. "I meet her the other day and she is... different, lets say. Was just curious if you guys knew each other living in the same dorm."'
+			*nl
 			'He laughs a little. "Different... that''s one way to put. I would say she is fucking crazy and not in the fun way, but the scary way. She is very dominating to most people. But some seem to like it." He raises a brow, obviously wondering if you fall into that group. You make a bit more small talk about her, he obviously don''t know her to well, or if he doesn''t he doesn''t want to give details, about what he does know.'
 			act 'Keep talking': gt 'djibril', 'djibril_chat'
 			act 'Stop talking and leave': gt 'dorm', 'korr'
 		end
 	end
+	act 'Kiss him':
+		*clr & cla
+		npc_rel['A82'] += 1
+		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/couch_kiss.jpg"></center>'
+		if hotcat >= 5:
+			'As the two of you sit side by side, you lean over and kiss him. At first he stiffens in surprise but then quickly he returns the kiss, he puts one hand around your back, pulling you in tighter as you keep kissing. After several moments of this he starts to encourage you to slide off the couch, you know he wants you to drop to your knees, next to the couch.'
+			gs 'arousal', 'kiss', 3
+			gs 'stat'
+			act 'Slide off the couch': gt 'djibrilev1', 'sveta_sex1'
+		else
+			'As the two of you sit side by side, you lean over and kiss him. At first he stiffens in surprise but then he pulls away from the kiss and stands up. "Uh I should really get to my homework."'
+			'You frown a little and nod. "Ok sure, I will get going so you can do your homework."'
+			'He smiles to you and walks you to the door. "Thanks, see you around." Then you walk out of his dorm room into the hall and he shuts the door behind you.'
+			gs 'arousal', 'kiss', 3
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave': gt 'dorm', 'korr'
+		end
+	end
+	if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
+		act 'How about I invite someone else?':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
+			'You smile to him "Actually I was thinking I could invite over someone else, if you are up for it?"'
+			'He pauses only a moment to process what you just said and then he grins "Hey if you are up for it and you think she would be up for it, I''m up for it, is she pretty?" He asks.'
+			'You nod "Yes she is pretty, let me text her and see if she is around."'
+			gs 'djibril', 'invite'
+		end
+	end
 	act 'Stop talking and leave': gt 'dorm', 'korr'
 end
 

+ 19 - 24
locations/djibrilev1.qsrc

@@ -1,4 +1,5 @@
 # djibrilev1
+!!2021/08/13
 
 !!names of Djibril''s friends
 !!Farai Ihejirika A244
@@ -32,7 +33,7 @@ if $ARGS[0] = 'djibrilgb':
 			else
 				'You thought you were in the mood for another gangbang, but now that you are here again, you are having second thoughts. You check your phone and tell them you have to go. They try and talk you into staying, but you tell them maybe some other time and make your way out of the door.'
 			end
-			act 'Leave': minut += 5 & gt 'city_island'
+			act 'Leave': gt 'dorm', 'eighth_floor'
 		end
 	else
 		act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -71,7 +72,7 @@ if $ARGS[0] = 'djibrilgb':
 					else
 						'You shake your head and then stand up quickly. You push out from between them. "Sorry, I can''t do this right now - maybe some other time." You say and then hurriedly head for the door. You hear Djibril say "Come on, you can''t leave us like this!" You mutter another "Sorry." You can hear the rest grumbling, but none of them try and stop you as you leave.'
 					end	
-					act 'Leave': minut += 5 & gt 'city_island'
+					act 'Leave': gt 'dorm', 'eighth_floor'
 				end
 			else
 				act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -267,7 +268,7 @@ if $ARGS[0] = 'gangbang_dress':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang_leave.jpg"></center>'
 			'With your face all cleaned up of their cum, you take a final look around to make sure you didn''t leave anything behind and you think about what just happened in here. You can''t help but smile at it, then you head out the door. You make your way out of the dorms, and across the quad back to street.'
 		end	
-		act 'Leave': minut += 5 & gt 'city_island'
+		act 'Leave': gt 'dorm', 'eighth_floor'
 	end
 end
 
@@ -339,7 +340,7 @@ if $ARGS[0] = 'sveta_sex1_bj_cum':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
 			'You swallow his load of cum down, making a big show of it. "Fuck that is so hot <<$pcs_nickname>>." He pulls up his pants, then pulls you up to your feet and gives you a quick kiss. "I would love to hang out more but I got some homework I need to get done."'
 			'You grin to him. "Ok, I got it. I will go and let you do your homework." With that you turn and head for the door, but you barely make it a step when he slaps you on the ass. You giggle at that, he goes to his desk while you head out.'
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Leave': gt 'dorm', 'eighth_floor'
 		end
 		act 'Spit':
 			*clr & cla
@@ -348,7 +349,7 @@ if $ARGS[0] = 'sveta_sex1_bj_cum':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
 			'You get up and spit his load out into the trash can by the couch. "Fuck I needed that <<$pcs_nickname>>." He pulls up his pants, then pulls you over to him and gives you a quick kiss. "I would love to hang out more but I got some homework I need to get done."'
 			'You grin to him. "Ok, I got it. I will go and let you do your homework." With that you turn and head for the door, but you barely make it a step when he slaps you on the ass. You giggle at that, he goes to his desk while you head out.'
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Leave': gt 'dorm', 'eighth_floor'
 		end
 	end
 end
@@ -399,7 +400,7 @@ if $ARGS[0] = 'sveta_sex1_anal':
 					gs 'cum_call', 'anus', 'A82', 1
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':gt 'dorm', 'korr'
+					act 'Leave': gt 'dorm', 'eighth_floor'
 				end
 			end
 		end
@@ -538,7 +539,7 @@ if $ARGS[0] = 'djibril_sveta_anya1':
 													gs 'cum_call', 'labia', 'A82', 1
 													gs 'arousal', 'end'
 													gs 'stat'
-													act 'Leave':gt 'dorm', 'korr'
+													act 'Leave': gt 'dorm', 'eighth_floor'
 												end
 											end
 										end
@@ -638,7 +639,7 @@ if $ARGS[0] = 'djibril_sveta_anya_gangbang1':
 								gs 'arousal', 'kiss', 3, 'lesbian'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Leave':gt 'dorm', 'korr'
+								act 'Leave': gt 'dorm', 'eighth_floor'
 							end
 						end
 					end
@@ -685,8 +686,7 @@ if $ARGS[0] = 'djibril_nush':
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You get up. "Well I will leave you guys to it then."'
 				'Anushka smiles to you and then scoots over against Djibril and starts running her hands down his body, while he looks at you a moment. "Ok, thanks for stopping by, come by anytime you want." Then he turns his full attention to Anushka. You make your way over to the door, with a final glance back you see the two of them kissing. With that you walk out, closing and locking the door behind you.'
-!!can we have code that locks djibril for the rest of the day, so the player can''t just walk back in and trigger it all over again which would be weird.
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		elseif temp <= 3:
 			'She looks him over lustfully, then looks to you biting her lower lip. "I am up for getting ploughed by all of them if you are." She tells you.'
@@ -702,8 +702,7 @@ if $ARGS[0] = 'djibril_nush':
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You get up. "Well I will leave you guys to it then."'
 				'Anushka smiles to you and then scoots over against Djibril and starts running her hands down his body, while he looks at you a moment. "Ok, thanks for stopping by, come by anytime you want." Then he turns his full attention to Anushka. You make your way over to the door, with a final glance back you see the two of them kissing. With that you walk out, closing and locking the door behind you.'
-!!can we have code that locks djibril for the rest of the day, so the player can''t just walk back in and trigger it all over again which would be weird.
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		else
 			'She looks him over lustfully, then looks to you biting her lower lip. "How about we keep it just the three of us." She tells you.'
@@ -722,8 +721,7 @@ if $ARGS[0] = 'djibril_nush':
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You get up. "Well I will leave you guys to it then."'
 				'Anushka smiles to you and then scoots over against Djibril and starts running her hands down his body, while he looks at you a moment. "Ok, thanks for stopping by, come by anytime you want." Then he turns his full attention to Anushka. You make your way over to the door, with a final glance back you see the two of them kissing. With that you walk out, closing and locking the door behind you.'
-!!can we have code that locks djibril for the rest of the day, so the player can''t just walk back in and trigger it all over again which would be weird.
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		else
 			'She looks him over lustfully, then looks to you biting her lower lip. "How about we keep it just the three of us." She tells you.'
@@ -742,8 +740,7 @@ if $ARGS[0] = 'djibril_nush':
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You get up. "Well I will leave you guys to it then."'
 				'Anushka smiles to you and then scoots over against Djibril and starts running her hands down his body, while he looks at you a moment. "Ok, thanks for stopping by, come by anytime you want." Then he turns his full attention to Anushka. You make your way over to the door, with a final glance back you see the two of them kissing. With that you walk out, closing and locking the door behind you.'
-!!can we have code that locks djibril for the rest of the day, so the player can''t just walk back in and trigger it all over again which would be weird.
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		else
 			'You glance at Djibril and he seems good with any of the options.'
@@ -756,8 +753,7 @@ if $ARGS[0] = 'djibril_nush':
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 				'You get up. "Well I will leave you guys to it then."'
 				'Anushka smiles to you and then scoots over against Djibril and starts running her hands down his body, while he looks at you a moment. "Ok, thanks for stopping by, come by anytime you want." Then he turns his full attention to Anushka. You make your way over to the door, with a final glance back you see the two of them kissing. With that you walk out, closing and locking the door behind you.'
-!!can we have code that locks djibril for the rest of the day, so the player can''t just walk back in and trigger it all over again which would be weird.
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'eighth_floor'
 			end
 		end
 	else
@@ -771,8 +767,7 @@ if $ARGS[0] = 'djibril_nush':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/anushka/nush_3some1.jpg"></center>'
 			'You get up. "Well I will leave you guys to it then."'
 			'Anushka smiles to you and then scoots over against Djibril and starts running her hands down his body, while he looks at you a moment. "Ok, thanks for stopping by, come by anytime you want." Then he turns his full attention to Anushka. You make your way over to the door, with a final glance back you see the two of them kissing. With that you walk out, closing and locking the door behind you.'
-!!can we have code that locks djibril for the rest of the day, so the player can''t just walk back in and trigger it all over again which would be weird.
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Leave': gt 'dorm', 'eighth_floor'
 		end
 	end
 end
@@ -928,7 +923,7 @@ if $ARGS[0] = 'djibril_sveta_nush1':
 															gs 'cum_cleanup'
 															gs 'arousal', 'end'
 															gs 'stat'
-															act 'Leave':gt 'dorm', 'korr'
+															act 'Leave': gt 'dorm', 'eighth_floor'
 															end
 														end
 													end
@@ -1034,7 +1029,7 @@ if $ARGS[0] = 'djibril_nush1':
 								gs 'arousal', 'voyeur_sex', 5
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Leave':gt 'dorm', 'korr'
+								act 'Leave': gt 'dorm', 'eighth_floor'
 							end
 						end
 					end
@@ -1136,7 +1131,7 @@ if $ARGS[0] = 'djibril_sveta_nush_gangbang1':
 									gs 'cum_cleanup'
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Leave':gt 'dorm', 'korr'
+									act 'Leave': gt 'dorm', 'eighth_floor'
 								end
 							end
 						end
@@ -1256,7 +1251,7 @@ if $ARGS[0] = 'djibril_nush_gangbang1':
 												gs 'arousal', 'voyeur_sex', 5, 'gangbang'
 												gs 'arousal', 'end'
 												gs 'stat'
-												act 'Leave':gt 'dorm', 'korr'
+												act 'Leave': gt 'dorm', 'eighth_floor'
 											end
 										end
 									end

+ 256 - 237
locations/dorm.qsrc

@@ -1,5 +1,5 @@
 # dorm
-!2021/05/29
+!!2021/08/13
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -19,108 +19,122 @@ if $ARGS[0] = 'start':
 		if meet_djibril = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Djibril':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 				'You walk over to the counter pulling our your ID as you say. "I''m here to visit Djibril."' 
 				'The woman gives you a look of complete disgust and remarks "What, your own kind not good enough for you? Go ahead and take care of those black cocks. He is on the eighth floor room 810." Then she turns away from you and goes back to what he was doing, not wanting to reply and possibly get in a argument that would cause her to call security, you say nothing and go get in the elevator to the eighth floor.'
-				act 'Enter':gt 'dorm', 'korr'
+				act 'Take elevator':gt 'dorm', 'elevator'
 			end
 		end
 		if gosh > 0 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Gosha':
 				*clr & cla
-				
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 				'You walk over to the counter pulling our your ID as you say. "I''m here to visit Gosha."' 
 				'The woman shakes her head in disapproval, as she remarks "Gosha''s new whore? What you sluts see in that scrawny bastard, I''ll never understand. He''s been through half of the dorm already. He is on the sixth floor room 602." Then she turns away from you and goes back to what she was doing, not wanting to reply and possibly get in a argument that would cause her to call security, you say nothing and go get in the elevator to the sixth floor.'
 				reccoldorm = 1
 				goshiflag = 1
-				act 'Enter':gt 'dorm', 'korr'
+				act 'Take elevator':gt 'dorm', 'elevator'
 			end
 		end
 		if meet_kendra = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Kendra':
 				*clr & cla
+				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 				if npc_rel['A84'] <= 40:
 					'You walk over to the counter pulling our your ID as you say. "I''m here to visit Kendra."' 
-					'The woman gives you a look of complete disgust and remarks "Seems she has gotten tired of you, you''re no longer on the guest list. Now get out of her before I call security." Surprised Kendra removed you from her guest list, you turn and leave the dorm before the old woman calls security.'
+					'The woman gives you a look of complete disgust and remarks "Seems she has gotten tired of you, you''re no longer on the guest list. Now get out of here before I call security." Surprised Kendra removed you from her guest list, you turn and leave the dorm before the old woman calls security.'
 					act 'Leave': minut += 5 & gt 'city_island'
 				else
 					'You walk over to the counter pulling our your ID as you say. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust and remarks "What, a man not good enough for you? Go ahead and go serve that black whore. She is on the eighth floor room 801." Then she turns away from you and goes back to what she was doing, not wanting to reply and possibly get in a argument that would cause her to call security, you say nothing and go get in the elevator to the eighth floor.'
-					act 'Enter':gt 'dorm', 'korr'
+					act 'Take elevator':gt 'dorm', 'elevator'
 				end
 			end
 		end
 	else
-		act 'Show him your student ID':
+		act 'Show her your student ID':
 			*clr & cla
 			minut += 1
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 			'As you walk by you take out your student ID and show it to her. She looks for just a moment then goes back to doing what ever it was, she was doing before you walked in. You head for the elevators.'
-			act 'Take elevator':gt 'dorm', 'korr'
+			act 'Take elevator':gt 'dorm', 'elevator'
 		end
 	end
 	act 'Leave':gt 'city_island'
 end
 
-if $ARGS[0] = 'korr':
+if $ARGS[0] = 'elevator':
+	*clr & cla
+	minut += 5
+	$menu_loc = 'dorm'
+	$menu_arg = 'elevator'
+	menu_off = 0
+	gs 'stat'
+	gs 'themes', 'indoors'
+	'<center><b><font color="maroon">Dormitory</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/elevator.jpg"></center>'
+	'You enter the dorm elevator, it seems to be in decent shape and fairly well maintained. There is a line of buttons to all the different floors in the dorm building.'
+	act 'Go to sixth floor': gt 'dorm', 'sixth_floor'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
+	act 'Go to tenth floor': gt 'dorm', 'tenth_floor'
+end
+
+if $ARGS[0] = 'sixth_floor':
 	$loc = 'dorm'
-	$loc_arg = 'korr'
+	$loc_arg = 'sixth_floor'
 	$menu_loc = 'dorm'
-	$menu_arg = 'korr'
+	$menu_arg = 'sixth_floor'
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
-	'Before you is the usual dorm hallway with dilapidated walls. You can hear music and loud talking from drunk students escaping from some rooms.'
-	gs 'willpower', 'exhib', 'self'
-	if will_cost <= pcs_willpwr:
-		act 'Enter the men''s restroom (<<will_cost>> Willpower)':
-			gs 'willpower', 'exhib', 'self'
-			gs 'willpower', 'pay', 'self'
-			gs 'stat'
-			gt 'dorm', 'mens_restroom'
-		end
-	else
-		act 'Enter the men''s restroom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-	act 'Enter the women''s restroom': gt 'dorm', 'womens_restroom'
-	act 'Leave':gt 'city_island'
-	act 'Go to the shared shower':
-		minut += 5
-		obdysh = 1
-		gt 'vann', 'start'
-	end
+	'Before you is the usual dorm hallway with dilapidated walls of the sixth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
-	if func('uniutil', 'student', 'enrolled'):
-		if courtletter_date <= daystart and courtletter_date ! 0:
-			gt 'sentence', 'letter'
-		end
-		act 'Your room':gt 'obroom', 'start'
-		act 'Go to the shared kitchen':
-			minut += 5
-			gt 'obkitchen'
-		end
-		if week = 5 and hour > 18 and hour < 23:
-			'You can hear music blasting in the corridor. It seems the Friday party is in full swing.'
-
-			act 'The party':gt 'vecher', 'start'
+	if gosh > 0:
+		act 'Gosha''s room':
+			*clr & cla 
+			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big83.jpg"></center>'
+				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in." He then stands aside so you can walk in, closing the door after you.'
+				act 'Enter':gt 'dorm', 'gosha_room'
+			else
+				!!not home text
+				minut += 5
+				gs 'stat'
+				'You knock on the door, but no one answers. He must be asleep or not home.'
+				act 'Leave':gt 'dorm', 'elevator'
+			end
 		end
 	end
+end
 
+if $ARGS[0] = 'eighth_floor':
+	$loc = 'dorm'
+	$loc_arg = 'eighth_floor'
+	$menu_loc = 'dorm'
+	$menu_arg = 'eighth_floor'
+	menu_off = 0
+	$location_type = 'public_indoors'
+	killvar '$locclass'
+	*clr & cla
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+	'Before you is the usual dorm hallway with dilapidated walls of the eighth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 	if meet_djibril = 1:
 		act 'Djibril'' room':
 			*clr & cla
 			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 				'You knock on the door. After a couple of seconds, Djibril opens the door. He smiles as he notices it''s you. "I was hoping you would stop by <<$pcs_nickname>>, come on in." He says as he invites you into his room.'
-				act 'Enter': gt 'dorm', 'djibril_room'
+				act 'Enter': gt 'djibril', 'djibril_room'
 			else
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				minut += 5
 				gs 'stat'
 				'You knock on the door, but no one answers. He must be asleep or not home.'
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave':gt 'dorm', 'elevator'
 			end
 		end
 	end
@@ -151,15 +165,15 @@ if $ARGS[0] = 'korr':
 								'She laughs loudly and roughly grabs your chin in her hand. "Aww so shy, adorable... but I will break you of that in time. Maybe next time then." Then she closes the door, as she does. You see her stroking her strapon as she heads for the young man. Once the door is closed you turn and leave yourself.'
 								gs 'arousal', 'end'
 								gs 'stat'
-								act 'Leave':gt 'dorm', 'korr'
+								act 'Leave':gt 'dorm', 'elevator'
 							end
 						end
-						act 'Leave':gt 'dorm', 'korr'
+						act 'Leave':gt 'dorm', 'elevator'
 					else
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 						if npc_rel['A84'] <= 40:
 							'You knock on the door. After a couple of seconds, Kendra opens the door. "I told you last time, I don''t have time for games and I am tired of yours. Now get lost." She closes the door in your face.'
-							act 'Leave':gt 'dorm', 'korr'
+							act 'Leave':gt 'dorm', 'elevator'
 						else
 							'You knock on the door. After a couple of seconds, Kendra opens the door. "Well if it isn''t my new favorite white slave bitch. Well come in." She stands aside to let you come in, as you enter she closes the door.'
 							act 'Enter': gt 'dorm', 'kendra_room_start'
@@ -168,195 +182,66 @@ if $ARGS[0] = 'korr':
 				else
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 					'As you get close to the door you can hear her voice. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You do hear a muffled reply that sounds male. She seems busy right now, you shouldn''t bother her.'
-					act 'Leave':gt 'dorm', 'korr'
+					act 'Leave':gt 'dorm', 'elevator'
 				end
 			else
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 				'You knock on the door, but no one answers. She must be asleep or not home.'
-				act 'Leave':gt 'dorm', 'korr'
-			end
-		end
-	end
-
-	if gosh > 0:
-		act 'Gosha''s room':
-			*clr & cla 
-			if (week <= 4 and hour >= 16 and hour < 23 and rand(1, 2) = 2) or (week = 6 and hour >= 9 and hour < 23 and rand(1, 2) = 2) or (week = 7 and hour >= 9 and hour < 23 and rand(1, 3) >= 2):
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big83.jpg"></center>'
-				'Gosha opens the door. "Hey <<$pcs_nickname>>, why don''t you come in." He then stands aside so you can walk in, closing the door after you.'
-				act 'Enter':gt 'dorm', 'gosha_room'
-			else
-				!!not home text
-				minut += 5
-				gs 'stat'
-				'You knock on the door, but no one answers. He must be asleep or not home.'
-				act 'Leave':gt 'dorm', 'korr'
+				act 'Leave':gt 'dorm', 'elevator'
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'djibril_room':
+if $ARGS[0] = 'tenth_floor':
+	$loc = 'dorm'
+	$loc_arg = 'tenth_floor'
+	$menu_loc = 'dorm'
+	$menu_arg = 'tenth_floor'
+	menu_off = 0
+	$location_type = 'public_indoors'
+	killvar '$locclass'
 	*clr & cla
-	$location_type = 'event'
-	reccoldorm = 0
-	djibrilflag = 0
-	gs 'boyStat', 'A82'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/djibrilroom/room.jpg"></center>'
-	'His room is bigger than you expected. There is just one bed over by the windows, and next to that is a desk and a laptop. Closer to the door is a couch and a recliner, with a small tv and playstation across from them. It is clean and tastefully decorated.'
-	if african_gangbang >= 1:
-		'As you enter, he looks you over hungrily and asks you "Would you like me to invite my friends over?" You know he is talking about inviting his friends over to gangbang you again.'
-		act 'No, let''s just talk': gt 'dorm', 'djibril_chat'
-		act 'Yes':
-			*clr & cla
-			minut += 10
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'He grins at that and grabs his phone. He starts sending out text messages. Once he finishes, he sits down in the reclining chair. "They should be here shortly" he tells you, and sure enough within a few minutes the first one arrives. Not long after the other two do as well. They take a seat on the couch with you.'
-			act 'Continue': gt 'dormev1', 'djibrilgb'
-		end
-	elseif meet_djibril = 1 and hotcat >= 5 or djibril_sex >= 1:
-		'As you enter, he pulls you over towards the couch. "I want you, I want you right now." Before you can respond he pulls you into a kiss.'
-		gs 'arousal', 'kiss', 3
-		gs 'stat'
-		act 'Return the kiss':
-			*clr & cla
-			npc_rel['A82'] += 1
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You return the kiss in full. He puts one hand around you to the small of your back, pulling you in tighter as you keep kissing. After a bit his hand lowers and starts squeezing your butt. After several moments of this he puts his hands on your shoulders and pushes you down, you know he wants you to drop to your knees.'
-			gs 'arousal', 'kiss', 3
-			gs 'stat'
-			act 'Drop to your knees': gt 'dormev1', 'sveta_sex1'
-			act 'Break free':
-				*clr & cla
-				npc_rel['A82'] -= 1
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Let''s talk': gt 'dorm', 'djibril_chat'
-				act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
-				act 'I should get going':
-					*clr & cla
-					npc_rel['A82'] -= 1
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-					act 'Leave':gt 'dorm', 'korr'
-				end
-			end
-		end
-		act 'Stop the kiss':
-			*clr & cla
-			npc_rel['A82'] -= 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
-			gs 'arousal', 'end'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
+	if func('uniutil', 'student', 'enrolled'):
+		'Before you is the dorm hallway with it''s dilapidated walls, that leads to your dorm room. You can hear music and loud talking from drunk students escaping from some rooms.'
+	else
+		'Before you is the usual dorm hallway with dilapidated walls. You can hear music and loud talking from drunk students escaping from some rooms.'
+	end
+	gs 'willpower', 'exhib', 'self'
+	if will_cost <= pcs_willpwr:
+		act 'Enter the men''s restroom (<<will_cost>> Willpower)':
+			gs 'willpower', 'exhib', 'self'
+			gs 'willpower', 'pay', 'self'
 			gs 'stat'
-			act 'Let''s talk': gt 'dorm', 'djibril_chat'
-			act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
-			act 'I should get going':
-				*clr & cla
-				npc_rel['A82'] -= 1
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-				act 'Leave':gt 'dorm', 'korr'
-			end
+			gt 'dorm', 'mens_restroom'
 		end
 	else
-		'As you enter, he asks you "So... what do you want to do? We can play some games, or just talk." He points to the Playstation and the couch.'
-		act 'Let''s talk': gt 'dorm', 'djibril_chat'
-		act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
-		act 'I should get going':
-			*clr & cla
-			npc_rel['A82'] -= 1
-			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-			act 'Leave':gt 'dorm', 'korr'
-		end
+		act 'Enter the men''s restroom (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+	end
+	act 'Enter the women''s restroom': gt 'dorm', 'womens_restroom'
+	act 'Leave':gt 'dorm', 'elevator'
+	act 'Go to the shared shower':
+		minut += 5
+		obdysh = 1
+		gt 'vann', 'start'
 	end
-end
-
-if $ARGS[0] = 'djibril_playgames':
-	*clr & cla
-	$location_type = 'event'
-	reccoldorm = 0
-	djibrilflag = 0
-	*clr & cla
-	gaming_exp += rand(1, 2)
-	minut += 60
-	npc_rel['A82'] += 1
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-	'You walk over and take a seat on the couch, picking up one of the controllers. "Sure, let''s play." He grins and turns the playstation on. He joins you on the couch, after grabbing the other controller. It is some sports game about football, you have played it before but not too often. He is a much better player than you are, he must play it a lot. You don''t mind, the two of you laugh and talk as you play. After an hour he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
-	'You nod and put the controller down as you gather up your stuff. "Sure, I''d love to. Well, have fun studying." He laughs at that and then escorts you to the door.'
-	act 'Leave':gt 'dorm', 'korr'
-end
 
-if $ARGS[0] = 'djibril_chat':
-	*clr & cla
-	$location_type = 'event'
-	reccoldorm = 0
-	djibrilflag = 0
-	*clr & cla
-	chrsm_exp += rand(1,2)
-	minut += 5
-	npc_rel['A82'] += 1
-	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-	'You walk over and take a seat on the couch. "Sure, let''s talk." He smiles and joins you on the couch. "What do you want to talk about?" he asks.'
-	act 'Leave':gt 'dorm', 'korr'
-	act 'Make small talk':
-		*clr & cla
-		minut += 30
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-		if hotcat >= 5 or djibril_sex >= 1:
-			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation. At one point he gets up, you think to go get something but instead he reaches down and pulls you up as well and starts kissing you.'
-			act 'Return the kiss':
-				*clr & cla
-				npc_rel['A82'] += 1
-				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-				'You return the kiss in full. He puts one hand around you to the small of your back, pulling you in tighter as you keep kissing. After a bit his hand lowers and starts squeezing your butt. After several moments of this he puts his hands on your shoulders and pushes you down, you know he wants you to drop to your knees.'
-				gs 'arousal', 'kiss', 3
-				gs 'stat'
-				act 'Drop to your knees': gt 'dormev1', 'sveta_sex1'
-				act 'Break free':
-					*clr & cla
-					npc_rel['A82'] -= 1
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Let''s talk': gt 'dorm', 'djibril_chat'
-					act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
-					act 'I should get going':
-						*clr & cla
-						npc_rel['A82'] -= 1
-						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-						'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-						act 'Leave':gt 'dorm', 'korr'
-					end
-				end
-			end
-			act 'Stop the kiss':
-				*clr & cla
-				npc_rel['A82'] -= 1
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You pull away from the kiss, he looks a little disappointed but doesn''t press the issue. "Um what would you like to do instead then?" He asks.'
-				gs 'arousal', 'end'
-				gs 'stat'
-				act 'Let''s talk': gt 'dorm', 'djibril_chat'
-				act 'Let''s play playstation': gt 'dorm', 'djibril_playgames'
-				act 'I should get going':
-					*clr & cla
-					npc_rel['A82'] -= 1
-					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You look over at the clock in his room. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
-					act 'Leave':gt 'dorm', 'korr'
-				end
-			end
-		else
-			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He asks you about similar stuff, asking about your school, friends, home life etc. Overall, it is a pleasant conversation.'
-			act 'Leave':gt 'dorm', 'korr'
-			act 'Keep talking': gt 'dorm', 'djibril_chat'
+	if func('uniutil', 'student', 'enrolled'):
+		if courtletter_date <= daystart and courtletter_date ! 0:
+			gt 'sentence', 'letter'
+		end
+		act 'Your room':gt 'dorm', 'dorm_room'
+		act 'Go to the shared kitchen':
+			minut += 5
+			gt 'dorm', 'dorm_kitchen'
+		end
+		if week = 5 and hour > 18 and hour < 23:
+			'You can hear music blasting in the corridor. It seems the Friday party is in full swing.'
+			act 'The party':gt 'vecher', 'start'
 		end
 	end
 end
@@ -376,7 +261,7 @@ if $ARGS[0] = 'kendra_room_start':
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 		'You look over at the clock in her room. "I should really get going, sorry to have bothered you."'
 		'She looks at you very annoyed. "What is this? I don''t have time for games. Don''t come back unless you are serious about playing." Then she grabs you by the arm and shoves you out the door, closing it behind you.'
-		act 'Leave':gt 'dorm', 'korr'
+		act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 	end
 	act 'Wait to see what she does':
 		npc_rel['A84'] += 1
@@ -433,7 +318,7 @@ if $ARGS[0] = 'kendra_room_0':
 		'"Yes mistress." You don''t rush and make sure you do a good job finishing her toenails, you blow on them until they dry.'
 		'Once you have finally finished she pushes you off the bed. "Now go!"'
 		'You stand up. "Yes mistress." Then you walk to the door and leave.'
-		act 'Leave':gt 'dorm', 'korr'
+		act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 	end
 end
 
@@ -450,7 +335,7 @@ if $ARGS[0] = 'kendra_room_1':
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_2':
@@ -466,7 +351,7 @@ if $ARGS[0] = 'kendra_room_2':
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_3':
@@ -482,7 +367,7 @@ if $ARGS[0] = 'kendra_room_3':
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_4':
@@ -498,7 +383,7 @@ if $ARGS[0] = 'kendra_room_4':
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_5':
@@ -518,7 +403,7 @@ if $ARGS[0] = 'kendra_room_5':
 	gs 'pain', 2, 'asscheeks', 'spank'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_6':
@@ -538,7 +423,7 @@ if $ARGS[0] = 'kendra_room_6':
 	gs 'pain', 3, 'asscheeks', 'spank'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_7':
@@ -557,7 +442,7 @@ if $ARGS[0] = 'kendra_room_7':
 	gs 'arousal', 'foreplay', 60, 'sub', 'humiliation', 'inhibition'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_8':
@@ -573,7 +458,7 @@ if $ARGS[0] = 'kendra_room_8':
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'feet', 'inhibition'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_9':
@@ -591,7 +476,7 @@ if $ARGS[0] = 'kendra_room_9':
 	gs 'arousal', 'foreplay', 30, 'sub', 'humiliation', 'inhibition'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_10':
@@ -612,7 +497,7 @@ if $ARGS[0] = 'kendra_room_10':
 	gs 'pain', 2, 'asscheeks', 'spank'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
 if $ARGS[0] = 'kendra_room_11':
@@ -643,10 +528,9 @@ if $ARGS[0] = 'kendra_room_11':
 	gs 'pain', 3, 'asscheeks', 'spank'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Go to eighth floor': gt 'dorm', 'eighth_floor'
 end
 
-
 if $ARGS[0] = 'gosha_room':
 	menu_off = 1
 	$location_type = 'event'
@@ -687,7 +571,7 @@ if $ARGS[0] = 'mens_restroom':
 	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_mens.jpg"></center>'
 	'You peek around the corner. Inside this room, stalls line the right side, with urinals on the far wall and rows of sinks and <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant and stale piss.'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 	
 	dynamic $tampon
 	dynamic $quickwash
@@ -703,15 +587,150 @@ if $ARGS[0] = 'womens_restroom':
 	$locM_arg = 'womens_restroom'
 	menu_off = 0
 	gs 'stat'
-	'<center><b><font color="maroon">Dormitory - Men''s Restroom</font></b></center>'
+	'<center><b><font color="maroon">Dormitory - Women''s Restroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/restrooms/bathroom_womens.jpg"></center>'
 	'You peek around the corner. Inside this room, stalls line the right side and rows of sinks, with <a href="exec:gt ''mirror'', ''start''">mirrors</a> to the left. The room has a smell of disinfectant.'
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 	
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 end
 
+
+if $ARGS[0] = 'dorm_room':
+	$sexloc = 'dorm'
+	CLOSE ALL
+	$loc_arg = 'dorm_room'
+	$loc = 'dorm'
+	$locM_arg = 'dorm_room'
+	$locM = 'dorm'
+    $location_type = 'private'
+	$menu_loc = 'dorm'
+	$menu_arg = 'dorm_room'
+	menu_off = 0
+	cla
+	*clr
+	odkomp = 1
+	gs 'stat'
+	'<center><b>Your room</b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
+	'This is your room which you share with another girl named Vika Kirilova.'
+	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
+	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
+	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
+	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'
+	*nl
+	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
+	gs 'exercise', 'start'
+	if hour > 14 and hour < func('bordel', 'open_hour'):
+		vika_sleep = 0
+		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
+			'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
+		else
+			'<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
+		end
+	elseif hour > func('bordel', 'close_hour') and hour < 8:
+		vika_sleep = 1
+		if vikaslut = 0:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
+		elseif vikaslut = 1:
+			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
+		end
+	end
+
+	act 'Walk out in the corridor':
+		if $clothingworntype ! 'nude':
+			odkomp = 0
+			minut += 5
+			gt 'dorm', 'tenth_floor'
+		else
+			'You need to get dressed.'
+		end
+	end
+
+	act 'Read the course literature (2:00)':
+		cla
+		menu_off = 1
+		minut += 120
+		intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
+		gs 'stat'
+		'You spend two hours reading the course literature. You feel like you''ve picked up some stuff from the book that will come in handy in time for the examination.'
+
+		act 'Finish':gt 'dorm', 'dorm_room'
+	end
+
+	gs 'unicoursework', 'start', $loc, $loc_arg
+
+dynamic $wearpan
+dynamic $removepan
+end
+
+if $args[0] = 'dorm_kitchen':
+	$loc_arg = 'dorm_kitchen'
+	$loc = 'dorm'
+    $location_type = 'private'
+	$locclass = 'kitr'
+	$menu_loc = 'dorm'
+	$menu_arg = 'dorm_kitchen'
+	menu_off = 0
+	gs 'stat'
+	'<center><b>in the dorm kitchen</b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obkitchen.jpg"></center>'
+	'This is this floors large shared kitchen, it is fairly tidy. There is a lot of cabnits along two walls, two ovens and two refrigerators as well. There is several tables with chairs around them scattered around the room.'
+	act 'Return to the corridor':gt 'dorm', 'tenth_floor'
+
+	if eda > 0:
+		'Your shelf in the refrigerator holds <b><<eda>></b> servings of food.'
+		if edahot = 0:
+			act 'Cook food (0:25)':
+				cla
+				*clr
+				menu_off = 1
+				minut += 25
+				edahot += 1
+				eda -= 1
+				pcs_mood -= 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
+				'You prepare a meal.'
+!!can this code be checked as I combined this from another file to this one and I think I got most of the code correct for the kitched and dorm room above but please check to be sure
+				gs 'obkitchen', 'food'
+			end
+		end
+	end
+
+	if edaD = 0 and eda = 0:'<b><font color = red>Your shelf in the refrigerator is bare, there is nothing left for you to eat.</font></b>'
+
+
+	if edahot > 0:
+		'A cooked meal is on the table.'
+		gs 'obkitchen', 'food'
+	end
+
+	if pranik > 0:
+		if pranik = 1:
+			'You only have one more portion of tea biscuits.'
+		else
+			'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
+		end
+		dynamic $pranik
+	end
+
+	dynamic $edaD
+	dynamic $fatdel
+	dynamic $driwater
+	dynamic $fill_bottle
+	dynamic $lekarstvo
+	dynamic $vitamin
+end
+
+if $args[0] = 'food':
+	act 'Eat cooked food':
+		edahot = 0
+		gt 'food', 'm_meal'
+	end
+end
+
 --- dorm ---------------------------------
 

+ 8 - 420
locations/dormev1.qsrc

@@ -1,402 +1,5 @@
 # dormev1
-
-if $ARGS[0] = 'djibrilgb':
-	menu_off = 1
-	*clr & cla
-	minut += 10
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang1.jpg"></center>'
-	if african_gangbang = 0:
-		'The dorm room is fairly small, with a large chair and a couch. Two beds are on the other side of the room. You take a seat on the couch with three of the guys, while Djibril takes a seat on the chair. They all talk to you, they ask you about where you are from, tell you about how great the university is and how much they love Russia and, in particular, Russian girls. They also compliment you, telling you how pretty you are, or how sexy you are. Things like that. The longer you talk with them, the more they compliment your looks. Their looks leave little doubt that they would all like to have sex with you.'
-	else
-		'The dorm room is fairly small, with a large chair and a couch. Two beds are on the other side of the room. You take a seat on the couch with three of the guys, while Djibril takes a seat on the chair. You remember what happened the other time you were here, and so do they. They are a lot less smooth-talking and complimentary, and a lot more sexual and aggressive with their comments. You are sure all they want to do is gangbang you again.'
-	end
-	gs 'willpower', 'gangbang', 'resist', 'medium'
-	if will_cost <= pcs_willpwr:
-		act 'Change your mind and leave (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'pay', 'resist'
-			minut += 10
-			npc_rel['A82'] -= 1
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang1.jpg"></center>'
-			if african_gangbang = 0:
-				'There are too many of them, you start to feel a little scared and worried about so many men lusting after you. You get up, apologise, and quickly head for the door. They try to talk you into staying, but you tell them you don''t have time and make your way out.'
-			else
-				'You thought you were in the mood for another gangbang, but now that you are here again, you are having second thoughts. You check your phone and tell them you have to go. They try and talk you into staying, but you tell them maybe some other time and make your way out of the door.'
-			end
-			act 'Leave': minut += 5 & gt 'city_island'
-		end
-	else
-		act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end
-	act 'Keep talking':
-		*clr & cla
-		minut += 10
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang2.jpg"></center>'
-		if african_gangbang = 0:
-			'The guys on either side of you move over, closer, so that their legs are touching yours on both sides. You feel them closing in around you, you can sense the lust from them. From the way they act, the tone of their voice, how they look at you, and how their hands constantly graze your legs and brush against you body. Just then, Djibril gets up and walks over. He stands in front of you and offers you his hand. "Stand up" he says.'
-		else
-			'The guys on either side of you move over, closer, and their hands begin to paw at you. Squeezing your thigh, brushing your hair back, or running a finger across your cheek. One of them even cups your breast and gives it a squeeze. Just then, Djibril gets up and walks over. He stands in front of you and offers you his hand. "Stand up" he says. You remember from last time where this leads.'
-		end	
-		act 'Standup':
-			*clr & cla
-			minut += 2
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang3.jpg"></center>'
-			if african_gangbang = 0:
-				'You take his hand and he pulls you up. "You are very pretty, like all Russian girls. Now you will you make us feel good, like the other Russian girls do." As he states that, you feel one of his hands on top of your head. He pushes down on the top of your head, his other hand moving to your shoulder and adding pressure, pushing you down. As you lower from him pushing you down, you finally end up sinking to your knees. Only then does he stop pushing you down. As you look around, now that you are on your knees, you notice they have all stood up and surrounded you with their dicks out. One of them says "Go on, grab it. You know you want to."'
-			else
-				'You take his hand and he pulls you up. "You ready to make us all feel good again?" He asks, as you feel one of his hands on top of your head. He pushes down on the top of your head, his other hand moving to your shoulder and adding pressure, pushing you down. You quickly get down onto your knees, just like last time. And just like that time, they are all standing up and surrounding you with their dicks out again. One speaks up. "Come on, slut, what are you waiting for? Start stroking our cocks."'
-			end	
-			gs 'willpower', 'gangbang', 'resist', 'medium'
-			if will_cost <= pcs_willpwr:
-				act 'Change your mind and leave (<<will_cost>> Willpower)':
-					*clr & cla
-					gs 'willpower', 'pay', 'resist'
-					minut += 10
-					npc_rel['A82'] -= 1
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbangno.jpg"></center>'
-					if african_gangbang = 0:
-						'You shake your head and then stand up quickly. You push out from between them. "Sorry, I can''t do this." You say and then rush for the door. You can hear them grumbling, but none of them try and stop you as you leave.'
-					else
-						'You shake your head and then stand up quickly. You push out from between them. "Sorry, I can''t do this right now - maybe some other time." You say and then hurriedly head for the door. You hear Djibril say "Come on, you can''t leave us like this!" You mutter another "Sorry." You can hear the rest grumbling, but none of them try and stop you as you leave.'
-					end	
-					act 'Leave': minut += 5 & gt 'city_island'
-				end
-			else
-				act 'Change you mind and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-			end
-			act 'Start stroking them':
-				*clr & cla
-				npc_rel['A82'] += 1
-				gs 'fame', 'city', 'sex', 3
-				djibril_sex = 2
-				african_gangbang = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang4.jpg"></center>'
-				'You reach up, wrapping your fingers around the dick of the one that spoke up with your left hand, while your reach over and grab Djibril''s massive cock with your right hand. You start stroking them both, while looking up at them. After a couple of minutes, the other two get tired of waiting and you have to switch which dicks you are stroking. Djibril places his hand on your head and pulls you over to his dick, and he starts rubbing the tip of it on your lips. You can feel his precum smearing on your lips.'
-				gs 'arousal', 'hj', 5, 'gangbang', 'sub'
-				gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-				gs 'stat'
-				act 'Start sucking':
-					*clr & cla
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang5.jpg"></center>'
-					'You open your mouth as wide as you can and start sucking Djibril''s monster cock. You also stroke it for a bit, before you start stroking two of the other three cocks with your hands while you keep sucking on Djibril''s massive dick. "Come on, Djibril, don''t hog her mouth all to yourself!" you hear one of them say.'
-					gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-					gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-					gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-					gs 'stat'
-					act 'Switch':
-						*clr & cla
-						gs 'stat'
-						'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang6.jpg"></center>'
-						'You stop sucking off Djibril and switch to sucking one of the other guys'' dicks, while jerking off two more. They keep encouraging you to switch, and soon you lose track of whose dick you are sucking at the moment. As one of them is not occupied, whoever it is removes some of your clothes. As you switch again to give him attention, the guy no longer getting your attention takes over and continues removing your clothes. One of them says "Hurry and get her naked, I want to fuck her."'
-						gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-						gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-						gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-						gs 'stat'
-						act 'Just suck them off':
-							*clr & cla
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang7.jpg"></center>'
-							'You take the dick out of your mouth long enough to say "Sorry, I don''t want to have sex. But I will suck you all off." You hear them muttering a bit, and then one of them says "Then hurry up and get on with it." You redouble your efforts with your mouth and your hands, trying to make sure none of them are left unattended for too long. Soon, one of them starts moaning and you can tell he is close - so you focus on the rest. Before long, you have all four of them about ready to cum.'
-							gs 'arousal', 'bj', 15, 'gangbang', 'sub'
-							gs 'arousal', 'hj', -15, 'gangbang', 'sub'
-							gs 'arousal', 'hj', -15, 'gangbang', 'sub'
-							gs 'stat'
-							act 'They start cumming': gt 'dormev1', 'gangbang_cum'
-						end
-						act 'Just anal':
-							*clr & cla
-							gs 'stat'
-							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang10.jpg"></center>'
-							'You take the dick out of your mouth long enough to say "Sorry, I don''t want to have sex. But you can fuck my butt, if you want." They laugh at that, and seem pleased with the idea. "I get first crack at her ass!" You hear Djibril loudly exclaim. They pull you up, and one of them sits on the couch while another kneels on it. You get on your hands and knees, joining them on the couch. You start stroking the one sitting on the couch, while sucking the one kneeling on it.'
-							*nl
-							'You feel someone applying lube to your ass, and moments later you feel the head of someone''s dick pressed against your butthole. The pressure builds, until it pops into your ass - stretching it. It must be Djibril, judging by how huge the cock feels in your ass. He starts fucking you anally, slow at first, but as things progress, he starts fucking you harder and faster. The others switch whose dick you are sucking, so they all get a turn.'
-							gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-							gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-							gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
-							gs 'stat'
-							act 'More butt fucking': gt 'dormev1', 'gangbang_anal'
-						end
-						if pcs_vag ! 0:
-							act 'Get fucked':
-								*clr & cla
-								gs 'stat'
-								'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang8.jpg"></center>'
-								'You decide not to say anything, and they take your silence as consent. They pull you up, as Djibril sits on the couch. You get you on your hands and knees, on the couch with Djibril. You start stroking Djibril''s massive cock again, as another man kneels behind you. You feel him rubbing the head of his dick against your slit, getting his cock nice and wet with your juices.'
-								*nl
-								'Moments later, you feel the head pushing inside of your twat - filling it up with his warm meat. He starts fucking your pussy, slow at first, but as things progress, he starts fucking your harder and faster, slapping your ass with his hand. And then he starts fucking you balls deep.'
-								gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-								gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
-								gs 'stat'
-								act 'Tag team fuck':
-									*clr & cla
-									gs 'stat'
-									'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang9.jpg"></center>'
-									'You keep sucking Djibril''s monster cock, as you are getting fucked balls deep by another, when you hear one of them say "My turn." The one inside of you pulls out, but your pussy doesn''t stay empty for long. Another cock is shoved inside of you moments later. The other three take turns fucking your twat as you keep sucking off Djibril. You notice that they give each other fist bumps when they switch, like they are some kind of tag team.'
-									gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-									gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
-									gs 'stat'
-									act 'Use your hands too':
-										*clr & cla
-										gs 'stat'
-										'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang10.jpg"></center>'
-										'Djibril pulls your mouth off of his dick and he stands up. "Alright, you guys have had enough fun. It''s my turn." He barely makes it a step away, when another guy sits down right where he was. You start jerking him off, as one of the others kneels on the couch and shoves his dick in your mouth. You feel a dick pull out of your pussy, only to be replaced straight after. You are sure, by the larger size, that it is now Djibril fucking you.'
-										*nl
-										'Several minutes go by as you get fucked, you alternate between the other three. Sucking one, while jerking another one off. Djibril pulls out of you, and you feel the head of his dick rubbing against your asshole, just as he says "I''m going to fuck your ass."'
-										gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-										gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-										gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
-										gs 'stat'
-										act 'Get butt fucked':
-											*clr & cla
-											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang10.jpg"></center>'
-											'You say nothing, and keep sucking their dicks and jerking them off. They take your silence as consent. You feel someone applying lube to your ass, and moments later you feel the head of someone''s dick pressed against your asshole again. The pressure builds, until it pops into your ass - stretching it. Djibril''s massive dick stretches your ass to its limits. He starts fucking your ass, slow at first, but as things progress, he starts fucking you harder and faster. The others switch whose dick you are sucking, so they all get a turn.'
-											gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-											gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-											gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
-											gs 'stat'
-											act 'More butt fucking': gt 'dormev1', 'gangbang_anal'
-										end
-										act 'Just suck them off':
-											*clr & cla
-											gs 'stat'
-											'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang7.jpg"></center>'
-											'You take the dick out of your mouth long enough to say "Sorry, I don''t want to be fucked in the butt." You hear them muttering a bit and then one of them says "Fine." You get off the couch back onto you knees as they all crowd around you again. You redouble your efforts with your mouth and your hands, trying to make sure none of them are left unattended for too long. Soon, one of them starts moaning and you can tell he is close, so you focus on the rest. Before long you have all four of them about ready to cum.'
-											gs 'arousal', 'bj', 15, 'gangbang', 'sub'
-											gs 'arousal', 'hj', -15, 'gangbang', 'sub'
-											gs 'arousal', 'hj', -15, 'gangbang', 'sub'
-											gs 'stat'
-											act 'They start cumming': gt 'dormev1', 'gangbang_cum'
-										end
-									end
-								end
-							end
-						end
-					end
-				end
-			end
-		end
-	end
-end
-	
-if $ARGS[0] = 'gangbang_anal':
-	menu_off = 1
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang11.jpg"></center>'
-	'You feel Djibril pull out of your butthole, but it is immediately filled by another dick. This one is a little smaller, so it slides in fairly easily. You keep sucking off one guy and jerking off another, as the one behind you fucks your lubed up backside, occasionally smacking your ass cheeks with his hands as he does.'
-	gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-	gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
-	gs 'stat'
-	act 'Next cock in the ass':
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang12.jpg"></center>'
-		'They switch, and a third one is now fucking your stretched out asshole. You start sucking the cock of the last guy that has not stuck it up your ass. The other two jerk off while watching you get railed up the ass by one of their friends, as you suck off another one. This one is going balls deep up inside of you, you can feel his balls smacking against your slit with each thrust.'
-		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-		gs 'arousal', 'anal', -5, 'gangbang', 'sub', 'lube'
-		gs 'stat'
-		act 'Just anal':
-			*clr & cla
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang13.jpg"></center>'
-			'Finally, the last guy gets his turn, and shoves it up your greased-up butthole. It slides in easily, and he starts fucking you hard and fast straight away. At this point you are stretched out enough, so it is really starting to feel good. A few minutes later, they start taking turns. Every couple of minutes a new dick is shoved back up your butt, and before long one of the guys starts moaning like he is close. The others soon follow suit. They pull you off the couch and onto the floor, on your knees.'
-			gs 'arousal', 'anal', 10, 'gangbang', 'sub', 'lube'
-			gs 'stat'
-			act 'They start cumming': gt 'dormev1', 'gangbang_cum'
-		end
-	end
-end
-
-if $ARGS[0] = 'gangbang_cum':
-	menu_off = 1
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbangcum.jpg"></center>'	
-	'While kneeling the middle of them, you jerk two of them off at a time, switching cocks every few seconds. Soon, one of them starts cumming - his sperm hitting you in the face. With your mouth open, some of it goes into your mouth as well. The rest soon start cumming also, and most of it ends up covering your face and neck. Some of it ends up on your breasts, and some ends up in your mouth - which you quickly swallow, once they have all finished.'
-	gs 'arousal', 'hj', 5, 'gangbang', 'sub'
-	gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-	gs 'cum_call', 'face', 'A82', 1
-	gs 'cum_call', 'face', 'gangbanger #1', 0
-	gs 'cum_call', 'face', 'gangbanger #2', 0
-	gs 'cum_call', 'face', 'gangbanger #3', 0
-	gs 'arousal', 'end'
-	gs 'stat'
-	act 'Get dressed': gt 'dormev1', 'gangbang_dress'
-	act 'Take a selfie': gt 'dormev1', 'gangbang_selfie'
-end
-
-if $ARGS[0] = 'gangbang_selfie':
-	menu_off = 1
-	*clr & cla
-	djibrilphoto[2] = 1
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/pc/activities/phone/djibril/2.jpg"></center>'
-	'Once they are done cumming all over you, they start to get cleaned up and get dressed. You reach over to your purse and pull out your phone, and you hold it up and take a selfie of your face covered in their cum. You take a couple of them until you find one you like, which you then save. You notice a couple of them looking at you smiling, as you take your selfies. With that done you start to get dressed yourself.'
-	act 'Get dressed': gt 'dormev1', 'gangbang_dress'
-end
-
-if $ARGS[0] = 'gangbang_dress':
-	*clr & cla
-	minut += 5
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang_leave_cum.jpg"></center>'
-	'You gather up your clothes and start getting dressed. Djibril says to you "This was fun, <<$pcs_nickname>>. I hope we can do this again sometime. Feel free to stop by anytime. Anyway, I need to go to the library and get some studying done tonight, so talk to you later." You wave to him as he leaves, one of his friends follows him out the door as well. A third one also leaves without saying a word, and the last one starts playing a game on his console. You guess this is his room. By the time you finish dressing, they are all gone, except the one playing games. You can feel their cum starting to dry on your face. You suppose you should really leave.'
-	act 'Leave Room':
-		menu_off = 0
-		*clr & cla
-		minut += 5
-		gs 'stat'
-		if cumloc[11] = 1 or (cumloc[6] = 1 or cumloc[7] = 1):
-			gs 'fame', 'city', 'sex', 5
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang_leave_cum.jpg"></center>'
-			'You take a final look around to make sure you didn''t leave anything behind, and you think about what just happened in here. You can''t help but smile at it, then you head out the door. As you make your way down the dorm hallway, you notice people looking at you. Some laugh, others look on with lost expressions, and some give you looks of utter disgust. You make it nearly to the ground floor, when you finally notice your reflection on some glass and see your face is still covered in their cum. You quickly exit the dorm and run across the quad to the street.'
-		else
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/gangbang/gangbang_leave.jpg"></center>'
-			'With your face all cleaned up of their cum, you take a final look around to make sure you didn''t leave anything behind and you think about what just happened in here. You can''t help but smile at it, then you head out the door. You make your way out of the dorms, and across the quad back to street.'
-		end	
-		act 'Leave': minut += 5 & gt 'city_island'
-	end
-end
-
-if $ARGS[0] = 'sveta_sex1':
-	menu_off = 1
-	*clr & cla
-	gs 'boyStat', 'A82'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_knees.jpg"></center>'
-	'Once on your knees you can''t help but notice the bulge in his pants. You pull his sweat pants and underwear down, as they do his <<dick>>cm <<$dick_girth>> dick springs free nearly hitting you in your face as it does. Each time you see it, you are still amazed by it''s size, it is about the size of your forearm. You lean forward and give the tip a quick kiss.'
-	gs 'arousal', 'foreplay', 2
-	gs 'stat'
-	act 'Suck his dick':
-		*clr & cla
-		gs 'boyStat', 'A82'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_bj1.jpg"></center>'
-		'You open your mouth as wide as you can and take his <<dick>>cm <<$dick_girth>> cock in your mouth and it barely fits. You bob your head back and forth sucking his dick, taking it as deep as you can in your mouth as you do. He lets out a soft moan of pleasure as you suck his massive member. You feel yourself starting to get wet a part of you want to get fucked by him, but he has made no move to indicate he wants anything more than just a blowjob.'
-		gs 'arousal', 'bj', 5
-		gs 'stat'
-		act 'Tell him to fuck you': 
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_bj2.jpg"></center>'
-			'You suck his dick for a couple of minutes more, before you take a break to catch your breath and just stroke his dick with your hand for a moment. As you do you look up at him and say. "I want you to fuck me."'
-			'He grins down at you. "That''s good, because I want to fuck your tight little white ass." It seems he only wants to fuck your ass today, but are you in the mood to let him tear your little ass up? Or maybe you should just finish him off with a blowjob.'
-			gs 'arousal', 'bj', 5
-			gs 'stat'
-			act 'Let him fuck your ass': gt 'dormev1', 'sveta_sex1_anal'
-			act 'Suck him off': gt 'dormev1', 'sveta_sex1_bj_cum'
-		end
-		act 'Keep sucking him off':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_bj2.jpg"></center>'
-			'You suck his dick for a couple of minutes more, before he grins down at you. "I want to fuck your tight little white ass."'
-			'For the moment you keep sucking him off considering his request. Then he says, "Come on get up on the couch." It seems he wants to fuck your ass today, but are you in the mood to let him tear your little ass up with his massive dick? Or maybe you should just finish him off with a blowjob.'
-			gs 'arousal', 'bj', 5
-			gs 'stat'
-			act 'Let him fuck your ass': gt 'dormev1', 'sveta_sex1_anal'
-			act 'Suck him off': gt 'dormev1', 'sveta_sex1_bj_cum'
-		end
-	end
-end
-
-if $ARGS[0] = 'sveta_sex1_bj_cum':
-	menu_off = 1
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_bj3.jpg"></center>'
-	'You look up at him and say. "I would rather just suck you off today." Then you go back to sucking his dick.'
-	'He looks down at you and grins. "Ok, maybe next time I get to fuck your ass." With that you suck his dick for several more minutes until you hear him starting moan louder followed by his dick start to twitch in your mouth. You feel his hot cum shooting in your mouth, you feel the thick jelly like texture of his sperm gathering on your tongue as he keeps cumming in your mouth. Once he has finally finished, he pulls his dick out of your mouth and you feel most of the cum collecting on your tongue.'
-	gs 'arousal', 'bj', 5
-	gs 'stat'
-	act 'Show him his cum':
-		*clr & cla
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_mouthful.jpg"></center>'
-		'You open your mouth as wide as you can and show him, your tongue coated in his cum. He laughs a bit. "Fuck that was amazing, you are truly a amazing girl <<$pcs_nickname>>." He watches you likely waiting to see if you are going to swallow his cum or spit it out.'
-		gs 'arousal', 'foreplay', 2
-		gs 'cum_call', 'mouth', 'A82', 1
-		gs 'arousal', 'end'
-		gs 'stat'
-		act 'Swallow':
-			*clr & cla
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You swallow his load of cum down, making a big show of it. "Fuck that is so hot <<$pcs_nickname>>." He pulls up his pants, then pulls you up to your feet and gives you a quick kiss. "I would love to hang out more but I got some homework I need to get done."'
-			'You grin to him. "Ok, I got it. I will go and let you do your homework." With that you turn and head for the door, but you barely make it a step when he slaps you on the ass. You giggle at that, he goes to his desk while you head out.'
-			act 'Leave':gt 'dorm', 'korr'
-		end
-		act 'Spit':
-			*clr & cla
-			minut += 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You get up and spit his load out into the trash can by the couch. "Fuck I needed that <<$pcs_nickname>>." He pulls up his pants, then pulls you over to him and gives you a quick kiss. "I would love to hang out more but I got some homework I need to get done."'
-			'You grin to him. "Ok, I got it. I will go and let you do your homework." With that you turn and head for the door, but you barely make it a step when he slaps you on the ass. You giggle at that, he goes to his desk while you head out.'
-			act 'Leave':gt 'dorm', 'korr'
-		end
-	end
-end
-	
-if $ARGS[0] = 'sveta_sex1_anal':
-	menu_off = 1
-	*clr & cla
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_undress.jpg"></center>'
-	'You nod to him with a smile. "Ok you can fuck my ass if you want too." You tell him, he at once pulls off his shirt. As you start to strip he finishes faster than you do and then he helps undress you as well. Once you are fully naked he bends you over his couch, then walks over to his night stand and pulls out a bottle of lube. As he walks back over he lubes up his massive dick. He stops just behind you and you can feel him squirt some lube onto your asshole, he uses his fingers to work it into your ass and loosen you up a bit. With your ass finally well lubed he tosses the bottle aside and scoots up close behind you, you feel the large bulbous head of his cock pressing against your asshole.'
-	gs 'arousal', 'foreplay', 2
-	gs 'stat'
-	act 'Get butt fucked':
-		*clr & cla
-		gs 'boyStat', 'A82'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_fuck1.jpg"></center>'
-		'He keeps leaning forward, the pressure of the head of his dick building against your asshole until it finally pops in, causing you to cry out and hiss a little in pain as his <<dick>>cm <<$dick_girth>> dick stretches your asshole wide. He starts to fuck you slowly and not to deep at first, as you start to relax and moan in pleasure, instead of groan in pain he goes a little faster and a little deeper.'
-		gs 'arousal', 'anal', 5, 'lube'
-		gs 'stat'
-		act 'A little deeper':
-			*clr & cla
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_fuck2.jpg"></center>'
-			'You bite your lower lip and look back at him as he slides his cock even deeper into you, surely that must be all of it. But you still don''t feel his balls slapping against your pussy. Yet it feels like his dick has pushed have way up to your throat by this point. The more he moans the faster and deeper he goes, as his dick continues to stretch out your ass.'
-			gs 'arousal', 'anal', 5, 'lube'
-			gs 'stat'
-			act 'Balls deep':
-				*clr & cla
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_fuck3.jpg"></center>'
-				'Finally he starts going so deep you feel his balls slapping against your twat. You ass feels so full and his rod is so deep in you, you have expect to feel it in throat. Despite the size, you start moaning in pleasure more and more, you asshole finally stretched enough it no longer hurts, or at least the pleasure is winning out. "Yes... yes... Ooohh... keep fucking me." You tell him as the pleasure keeps building. He takes this as a sign and grabs ahold of your hips and starts hammering your ass balls deep.'
-				gs 'arousal', 'anal', 5, 'lube'
-				gs 'stat'
-				act 'Fill up your ass':
-					*clr & cla
-					minut += 10
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_buttcum.jpg"></center>'
-					'As he fucks your ass he starts groaning loudly and then you feel his cock twitch inside of you, as he shoots his hot load of cum deep in your ass, as he buries himself balls deep in you until he stops cumming. He collapses down beside you on the couch, as you roll over on your side next to him. "Fuck that was amazing <<$pcs_nickname>>."'
-					'You just lay there side  by side for a few minutes catching your breath, as you do, you can feel his cum leaking out of your gapping asshole. "Mhm that was wonderful Djibril, truly wonderful. I enjoyed that so much."'
-					*nl
-					'He laughs and gets up and starts cleaning up and getting dressed. "Thanks, I actually believe you."'
-					'You wipe his cum leaking out of your ass off and then get dressed as well. "I really mean it." Once you are dressed you give him a passionate kiss.'
-					'Once you break the kiss his says. "I would love to hang out more but I got some homework I need to get done."'
-					'You grin to him. "Ok, I got it. I will go and let you do your homework." With that you turn and head for the door, but you barely make it a step when he slaps you on the ass. You giggle at that, he goes to his desk while you head out.'
-					gs 'arousal', 'anal', 1, 'lube'
-					gs 'cum_call', 'anus', 'A82', 1
-					gs 'arousal', 'end'
-					gs 'stat'
-					act 'Leave':gt 'dorm', 'korr'
-				end
-			end
-		end
-	end
-end
+!!2021/08/13
 
 if $ARGS[0] = 'kendra_male_slave':
 	menu_off = 1
@@ -447,7 +50,7 @@ if $ARGS[0] = 'kendra_male_slave':
 					gs 'arousal', 'voyeur_sex', 10
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':gt 'dorm', 'korr'
+					act 'Leave': gt 'dorm', 'eighth_floor'
 				end
 			end
 		end
@@ -461,12 +64,7 @@ if $ARGS[0] = 'gosha_sex':
 	srand = rand(1, 3)
 	if srand = 1:
 		gs 'cum_manage'
-		picrand = rand(1, 5)
-		if picrand = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh2.jpg"></center>'
-		if picrand = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh11.jpg"></center>'
-		if picrand = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh13.jpg"></center>'
-		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh14.jpg"></center>'
-		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh15.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh13.jpg"></center>'
 		'Seeing that you''re not resisting, Gosha quickly strips you naked and then removes his pants, revealing his cock. He guides it into your pussy and starts fucking you hard and rough, not seeming to care if you are enjoying yourself at all. You feel him starting to tense up, but before you can say anything he groans loudly. You feel his hot cum shoot inside of you, filling your pussy up.'
 		gs 'arousal', 'vaginal', 10, 'rough'
 		gs 'arousal', 'end'
@@ -476,17 +74,12 @@ if $ARGS[0] = 'gosha_sex':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
 			'Once he cums he quickly gets dressed and then sits down at his desk. It takes you a little bit longer to get dressed but once you are, he glances over at you. "It was great you stopping by, but I got some class work I need to do if you don''t mind." He says as he indicates the door, as you walk over to it he adds. "I hope you stop by again, see you later." With that you leave.'
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Go to sixth floor': gt 'dorm', 'sixth_floor'
 		end
 	elseif srand = 2:
 		spafinloc = 12
 		gs 'cum_manage'
-		picrand = rand(1, 5)
-		if picrand = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh.jpg"></center>'
-		if picrand = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh3.jpg"></center>'
-		if picrand = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh4.jpg"></center>'
-		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh5.jpg"></center>'
-		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh7.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh3.jpg"></center>'
 		'Seeing that you''re not resisting, Gosha quickly strips you naked and then removes his pants, revealing his cock. Gosha then pushes you down on your knees, and sticks his cock in your mouth. As you start sucking his dick, he starts fucking your mouth, forcing his dick down your throat, making you gag and your eyes water as you choke on his cock. It doesn''t take long before his cock starts twitching and he quickly pulls out and cums all over your face.'
 		gs 'arousal', 'bj', 10, 'deepthroat', 'rough'
 		gs 'arousal', 'end'
@@ -496,19 +89,14 @@ if $ARGS[0] = 'gosha_sex':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
 			'Once he cums he quickly gets dressed and then sits down at his desk. It takes you a little bit longer to get dressed but once you are, he glances over at you. "It was great you stopping by, but I got some class work I need to do if you don''t mind." He says as he indicates the door, as you walk over to it he adds. "I hope you stop by again, see you later." With that you leave.'
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Go to sixth floor': gt 'dorm', 'sixth_floor'
 		end
 	elseif srand = 3:
 		anal += 1
 		spafinloc = 3
 		gs 'cum_manage'
-		picrand = rand(1, 5)
 		gs 'stat'
-		if picrand = 1:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh6.jpg"></center>'
-		if picrand = 2:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh8.jpg"></center>'
-		if picrand = 3:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh9.jpg"></center>'
-		if picrand = 4:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh10.jpg"></center>'
-		if picrand = 5:'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh12.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/gosha/sex/gosh12.jpg"></center>'
 		'Seeing that you''re not resisting, Gosha quickly strips you naked and then removes his pants, revealing his cock. Gosha then grabs a bottle of lube and starts lubricating your asshole. Once he has your butthole nice and lubed up, he squirts some lube on his dick as well. After a moment he lines his cock up against your asshole and thrusts it deeply into your ass, causing your to cry out. He then starts fucking your ass hard and deep for some time, before he ends by cumming inside of your ass.'
 		anal_slip += 4
 		gs 'arousal', 'anal', 10, 'rough'
@@ -519,7 +107,7 @@ if $ARGS[0] = 'gosha_sex':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/gosharoom/gosha_room.jpg"></center>'
 			'Once he cums he quickly gets dressed and then sits down at his desk. It takes you a little bit longer to get dressed but once you are, he glances over at you. "It was great you stopping by, but I got some class work I need to do if you don''t mind." He says as he indicates the door, as you walk over to it he adds. "I hope you stop by again, see you later." With that you leave.'
-			act 'Leave':gt 'dorm', 'korr'
+			act 'Go to sixth floor': gt 'dorm', 'sixth_floor'
 		end
 	end
 end

+ 0 - 70
locations/obkitchen.qsrc

@@ -1,70 +0,0 @@
-# obkitchen
-
-if $args[0] = '':
-	$loc_arg = ''
-	$loc = 'obkitchen'
-    $location_type = 'private'
-	$locclass = 'kitr'
-	$menu_loc = 'obkitchen'
-	$menu_arg = ''
-	menu_off = 0
-	gs 'stat'
-	'<center><b>in the dorm kitchen</b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obkitchen.jpg"></center>'
-
-	act 'Return to the corridor':gt 'dorm', 'korr'
-
-	if eda > 0:
-		'Your shelf in the refrigerator holds <b><<eda>></b> servings of food.'
-		if edahot = 0:
-			act 'Cook food (0:25)':
-				cla
-				*clr
-				menu_off = 1
-				minut += 25
-				edahot += 1
-				eda -= 1
-				pcs_mood -= 5
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/shared/home/kitchen/cook.jpg"></center>'
-				'You prepare a meal.'
-
-				gs 'obkitchen', 'food'
-			end
-		end
-	end
-
-	if edaD = 0 and eda = 0:'<b><font color = red>Your shelf in the refrigerator is bare, there is nothing left for you to eat.</font></b>'
-
-
-	if edahot > 0:
-		'A cooked meal is on the table.'
-		gs 'obkitchen', 'food'
-	end
-
-	if pranik > 0:
-		if pranik = 1:
-			'You only have one more portion of tea biscuits.'
-		else
-			'You have enough tea biscuits for <b><<pranik>></b> more snacks.'
-		end
-		dynamic $pranik
-	end
-
-	dynamic $edaD
-	dynamic $fatdel
-	dynamic $driwater
-	dynamic $fill_bottle
-	dynamic $lekarstvo
-	dynamic $vitamin
-end
-
-if $args[0] = 'food':
-	act 'Eat cooked food':
-		edahot = 0
-		gt 'food', 'm_meal'
-	end
-end
-
---- obkitchen ---------------------------------
-

+ 0 - 74
locations/obroom.qsrc

@@ -1,74 +0,0 @@
-# obroom
-
-if $ARGS[0] = 'start' or $ARGS[0] = '':
-	$sexloc = 'obroom'
-	CLOSE ALL
-	$loc_arg = 'start'
-	$loc = 'obroom'
-	$locM_arg = 'start'
-	$locM = 'obroom'
-    $location_type = 'private'
-	$menu_loc = 'obroom'
-	$menu_arg = 'start'
-	menu_off = 0
-	cla
-	*clr
-	odkomp = 1
-	gs 'stat'
-	'<center><b>Your room</b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
-	'This is your room which you share with another girl named Vika Kirilova.'
-	'At the right of the entrance, you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
-	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
-	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
-	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> lying on your bed.'
-	*nl
-	'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.'
-
-	gs 'exercise', 'start'
-	''
-	if hour > 14 and hour < func('bordel', 'open_hour'):
-		vika_sleep = 0
-		if npc_rel['A220'] >= 60 and birthday = day and birthmonth = month and vikaslut = 1 and b_vika_present_Day ! daystart:
-			'<a href="exec:gt''Vika''">Vika</a> seems excited when she notices you, trying to hide a box behind her back.'
-		else
-			'<a href="exec:gt''Vika''">Vika</a> is lying on her bed.'
-		end
-	elseif hour > func('bordel', 'close_hour') and hour < 8:
-		vika_sleep = 1
-		if vikaslut = 0:
-			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after being out the whole night.'
-		elseif vikaslut = 1:
-			'<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
-		end
-	end
-
-	act 'Walk out in the corridor':
-		if $clothingworntype ! 'nude':
-			odkomp = 0
-			minut += 5
-			gt 'dorm', 'korr'
-		else
-			'You need to get dressed.'
-		end
-	end
-
-	act 'Read the course literature (2:00)':
-		cla
-		menu_off = 1
-		minut += 120
-		intel_exp += 1 + (mentats_dose - rand(0,mentats_dose))
-		gs 'stat'
-		'You spend two hours reading the course literature. You feel like you''ve picked up some stuff from the book that will come in handy in time for the examination.'
-
-		act 'Finish':gt 'obroom', 'start'
-	end
-
-	gs 'unicoursework', 'start', $loc, $loc_arg
-
-dynamic $wearpan
-dynamic $removepan
-end
-
---- obroom ---------------------------------
-

+ 445 - 34
locations/office.qsrc

@@ -1,12 +1,20 @@
 # office
+!!2021/08/13
+
 !!NPC list
-!!Janina Vishnyovsky - fellow secretary
-!!Natalia Torbica - female exc, head of HR
-!!Ignatiy Solodnikov - old man, CEO
-!!Isaak Solodnikov - floor boss, son of CEO
-!!Valerian Perezhogin - boy secretary
-!!Kolina Wilenken - shemale secretary
-!!Gorzyslawa Rybakov - older secretary
+!!Janina Vishnyovsky - fellow female secretary early 20s
+!!Natalia Torbica - female exc, head of HR, mid 40s
+!!Ignatiy Solodnikov - old man, CEO, 60s
+!!Isaak Solodnikov - floor boss, son of CEO late 20s
+!!Valerian Perezhogin - male secretary early 20s
+!!Kolina Wilenken - shemale secretary mid 20s
+!!Gorzyslawa Rybakov - older female secretary, early 40s
+!! Alex Fosse - black male manager from France, mid 30s
+!! Dariy Medved - young male manager
+!!Ruvim Kovalchuk - mid 30s male manager
+!!Ignatiy Pasternak - mid 30s male manager
+!! Pankratiy Lebedev - IT guy, mid 20s
+
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -21,9 +29,14 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">Engineering company offices</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/lobby.jpg"></center>'
 	if workSec = 1:
-		'You walk into the building, you give a wave to the receptionist, who smiles back to you as you head for for the elevators.'
-		act 'Go to your floor': gt 'office', 'work_floor'
-		act 'Leave': minut += 5 & gt 'city_center'
+		if $clothingworntype = 'gm_office' and PCLoSkirt > 0:
+			'You walk into the building, you give a wave to the receptionist, who smiles back to you as you head for for the elevators.'
+			act 'Go to your floor': gt 'office', 'work_floor'
+			act 'Leave': minut += 5 & gt 'city_center'
+		else
+			'You walk into the building, you give a wave to the receptionist, who shakes her head and waves you over. As you walk over she says. "You know the dress code, I''m afraid you can''t go to work dressed like that. You need to be wearing a womens business suit with a skirt. You will need to go home and change, before you can go to work." You sigh and nod, then turn and leave.'
+			act 'Leave': minut += 5 & gt 'city_center'
+		end
 	elseif jobsec = 1:
 		'You enter the office building of Titran-Express Engineering, the lobby is very fancy. Black marble floors, the inner walls look to be made out of white marble with lots of gold colored trim. Near the doors is a desk with a reception area, off to the side is several couches. A corridor leads off the entrance to a long row of elevators. As you look around you see the receptionist is looking at you, likely wondering why you are here. You walk over to her and say. "Hello I am here for a interview with Mrs Torbica."'
 		'She smiles to you. I assume you have your secretary certification?"'
@@ -186,7 +199,7 @@ if $ARGS[0] = 'break_room':
 			fat += 1
 			gs 'stat'
 			'<center><b><font color="maroon">Break Room</font></b></center>'
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/breakroom.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/eat_lunch.jpg"></center>'
 			'You get your lunch out of the fridge and warm it up in the microwave. After that you sit down to enjoy a pleasant lunch.'
 			act 'Go to the corridor':gt 'office', 'work_floor'
 			act 'Go back to work station':
@@ -254,14 +267,61 @@ if $ARGS[0] = 'mens_restrooms':
 	menu_off = 0
 	gs 'stat'
 	'<center><b><font color="maroon">Mens Restrooms</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/mensbr.jpg"></center>'
-	'You gather your courage up and walk into the mens restroom. Inside you find it empty, you are not sure if you are happy or disappointed by that. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in.'
-	act 'Look in the mirror': gt 'mirror', 'start'
-	dynamic $tampon
-	dynamic $quickwash
-	dynamic $basin
-	dynamic $publicpan
-	act 'Go to the corridor':gt 'office', 'work_floor'
+	if rand(1,4) = 1:
+		temp = rand(1,6)
+		if temp = 1:
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/sex/restroom/mensroom/fuck1.jpg"></center>'
+			'You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that''s not what catches your eye. No that would be one of your fellow secretaries naked and bent over the sink counter, with one of the managers fucking her hard from behind. She is looking your direction, you don''t know if she hear the door or even sees you yet. You quickly duck back outside before you are spotted.'
+			gs 'arousal', 'voyeur_sex', 2
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave':gt 'office', 'restrooms'
+		elseif temp = 2:
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/sex/restroom/mensroom/fuck2.jpg"></center>'
+			'You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that''s not what catches your eye. No that would be one of your fellow secretaries naked from the waist down, bent over, holding onto one of the stall walls, moaning loudly, with one of the managers fucking her hard from behind. You quickly duck back outside before you are seen by either of them.'
+			gs 'arousal', 'voyeur_sex', 2
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave':gt 'office', 'restrooms'
+		elseif temp = 3:
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/sex/restroom/mensroom/group_fuck.jpg"></center>'
+			'You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that''s not what catches your eye. No that would be one of your fellow secretaries naked from the waist down, bent over the sink counter, holding onto one of the stall walls, moaning loudly, with one of the managers fucking her hard from behind and another standing next to them, you assume waiting his turn. You quickly duck back outside before you are seen by any of them.'
+			gs 'arousal', 'voyeur_sex', 2
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave':gt 'office', 'restrooms'
+		elseif temp = 4:
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/sex/restroom/mensroom/older_bj.jpg"></center>'
+			'You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that''s not what catches your eye. No that would be one of your fellow secretaries squatting down in front of one of the senior managers, with her tits pulled out, while she sucks his dick. You quickly duck back outside before you are seen by either of them.'
+			gs 'arousal', 'voyeur_sex', 2
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave':gt 'office', 'restrooms'
+		elseif temp = 5:
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/sex/restroom/mensroom/stall_bj.jpg"></center>'
+			'You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that''s not what catches your eye. No that would be under one of the stalls, you see what appears to be a woman sitting on her ankles on the floor, facing in, while male legs with pants and underwear pushed down around his ankles faces her. You can hear him moaning softly and the distinct slurping sounds of a sloppy blow job. You quickly duck back outside before you are found out.'
+			gs 'arousal', 'voyeur_sex', 2
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave':gt 'office', 'restrooms'
+		else
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/sex/restroom/mensroom/stall_fuck.jpg"></center>'
+			'You gather your courage up and walk into the mens restroom. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in. But that''s not what catches your eye. No that would be one of your fellow secretaries naked from the waist down, riding one of the male manager cowgirl style while he sits on one of the toilets. Both of them are moaning loudly and she seems to be enjoying herself as much as he is. You quickly duck back outside before you are seen by either of them.'
+			gs 'arousal', 'voyeur_sex', 2
+			gs 'arousal', 'end'
+			gs 'stat'
+			act 'Leave':gt 'office', 'restrooms'
+		end
+	else
+		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/mensbr.jpg"></center>'
+		'You gather your courage up and walk into the mens restroom. Inside you find it empty, you are not sure if you are happy or disappointed by that. The restroom is very clean and nice looking, you think it is the nicest mens room you have ever been in.'
+		act 'Look in the mirror': gt 'mirror', 'start'
+		dynamic $tampon
+		dynamic $quickwash
+		dynamic $basin
+		dynamic $publicpan
+		act 'Go to the corridor':gt 'office', 'work_floor'
+	end
 end
 
 if $ARGS[0] = 'work':
@@ -283,43 +343,391 @@ if $ARGS[0] = 'work':
 			*clr & cla
 			if sound = 0 and hour >= 8 and hour < 17:PLAY 'sound/office.mp3',30 & PLAY 'sound/office2.mp3',30
 			gs 'stat'
-			work = rand(1,9)
+			temp = rand(1,27)
 			if temp = 1:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/answeringphone' + rand(1,3) + '.jpg"></center>'
 				'You spend most of your work period on the phone, either talking to clients or mangers about varies things.'
-				gt 'office', 'secretary_office'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			elseif temp = 2:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/getbinders' + rand(1,2) + '.jpg"></center>'
 				'You spend most of your work period going to get several binders on varies projects and taking them from office to office while the mangers look over them until they send you to someone else or to finally replace the binders.'
-				gt 'office', 'secretary_office'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			elseif temp = 3:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/getcoffee' + rand(1,2) + '.jpg"></center>'
 				'You spend most of your work period fetching coffee for the varies managers. A few make some inappropriate comments but you ignore them.'
-				gt 'office', 'secretary_office'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			elseif temp = 4:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/getfiles' + rand(1,5) + '.jpg"></center>'
 				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away.'
-				gt 'office', 'secretary_office'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			elseif temp = 5:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/helpcoworker1.jpg"></center>'
 				'You spend most of your work period helping a co-working on a large project she is having trouble with.'
-				gt 'office', 'secretary_office'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			elseif temp = 6:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/makecopies' + rand(1,4) + '.jpg"></center>'
 				'You spend most of your work period in the copy room making copies of many documents, organizing them into binders and then putting them away.'
-				gt 'office', 'secretary_office'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			elseif temp = 7:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/takenotes' + rand(1,2) + '.jpg"></center>'
-				'You spend most of your work period in a managers office taking notes as he brainstorms outloud his plans on a new project the company is about to start on soon.'
+				'You spend most of your work period in a managers office taking notes as he brainstorms out loud his plans on a new project the company is about to start on soon.'
 				gt 'office', 'secretary_office'
 			elseif temp = 8:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/workatdesk' + rand(1,7) + '.jpg"></center>'
 				'You spend most of your work period at your desk working on your computer doing a variety of tasks.'
-				gt 'office', 'secretary_office'
-			else
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 9:
+				mood += 5
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/relax1.jpg"></center>'
 				'This work period has proven to be fairly relaxing, you have rarely been asked to do much of anything. You spend most of your time surfing the net on your computer, playing on your phone or working on your makeup.'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 10:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/argument.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. But your work is interrupted as across the room several of your fellow secretaries starting arguing, soon two of them are yelling at each other. It is quickly broken up by a manager from a nearby office, you get the impression they was arguing over a man.'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 11:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/butt_grab.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. In one of the offices you are place files down where you was directed. As you slightly bend forward to set the files down, you feel his hand groping your butt, squeezing it.'
+				gs 'arousal', 'foreplay', 2
+				gs 'stat'
+				act 'Ignore it':
+					*clr & cla
+					office_slut += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/butt_grab_allow.jpg"></center>'
+					'You ignore his hand and let him keep squeezing your butt, you need this job. He then directs you to stack the files in a certain order, as you do what he asks he keeps feeling you up. Once you are done you return back to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+				act 'Tell him to stop':
+					*clr & cla
+					mood -= 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/butt_grab_no.jpg"></center>'
+					'You turn your head towards him. "Stop that."'
+					'He laughs. "You need to learn your place if you want to keep this job."'
+					'You swallow a bit at the not so veiled threat. "I don''t like it, I just want to do my job."'
+					'He laughs some more. "This is part of your job, but sure for now." He lets go of your butt and you finish placing the files, just before you leave he slaps your ass pretty hard. Fluster you return back to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 12:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/butt_slap' + rand(1,2) + '.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. In one of the offices you are place files down where you was directed. As you slightly bend forward to set the files down, you feel the slight sting of a hard slap on the ass. "That''s a good girl, now back to work." He says with a grin.'
+				gs 'arousal', 'foreplay', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 13:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/coffee_grab.jpg"></center>'
+				'You spend most of your work period fetching coffee for the varies managers. A few make some inappropriate comments but you ignore them. One of them even grabs you by the ass, before you can walk away and squeezes it hard. You manage to get free and get back to work easily enough.'
+				gs 'arousal', 'foreplay', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 14:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/copier_sit.jpg"></center>'
+				'You spend most of your work period in the copy room making copies of many documents, organizing them into binders and then putting them away. During one of your trips to the copy room, you find one of your fellow secretaries sitting on the copier photocopying her butt. A small stack of copies of her butt already sit in the bin. She turns to you and smiles. "It''s for the manager to brighten up there day." She says with a giggle.'
+				'You don''t really know how to respond. So you just nod. "OH... ok, I will come back later then." She giggles as you leave, you wait out in the hall until she leaves then go back to making copies.'
+				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 15:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/copier_tits.jpg"></center>'
+				'You spend most of your work period in the copy room making copies of many documents, organizing them into binders and then putting them away. During one of your trips to the copy room, you find one of your fellow secretaries leaning across the copier, with her shirt pulled open, photocopying her tits. A small stack of copies of her bear tits already sit in the bin. She turns her head towards you and smiles. "It''s for the manager to brighten up there day." She says with a giggle.'
+				'You don''t really know how to respond. So you just nod. "OH... ok, I will come back later then." She giggles as you leave, you wait out in the hall until she leaves then go back to making copies.'
+				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 16:
+				mood -= 10
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/flying_files.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. In one of the offices you are place files down where you was directed. As soon as the manager picks up the files, he flings them across the room. "What the fuck is this? These arn''t the files I asked for, you stupid fucking cow."'
+				*nl
+				'You a bit shocked by his outburst. "I''m sorry, I must have taken these to the wrong office, I will go get yours now."'
+				'He sneers at you. "Clean this up and get my files. I won''t tolerate these kinds of mistakes, young pretty things like you are easily replaced." Then he throws a few more loose papers from the files on the floor before he goes back to work. You quickly gather up the papers and go back to work.'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 17:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/get_file1.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. While you are getting some files out of one of the filing cabinets, you feel someone walk up behind you. Soon you feel some hands placed on your hips, from behind.'
+				gs 'arousal', 'foreplay', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Ignore it':
+					*clr & cla
+					office_slut += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/get_file2.jpg"></center>'
+					'You ignore his hands, you need this job. As you ignore him, his hands slide down your hips across your thighs and back up again, he steps even closer up behind you and you can feel his semi hard dick pressed against your ass. Finally you have the files you need, you pull away from him with the files in hand. "Excuse me, but I need to deliver these."'
+					'He lets go and grins at you. "I have a delivery for you as well." You give him a fake smile and walk out of the room to go deliver these files and return to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+				act 'Tell him to stop':
+					*clr & cla
+					mood -= 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/pc/reactions/no.jpg"></center>'
+					'You step away pulling away from his grasp and turn to face him. "Stop that."'
+					'He laughs. "You need to learn your place if you want to keep this job."'
+					'You swallow a bit at the not so veiled threat. "I don''t like it, I just want to do my job in peace, is that to much to ask?"'
+					'He laughs some more. "This is part of your job, but sure for now." He turns and walks out, leaving you fluster as you return back to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 18:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/harres1.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. In one of the offices the manager is away from his desk and directs you to place the files on his desk. As you set the files down, you feel someone walk up behind you. Soon you feel some hands placed on your hips, from behind. Then his hands start to roam around your body.'
 				gt 'office', 'secretary_office'
+				gs 'arousal', 'foreplay', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Ignore it':
+					*clr & cla
+					office_slut += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/harres_allow.jpg"></center>'
+					'One hand slides up your side and grabs you tit, he turns you slightly and leans in to nuzzle and then lick your neck, you find this impossible to ignore.'
+					gs 'arousal', 'foreplay', 2
+					gs 'stat'
+					act 'Let him':
+						*clr & cla
+						office_slut += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/harres2.jpg"></center>'
+						'You choose to still ignore it as best you can, he lifts one of your legs up and places it on his chair. He pulls your skirt up and starts rubbing your ass with his hands, then he moves closer and you can feel his semi hard cock grinding against your butt. Just when you think he is going to do more, another manager comes in and stops.'
+						*nl
+						'Instead of looking shocked he just grins really big. "Hey sorry to interrupt Ruvim but we got a meeting."'
+						'The one feeling you up named Ruvim suddenly stops. "Fuck now?" The other manager nods. "Fuck alright." Ruvim says to the other manager, who then ducks out and leaves, then Ruvim turns his attention back to you, he slaps your ass hard. "We will have to finish this some other time." Then he walks out as well, leaving you to straighten out your skirt, before going back to work.'
+						gs 'arousal', 'foreplay', 2
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go back to work': gt 'office', 'secretary_office'
+					end
+					act 'Tell him to stop':
+						*clr & cla
+						mood -= 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/harres_no.jpg"></center>'
+						'You try to step away, but he grabs hold of you to hold you in place, you try to pulls his hands free but he is stronger than you are. "Stop that."'
+						'He laughs and pulls up on your skirt. "You need to learn your place if you want to keep this job."'
+						'You swallow a bit at the not so veiled threat. "I don''t like it, I just want to do my job in peace, is that to much to ask?"'
+						'He laughs some more. "This is part of your job, but sure for now." He lets go of you, allowing you to pull away and leave, feeling flustered you return back to work.'
+						gs 'arousal', 'foreplay', 2
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go back to work': gt 'office', 'secretary_office'
+					end
+				end
+				act 'Tell him to stop':
+					*clr & cla
+					mood -= 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/harres_no.jpg"></center>'
+					'You try to step away, but he grabs hold of you to hold you in place, you try to pulls his hands free but he is stronger than you are. "Stop that."'
+					'He laughs and pulls up on your skirt. "You need to learn your place if you want to keep this job."'
+					'You swallow a bit at the not so veiled threat. "I don''t like it, I just want to do my job in peace, is that to much to ask?"'
+					'He laughs some more. "This is part of your job, but sure for now." He lets go of you, allowing you to pull away and leave, feeling flustered you return back to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 19:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/getfiles' + rand(1,5) + '.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. While delivering a file to one of the senior managers, he is sitting on the couch reading some files. After you place the new files down, you turn to leave. "Excuse miss, but can you retrieve my pen." He doesn''t sound like he is really asking.'
+				*nl
+				'You smile to him. "Of course sir, where did you last see it?"'
+				'He point to some chairs a bit away from him. "I last had it sitting over there, I think I might have dropped it on the floor."'
+				act 'Look for pen':
+					*clr & cla
+					office_slut += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/look.jpg"></center>'
+					'You smile then start trying to look for the pen, after a bit of not seeing it you get down on your hands and knee''s, with some prompting from him you keep looking, eventually you end up on your elbows and knees looking under everything in his office. You can''t help but realize with his directions you are in this position with your butt facing him each time. Finally after you have looked under everything twice you announce. "I''m sorry but I don''t think it is here."'
+					*nl
+					'He has a lustful smile on his face then, holds up a pen. "Oh I found it, silly me I had it in my jacket pocket, thank you for looking though, best get back to work."'
+					'You just nod and smile to him as you leave his office and go back to work.'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+				act 'Don''t look for pen':
+					*clr & cla
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/hallway.jpg"></center>'
+					'"I''m sorry but I don''t have time right now, I have several other files I have to get at once." You say to him with a sweet smile as nicely as you.'
+					'He frowns deeply and looks unhappy. He is about to say something when you hurry up and walk out of his office. "Again sorry but I really must be going." With that you leave before he can say anything in response.'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 20:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/move_hair.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. While you are working at your computer one of the managers comes by and sits on the edge of your desk, he makes a bit of small talk with you. It is a pleasant conversation, even if it is a bit of a distraction, then he suddenly reaches over and brushes your hair back over your ear. "My you are a cute one." With that he gets up and walks away, you notice several of the other secretaries giving you knowing smiles, you do your best to forget it and go back to work.'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 21:
+				mood += 5
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/office_race' + rand(1,2) + '.jpg"></center>'
+				'You spend most of your work period getting files and taking them to different managers in different offices, or getting files from them and filing them away. While delivering a file to one of the managers, you are nearly run over by some of your co-workers. Two of the managers are pushing office chairs with a couple of your fellow secretaries sitting on them down the hallway in some apparent race. You jump aside just in time as they rest past you and down the hall, all of them laughing as they go, once they are clear you go back to delivering files.'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 22:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder' + rand(1,3) + '.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. While you are working at your computer one of the managers comes up behind you, he places his hands on your shoulders. "My you feel tense." Then he starts massaging your shoulders, he is pretty decent at it and you feel yourself relaxing.'
+				gs 'arousal', 'massage', 2
+				gs 'stat'
+				act 'Let him':
+					*clr & cla
+					office_slut += 1
+					mood += 10
+					gs 'fame', 'city', 'sex', 'Tiny', 'local'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/officemassage.jpg"></center>'
+					'You keep working and let him massage your shoulders, it feels really good. After a few minutes of this, his hands slide down from your shoulders, down your chest where he grabs and squeezes your tits.'
+					gs 'arousal', 'massage', 5, 'inhibition'
+					gs 'stat'
+					act 'Ignore it':
+						*clr & cla
+						office_slut += 2
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/officeharras.jpg"></center>'
+						'You choose to still ignore it as best you can, he plays with your tits for a few more minutes, you notice several of your fellow secretaries glancing in your direction, some seem pissed, or maybe jealous, while others just look amused. None of them look surprised or act like this is out of place, so you do your best to work while he plays with your breasts, apparently this is the type of stuff you will have to put up with if you want to work here. Finally he lets go and walks off. "Have fun ladies." Several of the women giggle at that as you all go back to work.'
+						gs 'arousal', 'foreplay', 2, 'inhibition'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go back to work': gt 'office', 'secretary_office'
+					end
+					act 'Tell him to stop':
+						*clr & cla
+						mood -= 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder_resist.jpg"></center>'
+						'You turn your body away form him as best you can while seated and then pushes he hands away from you. "Please stop that."'
+						'He growls. "Fine, try and do something nice and this is the thanks I get... bitch." Then he storms off, you notice all the other secretaries looking at you and you get the feeling you just made a mistake. You do your best to focus back on work.'
+						gs 'arousal', 'foreplay', 2, 'inhibition'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go back to work': gt 'office', 'secretary_office'
+					end
+				end
+				act 'Tell him to stop':
+					*clr & cla
+					mood -= 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder_resist.jpg"></center>'
+					'You turn your body away form him as best you can while seated and then pushes he hands away from you. "Please stop that."'
+					'He growls. "Fine, try and do something nice and this is the thanks I get... bitch." Then he storms off, you notice all the other secretaries looking at you and you get the feeling you just made a mistake. You do your best to focus back on work.'
+					gs 'arousal', 'massage', 2, 'inhibition'
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 23:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/work/makecopies' + rand(1,4) + '.jpg"></center>'
+				'You spend most of your work period in the copy room making copies of many documents, organizing them into binders and then putting them away. As you are standing at the printer, you hear someone walking up behind you, then you feel his hand groping your butt, squeezing it.'
+				gs 'arousal', 'foreplay', 2
+				gs 'stat'
+				act 'Ignore it':
+					*clr & cla
+					office_slut += 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/printer_grab.jpg"></center>'
+					'You ignore his hands, you need this job. As you ignore him, his hands continue to group your butt until they slide up to your hips as he steps even closer up behind you and you can feel his semi hard dick pressed against your ass. Finally you have the files you need, you pull away from him with the files in hand. "Excuse me, but I need to deliver these."'
+					'He lets go and grins at you. "I have a delivery for you as well." You give him a fake smile and walk out of the room to go deliver these files and return to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+				act 'Tell him to stop':
+					*clr & cla
+					mood -= 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/pc/reactions/no.jpg"></center>'
+					'You step away pulling away from his grasp and turn to face him. "Stop that."'
+					'He laughs. "You need to learn your place if you want to keep this job."'
+					'You swallow a bit at the not so veiled threat. "I don''t like it, I just want to do my job in peace, is that to much to ask?"'
+					'He laughs some more. "This is part of your job, but sure for now." He turns and walks out, leaving you fluster as you return back to work.'
+					gs 'arousal', 'foreplay', 2
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 24:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/selfie_bra.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. You glance up to see one of your fellow secretaries, with her blouse pulled open, exposing her bra taking several selfies. You watch her take several of them and then you return back to your work occasionally glancing up at her until she finishes.'
+				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			elseif temp = 25:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder' + rand(1,3) + '.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. While you are working at your computer one of the managers comes up behind you, he places his hands on your shoulders. "What are you working on?" Then he starts giving you some pointers which are helpful for you work, but as he does he keeps leaning in closer and closer, until you feel his crotch pressed against your upper back.'
+				gs 'arousal', 'massage', 2
+				gs 'stat'
+				act 'Ignore it':
+					*clr & cla
+					office_slut += 1
+					mood += 10
+					gs 'fame', 'city', 'sex', 'Tiny', 'local'
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder_allow.jpg"></center>'
+					'You keep working and letting him loam over you and crowd you at your desk. At least his advice is helpful and helps you finish your work a bit faster. Finaly when you finish you tell him. "Thanks, for your help but I think I got it from here." Hoping he takes the hint.'
+					gs 'arousal', 'massage', 5, 'inhibition'
+					gs 'stat'
+					act 'Let him':
+						*clr & cla
+						office_slut += 1
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder_kiss.jpg"></center>'
+						'To your surprise he reaches down and takes one of your hands and lifts it up to his face and kisses the back of it. "You are most welcome." With that he turns and walks off. You are unsure what just happened but notice the amused smiles from some of your co-workers, with a few looking jealous. You do your best to ignore the looks and go back to work.'
+						gs 'arousal', 'foreplay', 2, 'inhibition'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go back to work': gt 'office', 'secretary_office'
+					end
+					act 'Tell him to stop':
+						*clr & cla
+						mood -= 5
+						gs 'stat'
+						'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder_resist.jpg"></center>'
+						'You turn your body away form him as best you can while seated and then pushes he hands away from you. "Please stop that."'
+						'He growls. "Fine, try and do something nice and this is the thanks I get... bitch." Then he storms off, you notice all the other secretaries looking at you and you get the feeling you just made a mistake. You do your best to focus back on work.'
+						gs 'arousal', 'foreplay', 2, 'inhibition'
+						gs 'arousal', 'end'
+						gs 'stat'
+						act 'Go back to work': gt 'office', 'secretary_office'
+					end
+				end
+				act 'Tell him to stop':
+					*clr & cla
+					mood -= 5
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/shoulder_resist.jpg"></center>'
+					'You turn your body away form him as best you can while seated and then pushes he hands away from you. "Please stop that."'
+					'He growls. "Fine, try and do something nice and this is the thanks I get... bitch." Then he storms off, you notice all the other secretaries looking at you and you get the feeling you just made a mistake. You do your best to focus back on work.'
+					gs 'arousal', 'massage', 2, 'inhibition'
+					gs 'arousal', 'end'
+					gs 'stat'
+					act 'Go back to work': gt 'office', 'secretary_office'
+				end
+			elseif temp = 26:
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/skirt_caught.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. You hear a bit of giggling from beside you, you glance over and notice several of the women giggling and looking past you. You turn and look and see one of the women with her skirt caught in the top of her panties, leaving her panty clad butt exposed for all to see. You can''t help but smile yourself, before you can decide if you want to say something one of the other women tells her. She blushes and quickly fixes her skirt before sitting down to work. Soon all of you have turned your attention back to work.'
+				gs 'arousal', 'voyeur', 2
+				gs 'arousal', 'end'
+				gs 'stat'
+				act 'Go back to work': gt 'office', 'secretary_office'
+			else
+				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/events/upskirt_photo.jpg"></center>'
+				'You spend most of your work period at your desk working on your computer doing a variety of tasks. As you are working you see one of the managers standing behind one of the women, as she bends forward slightly to grab some files, he drops his phone down and you are sure he is taking photo''s with his phone up her skirt. Before you can say something she turns and notices, but instead of being upset she giggles and lightly punches his shoulder, the banter playfully a bit as they both leave together.'
+				act 'Go back to work': gt 'office', 'secretary_office'
 			end
 		end
 	end
@@ -331,17 +739,20 @@ if $ARGS[0] = 'interview':
 	menu_off = 1
 	minut += 15
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/waiting_interview.jpg"></center>'
-	'You go to the elevators and follow the directions you was given. You pass by a break room many offices, some open others with their door closed. You also pass by a large open room with many work stations, most likely the secretaries room. When you arrive at HR, you are asked to take a seat. As you sit and wait to be called in for your interview you reflect on what you saw on your way here. A few things stand out to you, first the office is very nice, expensive looking furniture, new computers, it looks like the company is doing very well and like to reflect that. The second thing you notices is almost all of the managers in offices where men, ranging from their mid twenties to mid forties. The third thing you notices was almost all of the secretaries or personal assistances seemed to be women. You saw a couple of young men that might have been as well but you are not sure. The final thing you noticed was all the secretaries where either young and attractive or middle aged, yet still attractive for their age. Before you can ponder this more you are called into the office for you interview.'
+	'You go to the elevators and follow the directions you was given. You pass by a break room many offices, some open others with their door closed. You also pass by a large open room with many work stations, most likely the secretaries room. When you arrive at HR, you are asked to take a seat. As you sit and wait to be called in for your interview you reflect on what you saw on your way here. A few things stand out to you, first the office is very nice, expensive looking furniture, new computers, it looks like the company is doing very well and like to reflect that. The second thing you notices is almost all of the managers in offices where men, ranging from their mid twenties to mid forties.'
+	*nl
+	'The third thing you notices was almost all of the secretaries or personal assistances seemed to be women, dressed in nice women''s business suits with skirts. You saw a couple of young men that might have been as well but you are not sure. The final thing you noticed was all the secretaries where either young and attractive or middle aged, yet still attractive for their age. Before you can ponder this more you are called into the office for you interview.'
 	act 'Interview for a job':
 		*clr & cla
 		menu_off = 1
 		'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
-		if hotcat >= 6 and $clothingworntype = 'gm_office':
+		if hotcat >= 6 and $clothingworntype = 'gm_office' and PCLoSkirt > 0:
 			'As you walk in she looks you over and gives you a pleasant smile. "Please take a seat so we can get started."'
 			'She spends the next several minutes reading your resume and looking over your certification. Once she finishes that she talks to you and asks you a lot of questions. That is followed by a quiz you have to fill out, it seems to mostly be a morality test. Once you have finally finished it all, you glance up at the clock and notice that a hour has passed.'
+			*nl
 			'"Congratulations, you are exactly what we are looking for at Titran-Express." She says with a pleasant smile.'
 			'You smile back. "That means I got the job?"'
-			'She laughs slightly. "You sure did if you want it, if so just come in on our next business day dressed appropriately and we can get you started. So what do you say?"'
+			'She laughs slightly. "You sure did if you want it, if so just come in on our next business day dressed appropriately, which is a womens business suit and skirt, then we can get you started. So what do you say?"'
 			act 'Refuse':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/npc/torbica_office.jpg"></center>'
@@ -362,9 +773,9 @@ if $ARGS[0] = 'interview':
 			end
 		elseif hotcat >= 6 and $clothingworntype ! 'gm_office':
 			'As soon as you walk in the woman takes one look at you and frowns. "What are you wearing?"'
-			'You start to respond that it is just your clothes, not sure what she meant by that, but before you can respond she keeps talking. "That is not appropriate attire, I am afraid I can''t offer you the job dressed like that. If you acquire the appropriate attire, feel free to come back later for a interview. For now though I have no positions open for you. If you don''t mind I am rather busy." She says indication the door, crestfallen and knowing there is nothing you can say you turn to leave, you should have really wore a womans suit.'
+			'You start to respond that it is just your clothes, not sure what she meant by that, but before you can respond she keeps talking. "That is not appropriate attire, I am afraid I can''t offer you the job dressed like that. If you acquire the appropriate attire, which is a women''s business suit and skirt, feel free to come back later for a interview. For now though I have no positions open for you. If you don''t mind I am rather busy." She says indication the door, crestfallen and knowing there is nothing you can say you turn to leave, you should have really wore a womans suit.'
 			act 'Leave': minut += 15 & gt 'office', 'start'
-		elseif hotcat <= 5 and $clothingworntype = 'gm_office':
+		elseif hotcat <= 5 and $clothingworntype = 'gm_office' and PCLoSkirt > 0:
 			'As soon as you walk in the woman takes one look at you and frowns. "I am afraid you are just not what we are looking for, you are dressed the part at least."'
 			'You start to respond to ask just what she means you don''t look the part, but before you can respond she keeps talking. "I am afraid I can''t offer you the job. Perhaps you should put more effort in how you look, our employees represent us and we only hire the best. If you don''t mind I am rather busy." She says indication the door, is she really saying she isn''t going to hire you because you are not pretty enough? You feel angry that you are being judge on your looks and not how well you could do the job, but you know it is pointless to try and argue, so you get up and leave.'
 			act 'Leave': minut += 15 & gt 'city_center'

+ 2 - 7
locations/vann.qsrc

@@ -1,4 +1,5 @@
 # vann
+!!2021/08/13
 
 if $ARGS[0] = 'start':
 	$loc = 'vann'
@@ -26,13 +27,7 @@ end
 
 if $ARGS[0] = 'fin':
 	cla
-	if obdysh = 1:
-		obdysh = 0
-		vannin = 0
-		gt 'dorm', 'korr'
-	else
-		gt $locM, $locM_arg
-	end
+	gt $locM, $locM_arg
 end
 
 if $ARGS[0] = 'brit1':

+ 24 - 22
locations/vecher.qsrc

@@ -1,4 +1,6 @@
 # vecher
+!!2021/08/13
+
 if $ARGS[0] = 'start':
 	*clr & cla
 	$menu_loc = 'vecher'
@@ -12,7 +14,7 @@ if $ARGS[0] = 'start':
 	'A large crowd gathers on the senior''s floor, some people looking for others to play <a href="exec:gt ''vecher'',''twister''">twister</a>.'
 	gs 'willpower', 'drink', 'resist'
 	if will_cost <= pcs_willpwr:
-		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'korr'
+		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'tenth_floor'
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -34,7 +36,7 @@ if $ARGS[0] = 'end1':
 	'<center><img <<$set_imgh>> src="images/locations/shared/party/itog.jpg"></center>'
 	'Gradually, your steady alcohol intake gets the better of you, and you spend the rest of the night in the bathroom, hugging the toilet'
 
-	act 'Leave':gt 'dorm', 'korr'
+	act 'Leave':gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'end2':
@@ -44,7 +46,7 @@ if $ARGS[0] = 'end2':
 
 	gs 'willpower', 'cuni', 'resist'
 	if will_cost <= pcs_willpwr:
-		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'korr'
+		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'tenth_floor'
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -64,12 +66,12 @@ if $ARGS[0] = 'end3':
 		'<center><img <<$set_imgh>> src="images/locations/shared/party/itog3.jpg"></center>'
 		'You stumble into an open room and sleep it off, listening to the sounds of hardcore sex from down the hall.'
 
-		act 'Leave': gt 'dorm', 'korr'
+		act 'Leave': gt 'dorm', 'tenth_floor'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/party/vechend1.jpg"></center>'
 		'You stumble into an open room and sleep it off, listening to the sounds of hardcore sex from down the hall. You dream about fucking Vika, the fantasy so real that you can feel your legs spreading, her tongue on your clitoris. Opening your eyes, you see a few girls bent over your body, hands busy caressing you, while between your legs Vika skillfully uses her tongue. "This needs to become reality," you think as you awaken.'
 
-		act 'Leave': gt 'dorm', 'korr'
+		act 'Leave': gt 'dorm', 'tenth_floor'
 
 		act 'Enjoy':
 			*clr & cla
@@ -94,7 +96,7 @@ if $ARGS[0] = 'end4':
 
 	gs 'willpower', 'cuni', 'resist'
 	if will_cost <= pcs_willpwr:
-		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'korr'
+		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'tenth_floor'
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -114,7 +116,7 @@ if $ARGS[0] = 'end5':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/party/itog5.jpg"></center>'
 	'You wake up on the floor in the hallway, halfway to your room. Panting over your body is a pimply young man, dick inside you, trying to fuck your vagina carefully so you don''t wake up. Noticing that you''re awake, he quickly jumps to his feet and runs off, leaving you lying confused and naked on the dirty floor.'
 
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'end6':
@@ -122,7 +124,7 @@ if $ARGS[0] = 'end6':
 	'<center><img <<$set_imgh>> src="images/locations/shared/party/itog6.jpg"></center>'
 	'You spend all evening molesting a girl with big tits, begging her to let you kiss them. Eventually, you both get so drunk she allows you to bury your face in her cleavage and motorboat her.'
 
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'end7':
@@ -132,7 +134,7 @@ if $ARGS[0] = 'end7':
 
 	gs 'willpower', 'sex', 'resist'
 	if will_cost <= pcs_willpwr:
-		act 'Leave him blueballed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'korr'
+		act 'Leave him blueballed (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'tenth_floor'
 	else
 		act 'Leave him blueballed (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -162,7 +164,7 @@ if $ARGS[0] = 'end7':
 					'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/party/itog74.jpg"></center>'
 					'Just when you start to get tired of his thrusting, he tugs his dick out of your aching puss, shooting a few meager ropes of cum onto your buttocks. Scooping up your clothes from the floor, you follow him to his room to sleep it off.'
 
-					act 'Leave':gt 'dorm', 'korr'
+					act 'Leave':gt 'dorm', 'tenth_floor'
 				end
 			end
 		end
@@ -176,7 +178,7 @@ if $ARGS[0] = 'end8':
 
 	gs 'willpower', 'voyeur', 'resist'
 	if will_cost <= pcs_willpwr:
-		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'korr'
+		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'tenth_floor'
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -209,7 +211,7 @@ if $ARGS[0] = 'end8':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/party/itog83.jpg"></center>'
 				'You spend a couple of moments making out and snowballing the cum between the two of you.'
 
-				act 'Leave': gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'tenth_floor'
 			end
 		end
 
@@ -229,7 +231,7 @@ if $ARGS[0] = 'end8':
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/party/itog83.jpg"></center>'
 				'You spend a couple of moments making out and snowballing the cum between the two of you.'
 
-				act 'Leave': gt 'dorm', 'korr'
+				act 'Leave': gt 'dorm', 'tenth_floor'
 			end
 		end
 	end
@@ -240,7 +242,7 @@ if $ARGS[0] = 'end9':
 	'<center><img <<$set_imgh>> src="images/locations/shared/party/sex/itog9.jpg"></center>'
 	'Girls love to have fun, particularly drunken ones. You and two new girlfriends you met spend the party kissing and caressing each other, drawing a lot of admiring glances.'
 
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'end10':
@@ -272,7 +274,7 @@ if $ARGS[0] = 'end11':
 	'You wake up in a strange room, lying on a man''s stomach, thankfully still dressed although your hangover is killing you.'
 	'As you sit up, you notice something wet on your butt. What a bastard! He dragged you into some random room and came on your clothes.'
 
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'end12':
@@ -282,7 +284,7 @@ if $ARGS[0] = 'end12':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/college_ass_show<<picrand>>.jpg"></center>'
 	'All girls love to party. You and a few others get drunk and decide to host a contest for who has the best ass.'
 	
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'end13':
@@ -293,7 +295,7 @@ if $ARGS[0] = 'end13':
 	'All mixed up in a big ball of women''s bodies, you can''t remember the name of the girl your fingers are exploring, put a face to the taste on your tongue, or identify who is delving into your pussy.'
 
 	act 'More': gt 'vecher', 'end13'
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 if $ARGS[0] = 'twister':
@@ -305,7 +307,7 @@ if $ARGS[0] = 'twister':
 
 	gs 'willpower', 'exhib', 'resist', 'easy'
 	if will_cost <= pcs_willpwr:
-		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'korr'
+		act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'dorm', 'tenth_floor'
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
@@ -322,18 +324,18 @@ if $ARGS[0] = 'twister_nude':
 	twister_rand = rand(1,3)
 	if twister_rand = 1:
 		cla
-		act 'Leave': gt 'dorm', 'korr'
+		act 'Leave': gt 'dorm', 'tenth_floor'
 	end
 	if twister_rand = 2:
 		cla
-		act 'Leave': gt 'dorm', 'korr'
+		act 'Leave': gt 'dorm', 'tenth_floor'
 	end
 	if twister_rand = 3:
 		cla
-		act 'Leave': gt 'dorm', 'korr'
+		act 'Leave': gt 'dorm', 'tenth_floor'
 	end
 	
-	act 'Leave': gt 'dorm', 'korr'
+	act 'Leave': gt 'dorm', 'tenth_floor'
 end
 
 --- vecher ---------------------------------