Merge remote-tracking branch 'upstream/master' into home-and-internet

locations/arousal.qsrc

@@ -68,7 +68,15 @@ $orgasm_or = 'custom' to force orgasm and use custom text set as $orgasm_txt - *
 $orgasm_or = 'yes' and 'custom' require that the first arousal call is a call that can trigger an orgasm, the following arousal calls can trigger it: clit_finger, clit_vibe, cuni, rimming, trib, anal, anal_finger, anal_fist, anal_dildo, anal_strap, anal_vibe, vaginal, vaginal_finger, vaginal_fist, vaginal_dildo, vaginal_strap, vaginal_vibe, self_fisting and self_fisting_anal.
 $orgasm_or = 'no' to prevent orgasm, it will remain in place until manually changed, or if end is called.
 $orgasm_txt is used to add custom text that will be called if Sveta orgasms in the next arousal call. It will remain until cleared or orgasm so you must clear it if not forcing orgasm and don''t want it to be used on next orgasm.
- }
+}
+ 
+!!------------------------------------Virginity checks----------------------------------
+!!{
+	pcs_vag > 0: Hymen broken
+	stat['vaginal'] > 0: Had intercourse with a boy [penis in vagina]
+	stat['think_virgin'] = 0: Had intercourse by penis, strap, dildo and/or fist [could be solo]
+}
+!!--------------------------------------------------------------------------------------
 
 
 temp_unaware = 0

locations/gadforest_event.qsrc

@@ -10,7 +10,7 @@ if $ARGS[0] = 'find_meadow':
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_path.jpg"></center>'
 	*nl
-	'As you walk through the forest, you notice a small path that runs along some bushes and a small ravine. The path leads away from the well worn tracks you are currently on and into a dense thicket.'
+	'Walking through the forest, you notice a small path that runs along some bushes and a small ravine. The trail leads away from the well-worn tracks you are currently on and into a dense thicket.'
 
 	act 'Ignore it and keep walking':gt 'gadforest', 'forest_edge'
 	act 'Follow the path to see where it goes':
@@ -26,7 +26,7 @@ if $ARGS[0] = 'find_meadow':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow_trail.jpg"></center>'
 			*nl
-			'You''re about to return to the edge of the forest, but you spot a small break in the thicket, from the looks of it, it''s no more than an animal trail.'
+			'You''re about to return to the forest''s edge, but you spot a small break in the thicket. From the looks of it, it''s no more than an animal trail.'
 			minut += 10
 			gs 'stat'
 
@@ -34,7 +34,7 @@ if $ARGS[0] = 'find_meadow':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 				*nl
-				'A few minutes later, you reach a majestic meadow filled with wildflowers. Judging by its undisturbed state no one else uses it or has been even been here in a long time.'
+				'A few minutes later, you reach a majestic meadow filled with wildflowers. Judging by its peaceful state, no one else uses it or has even been here in a long time.'
 				minut += 10
 				gs 'stat'
 
@@ -42,7 +42,7 @@ if $ARGS[0] = 'find_meadow':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/meadow/meadow1_<<rand(0,5)>>.jpg"></center>'
 					*nl
-					'You spend some time exploring the meadow and its surroundings. You''re positive no one visits this location. You proclaim the meadow to be your secret hideway all your own.'
+					'You spend some time exploring the meadow and its surroundings. You''re positive no one visits this location. You proclaim the field to be your secret hideaway, all your own.'
 					minut += 10
 					gs 'stat'
 
@@ -65,10 +65,10 @@ if $ARGS[0] = 'mira_picking_talk':
 
 	gs 'miroslava','miraclothes'
 	*nl
-	'"Hi <<$pcs_nickname>>, just wanted to let you know to be careful out here in the forest."'
-	'"It is very easy to get lost if you wander away from the forest''s edge. But, the deeper you go into the forest, the more mushrooms and berries you can find."'
-	'"Also every morning during the summertime the truck from the city comes to buy mushroms and berries from the local pickers. I don''t bother doing it, but I''m sure you could make some money from that if you wanted to."'
-	'"One more warning, I''ve heard some of the other villagers say there are wolves in the forest that come out after dark, so you shouldn''t stay in the forest after sundown."'
+	'"Hi, <<$pcs_nickname>>. I just wanted to tell you to be careful in the forest."'
+	'"It''s effortless to get lost if you wander away from the forest''s edge. But, the deeper you go into the forest, the more mushrooms and berries you can find."'
+	'"Also, every morning during summertime, the truck from the city comes to buy mushrooms and berries from the local pickers. I don''t bother doing it, but I''m sure you could make some money from that if you wanted to."'
+	'"One more warning, I''ve heard some other villagers say there are wolves in the forest that come out after dark, so you shouldn''t stay in the forest after sundown."'
 	'"That''s one of the reasons why I prefer to walk around the forest''s edge in the morning. It''s much safer in the daylight when more people are around."'
 
 	act 'Continue':gt 'gadforest', 'forest_edge'
@@ -86,9 +86,9 @@ if $ARGS[0] = 'mira_nude_talk':
 
 	gs 'miroslava','miraclothes'
 	*nl
-	'"Hey <<$pcs_nickname>>, guess what I overheard recently, Mira giggles, as she whispers in your ear. Some of the elders in the village were talking about how walking naked in the woods is said to greatly improve your health and mood."'
+	'"Hey <<$pcs_nickname>>, guess what I overheard recently," Mira giggles as she whispers in your ear. "Some village elders talked about how walking naked in the woods is said to greatly improve your health and mood."'
 	'"I don''t know if it''s the fresh air or just being surrounded by nature, but it did make me feel better."'
-	'"I may have tried it once, just to see if what they said was true. Maybe we can go together some time?"'
+	'"I may have tried it once to see if what they said was true. Maybe we can go together sometime?"'
 
 	act 'Continue':gt 'gadforest', 'forest_edge'
 end
@@ -107,15 +107,15 @@ if $ARGS[0] = 'mira_nude_event':
 	'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraforest4.jpg"></center>'
 	*nl
 	'"<<$pcs_nickname>>, do you remember what I told you about walking in the forest? Why don''t we try it out together?" Mira asks.'
-	'"You mean walking naked in the woods? you reply."'
-	'"Silly, of course that" said Mira. "What do you say?"'
-	'"I don''t know Mira." It''s an unexpected offer. On one hand you are a little afraid to do it, but on the other it could be exciting. "But what if someone sees us?"'
+	'"You mean walking naked in the woods?" you reply.'
+	'"Silly, of course, that," said Mira. "What do you say?"'
+	'"I don''t know, Mira." It''s a surprising offer. On the one hand, you are a little afraid to do it, but on the other, it could be exciting. "But what if someone sees us?"'
 	'"Oh, don''t worry, no one will see us." She laughed, spun around and yelled out. "Is anybody here??"'
 	'Aside from the chirping birds and some rustling leaves, there was no other sound.'
 	'Mira turns back to you, "You see, no one is here. We are all alone."'
-	'You hesitantly look around as Mira waits for you reply.'
-	'"Well, <<$pcs_nickname>>, come on, make up your mind" Mira said cheerfully and started to mess with your clothes, trying to pull them off.'
-	'Finally looking around to make sure no one is around, you decide to...'
+	'You hesitantly look around as Mira waits for your reply.'
+	'"Well, <<$pcs_nickname>>, come on, make up your mind," Mira chirped and started to mess with your clothes, trying to pull them off.'
+	'Finally, looking around to ensure no one is around, you decide to...'
 
 	if pcs_inhib < 25:
 		gs 'willpower', 'exhib', 'resist', 'easy'
@@ -143,7 +143,7 @@ if $ARGS[0] = 'mira_nude_event':
 
 			'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraforest2.jpg"></center>'
 			*nl
-			'Mira pouts at you for refusing to undress for a moment then she smiles again, "Alright then, <<$pcs_nickname>>, we can still just go for a normal walk instead."'
+			'Mira pouts at you for refusing to undress for a moment, then she smiles again, "Alright then, <<$pcs_nickname>>, we can still just go for a normal walk instead."'
 
 			act'Continue':gt 'gadforest','forest_edge'
 		end
@@ -163,7 +163,7 @@ if $ARGS[0] = 'mira_nude_event':
 
 		'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/miraforest5.jpg"></center>'
 		*nl
-		'Seeing that your resistance has stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
+		'Seeing that your resistance had stopped, Mira quickly began to undress you, leaving your clothes in a pile on the forest floor.'
 
 		act'Continue':gt 'gadforest','forest_edge'
 	end
@@ -174,7 +174,7 @@ if $ARGS[0] = 'mira_morning_walk':
 
 	gs 'Miroslava','miraclothes'
 	*nl
-	'As you walk through the forest, you hear a familiar voice call out to you, "Hey <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
+	'As you walk through the forest, you hear a familiar voice call out, "Hey, <<$pcs_nickname>>, wait up!" You turn around and see Mira excitedly bounding up behind you.'
 	'"Want to join me on my walk?" she asks. "I love walking through the forest in the morning."'
 
 	act 'Say Hello': gt 'gadforest', 'forest_edge'
@@ -189,9 +189,9 @@ if $ARGS[0] = 'mushroom_pickers1':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers1.jpg"></center>'
 	*nl
-	'Wandering through the woods, you notice mushroom pickers from the village. You wonder whether you should look for mushrooms and berries here too, or go someplace else in the forest with less competition.'
+	'Wandering through the woods, you notice mushroom pickers from the village. You wonder whether you should also look for mushrooms and berries here or go somewhere else in the forest with less competition.'
 	if $clothingworntype = 'nude':
-		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
+		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here. If they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
 		gs 'stat'
@@ -208,9 +208,9 @@ if $ARGS[0] = 'mushroom_pickers2':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers2.jpg"></center>'
 	*nl
-	'On the edge of the forest, you see mushroom pickers from the village going deeper into the forest. You wonder if you should follow them or stay along the edge of the forest where it is safer.'
+	'On the edge of the forest, you see mushroom pickers from the village going deeper into the woods. You wonder if you should follow them or stay along the edge of the forest where it is safer.'
 	if $clothingworntype = 'nude':
-		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
+		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here. If they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
 	else
@@ -233,7 +233,7 @@ if $ARGS[0] = 'mushroom_pickers3':
 
 
 	if $clothingworntype = 'nude':
-		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
+		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here. If they did, it would be the talk of the whole village.'
 		pcs_horny += 5
 		inhib_exp += rand(1,3)
 	else
@@ -257,18 +257,18 @@ if $ARGS[0] = 'mushroom_pickers3':
 					'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom_pickers3.jpg"></center>'
 					*nl
 					if rand(0,1) = 0:
-						'They are very good at finding mushrooms and berries, one of them shows you his basket full of mushrooms and berries. You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
+						'They are very good at finding mushrooms and berries. One of them shows you his basket full of mushrooms and berries. You spend ten minutes talking about the forest and the best places to find mushrooms and berries before continuing your day.'
 					else
 						'One of them asks, "How is your day going?"'
 						if boletus + boletus_cooked + bilberry < 5:
-							'"Not great today." you answer sadly, showing him your less than full basket.'
-							'"Here you go, have a couple of mine." the man says, giving you a couple mushrooms and berries from his basket.'
-							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
+							'"Not great today," you answer sadly, showing him your less-than-full basket.'
+							'"Here you go, have a few of mine." the man says, giving you a couple mushrooms and berries from his basket.'
+							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries before continuing your day.'
 							boletus += rand(1,2)
 							bilberry += rand(1,2)
 						else
-							'"Pretty well today." you answer happily, showing him your full basket.'
-							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries, before getting up to continue on with your day.'
+							'"Pretty well today," you answer happily, showing him your full basket.'
+							'You spend ten minutes talking about the forest and the best places to find mushrooms and berries before continuing your day.'
 						end
 					end
 					act 'Leave':gt 'gadforest','forest_outskirts'
@@ -292,7 +292,7 @@ if $ARGS[0] = 'mushroom':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mushroom0.'+rand(1,3)+'.jpg"></center>'
 	*nl
-	'Wandering deep in the forest, you stumble upon a clearing full of mushrooms. How lucky!.'
+	'Wandering deep in the forest, you stumble upon a clearing full of mushrooms. How lucky!'
 
 	if boletus + boletus_cooked + bilberry < 5:
 		act 'Gather mushrooms':
@@ -311,7 +311,7 @@ if $ARGS[0] = 'mushroom':
 	else
 		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
 		*nl
-		'Unfortunately your basket is already full and you cannot carry any more mushrooms.'
+		'Unfortunately, your basket is full, and you cannot carry any more mushrooms.'
 	end
 
 	gs 'stat'
@@ -326,7 +326,7 @@ if $ARGS[0] = 'bilberry':
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/bilberry'+rand(3,5)+'.jpg"></center>'
 	*nl
-	'Wandering deep in the forest, you stumble upon a clearing full of berries. How lucky!.'
+	'Wandering deep in the forest, you stumble upon a clearing full of berries. How lucky!'
 
 	if boletus + boletus_cooked + bilberry < 5:
 		act 'Gather berries':
@@ -345,7 +345,7 @@ if $ARGS[0] = 'bilberry':
 	else
 		gs 'gadforest', 'picking_clothes_empty', 'forest_center'
 		*nl
-		'Unfortunately your basket is already full and you cannot carry any more berries.'
+		'Unfortunately, your basket is already full, and you cannot carry any more berries.'
 	end
 	gs 'stat'
 
@@ -362,22 +362,22 @@ if $ARGS[0] = 'basket':
 	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_boletus.jpg"></center>'
 		*nl
-		'Wandering in the forest you find a basket full of mushrooms. Strange, someone must have left it here or lost it.'
+		'Wandering in the forest, you find a basket full of mushrooms. Strange, someone must have left it here or lost it.'
 
 		if boletus + boletus_cooked + bilberry < 5:
 			act 'Steal and empty them into your basket':boletus += 5
 		else
-			'Unfortunately your basket is already full and you cannot carry any more mushrooms.'
+			'Unfortunately, your basket is full, and you cannot carry any more mushrooms.'
 		end
 	else
 		'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/basket_bilberry.jpg"></center>'
 		*nl
-		'Wandering in the forest you find a basket full of berries. Strange, someone must have left it here or lost it.'
+		'Wandering in the forest, you find a basket full of berries. Strange, someone must have left it here or lost it.'
 
 		if boletus + boletus_cooked + bilberry < 5:
 			act 'Steal and empty them into your basket':bilberry += 5
 		else
-			'Unfortunately your basket is already full and you cannot carry any more berries.'
+			'Unfortunately, your basket is already full, and you cannot carry any more berries.'
 		end
 	end
 	gs 'stat'
@@ -392,11 +392,11 @@ if $ARGS[0] = 'picnic':
 	gs 'stat'
 
 	'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/picnic1.'+rand(1,4)+'.jpg"></center>'
-	'On the edge of the forest you see some people. Apparently they are having a family picnic.'
+	'On the edge of the forest, you see some people. Apparently, they are having a family picnic.'
 
 	if $clothingworntype = 'nude':
 		'You quickly remember you are naked right now and back away from them. It''s a good thing they didn''t see you here, if they did, it would be the talk of the whole village.'
-		'You shouldn''t be naked right now with this many people in this area of the forest. You''ll either need to get dressed or move to a more secluded area for now.'
+		'You shouldn''t be naked now with this many people in this forest area. So you''ll either need to get dressed or move to a more secluded area for now.'
 		if clothesAtLocation = 1:
 			act 'Hide and get dressed':
 				*clr & cla
@@ -443,7 +443,7 @@ if $ARGS[0] = 'forest_hunters':
 
 			'<center><img <<$set_imgh>> src="images/locations/gadukino/hunters/hanters.jpg"></center>'
 			*nl
-			'You decide to approach the strangers and chat. You never know, maybe they can show you some good places to find mushrooms and berries. After welcoming you, the whole company sat on the ground to rest and chat for a while.'
+			'You decide to approach the strangers and chat. You never know. Maybe they can show you some good places to find mushrooms and berries. After welcoming you, the whole company sat on the ground to rest and chat.'
 			'"What''s your name'+iif(pcs_apprnc >= 60,', beautiful','')+'?" one of them asks.'
 			'"<<$pcs_nickname>>," you answer.'
 			*nl
@@ -451,13 +451,13 @@ if $ARGS[0] = 'forest_hunters':
 				minut += 30
 				gs 'stat'
 
-				'"I''m Andrei," replies the older man, "And these are my friends, from the village, Igor and Sergei."'
-				'"By any chance is your last name <<$pcs_lastname>>?" he asked. You looked at him and nodded.'
-				'"Don''t be surprised <<$pcs_nickname>>, you look a lot like your mother when she was younger. I... Hmmm... very good to know, I''m also from Gadukino." said Andrei.'
+				'"I''m Andrei," replies the older man, "And these are my friends from the village, Igor and Sergei."'
+				'"By any chance, is your last name <<$pcs_lastname>>?" he asked. You looked at him and nodded.'
+				'Don''t be surprised, <<$pcs_nickname>>, you look a lot like your mother when she was younger. I... Hmmm... very good to know. I''m also from Gadukino." said Andrei.'
 				*nl
 				'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
-				'"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei.'
-				'"If you want, we show you our camp," he added after a short pause. "From there we have made a path back to the village. We can show it to you if you come with us. Or if you want, you can even stay with us for a bit."'
+				'"Okay, Sveta, it''s time for us to go," said Andrei.'
+				'"If you want, we will show you our camp," he added after a short pause. "From there, we have made a path back to the village. We can show it to you if you come with us. Or you can stay with us for a bit if you want."'
 				act 'Stay in the forest':gt 'gadforest', $ReturnAdr
 				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
 			else
@@ -465,16 +465,16 @@ if $ARGS[0] = 'forest_hunters':
 				huntersRape = 1
 				gs 'stat'
 
-				'"What are you doing so far from the village?" asks the older man, looking at you closely, "It''s <<$pcs_nickname>> <<$pcs_lastname>>, the local whore.'
+				'"What are you doing so far from the village?" asks the older man, looking at you closely, "It''s <<$pcs_nickname>> <<$pcs_lastname>>, the local whore."'
 				'You look at him with a mixture of surprise and shock.'
-				'"Don''t be surprised, I''m also from Gadukino, and you look just like your mother when she was younger, and apparently you are a whore like her too." he said.'
+				'"Don''t be surprised. I''m also from Gadukino, and you look just like your mother when she was younger, and apparently, you are a whore like her, too," he said.'
 				'You don''t even remember us. We remember you from that day by the river with Uncle Stepan.'
 				'"I''m Andrei, " he added further, "And these are my friends, also from the village, Igor and Sergei."'
 				*nl
 				if gadriver_gang > 2:'I''m not a whore. I told Uncle Stepan to go to hell! I didn''t want that to happen to me!'
-				'"Don''t run away, we won''t hurt you." said Sergei, seeing you jump to your feet.'
-				'"I think it''s about time I left" you reply.'
-				'You quickly move away from them and only slowing once you can no longer hear them talking.'
+				'"Don''t run away. We won''t hurt you," said Sergei, seeing you jump to your feet.'
+				'"I think it''s about time I left", you reply.'
+				'You quickly move away from them, only slowing once you can no longer hear them talking.'
 				act 'Go back to the forest':gt 'gadforest', $ReturnAdr
 			end
 		else
@@ -485,11 +485,11 @@ if $ARGS[0] = 'forest_hunters':
 			if hunter_sexual_comfort < 60 or hunter_collective_opinion < 60:
 				minut += 30
 				'After chatting with them for about half an hour, the hunters begin to get up and gather their things.'
-				'"Okay <<$pcs_nickname>>, it''s time for us to go." said Andrei. "You should pay us another visit some time, ok?"'
+				'"Okay, <<$pcs_nickname>>, it''s time for us to go," said Andrei. "You should pay us another visit sometime, okay?"'
 				act 'Stay in the forest':gt 'gadforest', $ReturnAdr
 				act 'Go with them': minut += 60 & gt 'swamp_yard', 'start'
 			else
-				'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
+				'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again," Andrei said with a smile.'
 				'"How about you come back with us to our hut, we were just about to head back there anyways."'
 
 				gs 'willpower', 'misc', 'resist', 'hard'
@@ -516,7 +516,7 @@ if $ARGS[0] = 'forest_hunters':
 
 				'<center><img <<$set_imgh>> src="images/locations/gadukino/forest/mitkanudeforest.jpg"></center>'
 				*nl
-				'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you notice that the effect has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
+				'You pretend not to notice the hunters and walk right past them, swaying your hips pointedly to maximize the effect. Looking around, you see that the impact has exceeded your expectations. The men have been stopped in their tracks and are staring at you...'
 
 				act 'Continue':gt 'gadforest', $ReturnAdr
 			end
@@ -532,8 +532,8 @@ if $ARGS[0] = 'forest_hunters':
 				act 'Continue':gt 'gadforest', $ReturnAdr
 			end
 		if hunters_were_met = 1:
-			'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again" Andrei said with a smile.'
-			'"How about you come back with us to our hut, we were just about to head back there anyways."'
+			'"Oh, <<$pcs_nickname>>, we were all looking forward to seeing you again," Andrei said with a smile.'
+			'"How about you come back with us to our hut? We were just about to head back there anyways."'
 
 			gs 'willpower', 'misc', 'resist', 'hard'
 			if will_cost <= pcs_willpwr:
@@ -564,8 +564,8 @@ if $ARGS[0] = 'mitka_temporary_event':
 			'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big63.jpg"></center>'
 			*nl
-			'While walking through the forest, you meet Mitka. You chat for a bit before saying goodbye. As you begin to walk away, you notice Mira is not with you.'
-			'"<<$pcs_nickname>>, you go on, I need to talk to Mitka in private." She says blushing. "He''ll take me home."'
+			'While walking through the forest, you meet Mitka. You chat for a bit before saying goodbye. As you walk away, you notice Mira is not with you.'
+			'"<<$pcs_nickname>>, you go on. I need to talk to Mitka in private." She says, blushing. "He''ll take me home."'
 			'"Have fun!" you reply to Mira with a wink.'
 
 			act 'Continue': gt 'gadforest','forest_edge'
@@ -578,7 +578,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
 					*nl
-					'You decide to follow them from a safe distance. The forest offers plenty of places to hide and you have no trouble staying unseen.'
+					'You decide to follow them from a safe distance. The forest offers plenty of hiding places, and you have no trouble staying unseen.'
 					'Mira and Mitka talk in whispers, slowly undressing as they walk, but you can''t hear a word they are saying.'
 
 					act 'Watch':
@@ -589,9 +589,9 @@ if $ARGS[0] = 'mitka_temporary_event':
 						'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex1.jpg"></center>'
 						*nl
 						if npc_QW['A60'] = 2:
-							'Eventually, you arrive at your secret meadow. Mira lays down on a blanket in front of Mitka and spreads her legs invitingly. He doesn''t waste a second before he is on top of her her. He positions himself between her legs and starts eagerly slamming his cock roughly into her vagina. Mira certainly seems to be enjoying it though, as she moans and begs for more.'
+							'Eventually, you arrive at your secret meadow. Mira lays down on a blanket before Mitka and spreads her legs invitingly. He doesn''t waste a second before he is on top of her. He positions himself between her legs and eagerly slams his cock roughly into her vagina. Mira seems to be enjoying it, though, as she moans and begs for more.'
 						else
-							'Eventually, you arrive at your not-so-secret meadow. You already know what is about to happen having seen it all before. Mira lays down on a blanket in front of Mitka and spreads her legs invitingly. He doesn''t waste a second before he is on top of her her. He positions himself between her legs and starts eagerly slamming his cock roughly into her vagina. Mira seems to be enjoying it even more than last time, as she moans and begs for more.'
+							'Eventually, you arrive at your not-so-secret meadow. You already know what will happen, having seen it all before. Mira lays down on a blanket before Mitka and spreads her legs invitingly. He doesn''t waste a second before he is on top of her. He positions himself between her legs and eagerly slams his cock roughly into her vagina. Mira seems to be enjoying it even more than last time as she moans and begs for more.'
 						end
 
 						act 'Continue Watching':
@@ -603,7 +603,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex2.jpg"></center>'
 							*nl
-							'After a few more minutes Mitka pulls out and cums on her stomach. They rest for a little while and then get dressed and leave to head back to the village.'
+							'After a few more minutes, Mitka pulls out and cums on her stomach. They rest for a little while, then get dressed and leave to head back to the village.'
 
 							act 'Leave': gt 'gadforest','forest_edge'
 						end
@@ -616,7 +616,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/mirameadowsex.jpg"></center>'
 					*nl
-					'You decide to follow them from a safe distance. The forest offers plenty of places to hide and you have no trouble staying unseen.'
+					'You decide to follow them from a safe distance. The forest offers plenty of hiding places, and you have no trouble staying unseen.'
 					'Mira and Mitka talk in whispers, slowly undressing as they walk, but you can''t hear a word they are saying.'
 
 					act 'Watch':
@@ -628,11 +628,11 @@ if $ARGS[0] = 'mitka_temporary_event':
 						if temp_gadf = 0:
 							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
 							*nl
-							'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
+							'Mira is working her ass up and down on Mitka''s hard member. Every time she goes down, her buttocks slap loudly on his thighs.'
 						elseif temp_gadf = 1:
 							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal1.jpg"></center>'
 							*nl
-							'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock all the way in her wide open hole.'
+							'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock into her wide-open hole.'
 						end
 
 						act 'Continue Watching':
@@ -643,7 +643,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 							'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
 							*nl
-							'After a couple of minutes Mitka strongly slaps her ass and Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he shoots his warm cum all over her face.'
+							'After a couple of minutes, Mitka vigorously slaps her ass. Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he shoots his warm cum all over her face.'
 
 							act 'Leave': gt 'gadforest','forest_edge'
 						end
@@ -661,7 +661,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 			'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big63.jpg"></center>'
 			*nl
-			'Walking through the forest with Mira, you meet Mitka. Seeing Mira, Mitka grabbed her hand and pulled her into the nearest bush, seeing that Mira is not resisting, you decide not to interfere and mind your own business.'
+			'Walking through the forest with Mira, you meet Mitka. Seeing Mira, Mitka grabbed her hand and pulled her into the nearest bush. Seeing Mira is not resisting, you decide not to interfere and mind your business.'
 
 			act 'Continue': gt 'gadforest','forest_edge'
 			act 'Spy on them':
@@ -673,11 +673,11 @@ if $ARGS[0] = 'mitka_temporary_event':
 				if temp_gadf = 0:
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal.jpg"></center>'
 					*nl
-					'Mira is working her ass up and down on Mitka''s hard member, every time she goes down her buttocks slap loudly on his thighs.'
+					'Mira is working her ass up and down on Mitka''s hard member. Every time she goes down, her buttocks slap loudly on his thighs.'
 				elseif temp_gadf = 1:
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal1.jpg"></center>'
 					*nl
-					'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock all the way in her wide open hole.'
+					'Mira is on all fours and moaning loudly as Mitka spreads her asshole with his fingers and then drives his cock into her wide-open hole.'
 				end
 
 				act 'Continue Watching':
@@ -688,7 +688,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 
 					'<center><img <<$set_imgh>> src="images/characters/gadukino/mira/sex/mirameadowanal2.jpg"></center>'
 					*nl
-					'After a couple of minutes Mitka strongly slaps her ass and Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he shoots his warm cum all over her face.'
+					'After a couple of minutes, Mitka vigorously slaps her ass. Mira quickly turns around, gets on her knees before him and sucks his cock for a few seconds before he shoots his warm cum all over her face.'
 
 					act 'Leave': gt 'gadforest','forest_edge'
 				end
@@ -703,7 +703,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 			'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big63.jpg"></center>'
 			*nl
-			'Walking through the forest with Mira, you meet Mitka. You chat for a little while, noticing the interest Mira showed Mitka, before saying goodbye.'
+			'Walking through the forest with Mira, you meet Mitka. You chat for a little while, noticing the interest Mira showed Mitka before saying goodbye.'
 
 			act 'Continue': gt 'gadforest','forest_edge'
 		end
@@ -717,7 +717,7 @@ if $ARGS[0] = 'mitka_temporary_event':
 		'<center><b><font color = maroon>Mitka Shkvoryen</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big63.jpg"></center>'
 		*nl
-		'Walking through the forest with Mira, you meet Mitka. He looks at you both like he is trying to decide something, but must have thought better of it because he continues to just chat normally. You talk for a bit longer before saying goodbye.'
+		'Walking through the forest with Mira, you meet Mitka. He looks at you both like he is trying to decide something but must have thought better because he continues to chat usually. So you talk for a bit longer before saying goodbye.'
 
 		act 'Continue':gt 'gadforest','forest_edge'
 	end

locations/uni_dorm.qsrc

@@ -1,5 +1,5 @@
 # uni_dorm
-!!2021/08/13
+!!2022/10/05 - Alaratt
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -7,33 +7,44 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'start'
 	menu_off = 0
-	gs 'stat'
 	gs 'themes', 'indoors'
+	minut += 1
+	gs 'stat'
+	*clr & cla
 	'<center><b><font color="maroon">Dormitory</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm.jpg"></center>'
 	'You walk up to the dorm building and go inside. It is pretty clean and in good shape. An older woman, with a very unpleasant and judgmental look on her face sits in a room just off the main hallway. It has a partially glass wall and a window, splitting it from the main room. She looks up at you as you enter, her look telling you she is already judging you as her face frowns into a look of disapproval.'
+
+	act 'Go outside':
+		minut += 1
+		killvar 'university_dorm'
+		gt 'uni_grounds', 'main'
+	end
+
 	if func('homes_properties', 'can_live_here') or university['student'] = 1:
 	univ
 		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 second and nods before going back to what she was doing. You head for the elevators.'
+
 			act 'Take the elevator':gt 'uni_dorm', 'elevator'
 		end
 	else
 		menu_off = 1
 		'Since you''re not attending the university and don''t have an ID, you won''t be allowed in the dorms unless you''re on the guest list of a student.'
-		act 'Leave': minut += 5 & gt 'city_island'
+
 		if DjibrilQW['invite'] = 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 and pull out your ID. "I''m here to visit Djibril."' 
 				'The woman gives you a look of complete disgust. "What, your own kind not good enough for you? Go ahead and take care of those black cocks. He''s on the eighth floor, room 810." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
+
 				act 'Take the elevator':gt 'uni_dorm', 'elevator'
 			end
 		end
+
 		if gosh > 0 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Gosha':
 				*clr & cla
@@ -42,9 +53,11 @@ if $ARGS[0] = 'start':
 				'The woman shakes her head in disapproval. "You''re Gosha''s new whore? I''ll never understand what you sluts see in that scrawny bastard. He''s been through half of the dorm already! He''s on the sixth floor, room 602." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
 				reccoldorm = 1
 				goshiflag = 1
+
 				act 'Take the elevator':gt 'uni_dorm', 'elevator'
 			end
 		end
+
 		if meet_kendra = 1 and hour >= 8 and hour < 22:
 			act 'I''m here to visit Kendra':
 				*clr & cla
@@ -52,44 +65,47 @@ if $ARGS[0] = 'start':
 				if npc_rel['A84'] < 40:
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "It seems like she''s gotten tired of you since you''re no longer on the guest list. Now get out of here before I call security." Surprised, you turn and quickly leave before the woman calls security.'
-					act 'Leave': 
-						minut += 5 
+
+					act 'Go outside':
 						killvar 'university_dorm'
-						gt 'city_island'
+						minut += 1
+						gt 'uni_grounds', 'main'
 					end
 				else
 					'You walk over to the counter and pull out your ID. "I''m here to visit Kendra."' 
 					'The woman gives you a look of complete disgust. "What, a man not good enough for you? Go ahead and serve that black whore. She''s on the eighth floor, room 801." She turns away from you and goes back to what she was doing. Not wanting to get into an argument with her, you say nothing and quickly head for the elevator.'
+
 					act 'Take the elevator':gt 'uni_dorm', 'elevator'
 				end
 			end
 		end
 	end
-	act 'Leave':
-		killvar 'university_dorm'
-		gt 'city_island'
-	end
 end
 
 if $ARGS[0] = 'elevator':
-	*clr & cla
-	minut += 5
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'elevator'
 	menu_off = 0
-	gs 'stat'
 	gs 'themes', 'indoors'
+	minut += 5
+	gs 'stat'
+	*clr & cla
 	'<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. The panel of floor numbers awaits your input.'
 	if func('uniutil', 'student', 'enrolled'):
 		'Your dorm room is on the tenth floor.'
 	end
+
+	act 'Go to the first floor and leave the dorm':
+		killvar 'university_dorm'
+		minut += 1
+		gt 'uni_grounds', 'main'
+	end
 	act 'Go to the second floor': gt 'uni_dorm', 'second_floor'
 	act 'Go to the sixth floor': gt 'uni_dorm', 'sixth_floor'
 	act 'Go to the eighth floor': gt 'uni_dorm', 'eighth_floor'
 	act 'Go to the tenth floor': gt 'uni_dorm', 'tenth_floor'
-	act 'Go to the first floor and leave the dorm':gt 'city_island'
 end
 
 if $ARGS[0] = 'second_floor':
@@ -100,18 +116,27 @@ if $ARGS[0] = 'second_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	gs 'katja_meynold_schedule'
 	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with the dilapidated walls of the second floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
 	if katjaQW['knows_dorm_room_number'] > 0 and yearstart > 1:
 		act 'katja''s room':
 			*clr & cla 
 			if locat['katja']  = 31:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'Katja opens the door. "Hi <<$pcs_nickname>>, come in?" she stands aside so you can walk in before closing the door behind you.'
+
 				act 'Enter': gt 'katja_dorm', 'start'
 			else
 				if locat['katja'] = 29 and sofiaQW['know'] = 1 and rand(0,3) = 0 and week < 5:
@@ -123,12 +148,11 @@ if $ARGS[0] = 'second_floor':
 				end
 				minut += 5
 				gs 'stat'
-				act 'Leave': gt 'uni_dorm', 'elevator'
+
+				act 'Leave': gt 'uni_dorm', 'second_floor'
 			end
 		end
 	end
-
-	act 'Leave':gt 'uni_dorm', 'elevator'
 end
 
 if $ARGS[0] = 'sixth_floor':
@@ -139,29 +163,37 @@ if $ARGS[0] = 'sixth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with the dilapidated walls of the sixth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
 
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
 	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 stands aside so you can walk in before closing the door behind you.'
+
 				act 'Enter':gt 'gosha', 'gosha_room'
 			else
 				minut += 5
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 				'You knock on the door, but no one answers. He must be asleep or not home.'
+
 				act 'Leave':gt 'uni_dorm', 'elevator'
 			end
 		end
 	end
-
-	act 'Leave':gt 'uni_dorm', 'elevator'
 end
 
 if $ARGS[0] = 'eighth_floor':
@@ -172,23 +204,34 @@ if $ARGS[0] = 'eighth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_hall.jpg"></center>'
 	'Before you is the usual dorm hallway with the dilapidated walls of the eighth floor. You can hear music and loud talking from drunk students escaping from some rooms.'
+
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
 	if DjibrilQW['invite'] = 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 few 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."'
+
 				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 'uni_dorm', 'elevator'
+
+				act 'Leave':gt 'uni_dorm', 'eighth_floor'
 			end
 		end
 	end
@@ -201,13 +244,16 @@ if $ARGS[0] = 'eighth_floor':
 					if rand(1,5) = 1:
 						'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 						'You can hear Kendra''s voice as you get close to the door. It is fairly loud and sounds harsh in tone, but you can''t quite make out what she is saying. You hear a muffled reply that sounds male. It sounds like she''s already busy. You could knock or just leave her to her company.'
+
+						act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						act 'Knock':
 							kendra_busy = daystart
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
 							if npc_rel['A84'] < 40:
 								'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she frowns at you. "I told you last time, I don''t have time for games and I''m tired of yours! Now get lost, I''m busy!" She then slams the door in your face.'
-								act 'Leave':gt 'uni_dorm', 'elevator'
+
+								act 'Leave':gt 'uni_dorm', 'eighth_floor'
 							else
 								if kendra_male_slave = 0:
 									'You knock on the door. After a few seconds, Kendra opens the door. She is completely naked and wearing a strapon harness around her hips. A large black dildo is attached to it and she plays with it as she looks at you. "Well if it isn''t my new favorite white slave bitch. I''m kind of busy punishing one of my other slaves right now."'
@@ -220,10 +266,10 @@ if $ARGS[0] = 'eighth_floor':
 								end
 								gs 'arousal', 'erotic_nudity', 3
 								gs 'stat'
+
 								act 'Enter': gt 'kendra', 'kendra_male_slave'
 								act 'Decline':
 									*clr & cla
-									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/strapon_door.jpg"></center>'
 									if kendra_male_slave = 0:
 										'You shake your head. "No thanks. You look busy and I don''t want to disturb you..."'
@@ -234,37 +280,39 @@ if $ARGS[0] = 'eighth_floor':
 									end
 									gs 'arousal', 'end'
 									gs 'stat'
-									act 'Leave':gt 'uni_dorm', 'elevator'
+
+									act 'Leave':gt 'uni_dorm', 'eighth_floor'
 								end
 							end
 						end
-						act 'Leave':gt 'uni_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 few seconds, Kendra opens the door. "I told you last time, I don''t have time for games and I''m tired of yours. Now get lost." She slams the door in your face.'
-							act 'Leave':gt 'uni_dorm', 'elevator'
+
+							act 'Leave':gt 'uni_dorm', 'eighth_floor'
 						else
 							'You knock on the door. After a few seconds, Kendra opens the door. "Well if it isn''t my new favorite white slave bitch. Come in." She stands aside to let you enter. She then closes the door behind you.'
+
 							act 'Enter': gt 'kendra', 'kendra_room_start'
 						end
 					end
 				else
 					'<center><img <<$set_imgh>> src="images/characters/city/university/girl/kendra/door.jpg"></center>'
 					'You can hear Kendra''s voice as you get close to the door. 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. It sounds like she''s busy right now, so you shouldn''t bother her.'
-					act 'Leave':gt 'uni_dorm', 'elevator'
+
+					act 'Leave':gt 'uni_dorm', 'eighth_floor'
 				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 'uni_dorm', 'elevator'
+
+				act 'Leave':gt 'uni_dorm', 'eighth_floor'
 			end
 		end
 	end
-
-	act 'Leave':gt 'uni_dorm', 'elevator'
 end
 
 if $ARGS[0] = 'tenth_floor':
@@ -277,40 +325,47 @@ if $ARGS[0] = 'tenth_floor':
 	menu_off = 0
 	$location_type = 'public_indoors'
 	killvar '$locclass'
-	*clr & cla
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<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 leading 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
+
+	act 'Go outside':
+		killvar 'university_dorm'
+		minut += 6
+		gt 'uni_grounds', 'main'
+	end
+	act 'Elevator': gt 'uni_dorm', 'elevator'
+
+	if owned_property['university_dorm'] = 4:
+		if courtletter_date <= daystart and courtletter_date ! 0:
+			gt 'sentence', 'letter'
+		end
+		act 'Your room': gt 'uni_dorm', 'dorm_room'
+		act 'Go to the shared kitchen': gt 'uni_dorm', 'dorm_kitchen'
+		act 'Go to the shared shower': gt 'vann', 'start'
+	end
+
+	act 'Enter the women''s restroom': minut += 1 & gt 'uni_dorm', 'womens_restroom'
+
 	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'
-			minut =+ 1
 			gs 'stat'
 			gt 'uni_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': minut += 1 & gt 'uni_dorm', 'womens_restroom'
-	act 'Leave':gt 'uni_dorm', 'elevator'
-	act 'Go to the shared shower':
-		minut += 1
-		gt 'vann', 'start'
-	end
 
-	if owned_property['university_dorm'] = 4:
-		if courtletter_date <= daystart and courtletter_date ! 0:
-			gt 'sentence', 'letter'
-		end
-		act 'Your room': minut += 1 & gt 'uni_dorm', 'dorm_room'
-		act 'Go to the shared kitchen': minut += 1 & gt 'uni_dorm', 'dorm_kitchen'
-	end
+!!	commented out until parties are added back in
 !!	if (home_owned[11] = 1 or university['student'] = 1) and week = 5 and hour > 18 and hour < 23:
 !!		'You can hear music blasting in the corridor. It sounds like the Friday night party is in full swing.'
 !!		act 'The party': minut += 1 & gt 'vecher', 'start'
@@ -319,18 +374,20 @@ end
 
 if $ARGS[0] = 'mens_restroom':
 	$location_type = 'public_indoors'
-	*clr & cla
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'mens_restroom'
 	$locM = 'uni_dorm'
 	$locM_arg = 'mens_restroom'
 	menu_off = 0
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<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': minut += 1 & gt 'uni_dorm', 'tenth_floor'
-	
+
+	act 'Leave': gt 'uni_dorm', 'tenth_floor'
+
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
@@ -338,24 +395,25 @@ end
 
 if $ARGS[0] = 'womens_restroom':
 	$location_type = 'public_indoors'
-	*clr & cla
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'womens_restroom'
 	$locM = 'uni_dorm'
 	$locM_arg = 'womens_restroom'
 	menu_off = 0
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<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': minut += 1 & gt 'uni_dorm', 'tenth_floor'
-	
+
+	act 'Leave': gt 'uni_dorm', 'tenth_floor'
+
 	dynamic $tampon
 	dynamic $quickwash
 	dynamic $basin
 end
 
-
 if $ARGS[0] = 'dorm_room':
 	$sexloc = 'uni_dorm'
 	CLOSE ALL
@@ -367,10 +425,11 @@ if $ARGS[0] = 'dorm_room':
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_room'
 	menu_off = 0
-	cla
-	*clr
 	odkomp = 1
+	gs 'themes', 'indoors'
+	minut += 1
 	gs 'stat'
+	*clr & cla
 	'<center><b>Your room</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_room/room.jpg"></center>'
 	'This is the dorm room you share with Vika.'
@@ -393,7 +452,6 @@ if $ARGS[0] = 'dorm_room':
 		elseif vikaslut = 1:
 			$vikatext = '<a href="exec:gt''Vika''">Vika</a> is sleeping in her bed after working hard in the brothel all night.'
 		end
-		
 	end
 
 	if komp = 1:
@@ -412,7 +470,7 @@ if $ARGS[0] = 'dorm_room':
 		end
 		'Your <a href="exec:gt ''Komp'',''start''">laptop</a> sits on your desk.'
 	end
-	
+
 	'To the left of the entrance is an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
 
@@ -435,13 +493,13 @@ if $ARGS[0] = 'dorm_room':
 	act 'Walk out to the corridor':
 		if $clothingworntype ! 'nude':
 			odkomp = 0
-			minut += 1
 			gt 'uni_dorm', 'tenth_floor'
 		else
-			'You need to get dressed first!'
+			msg'<b><font color = red>You need to get dressed first.</font></b>'
+			gt 'uni_dorm', 'dorm_room'
 		end
 	end
-	
+
 	act 'Relax on your bed': gt 'bed', 'start'
 
 	dynamic $wearpan
@@ -462,12 +520,15 @@ if $args[0] = 'dorm_kitchen':
 	$menu_loc = 'uni_dorm'
 	$menu_arg = 'dorm_kitchen'
 	menu_off = 0
+	minut += 1
 	gs 'kit_din'
 	gs 'stat'
+	*clr & cla
 	'<center><b>Dorm Kitchen</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/dorm_kitchen.jpg"></center>'
 	'The large shared kitchen for this floor. It is fairly tidy, with a lot of cabinets along two of the walls. Two ovens and two refrigerators, as well as several tables with chairs around them, are scattered around the room.'
-	act 'Return to the corridor': minut += 1 & gt 'uni_dorm', 'tenth_floor'
+
+	act 'Return to the corridor': gt 'uni_dorm', 'tenth_floor'
 
 	if eda > 0:
 		if edahot = 0:

locations/uni_grounds.qsrc

@@ -1,4 +1,5 @@
 # uni_grounds
+!!2022/10/05 - Alaratt
 
 if $ARGS[0] = 'main':
 	music_loop = 0
@@ -93,10 +94,12 @@ if $ARGS[0] = 'main':
 	if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 	if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 
-	act 'Go to the dorms':
-		minut += 5
-		gt 'uni_dorm', 'start'
+	if owned_property['university_dorm'] = 1 or university['student'] = 1:
+		act 'Go to your room': minut += 7 & gt 'uni_dorm', 'dorm_room'
 	end
+
+	act 'Go to the dorms': minut += 3 & gt 'uni_dorm', 'start'
+
 	!!act 'Got to the gym':
 	!!	minut += 3
 	!!	gt '', ''