1
0
Quellcode durchsuchen

Renamed the postoffice and the lab

postoffice -> post_office
postdeliveries -> post_deliveries
postmaster -> post_master
postevents -> post_events
lab -> tatiana->lab
Netuttki vor 4 Jahren
Ursprung
Commit
3716c89e23

+ 6 - 6
glife.qproj

@@ -250,10 +250,10 @@
 		<Location name="noticeboard"/>
 	</Folder>
 	<Folder name="Post office">
-		<Location name="postoffice"/>
-		<Location name="postmaster"/>
-		<Location name="postdeliveries"/>
-		<Location name="postevents"/>
+		<Location name="post_office"/>
+		<Location name="post_master"/>
+		<Location name="post_deliveries"/>
+		<Location name="post_events"/>
 	</Folder>
 	<Folder name="Home Street - Locations">
 		<Location name="city_residential"/>
@@ -760,10 +760,10 @@
 		<Location name="danceclass"/>
 		<Location name="dorm"/>
 		<Location name="dormev1"/>
-		<Location name="downlibrary"/>
+		<Location name="city_library"/>
 		<Location name="fit"/>
 		<Location name="talent_agency"/>
-		<Location name="lab"/>
+		<Location name="tatiana_lab"/>
 		<Location name="tatiana_missions"/>
 		<Location name="NewCloShop"/>
 		<Location name="office"/>

+ 7 - 0
glmf.code-workspace

@@ -0,0 +1,7 @@
+{
+	"folders": [
+		{
+			"path": "."
+		}
+	]
+}

+ 4 - 4
locations/city_center.qsrc

@@ -186,14 +186,14 @@ else
 	$desc_txt3 = '<a href="exec:msg ''Kirsanova Realty is closed and will reopen at 8:00''">Kirsanova Realty</a>'
 end
 if (week < 6 and hour >= 9 and hour <= 16) or (week = 6 and hour >= 9 and hour <= 13):
-	$desc_txt4 = '<a href="exec: minut += 3 & gt ''postoffice'', ''start''">post office</a>'
+	$desc_txt4 = '<a href="exec: minut += 3 & gt ''post_office'', ''start''">post office</a>'
 elseif (week = 5 or week = 6) and hour > 16:
 	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 9:00 on Monday''">post office</a>'
 else
 	$desc_txt4 = '<a href="exec:msg ''The post office is closed and will reopen at 9:00''">post office</a>'
 end
 if hour >= 8 and hour <= 18:
-	$desc_txt5 = '<a href="exec: minut += 5 & gt ''downlibrary''">National Library of Russia</a>'
+	$desc_txt5 = '<a href="exec: minut += 5 & gt ''city_library''">National Library of Russia</a>'
 else
 	$desc_txt5 = '<a href="exec:msg ''The National Library of Russia is closed and will reopen at 8:00''">National Library of Russia</a>'
 end
@@ -224,7 +224,7 @@ if Enable_tablemap = 0:
 	if nichTanyaRelationship = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanyaFuckLast ! daystart:'<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment where Tanya lives</a>.'
 	if nichWork = 2:'<a href="exec:gt ''nichApartment''">Nicholas''</a> apartment where you work as a live in maid.'
 	if izoldaQW >= 1:'Your friend <a href="exec:gt ''qwIzoldaApp''">Isolde''s</a> apartment.'
-	if mainQW >= 1:'<a href="exec:gt ''lab'', ''start''">Tatiana''s</a> secret hideout.'
+	if mainQW >= 1:'<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout.'
 	if yaq = 1:'<a href="exec:gt ''yarik'', ''start''">Yaroslav</a> from the office''s apartment.'
 	if peter > 0:'<a href="exec:gt ''peterroom'', ''start_door''">Peter</a> the sexshop owner''s apartment.'
 else
@@ -232,7 +232,7 @@ else
 	if nichTanyaRelationship = 1 and nichWork ! 2 and hour >= 16 and hour <= 21 and nichTanyaFuckLast ! daystart:gs'show_table','<a href="exec:gt ''nichApartment'', ''visitTanya''">Apartment</a> where Tanya lives','3'
 	if nichWork = 2:gs'show_table','<a href="exec:gt ''nichApartment''">Nicholas''</a> apartment','3'
 	if izoldaQW >= 1:gs'show_table','<a href="exec:gt ''qwIzoldaApp''">Isoldes</a> apartment','3'
-	if mainQW >= 1:gs'show_table','<a href="exec:gt ''lab'', ''start''">Tatiana''s</a> secret hideout','3'
+	if mainQW >= 1:gs'show_table','<a href="exec:gt ''tatiana_lab'', ''start''">Tatiana''s</a> secret hideout','3'
 	if yaq = 1:gs'show_table','<a href="exec:gt ''yarik'', ''start''">Yaroslavs</a> apartment','3'
 	if peter > 0:gs'show_table','<a href="exec:gt ''peterroom'', ''start_door''">Peters</a> apartment','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'

+ 4 - 4
locations/downlibrary.qsrc → locations/city_library.qsrc

@@ -1,8 +1,8 @@
-# downlibrary
+# city_library
 
 $metka = $ARGS[0]
 $loc = $CURLOC
-$menu_loc = 'downlibrary'
+$menu_loc = 'city_library'
 $menu_arg = ''
 menu_off = 0
 $location_type = 'public_indoors'
@@ -104,7 +104,7 @@ if hour >= 8 and hour <= 18:
 			end
 
 			if arrsize('$ResearchingSP') > 0:
-				gs 'spellList', 'teacherActions', '$ResearchingSP', 'downlibrary', ''
+				gs 'spellList', 'teacherActions', '$ResearchingSP', 'city_library', ''
 			end
 			act 'Put the book down':gt $curloc
 		end
@@ -116,5 +116,5 @@ end
 
 
 
---- downlibrary ---------------------------------
+--- city_library ---------------------------------
 

+ 6 - 6
locations/ender.qsrc

@@ -28,7 +28,7 @@ if $ARGS[0] = 'loss':
 
 		'You fall down on the floor as you''re not longer able to fight Gustav.'
 
-		act 'Further':gt'lab','start'
+		act 'Further':gt'tatiana_lab','start'
 		exit
 	elseif fightEnding = 3:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -37,7 +37,7 @@ if $ARGS[0] = 'loss':
 
 		'You fall down on the floor as you''re not longer able to fight Tatiana.'
 
-		act 'Further':gt'lab','start'
+		act 'Further':gt'tatiana_lab','start'
 		exit
 	elseif fightEnding = 4:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -273,7 +273,7 @@ if $ARGS[0] = 'win':
 		'Gustav falls to the floor. He can no longer continue the fight.'
 		'"You have improved greatly, few can beat me in combat." He says with reverence.'
 
-		act 'Further':gt'lab','start'
+		act 'Further':gt'tatiana_lab','start'
 		exit
 	elseif fightEnding = 3:
 		pcs_health = pcs_vital*10
@@ -283,7 +283,7 @@ if $ARGS[0] = 'win':
 
 		'Tatiana fell to the floor and can no longer keep on fighting.'
 
-		act 'Further':gt'lab','start'
+		act 'Further':gt'tatiana_lab','start'
 		exit
 	elseif fightEnding = 4:
 		fightEnding = 0
@@ -449,7 +449,7 @@ if $ARGS[0] = 'surrender':
 
 		'You raise your hands asking Gustav to stop, he complains that he hasn''t even warmed up yet but stops the fight.'
 
-		act 'Further':gt'lab','start'
+		act 'Further':gt'tatiana_lab','start'
 		exit
 	elseif fightEnding = 3:
 		if pcs_health < 100: pcs_health = 100
@@ -458,7 +458,7 @@ if $ARGS[0] = 'surrender':
 
 		'You tell Tatiana you''ve had enough. She shakes her head and tells you you need to toughen up.'
 
-		act 'Further':gt'lab','start'
+		act 'Further':gt'tatiana_lab','start'
 		exit
 	elseif fightEnding = 4:
 		killvar 'autocombat_surrender'

+ 2 - 2
locations/pav_commercial.qsrc

@@ -98,9 +98,9 @@ end
 '<br>Centered along the main street is the <a href="exec:minut += 10 & gt ''pav_train''">train station</a> that is always open and running. For those with a car, the end of the street leads to a <a href="exec:minut += 5 & gt ''zaprF'', ''start''">gas station</a> which is usually the last stop people make before heading out onto the nearby highway.'
 
 if week < 6 and hour >= 9 and hour <= 18:
-	$desc_txt4 = '<a href="exec:minut += 3 & gt ''postoffice'', ''start''">post office</a>'
+	$desc_txt4 = '<a href="exec:minut += 3 & gt ''post_office'', ''start''">post office</a>'
 elseif week = 6 and hour >= 10 and hour <= 18:
-	$desc_txt4 = '<a href="exec:minut += 3 & gt ''postoffice'', ''start''">post office</a>'
+	$desc_txt4 = '<a href="exec:minut += 3 & gt ''post_office'', ''start''">post office</a>'
 else
 	$desc_txt4 = '<a href="exec:msg ''The post office, which is closed right now, will reopen again at 9:00 and at 10:00 on Saturdays.''">post office</a>'
 end

+ 100 - 100
locations/postdeliveries.qsrc → locations/post_deliveries.qsrc

@@ -1,4 +1,4 @@
-# postdeliveries
+# post_deliveries
 
 !!variables used:
 !!postamountrand = (0-2), whether there is a little, medium or lots of mail to deliver. Affects how much time you have to do other things
@@ -74,7 +74,7 @@ if $ARGS[0] = 'start':
 			else
 				'After another half hour you take another look in your bag. Damn, there''s still so much left to deliver! There''s no way you''ll be able to finish your round on time if you keep this up.'
 			end
-			act 'During your round...':gt 'postdeliveries', 'event'
+			act 'During your round...':gt 'post_deliveries', 'event'
 		end
 		gs 'willpower', 'misc', 'self'
 		if will_cost <= pcs_willpwr:
@@ -93,7 +93,7 @@ if $ARGS[0] = 'start':
 					'After another half hour you take another look in your bag. Damn, there''s still so much left to deliver! You should be able to just about get it done on time, but you''re going to have to keep the pace up...'
 				end
 				
-				act 'During your round...':gt 'postdeliveries', 'event'
+				act 'During your round...':gt 'post_deliveries', 'event'
 			end
 		else
 			act 'Use the more dangerous shortcuts to save time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -110,60 +110,60 @@ if $ARGS[0] = 'event':
 	end
 !!change to determine which event is chosen. Easily moddable in case events ought to happen more or less often.
 	if eventrand <= 3 and posteventQW1 = 0:
-		gt 'postdeliveries', '1'
+		gt 'post_deliveries', '1'
 	elseif eventrand <= 6 and posteventQW2 = 0:
-		gt 'postdeliveries', '2'
+		gt 'post_deliveries', '2'
 	elseif eventrand <= 9 and posteventQW3 = 0:
-		gt 'postdeliveries', '3'
+		gt 'post_deliveries', '3'
 	elseif eventrand <= 12 and posteventQW4 = 0:
-		gt 'postdeliveries', '4'
+		gt 'post_deliveries', '4'
 	elseif eventrand <= 15 and posteventQW5 = 0:
-!!		gt 'postdeliveries', '5' - pending follow up event/s
-		gt 'postdeliveries', 'event'
+!!		gt 'post_deliveries', '5' - pending follow up event/s
+		gt 'post_deliveries', 'event'
 	elseif eventrand <= 20:
-		gt 'postdeliveries', '6'
+		gt 'post_deliveries', '6'
 	elseif eventrand <= 25:
-		gt 'postdeliveries', '7'
+		gt 'post_deliveries', '7'
 	elseif eventrand <= 30:
-		gt 'postdeliveries', '8'
+		gt 'post_deliveries', '8'
 	elseif eventrand <= 35:
-		gt 'postdeliveries', '9'
+		gt 'post_deliveries', '9'
 	elseif eventrand <= 40:
-		gt 'postdeliveries', '10'
+		gt 'post_deliveries', '10'
 	elseif eventrand <= 45:
-		gt 'postdeliveries', '11'
+		gt 'post_deliveries', '11'
 	elseif eventrand <= 50:
-		gt 'postdeliveries', '12'
+		gt 'post_deliveries', '12'
 	elseif eventrand <= 55:
-		gt 'postdeliveries', '13'
+		gt 'post_deliveries', '13'
 	elseif eventrand <= 60:
-		gt 'postdeliveries', '14'
+		gt 'post_deliveries', '14'
 	elseif eventrand <= 65:
-		gt 'postdeliveries', '15'
+		gt 'post_deliveries', '15'
 	elseif eventrand <= 70:
-		gt 'postdeliveries', '16'
+		gt 'post_deliveries', '16'
 	elseif eventrand <= 75:
-		gt 'postdeliveries', '17'
+		gt 'post_deliveries', '17'
 	elseif eventrand <= 80:
-		gt 'postdeliveries', '18'
+		gt 'post_deliveries', '18'
 	elseif eventrand <= 85:
-		gt 'postdeliveries', '19'
+		gt 'post_deliveries', '19'
 	elseif eventrand <= 90:
-		gt 'postdeliveries', '20'
+		gt 'post_deliveries', '20'
 	elseif eventrand <= 95:
-		gt 'postdeliveries', '21'
+		gt 'post_deliveries', '21'
 	elseif eventrand <= 100:
-		gt 'postdeliveries', '22'
+		gt 'post_deliveries', '22'
 	elseif eventrand <= 105:
-		gt 'postdeliveries', '23'
+		gt 'post_deliveries', '23'
 	elseif eventrand <= 110:
-		gt 'postdeliveries', '24'
+		gt 'post_deliveries', '24'
 	elseif eventrand <= 115:
-		gt 'postdeliveries', '25'
+		gt 'post_deliveries', '25'
 	elseif eventrand <= 120:
-		gt 'postdeliveries', '26'
+		gt 'post_deliveries', '26'
 	else
-		gt 'postdeliveries', 'event'
+		gt 'post_deliveries', 'event'
 	end
 end
 	
@@ -188,7 +188,7 @@ if $ARGS[0] = '1':
 			cla
 			'"Yea, no. How would your wife feel, if she knew another girl put those clothes on before her?" you ask him, and continue your round without saying another word.'
 			'The man doesn''t bother to object, and closes the door dejectedly. He knows you''re right.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'	
+			act 'Continue your round':gt 'post_deliveries', 'resume'	
 		end
 	else
 		act 'Refuse and continue your round (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -210,7 +210,7 @@ if $ARGS[0] = '1':
 				cla
 				'"Sorry, but no. I really shouldn''t. I have to go!" you tell him.'
 				'The man''s shoulders sag a little, but he was expecting this response. What girl would agree to model lingerie for some random guy she just met?'			
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -221,7 +221,7 @@ if $ARGS[0] = '1':
 			'"That... sounds interesting, but I really don''t have time," you apologize to the man. "I still have some mail to deliver."'
 			'He ponders for a moment, and suggests: "How about you come back after you finish your round? My wife won''t be home for a few more hours. Please?"'
 			'"I''ll think about it. I really have to go now! Maybe see you later!" you say, and continue your round.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	end
 end
@@ -259,7 +259,7 @@ if $ARGS[0] = '2':
 				'Jenya kisses her boyfriend passionately, as you turn your back to them and head for the door. "Don''t worry, babe. I''ll take care of you!" she tells him. "Maksim, you ready?"'
 				'The last thing you see before you close the door is Jenya dropping to her knees before Arsen.'
 
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		else
 			act 'Refuse and ask him to sign (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -273,7 +273,7 @@ if $ARGS[0] = '2':
 			'"Just a second, babe!" she tells him, as she walks you to the door and gives you a wicked grin: "This is gonna be great! I can''t wait to get my hands on you... see you soon!"'
 			'She gives you a quick kiss on the lips and closes the door.'
 
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	end
 end
@@ -302,7 +302,7 @@ if $ARGS[0] = '3':
 			'This guy gives you the creeps! "Uhhh... I don''t think so, sir. I just need you to sign here so I can be on my way," you tell him.'
 			'The man smirks, but signs where you ask him to: "You''d rather be poor, huh? Suit yourself."'
 			'He slams the door shut before you can even say anything more.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	else
 		act 'Just get his signature and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -322,7 +322,7 @@ if $ARGS[0] = '3':
 				'"I''m not that kind of girl, sir. I just need you to sign here so I can be on my way," you tell him.'
 				'The man smirks, but signs where you ask him to: "Suit yourself."'
 				'He slams the door shut before you can even say anything more.'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		else
 			act 'Tell him you''re not interested (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -344,7 +344,7 @@ if $ARGS[0] = '3':
 					'"I don''t know... I don''t think I''ll be coming, sir. I just need you to sign here so I can be on my way," you tell him.'
 					'The man smirks at you, but signs where you ask him to and pulls the box out of your hands: "We''ll see. That''s what you girls all say, until you get sick of the crappily paid jobs you''re doing now and realize how much more comfortable your lives can be. Come find me, if you change your mind. And if you''re brave enough."'
 					'He winks at you, and then slams the door shut before you can say anything more.'
-					act 'Continue your round':gt 'postdeliveries', 'resume'
+					act 'Continue your round':gt 'post_deliveries', 'resume'
 				end
 			else
 				act 'Say you probably won''t be coming (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -353,7 +353,7 @@ if $ARGS[0] = '3':
 				cla
 				'"Deal. I''ll come back once I''m done," you tell him. "I should be done around 15:00."'
 				'"Heh... I can''t wait. I have a feeling we''re going to be good friends," he grins, as he signs for his parcel. "See you then."'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		end
 	end
@@ -388,12 +388,12 @@ if $ARGS[0] = '4':
 					gs 'stat'
 					posteventQW4 = 1
 					'Not saying another word, you turn around and leave his apartment. Hopefully you''re right about the postmaster believing you...'
-					act 'Continue your round':gt 'postdeliveries', 'resume'
+					act 'Continue your round':gt 'post_deliveries', 'resume'
 				end
 			else
 				act 'Stick to your guns 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 'Back down and agree to jerk him off': gt 'postevents', '4'
+			act 'Back down and agree to jerk him off': gt 'post_events', '4'
 		end
 	else
 		act 'Say you don''t care if he reports you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -409,7 +409,7 @@ if $ARGS[0] = '4':
 			'You don''t like where this is going at all! Deciding you''re better off leaving his apartment while you still can, you bolt for the door and run away. You don''t trust him one bit... who knows what kind of other things he''d make you do!?'
 			'Once you''re a few houses away and look behind you, you realize there''s no way he can follow you. Not with the way he was dressed.'
 			'You take a deep breath, and look at your clipboard to see where you have to go next while you try to put the last guy out of your head. One signature will be missing from your list today, but surely the postmaster will understand when you explain what happened?'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	else
 		act 'Run away from him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -430,12 +430,12 @@ if $ARGS[0] = '4':
 				posteventQW4 = 1
 				'When he slowly comes closer to you, you decide to quickly leave his apartment and run away while you still can. Who knows what else he''d make you do!?'
 				'Once you''re a few houses away and look back, you realize there''s no way he can follow you the way he was dressed. You take a deep breath, and look at your clipboard to see where you have to go next. One signature will be missing from your list today, but surely the postmaster will understand?'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		else
 			act 'Refuse and run away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		act 'Do as he says and jerk him off': gt 'postevents', '4'
+		act 'Do as he says and jerk him off': gt 'post_events', '4'
 	end
 end
 
@@ -462,7 +462,7 @@ if $ARGS[0] = '5':
 			gs 'stat'
 			'"Sorry guys, I have mail to deliver! No time to chat!" you say, and keep walking.'
 			'For a second you were afraid they were going to be more insistent, but luckily they leave you alone.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	else
 		act 'Say you have no time (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -486,7 +486,7 @@ if $ARGS[0] = '5':
 			'One of the others interrupts you and says: "Well, it''s been nice getting to know you, but we shouldn''t keep you from your work any longer. Are you done any time soon? Perhaps you could guide us around town later? We''d love to hang out with you some more!"'
 			'Taking this as your cue to leave, you pick up your bag and think for a second. Do you?'
 			'Deciding to just leave it in the middle for now, you simply say: "I''ll think about it. Bye guys!" and leave the hostel.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	end
 end
@@ -511,7 +511,7 @@ if $ARGS[0] = '6':
 			gs 'stat'
 			'Even though you would like to sit down for a while, you decide it''s better to just deliver your mail first. You can relax when you''re done, right?'
 			'You ignore your aching feet and keep walking to your next address, and the one after that. You try to not let your feet slow you down, but the pain in your feet gets worse the longer you ignore it. You get used to it over time, but the constant nagging pain slowly wears down your mood a little while you continue your run.'
-			act 'Continue':gt 'postdeliveries', 'resume'
+			act 'Continue':gt 'post_deliveries', 'resume'
 		end
 	else
 		act 'No time for breaks, keep working! (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -551,7 +551,7 @@ if $ARGS[0] = '6':
 			'She turns out to have a very happy and bubbly personality, and enthusiastically talks to you about trivial things while you take your break.'
 			'Her cheerful nature spreads to you while the two of you talk, and you feel great by the time the two of you part ways. You resume your round with a slight spring in your step.'
 		end
-		act 'Resume your round':gt 'postdeliveries', 'resume'
+		act 'Resume your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -563,7 +563,7 @@ if $ARGS[0] = '7':
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/window.jpg"></center>'
 	'Continuing along your route, you manage to catch a glimpse through a nearby window to see a woman looking out over the street expectantly. She''s completely naked! You wonder who she''s waiting for...'
 
-	act 'Who knows?':gt 'postdeliveries', 'resume'
+	act 'Who knows?':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '8':
@@ -575,7 +575,7 @@ if $ARGS[0] = '8':
 	'Another set of houses down, another street of mail to be delivered. You only get halfway down this row of buildings before you hear the ripping of threads and a firm tug against your bag. You look behind you to spot the nail that tore open your bag and the pile of letters that fell out onto the floor.'
 	'Sighing, you bend down and spend a couple of minutes hunting them all down and cramming them back into your broken bag. As you stand up to resume your round, you notice you now have to constantly make sure you don''t lose anything... that''s definitely going to slow you down for the rest of the day!'
 
-	act 'Resume your round':gt 'postdeliveries', 'resume'
+	act 'Resume your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '9':
@@ -590,7 +590,7 @@ if $ARGS[0] = '9':
 	'One house down, two houses down, you''re on a roll with this set of houses, nothing can hold you back!'
 	'The driver of that car seems to have other ideas, however. You''d swear he purposely aimed for that puddle, dousing you in a huge spray of dirty, cold puddle water. You might be able to pull off the wet T-shirt look nicely, but this definitely put a dampener on your day! On the other hand: you''re improving the mood of everyone around you, with your boobs showing like this...'
 
-	act 'Carry on, ignoring the cat calls':gt 'postdeliveries', 'resume'
+	act 'Carry on, ignoring the cat calls':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '10':
@@ -610,7 +610,7 @@ if $ARGS[0] = '10':
 			'The home owner is a bit startled to see you suddenly entering her back yard, but understands: "Oh don''t worry about Boomer! I know he looks scary, but he just wants to play!"'
 			'She signs for her mail so you can continue your round. You can still hear the dog barking angrily when you leave the street... no matter what that lady says, there''s no way you would enter that yard!'
 			
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	end
 	act 'Try to draw the attention of the dog''s owner':
@@ -620,7 +620,7 @@ if $ARGS[0] = '10':
 		'It takes a good while for the person in the house to finally realize you need to talk to them, and after a few minutes a woman comes out with an apologetic smile.'
 		'"I''m so sorry, he''s usually never like this! He probably just wants to play!" she says, as she finally signs for her mail.'
 		'You managed to get her signature, but that did set you back a few minutes...'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -636,7 +636,7 @@ if $ARGS[0] = '11':
 	'At long last, you find a staircase leading upwards, to a shabby office. The man looks at you as if he doesn''t have time, and mutters: "You''re late, I needed this an hour ago! Leave now so I can work!"'
 	'After some convincing he finally signs so you can leave, but only after complaining about how late you are once more. What a jerk...'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '12':
@@ -664,7 +664,7 @@ if $ARGS[0] = '12':
 			'She bites her lip and shakes her head: "I... I won''t, <<$pcs_nickname>>. I''ll find a way to repay you."'
 			'"Good," you give her a satisfied nod, and leave her apartment.'
 			if NatbelQW['QWstage'] >= 5: 'You smile evilly as you walk down the stairs, replaying her words over and over in your mind. "I''ll find a way to repay you!" she said... you can think of several ways! Whether she''ll like them is a different matter...'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	end
 	act 'Stay a few minutes and try to cheer her up':
@@ -676,9 +676,9 @@ if $ARGS[0] = '12':
 		'"Natasha, wait!" you say, and put your foot between the door so she can''t close it.'
 		'She doesn''t have the energy to object when you enter her apartment, and you take her by the shoulder and chat with her for about ten minutes.'
 		'By the end you can see a faint smile on her face again... it may not make her problems go away, but at least you made her feel a bit better.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '13':
@@ -695,7 +695,7 @@ if $ARGS[0] = '13':
 	else
 		'Just before he closes the door completely, you''d swear you saw a nude girl walking through Sergey''s apartment! You didn''t get a good enough look to see who it is, though.'
 	end
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '14':
@@ -716,7 +716,7 @@ if $ARGS[0] = '14':
 		'"Ah I see... you''re such a scatterbrain sometimes!" she smiles, and returns to the kitchen.'
 		'Your stepfather gives you a grateful nod as he signs your sheet, and whispers: "Phew! Thanks, <<$pcs_nickname>>... I didn''t want your mother to find out I bought her something! I''m waiting for the right time to give it to her, you see?"'
 		'You give him a conspiratory nod and turn around, you still have more mail to deliver! As you walk down the stairs, you can''t help but wonder what he bought her.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 	act 'Tell her you''re delivering a package':
 		cla
@@ -727,7 +727,7 @@ if $ARGS[0] = '14':
 		'"Silly <<$pcs_nickname>>, she can be such a scatterbrain sometimes!" she says, and goes back to the kitchen.'
 		'"I said ssssh! Your mother doesn''t know I bought her this, and I want to surprise her! What''s wrong with you!?" he sighs, definitely unhappy about you nearly ruining his surprise.'
 		'He signs your sheet quickly, and slams the door shut. As you walk down the stairs, you can''t help but wonder what he bought her.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -746,7 +746,7 @@ if $ARGS[0] = '15':
 	'When he turns around, you can see the clear outline of a gun in his jacket. Yikes!'
 	'You definitely don''t want to bother him again, so you quickly forge a signature on your sheet and walk down the stairs again. There''s no way you''ll get complaints about this package... but you can''t help but wonder why he was so paranoid. And rather: what you just brought him!'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '16':
@@ -768,7 +768,7 @@ if $ARGS[0] = '16':
 		'"Oh, she sent you to the wrong room?" the doctor laughs, when the receptionist explains why you look so pale. "That wasn''t very smart of you, Tanya!"'
 		'He signs your form without giving it another thought, and dismisses you. Your heart is still pounding when Tanya walks you out of the clinic, apologizing all the way.'
 		'The image of those dead people will be haunting you for a while...'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -787,7 +787,7 @@ if $ARGS[0] = '17':
 	'"The guys are on their way, you just lie there and be pretty for a while!" he smirks. Then he turns back to you and says: "I swear, sometimes I think she does it on purpose! Horny little bitch... anyway, here''s a pen. You can keep that. Have a nice day, miss."'
 	'He ushers you out the door, and you quickly cast one more glance at the girl on your way out. You wonder what he has in store for her...'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '18':
@@ -805,7 +805,7 @@ if $ARGS[0] = '18':
 	'"Damn, you''re no fun..." she groans mockingly, when you try to just get her to sign so you can be on your way. "Are you sure you don''t want to come in for a little while? You seem stressed, I bet I could help you relax..."'
 	'You respectfully decline the offer, and turn around to continue your round. You''d swear you feel a bit wobbly, just from standing near that house for so long!'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '19':
@@ -823,7 +823,7 @@ if $ARGS[0] = '19':
 	'"Thanks! You have a nice day, miss!" he says, giving you a friendly nod before closing the door again.'
 	'You bury your head in your hands for a moment and let out a deep sigh; what must that man be thinking of you right now? That was definitely not your proudest moment...'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '20':
@@ -848,7 +848,7 @@ if $ARGS[0] = '20':
 		'"Thank you so much, I wish I could but I really have to go!" you smile apologetically at the woman.'
 		'"I understand... you youngsters, always on the move!" she laughs heartily. She offers you a small paper bag: "Here, at least take some cookies! You look like you could use a snack for the road!"'
 		'The burly guys give you a friendly nod on your way out of the building, wishing you a good day. Maybe this area isn''t so bad after all... and those cookies are really good, too!'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -866,7 +866,7 @@ if $ARGS[0] = '21':
 	'"My new tail! Isn''t it adorable? I''m so happy right now! Master will be so happy, too! You''re the best!" she squees again, besides herself with happiness. She moves her bare ass back and forth, making it look like she''s wagging her tail at you.'
 	'You''re not entirely surprised when you see her signature looks exactly like a cat''s paw.'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '22':
@@ -883,7 +883,7 @@ if $ARGS[0] = '22':
 	'"Where is that bastard!?" Mr. Barlovsky yells, when the other men finally reach you. "You, girl! Did he tell you where he was going?"'
 	'You shrug, but offer him his mail. He signs absent-mindedly, tracking the horizon for a sign of the man who just ran off. You wonder what he did to make Mr. Barlovsky this angry...'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '23':
@@ -901,7 +901,7 @@ if $ARGS[0] = '23':
 	'"Come on, show me again! It''ll be fine. See? She''s no longer looking!" the guy says, laughing.'
 	'"You think that was funny!? You can be such an ass sometimes!" the girl sneers at him, as you walk around the corner and out of earshot. Sounds like he''s in trouble...'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '24':
@@ -912,7 +912,7 @@ if $ARGS[0] = '24':
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/mailbox.jpg"></center>'
 	'While you walk through the posh area of town, you see the strangest mailbox! Whoever lives here must have a lot of money, if even their mailbox is this fancy...'
 
-	act 'Continue your round':gt 'postdeliveries', 'resume'
+	act 'Continue your round':gt 'post_deliveries', 'resume'
 end
 
 if $ARGS[0] = '25':
@@ -934,7 +934,7 @@ if $ARGS[0] = '25':
 		'Surely she''s not talking about the strap-on? Judging from the size of the package, it''s even larger than the strap-on she''s wearing now!'
 		'She quickly closes the door while tearing the box open, and through the door you can hear her voice: "The Black Stallion I ordered just arrived, sweetie! I hope you''re ready!"'
 		'Poor guy...'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -959,7 +959,7 @@ if $ARGS[0] = '26':
 			gs 'stat'
 			'"Sorry kid, I have no time to deliver your note, very busy day today!" you shrug at him, and keep walking.'
 			'The boy''s shoulders sag, and he sadly looks at the note he has in his hand. How is he going to get it delivered to her, if even the postal service won''t help him?'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	else
 		act 'Decline and say you''re in a hurry (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -978,7 +978,7 @@ if $ARGS[0] = '26':
 		'You lose track of them for a moment, but after a quick search you see them walking. "Excuse me, miss! I have a note for you!" you shout after them, and walk towards them.'
 		'The mother looks at you a bit surprised, but you stop her before she can say something and say: "Not for you... but for you!" as you hand the note to the little girl.'
 		'She needs her mother''s help to read the note, but a big grin appears on her face when her mother explains who it''s from. It may have cost you a few minutes, and it will cost you a few minutes more to get back on track, but the feeling you get from seeing her genuine happiness is amazing! When you''re about to leave, her mother stops you and gives you 100 <b>₽</b> and says: "What a nice thing of you to do! Thank you so much, that made her day!"'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end
 
@@ -1003,19 +1003,19 @@ if $ARGS[0] = 'resume':
 					'You''re almost done in the streets you''re not supposed to be in! With only a few mail pieces to go, you suddenly hear a deep voice behind you: "You, girl. Come here!"'
 					'Before you can do anything, two men catch up to you and block your path.'
 
-					act 'See what they want': gt 'postdeliveries', 'bandits'
+					act 'See what they want': gt 'post_deliveries', 'bandits'
 				else
 					*clr
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/shush.jpg"></center>'
 					'You''re almost done in the streets you''re not supposed to be in! With only a few mail pieces to go, you suddenly hear a deep voice behind you: "I see you came back to play! We''ve been keeping an eye on you for a while..."'
 					'Before you can do anything, two men catch up to you and block your path.'
 
-					act 'See what they want': gt 'postdeliveries', 'bandits'
+					act 'See what they want': gt 'post_deliveries', 'bandits'
 				end
 			else
 				'You can''t help but feel a bit relieved, as you walk through the last of the streets you''re not supposed to be in. Looks like, if there actually were guys following you, they decided not to bother you today.'
 !!second round of events
-				act 'Then...':gt 'postdeliveries', 'event'
+				act 'Then...':gt 'post_deliveries', 'event'
 			end
 		else
 			if postamountrand = 0: minut += 50
@@ -1024,7 +1024,7 @@ if $ARGS[0] = 'resume':
 			gs 'stat'
 			'Before you know it, you only have a few mail pieces left.'
 !!second round of events
-			act 'Then...':gt 'postdeliveries', 'event'
+			act 'Then...':gt 'post_deliveries', 'event'
 		end
 !!if after second event
 	else
@@ -1040,7 +1040,7 @@ if $ARGS[0] = 'resume':
 		else
 			'You check the time and see it''s already well past 15:00. The postmaster won''t be happy...'
 		end
-		act 'Return to the post office': gt 'postdeliveries', 'finishround'
+		act 'Return to the post office': gt 'post_deliveries', 'finishround'
 	end
 end
 
@@ -1063,7 +1063,7 @@ if $ARGS[0] = 'bandits':
 				'"What do you mean, play!? Let go of me!" you shout at him.'
 				'The man tightens his grip on your shoulders and says: "Shut up and listen. We had a deal with the previous delivery girl. Eager little slut, she was! She even made a game out of it... if she used our streets during her round, she''d do what we want if we caught her. Since you took her place, that goes for you too. We''ll go easy on you this time, but now that you know the rules: if we see you again around here, you better be ready to put out if you want to keep your job. Understood?"'
 				'He doesn''t wait for an answer but walks away with his friend, leaving you alone to collect your thoughts. What the hell did they make that girl do!?'
-				act 'Deliver the last envelopes in your bag':gt 'postdeliveries', 'resume'
+				act 'Deliver the last envelopes in your bag':gt 'post_deliveries', 'resume'
 			end
 		end
 	else
@@ -1091,26 +1091,26 @@ if $ARGS[0] = 'bandits':
 					'You''re a good enough runner to outrun them, despite the bag you''re carrying.'
 					'Once you''re sure you''ve lost them, you stop to catch your breath. They probably gave up on chasing you.'
 					'You smile to yourself: "Nice try, idiots..."'
-					act 'Continue your round':gt 'postdeliveries', 'resume'
+					act 'Continue your round':gt 'post_deliveries', 'resume'
 				elseif begresult >= 23 and randrun = 1:
 					'You manage to break free from them and start running, but the strap of your bag gets caught on a fence when you try to run away.'
 					'The guys are upon you moments later, grabbing onto you tightly to make sure you can''t try to run again.'
 					'"Nice try, bitch! You almost got away... almost, but not quite!" one of them pants, gasping for breath.'
 					'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
-					act 'Continue':gt 'postdeliveries', 'bandsex'
+					act 'Continue':gt 'post_deliveries', 'bandsex'
 				elseif begresult >= 23 and randrun = 2:
 					'You manage to break free from them and start running, but you almost immediately trip over a loose rock you failed to notice.'
 					'The guys are upon you moments later, and one of them places his knee between your shoulder blades as you scramble to try and get back on your feet.'
 					'"Nice try, bitch! Looks like you''re ours, though!" one of them grins, somewhat amused at how clumsily you tripped over that rock.'
 					'They hoist you up and drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
 					''
-					act 'Continue':gt 'postdeliveries', 'bandsex'
+					act 'Continue':gt 'post_deliveries', 'bandsex'
 				else
 					'"Where the fuck do you think you''re going!?" his friend yells when he notices you''re trying to yank the bag out of his hands. The guy who initially talked to you firmly grabs you by the arms, with a wide grin on his face. Uh oh!'
 					'"Hah! Nice try, but it''s too late to run now!" he laughs, somehow entertained by your failed attempt to get away.'
 					'They drag you away from the street, entering an alleyway between two buildings. They have a firm grip on you, and the two of them look way too tough to fight. Looks like you have no choice...'
 					''
-					act 'Continue':gt 'postdeliveries', 'bandsex'
+					act 'Continue':gt 'post_deliveries', 'bandsex'
 				end
 			end
 		else
@@ -1120,7 +1120,7 @@ if $ARGS[0] = 'bandits':
 			cla
 			'They look like they''re pretty fast, and way too strong to fight off. You quietly resign to the fact that there''s no way you''re getting out of this, and meekly let them guide you to behind the building.'
 			''
-			act 'Behind the building...':gt 'postdeliveries', 'bandsex'
+			act 'Behind the building...':gt 'post_deliveries', 'bandsex'
 		end
 	end
 end
@@ -1152,7 +1152,7 @@ if $ARGS[0] = 'bandsex':
 				gs 'stat'
 				'While you quickly cover up, his friend smiles benevolently and offers you your bag: "See, what wasn''t so bad!"'
 				'You quickly take it out of his hands and leave, assuming they''re done with you. From the greedy looks in their eyes, you figure they will probably expect more from you if they catch you again.'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		else
 			act 'Agree to show your boobs (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1167,7 +1167,7 @@ if $ARGS[0] = 'bandsex':
 			'"You could''ve easily prevented this! If only you weren''t such a prude..." he grins cruelly.'
 			'His friend mockingly pretends to be warming his hands over the smouldering remains of the letters and laughs: "Good luck finding a new job. Now get lost!"'
 			'When you pick up the empty bag and return to the street dejectedly, you realize he''s right. You''re going to get fired, for sure!'
-			act 'Return to the post office':gt 'postdeliveries', 'finishround'
+			act 'Return to the post office':gt 'post_deliveries', 'finishround'
 		end
 	elseif postbandQW = 2:
 		'You follow the two men to behind the building again, while one of them digs through your bag.'
@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'bandsex':
 			gs 'arousal',5 ,'flash'
 			gs 'stat'
 			'They give you back your bag, and shoo you away. Looks like they''re satisfied for now.'
-			act 'Continue your round':gt 'postdeliveries', 'resume'
+			act 'Continue your round':gt 'post_deliveries', 'resume'
 		end
 	elseif postbandQW = 3:
 		'"Strip!" one of them orders you, once you''re behind the building.'
@@ -1213,7 +1213,7 @@ if $ARGS[0] = 'bandsex':
 				'Then he lets you leave. Their words keep lingering in your mind, though. They obviously expect you to put out next time, demanding you give them a blowjob just to walk through some streets! And who knows what else they''ll want, after that! Is it even worth it?'
 				'You complete your round without any more issues. The guys see you walking several times more, but other than a few lewd remarks they leave you alone.'
 
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		end
 	elseif postbandQW = 4:
@@ -1266,14 +1266,14 @@ if $ARGS[0] = 'bandsex':
 					act 'Leave quickly':
 						cla
 						'You quickly find your bag and leave the apartment, before they come find you again. There''s no way either of them will settle for a handjob now, if they catch you again...'
-						act 'Continue your round':gt 'postdeliveries', 'resume'
+						act 'Continue your round':gt 'post_deliveries', 'resume'
 					end
 				end
 				act 'Put your clothes back on and leave':
 					cla
 					'You quickly put your clothes back on, ignoring the man''s cum on your body. The other guy might come looking for you too!'
 					'You quickly pull your bag out of his hand when you leave the apartment, and walk away to finish your round.'
-					act 'Continue your round':gt 'postdeliveries', 'resume'
+					act 'Continue your round':gt 'post_deliveries', 'resume'
 				end
 			end
 		else
@@ -1299,7 +1299,7 @@ if $ARGS[0] = 'bandsex':
 				cla
 				gs 'stat'
 				'You quickly walk away from him before he can say anything, and continue your round as usual. Despite the hold-up you''re done a fair bit earlier than usual, but the tangy taste in your mouth is a constant reminder of what you had to do for it.'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 			act 'Ask if you''re supposed to give him a blowjob too':
 				cls
@@ -1320,7 +1320,7 @@ if $ARGS[0] = 'bandsex':
 					'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postgirl.jpg"></center>'
 					'You quickly leave the apartment before they come find you again, and complete your round without any more issues. You run into the guys several times more, but other than a few lewd remarks they leave you alone.'
 
-					act 'Continue your round':gt 'postdeliveries', 'resume'	
+					act 'Continue your round':gt 'post_deliveries', 'resume'	
 				end
 			end
 		end
@@ -1345,7 +1345,7 @@ if $ARGS[0] = 'bandsex':
 			'"Yea, okay..." you nod, before leaving the apartment.'
 		end
 		'The other guy was already standing by with your bag, letting you get on your way.'
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	else
 		cla
 		*clr
@@ -1414,7 +1414,7 @@ if $ARGS[0] = 'bandsex':
 		'You quickly put your clothes back on, so you can resume your round as soon as possible. The sexual services the guys want from you barely take up any time any more, now that you''re getting to know their cocks better.'
 		'"Bye, boys! See you next time!" you grin at them.'
 
-		act 'Continue your round':gt 'postdeliveries', 'resume'
+		act 'Continue your round':gt 'post_deliveries', 'resume'
 	end
 end	
 	
@@ -1469,11 +1469,11 @@ if $ARGS[0] = 'finishround':
 	if postjobQW = 999: '"I better let Aleksiy know he needs to come in again on Saturdays, from now on. I knew I shouldn''t have trusted you!" he sighs, shaking his head in disappointment as he walks off. Guess you''re not getting paid for the day...'
 !! actions after your round is finished, default plus options if a long scene was triggered during your round
 	act 'Leave':gt 'pav_commercial'
-	if posteventQW1 = 2: act 'Return to the married man''s house': gt 'postevents', '1'
-	if posteventQW2 = 2: act 'Go back to Jenya and Arsen''s apartment': gt 'postevents', '2'
-	if posteventQW3 = 2: act 'Return to the businessman''s house': gt 'postevents', '3'
-!!	if posteventQW5 = 2: act 'Return to the hostel to rejoin the tourists': gt 'postevents', '5'
+	if posteventQW1 = 2: act 'Return to the married man''s house': gt 'post_events', '1'
+	if posteventQW2 = 2: act 'Go back to Jenya and Arsen''s apartment': gt 'post_events', '2'
+	if posteventQW3 = 2: act 'Return to the businessman''s house': gt 'post_events', '3'
+!!	if posteventQW5 = 2: act 'Return to the hostel to rejoin the tourists': gt 'post_events', '5'
 end
 
---- postdeliveries ---------------------------------
+--- post_deliveries ---------------------------------
 

+ 21 - 21
locations/postevents.qsrc → locations/post_events.qsrc

@@ -1,4 +1,4 @@
-# postevents
+# post_events
 
 menu_off = 1
 
@@ -69,7 +69,7 @@ if $ARGS[0] = '1':
 						else
 							act 'Don''t do it, but tell him he deserves better (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 						end	
-						act 'Give him a blowjob he''ll never forget':gt 'postevents', '1-1'
+						act 'Give him a blowjob he''ll never forget':gt 'post_events', '1-1'
 					end
 				else
 					act 'Press on and seduce him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -186,7 +186,7 @@ if $ARGS[0] = '2':
 			'You take a few sips of the vodka. It''s the cheap home brewed stuff, but it gets the job done.'
 			'Within minutes you feel a slight buzz in your head, and Jenya begins to kiss you again. She starts off slowly but her kisses become more and more passionate, and you struggle to keep the mug straight.'
 			'Realizing you need to get rid of the mug, you decide to just gulp down the rest and let yourself fall back down on the bed, where Jenya is immediately on top of you. After a few minutes, she refills the mug and hands it to you again.'
-			act 'Close your eyes and enjoy her touch': gt 'postevents', '2-1'
+			act 'Close your eyes and enjoy her touch': gt 'post_events', '2-1'
 		end
 		act 'Ask about the camera':
 			cla
@@ -223,7 +223,7 @@ if $ARGS[0] = '2':
 				'Within minutes you feel a slight buzz in your head, and Jenya begins to kiss you again. She starts off slowly but her kisses become more and more passionate, and you struggle to keep the mug straight.'
 				'Realizing you need to get rid of the mug, you decide to just gulp down the rest and let yourself fall back down on the bed, where Jenya is immediately on top of you. After a few minutes, she refills the mug and hands it to you again.'
 
-				act 'Close your eyes and enjoy her touch': gt 'postevents', '2-1'
+				act 'Close your eyes and enjoy her touch': gt 'post_events', '2-1'
 			end
 		end
 		act 'Tell her you only want to be with her':
@@ -261,7 +261,7 @@ if $ARGS[0] = '2':
 				'Within minutes you feel a slight buzz in your head, and the girl begins to kiss you again. She starts off slowly but her kisses become more and more passionate, and you struggle to keep the mug straight.'
 				'Realizing you need to get rid of the mug, you decide to just gulp down the rest and let yourself fall back down on the bed, where the girl is immediately on top of you again. After a few minutes, she refills the mug and hands it to you again.'
 
-				act 'Close your eyes and enjoy her touch': gt 'postevents', '2-1'
+				act 'Close your eyes and enjoy her touch': gt 'post_events', '2-1'
 			end
 			act 'Tell her that sounds fair':
 				cla
@@ -271,7 +271,7 @@ if $ARGS[0] = '2':
 				'You do as she says and smile for the camera when Maksim begins to take photos. Hopefully no one you know will see these...'
 				'"That''s it. Get that cock nice and hard," Arsen orders you.'
 
-				act 'Continue': gt 'postevents', '2-2'
+				act 'Continue': gt 'post_events', '2-2'
 			end
 		end
 	end
@@ -558,14 +558,14 @@ if $ARGS[0] = '3':
 		'When you''re about to object, he continues: "You have sex with men, and in return they give you things. Sounds like a whore to me?"'
 		'The man laughs when he sees you think, and reassures you: "Don''t worry, I''m not judging you... I love whores who know what they''re doing. Make me happy and I''ll make it worth your while. Show me what you can do with your mouth. Only your mouth, no hands."'
 		
-		act 'Please him with your mouth': gt 'postevents', '3-1'
+		act 'Please him with your mouth': gt 'post_events', '3-1'
 	end
 	act '"I love cocks!"':
 		cla
 		'"I love cocks!"'
 		'"Hah! My favourite type of girl!" he laughs, not expecting such a direct answer from you. "In that case: impress me. Take care of me and you''ll get all the cock you want. And I''ll take care of you... I love spoiling my little sluts. Go on. Show me what you can do with your mouth. Only your mouth, no hands."'
 		
-		act 'Please him with your mouth': gt 'postevents', '3-1'
+		act 'Please him with your mouth': gt 'post_events', '3-1'
 	end	
 	!if sub > 20:
 		act '"I like being told what to do."':
@@ -575,7 +575,7 @@ if $ARGS[0] = '3':
 			'"Do you, now?" the man grins evilly. "In that case, let''s make this a little bit more interesting. Close your eyes, turn around and put your hands behind your back."'
 			'You hear him rummaging in the nightstand drawer for a moment, and then feel the cold touch of metal on your wrists. He tells you: "Those are not coming off until you get me off. Start sucking."'
 
-			act 'Please him with your mouth': gt 'postevents', '3-1'
+			act 'Please him with your mouth': gt 'post_events', '3-1'
 		end
 	!end	
 end
@@ -597,7 +597,7 @@ if $ARGS[0] = '3-1':
 		gs 'stat'
 		'"That was amazing!" he grins. "Even better than the last girl I had, and that was after months of training! You''re definitely paying me a visit more often..."'
 		
-		act 'Continue': gt 'postevents', '3-2'
+		act 'Continue': gt 'post_events', '3-2'
 	elseif stat['bj'] > 15:
 !!!!you swallow his load
 		'You have some experience giving blowjobs, but it''s difficult to do without being able to use your hands!'
@@ -608,7 +608,7 @@ if $ARGS[0] = '3-1':
 		gs 'stat'
 		'"That... was decent," he says. "I''ve had better, but we can make a good cocksucker out of you yet."'
 		
-		act 'Continue': gt 'postevents', '3-2'
+		act 'Continue': gt 'post_events', '3-2'
 	else
 		'You swallow nervously when you see his erection dangling in front of you, it''s bigger than you thought it would be!'
 		'The man notices your hesitation and says: "Well? I said: start sucking!"'
@@ -633,7 +633,7 @@ if $ARGS[0] = '3-1':
 				gs 'stat'
 				'"Look at me!" he groans, and a warm load of his tangy sperm fills your mouth seconds later. "That was better I guess, but rather half-hearted. Swallow," he orders you, while he strokes your hair with his hand. With him so obviously waiting for you to swallow his sperm, you decide to just do it without hesitation. He seemed unhappy enough with your performance already!'
 				'"You have a lot to learn, but... it''ll be worth it!" he sighs contently. "You could become a good little slut for me, with some training."'
-				act 'Continue': gt 'postevents', '3-2'
+				act 'Continue': gt 'post_events', '3-2'
 			end
 		else
 			act 'Beg him to let you try again (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -650,7 +650,7 @@ if $ARGS[0] = '3-1':
 			gs 'stat'
 			'"Don''t feel bad, you did good!" he pants, while he undoes the gag. "Not the blowjob itself, obviously. That was terrible. But you''re not afraid to get a little kinky, and continued to try and please me even when you were having a rough time. You''re exactly the kind of girl I''m looking for!"'
 
-			act 'Continue': gt 'postevents', '3-2'
+			act 'Continue': gt 'post_events', '3-2'
 		end
 	end
 end
@@ -731,7 +731,7 @@ if $ARGS[0] = '4':
 			'"Wow, you''re fun! And horribly naive..." the man pants, while he picks up the clipboard and puts his signature on the sheet. "There. I''ll be seeing you again!"'
 			'You try to ignore his triumphant grin while you put your clothes back on, after quickly cleaning yourself up with a tissue. At least the postmaster can''t give you any trouble now!'
 		end
-		act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
+		act 'Continue your round':gs 'arousal', 'end' & gt 'post_deliveries', 'resume'
 	end
 	if lubri > 0:
 		act 'Use some lubricant to get him off faster':
@@ -745,7 +745,7 @@ if $ARGS[0] = '4':
 			gs 'stat'
 			'"I''m going to make you cum?" you say with a sly grin. "That was exactly what I was trying to do. Now sign so I can go?"'
 			'The man sighs, and signs as promised. "I hope I''ll see you again!" he says, while you walk towards the door. "I hope not!" you yell back at him, right before you close the door behind you.'
-			act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
+			act 'Continue your round':gs 'arousal', 'end' & gt 'post_deliveries', 'resume'
 		end
 	end
 	act 'Use your mouth to get him off faster':
@@ -766,7 +766,7 @@ if $ARGS[0] = '4':
 			'"Thaaat''s a good girl..." he groans, definitely pleased with himself. "That''s a nice look for you! But I guess you hear that a lot, huh?" he laughs.'
 			'You feel around for something to wipe your face with, and eventually settle for his bed sheets. The man shrugs: "I was going to wash those anyway. Here''s your signature... I''ll be seeing you again soon! I''ll make sure of it!"'
 			'You quickly check your face in the mirror to see if you missed anything, on the way out. You look yourself deep in the eye for a second, and mutter: "I did what I had to do... at least my job is safe!"'
-			act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
+			act 'Continue your round':gs 'arousal', 'end' & gt 'post_deliveries', 'resume'
 		end
 		act 'Make him cum in your mouth':
 			*clr & cla
@@ -778,7 +778,7 @@ if $ARGS[0] = '4':
 			'When he''s mostly done, you let his cock slide out of his mouth and lick the head a few times, showing the man his load on your tongue before swallowing it.'
 			'"Oh wow! You''re... I''ve visited whores that weren''t as good..." he pants, simply amazed. He signs for his mail, and gives you 200 <b>₽</b>: "Here, take this. If you ever want to make some extra cash during your round, you know where I live! Knock twice."'
 			'"Uhh, I''ll keep it in mind," you tell him, as you stand up to leave his apartment.'
-			act 'Continue your round':gs 'arousal', 'end' & gt 'postdeliveries', 'resume'
+			act 'Continue your round':gs 'arousal', 'end' & gt 'post_deliveries', 'resume'
 		end			
 	end
 	if pcs_intel > 70:
@@ -811,7 +811,7 @@ if $ARGS[0] = '4':
 						'"I was seriously considering it," you tell him. "And you definitely would''ve deserved it if I did. Now sign, so I never have to see your face again."'
 						'He promptly signs, and you leave his apartment. You cast a quick look at your watch: fortunately you didn''t lose too much time over this. You still have mail to deliver, though.'
 
-						act 'Continue your round':gt 'postdeliveries', 'resume'
+						act 'Continue your round':gt 'post_deliveries', 'resume'
 					end
 					act 'You don''t want his money, make him suffer':
 						cla
@@ -822,7 +822,7 @@ if $ARGS[0] = '4':
 						'You reduced the man to a sniffling mess, curled up into a ball. "No... no... please, just leave..." he whimpers.'
 						'As you get ready to leave, you smirk at him: "A piece of advice: if you want to blackmail a girl, don''t put your most delicate parts in her hands!"'
 
-						act 'Continue your round':gt 'postdeliveries', 'resume'
+						act 'Continue your round':gt 'post_deliveries', 'resume'
 					end
 				end
 			else
@@ -833,11 +833,11 @@ if $ARGS[0] = '4':
 				'You give his balls one more angry squeeze, and then let go. You grin at him and say: "You''re damn right you won''t bother me again. Now sign, unless you want me to tell the postmaster exactly why your signature is missing!"'
 				'"Okay, okay!" he yelps, and quickly signs before you can change your mind. He curls up into a ball after he signs, carefully caressing his junk.'
 				'"You''re pathetic, you know that?" you scoff at him, and walk away. You don''t know how many girls he tried to blackmail before you, but you''re fairly sure you put an end to it just now.'
-				act 'Continue your round':gt 'postdeliveries', 'resume'
+				act 'Continue your round':gt 'post_deliveries', 'resume'
 			end
 		end
 	end
 end
 
---- postevents ---------------------------------
+--- post_events ---------------------------------
 

+ 22 - 22
locations/postmaster.qsrc → locations/post_master.qsrc

@@ -1,4 +1,4 @@
-# postmaster
+# post_master
 
 !!variables used:
 !!postjobQW (1 = trial offered but declined, 2 = trial accepted, 3 = job offered, 4 = job accepted, 5 = not working until accepted again, 999 = no longer available)
@@ -12,7 +12,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 	'The manager of the post office, also known as the postmaster, just finished helping a customer and is about to walk back to his office when he spots you.'
 	'"You look like you want to ask something... if it''s about our regular services, you should get in line. I don''t have time to help more customers," he says.'
-	act 'Leave': gt 'postoffice', 'start'
+	act 'Leave': gt 'post_office', 'start'
 	if postjobQW = 0:
 		act 'Ask for work':
 			*clr & cla
@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 				'"Sorry... but I don''t know. That''s not what I''m looking for," you tell him.'
 				'The postmaster looks at you a bit confused, wondering what other job you expected to get here. Nevertheless, he sighs: "Suit yourself. Tough luck for Aleksiy, then. Well, let me know if you change your mind."'
 				'He then nods you off, before returning to his work.'
-				act 'Leave him alone':gt 'postoffice', 'start'
+				act 'Leave him alone':gt 'post_office', 'start'
 			end
 			act 'Accept the job':
 				cla
@@ -38,7 +38,7 @@ if $ARGS[0] = 'start':
 				'"That sounds great, thank you!" you smile at him. That''s good money!'
 				'"<b>Meet me here on Saturday, between 11:00 and 12:00.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out. Our post office has a damn near perfect record for deliveries, and I intend to keep it that way."'
 				'He quickly records your personal information and then nods you off, before returning to his work.'
-				act 'Leave him alone': gt 'postoffice', 'start'
+				act 'Leave him alone': gt 'post_office', 'start'
 			end	
 		end
 	elseif postjobQW = 1:
@@ -54,7 +54,7 @@ if $ARGS[0] = 'start':
 			'"Sorry... but I don''t know..." you tell him.'
 			'The postmaster looks at you a bit confused, wondering what other job you expected to get. He shrugs: "Still? Well, okay. If you''re not interested in this job, there''s no point in visiting me again... I won''t have anything else. Let me know if you change your mind. Until then, stop wasting my time."'
 			'He then nods you off, before returning to his work.'
-			act 'Leave him alone':gt 'postoffice', 'start'
+			act 'Leave him alone':gt 'post_office', 'start'
 		end
 		act 'Accept the job':
 			cla
@@ -62,7 +62,7 @@ if $ARGS[0] = 'start':
 			'"That sounds great, thank you!" you smile at him. That''s good money!'
 			'"<b>Meet me here on Saturday, between 11:00 and 12:00.</b> I''ll talk you through the details then," he grunts. "By the way: any complaints from people not receiving their mail in good shape and you''re out! Our post office has a damn near perfect record for deliveries, and I intend to keep it that way."'
 			'He then nods you off, before returning to his work.'
-			act 'Leave him alone':gt 'postoffice', 'start'
+			act 'Leave him alone':gt 'post_office', 'start'
 		end	
 	elseif postjobQW = 2 and postworkday ! daystart:
 !!when you go to work on Saturday, first time
@@ -103,7 +103,7 @@ if $ARGS[0] = 'start':
 						'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by closing time on Friday, I will assume you''re not coming."'
 						'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
 
-						act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+						act 'Leave the postmaster''s office':gt 'post_office', 'start'
 					end
 					act 'Accept the job':
 						cla
@@ -111,7 +111,7 @@ if $ARGS[0] = 'start':
 						'You tell him you want to work again next Saturday.'
 						'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
 
-						act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+						act 'Leave the postmaster''s office':gt 'post_office', 'start'
 					end
 				end
 				gs 'willpower', 'misc', 'self'
@@ -145,7 +145,7 @@ if $ARGS[0] = 'start':
 								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by Friday 18:00, I will assume you''re not coming."'
 								'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
 
-								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+								act 'Leave the postmaster''s office':gt 'post_office', 'start'
 							end
 							act 'Accept the job':
 								cla
@@ -155,7 +155,7 @@ if $ARGS[0] = 'start':
 								'You tell him you want to work again next Saturday.'
 								'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
 
-								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+								act 'Leave the postmaster''s office':gt 'post_office', 'start'
 							end
 
 						end
@@ -177,7 +177,7 @@ if $ARGS[0] = 'start':
 								'"I guess, but I''m telling Aleksiy he has to come in next Saturday then. I can''t work with maybes," he shrugs. "If you want the job, let me know before Saturday so I can make the arrangements. If I haven''t heard from you by closing time on Friday, I will assume you''re passing up on the offer."'
 								'You nod understandingly: "That sounds fair. I will come tell you once I''ve made my decision."'
 
-								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+								act 'Leave the postmaster''s office':gt 'post_office', 'start'
 							end
 							act 'Accept the job':
 								cla
@@ -187,7 +187,7 @@ if $ARGS[0] = 'start':
 								'You tell him you want to work again next Saturday.'
 								'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you next week!" he says, shaking your hand. "And thank you for a job well done!"'
 
-								act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+								act 'Leave the postmaster''s office':gt 'post_office', 'start'
 							end
 						end
 					end
@@ -206,7 +206,7 @@ if $ARGS[0] = 'start':
 			'He nods and says: "Of course. As you probably know, Russian Post doesn''t deliver regular mail on Saturdays, only priority mail. That''s what you will be delivering. Not a lot of mail, but if people choose to have it delivered on Saturdays, it must be important! It''s a big responsibility, but I trust you to get the job done. It''ll take you roughly three hours, going on past experience. Some days we have more, some days we have less. <b>Make sure you''re here between 11:00 and 12:00 on Saturday, so I can talk you through what exactly it is you have to do.</b>"'
 			'He watches you for a second while you try to memorize it all, and says somewhat impatiently: "Was that all? I really need to get back to work..."'
 
-			act 'Leave him alone':gt 'postoffice', 'start'
+			act 'Leave him alone':gt 'post_office', 'start'
 		end
 	elseif postjobQW = 3:
 !!if you said you''re not sure about taking the regular job and refuse it the first time
@@ -223,7 +223,7 @@ if $ARGS[0] = 'start':
 			'"I''ve given it some thought, but no. Sorry, you''ll have to find someone else," you tell the postmaster.'
 			'"That''s too bad, <<$pcs_firstname>>, you could''ve been a great post girl! Well... thanks for letting me know," he mutters, clearly disappointed. "My door is always open for you, if you change your mind."'
 	
-			act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+			act 'Leave the postmaster''s office':gt 'post_office', 'start'
 		end
 		act 'Accept the job':
 			cla
@@ -231,7 +231,7 @@ if $ARGS[0] = 'start':
 			'You tell him you''ll take the job.'
 			'"That''s great! I''ll let Aleksiy know he no longer has to come in on weekends, in that case. See you on Saturday!" he says, shaking your hand.'
 
-			act 'Leave the postmaster''s office':gt 'postoffice', 'start'
+			act 'Leave the postmaster''s office':gt 'post_office', 'start'
 		end
 	elseif postjobQW = 4:
 		if week ! 6:
@@ -247,7 +247,7 @@ if $ARGS[0] = 'start':
 				'The postmaster looks up at you somewhat disappointedly. Nevertheless, he says: "Oh, okay. No problem. I''ll let Aleksiy know he has to come in on Saturday. Thanks for letting me know, I guess."'
 				'He scribbles something down on a piece of paper and focuses on his work again.'
 
-				act 'Leave him alone':gt 'postoffice', 'start'
+				act 'Leave him alone':gt 'post_office', 'start'
 			end
 		elseif hour < 11:
 !!if it''s Saturday but you''re early
@@ -257,7 +257,7 @@ if $ARGS[0] = 'start':
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"You''re a bit early, <<$pcs_firstname>>!" the postmaster says when he sees you enter his office. "I don''t have your mail yet, but I like the enthusiasm. Come see me <b>between 11:00 and 12:00</b>, I should have it ready then."'
 
-			act 'Leave him alone':gt 'postoffice', 'start'
+			act 'Leave him alone':gt 'post_office', 'start'
 		elseif hour > 11 and postworkday ! daystart:
 !!if it''s Saturday but you''re late	
 			*clr & cla
@@ -268,14 +268,14 @@ if $ARGS[0] = 'start':
 			'"You''re late, <<$pcs_firstname>>!" the postmaster scoffs when he sees you enter his office. "I already called Aleksiy in to cover your shift. He was not happy, and neither am I. Don''t make this a habit..."'
 			'You try to apologize for being late, but the postmaster is not interested and tells you to leave him alone.'
 
-			act 'Leave his office':gt 'postoffice', 'start'
+			act 'Leave his office':gt 'post_office', 'start'
 		elseif hour = 11 and postworkday ! daystart:
 !!if it''s Saturday and you''re ready to work
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/postmaster.jpg"></center>'
 			'"Hi there, <<$pcs_firstname>>!" the postmaster smiles when you enter the post office. "Right on time. Please, follow me."'
 		
-			act 'Follow him':gt 'postdeliveries', 'start'
+			act 'Follow him':gt 'post_deliveries', 'start'
 		end
 	elseif postjobQW = 5:
 !!if you want to work after all next Saturday
@@ -291,7 +291,7 @@ if $ARGS[0] = 'start':
 			'"Ah! Excellent news. Thanks, I''ll tell Aleksiy he can stay at home with his daughter," he says, quickly making a note. "Is there anything else I can do for you?"'
 			'"Nope, that was it!" you tell him. "See you on Saturday!"'
 
-			act 'Leave him alone':gt 'postoffice', 'start'
+			act 'Leave him alone':gt 'post_office', 'start'
 		end
 	elseif postjobQW = 999:
 !!you were fired, the postmaster won''t see you again
@@ -299,9 +299,9 @@ if $ARGS[0] = 'start':
 		'"You! Get out of here!" the postmaster shouts angrily when you enter his office. "There''s no job for you! Not now, not ever! That screw-up of yours ruined our perfect record..."'
 		'You try to talk to the postmaster and explain what happened, but he''s simply not interested in whatever it is you have to say. It seems very unlikely that he''d consider hiring you again.'
 
-		act 'Leave him alone':gt 'postoffice', 'start'
+		act 'Leave him alone':gt 'post_office', 'start'
 	end
 end
 
---- postmaster ---------------------------------
+--- post_master ---------------------------------
 

+ 32 - 32
locations/postoffice.qsrc → locations/post_office.qsrc

@@ -1,14 +1,14 @@
-# postoffice
+# post_office
 
 if $ARGS[0] = 'start':
 	*clr & cla
-	$menu_loc = 'postoffice'
+	$menu_loc = 'post_office'
 	$menu_arg = 'start'
 	menu_off = 0
 	gs 'stat'
 	$postloc = ''
 
-	act 'Leave':$postloc = 'leave' & gt 'postoffice'
+	act 'Leave':$postloc = 'leave' & gt 'post_office'
 
 	if (hour >= 9 and hour <= 10) or (hour >= 15 and hour <=16):
 
@@ -20,7 +20,7 @@ if $ARGS[0] = 'start':
 			cla
 			minut += 30
 			gs 'stat'
-			$postloc = 'counter' & gt 'postoffice'
+			$postloc = 'counter' & gt 'post_office'
 		end
 
 		if exhibitionist_lvl > 2:
@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 					gs 'flash', 'full', 'inside', 1
 					gs 'stat'
 
-					act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+					act 'Go to the counter':$postloc = 'counter' & gt 'post_office'
 				end
 			else
 				act 'Flash both your tits and your pussy to skip the line (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -52,7 +52,7 @@ if $ARGS[0] = 'start':
 					gs 'flash', 'pussy', 'inside', 1
 					gs 'stat'
 
-					act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+					act 'Go to the counter':$postloc = 'counter' & gt 'post_office'
 				end
 			else
 				act 'Flash your pussy to skip the line (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -70,7 +70,7 @@ if $ARGS[0] = 'start':
 					gs 'flash', 'tits', 'inside', 1
 					gs 'stat'
 
-					act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+					act 'Go to the counter':$postloc = 'counter' & gt 'post_office'
 				end
 			else
 				act 'Flash your tits to skip the line (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'start':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+							act 'Go to the counter':$postloc = 'counter' & gt 'post_office'
 						end
 
 						act 'Cum in your mouth':
@@ -125,7 +125,7 @@ if $ARGS[0] = 'start':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Go to the counter':$postloc = 'counter' & gt 'postoffice'
+							act 'Go to the counter':$postloc = 'counter' & gt 'post_office'
 						end
 
 					else
@@ -153,24 +153,24 @@ if $ARGS[0] = 'start':
 		'It is currently quiet and you can walk straight up to the counter.'
 
 		act 'Go to the counter':
-			$postloc = 'counter' & gt 'postoffice'
+			$postloc = 'counter' & gt 'post_office'
 		end
 	end
 
-	if bankloc = 0: act 'Go to Postmaster''s Office': gt 'postmaster', 'start'
+	if bankloc = 0: act 'Go to Postmaster''s Office': gt 'post_master', 'start'
 end
 
 if $postloc = 'counter':
 	cla
 	*clr
-	$menu_loc = 'postoffice'
+	$menu_loc = 'post_office'
 	$menu_arg = 'counter'
 	menu_off = 0
 	'<center><b><font color="maroon">Counter</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
 	'The counter, its boring here.'
 
-	act 'Leave':$postloc = 'leave' & gt 'postoffice'
+	act 'Leave':$postloc = 'leave' & gt 'post_office'
 
 	if bankAccount = 1 and money > 0:
 		act 'Deposit money to your bank account':
@@ -191,8 +191,8 @@ if $postloc = 'counter':
 
 			'"Is there anything else I can do for you?"'
 
-			act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
-			act 'Yes':$postloc = 'counter' & gt 'postoffice'
+			act 'Leave the post office':$postloc = 'leave' & gt 'post_office'
+			act 'Yes':$postloc = 'counter' & gt 'post_office'
 		end
 	end
 
@@ -222,7 +222,7 @@ if $postloc = 'counter':
 				'<center><b><font color="maroon">Counter</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/shared/postoffice/counter.jpg"></center>'
 				'You pay the full amount of your outstanding fine/s to the cashier and they print out a receipt to say that it is paid off.'
-				act 'Done':$postloc = 'counter' & gt 'postoffice'
+				act 'Done':$postloc = 'counter' & gt 'post_office'
 			end
 		end
 	end
@@ -238,7 +238,7 @@ if $postloc = 'counter':
 			else
 				'Unfortunately you have no money to send the test in. You could, but they would just throw it out without the receipt of payment.'
 			end
-			act 'Done':$postloc = 'counter' & gt 'postoffice'
+			act 'Done':$postloc = 'counter' & gt 'post_office'
 		end
 	end
 
@@ -255,9 +255,9 @@ if $postloc = 'counter':
 
 		'"Is there anything else I can do for you?"'
 
-		act 'Yes':$postloc = 'counter' & gt 'postoffice'
+		act 'Yes':$postloc = 'counter' & gt 'post_office'
 
-		act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
+		act 'Leave the post office':$postloc = 'leave' & gt 'post_office'
 	end
 
 	i = 0
@@ -269,19 +269,19 @@ if $postloc = 'counter':
 	if i = 0:
 		n = 5
 		price = 60
-		$buy_link = '<a' + iif(money >= 60, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''postoffice''">buy ','>buy ') +'</a>'
+		$buy_link = '<a' + iif(money >= 60, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''post_office''">buy ','>buy ') +'</a>'
 	elseif i = 1:
 		n = 10
 		price = 115
-		$buy_link = '<a' + iif(money >= 115, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''postoffice''">buy ','>buy ') +'</a>'
+		$buy_link = '<a' + iif(money >= 115, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''post_office''">buy ','>buy ') +'</a>'
 	elseif i = 2:
 		n = 20
 		price = 220
-		$buy_link = '<a' + iif(money >= 220, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''postoffice''">buy ','>buy ') +'</a>'
+		$buy_link = '<a' + iif(money >= 220, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''post_office''">buy ','>buy ') +'</a>'
 	elseif i = 3:
 		n = 50
 		price = 520
-		$buy_link = '<a' + iif(money >= 520, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''postoffice''">buy ','>buy ') +'</a>'
+		$buy_link = '<a' + iif(money >= 520, ' href="exec: gs ''$buy_item'', <<n>>, ''hours of internet access'', <<price>>, ''internet'', ''post_office''">buy ','>buy ') +'</a>'
 	end
 
 	i += 1
@@ -301,11 +301,11 @@ if $postloc = 'counter':
 
 			if obmennik <= 0:
 				'<center><br><b>Do you want to think again?</b></center>'
-				act 'Return':$postloc = 'counter' & gt 'postoffice'
+				act 'Return':$postloc = 'counter' & gt 'post_office'
 			else
 				if money < obmennik:
 					'<center><br>You do not have <b><<obmennik>></b> <b>₽</b>.</center>'
-					act 'Return':$postloc = 'counter' & gt 'postoffice'
+					act 'Return':$postloc = 'counter' & gt 'post_office'
 				end
 
 				if money >= obmennik:
@@ -317,9 +317,9 @@ if $postloc = 'counter':
 
 					'"Is there anything else I can do for you?"'
 
-					act 'Yes':$postloc = 'counter' & gt 'postoffice'
+					act 'Yes':$postloc = 'counter' & gt 'post_office'
 
-					act 'Leave the post office':$postloc = 'leave' & gt 'postoffice'
+					act 'Leave the post office':$postloc = 'leave' & gt 'post_office'
 				end
 			end
 		end
@@ -337,7 +337,7 @@ if $postloc = 'counter':
 !!'She nods understandingly: "We are looking for new workers, that''s true. I''d hire you in an instant, but unfortunately it''s not up to me. You should go see Oleg Koltsov, the postmaster. He''s usually in his office between 12:00 and 14:00. I bet he will hire you! Good luck when you go see him!"'
 !!			'"I''m afraid there is no position available at this time."'
 
-!!			act 'Step away from the counter':gt'postoffice', 'start'
+!!			act 'Step away from the counter':gt'post_office', 'start'
 !!askWork += 1
 !!		end
 !!	end
@@ -365,7 +365,7 @@ if $postloc = 'post_off':
 	!!'<center><img src="images/system/image_needed.png"></center>'
 	'Behind his desk, a man of about 50 is busy with some paperwork. He''s dressed quite sharply, and you had never expected the postmaster would be this good looking.'
 
-	act 'Exit office':gt'postoffice', 'start'
+	act 'Exit office':gt'post_office', 'start'
 
 	if post_wrk = 0:
 		act 'Ask for work':
@@ -384,7 +384,7 @@ if $postloc = 'post_off':
 				'"I need to think about it if it''s okay."'
 				'"Sure <<$pcs_nickname>>, come back when you''ve made up your mind."'
 
-				act'Exit office':gt'postoffice', 'start'
+				act'Exit office':gt'post_office', 'start'
 			end
 
 			act'"That sounds great!"':
@@ -397,11 +397,11 @@ if $postloc = 'post_off':
 				'Oleg continues: "If you want to work a shift, you need to be here between this time. There''s no point in you getting changed for just 20 minutes of work."'
 				'That also sounds fair. You give him a handshake as you get ready to leave: "Okay. Thank you sir!"'
 
-				act'Exit Office':gt'postoffice', 'start'
+				act'Exit Office':gt'post_office', 'start'
 			end
 		end
 	end
 end
 
---- postoffice ---------------------------------
+--- post_office ---------------------------------
 

+ 3 - 3
locations/succubus.qsrc

@@ -302,11 +302,11 @@ if $ARGS[0] = 'tatianaask':
 			cla
 			'You ask her if she knows anything else.'
 			'She replies, "No, that''s all I know."'
-			act 'Continue': gt 'lab', 'Tatiana'
+			act 'Continue': gt 'tatiana_lab', 'Tatiana'
 		end
 	end
 	gs 'stat'
-	act 'Finish': gt 'lab', 'Tatiana'
+	act 'Finish': gt 'tatiana_lab', 'Tatiana'
 end
 
 !!**********
@@ -371,7 +371,7 @@ if $ARGS[0] = 'tatianasex':
 					tatisucsex += 1
 					if tatisucsex = 0: tatisucsex = 1
 					'As you both put yourselves back together, Tatiana says, "That was intense, Thank You!"'
-					act 'Continue': gt 'lab', 'Tatiana'
+					act 'Continue': gt 'tatiana_lab', 'Tatiana'
 				end
 			end
 		end

+ 69 - 69
locations/lab.qsrc → locations/tatiana_lab.qsrc

@@ -1,7 +1,7 @@
-# lab
+# tatiana_lab
 if $ARGS[0] = 'start':
 	cla & *clr
-	$menu_loc = 'lab'
+	$menu_loc = 'tatiana_lab'
 	$menu_arg = 'start'
 	menu_off = 0
 	CLOSE ALL
@@ -13,9 +13,9 @@ if $ARGS[0] = 'start':
     
 	if succubusflag = 1 and sucbypass = 0:
 		if sucpcinfo < 2:
-			xgt 'lab', 'suctraining'
+			xgt 'tatiana_lab', 'suctraining'
 		elseif sucpcinfo >= 6 and sucskill < 3 and sctrainprep = 1:
-			xgt 'lab', 'suctraining'
+			xgt 'tatiana_lab', 'suctraining'
 		end
 	elseif succubusflag = 1 and sucbypass = 1:
 		sucbypass = 0
@@ -28,17 +28,17 @@ if $ARGS[0] = 'start':
 	end
 
 !!	if tatina_missionday < daystart:
-!!		gt 'lab', 'missions'
+!!		gt 'tatiana_lab', 'missions'
 !!	end
 
 	act 'Train with Gustav':
 		cla
-		gt 'lab', 'Gustav'
+		gt 'tatiana_lab', 'Gustav'
 	end
 
 	act 'Talk with Tatiana':
 		cla
-		gt 'lab', 'Tatiana'
+		gt 'tatiana_lab', 'Tatiana'
 	end
 
 	if judosparday ! daystart:
@@ -75,7 +75,7 @@ if $ARGS[0] = 'start':
 	
 	if tobiQW > 0 and TatianaMissionDay + 30 < daystart and TatianaMissionQW < TatianaMissionTotal:
 		'You have a feeling Tatiana might want to talk to you about something...'
-		act 'Ask Tatiana what she wants':gt 'lab','missions'
+		act 'Ask Tatiana what she wants':gt 'tatiana_lab','missions'
 	end
 end
 
@@ -90,7 +90,7 @@ if $ARGS[0] = 'Gustav':
 	'<center><img <<$set_imgh>> src="images/characters/city/jugo/jugopre.jpg"></center>'
 	'Gustav is sitting on floor and staring off into space.'
 
-	act 'Leave':gt 'lab', 'start'
+	act 'Leave':gt 'tatiana_lab', 'start'
 
 	if gustavday ! daystart:
 		act 'Develop strength (1:00)':
@@ -105,7 +105,7 @@ if $ARGS[0] = 'Gustav':
 			gustavday = daystart
 			'You do exercises under the guidance of Gustav.'
 
-			act 'Leave':gt 'lab', 'Gustav'
+			act 'Leave':gt 'tatiana_lab', 'Gustav'
 		end
 
 		act 'Develop agility (1:00)':
@@ -120,7 +120,7 @@ if $ARGS[0] = 'Gustav':
 			gustavday = daystart
 			'You do exercises under the guidance of Gustav.'
 
-			act 'Leave':gt 'lab', 'Gustav'
+			act 'Leave':gt 'tatiana_lab', 'Gustav'
 		end
 
 		act 'Develop reactions (1:00)':
@@ -135,7 +135,7 @@ if $ARGS[0] = 'Gustav':
 			gustavday = daystart
 			'You do exercises under the guidance of Gustav.'
 
-			act 'Leave':gt 'lab', 'Gustav'
+			act 'Leave':gt 'tatiana_lab', 'Gustav'
 		end
 
 		act 'Develop endurance (1:00)':
@@ -150,7 +150,7 @@ if $ARGS[0] = 'Gustav':
 			gustavday = daystart
 			'You do exercises under the guidance of Gustav.'
 
-			act 'Leave':gt 'lab', 'Gustav'
+			act 'Leave':gt 'tatiana_lab', 'Gustav'
 		end
 	end
 end
@@ -182,7 +182,7 @@ if $ARGS[0] = 'BodyModActuate':
 		minut+=bodyModTime-30
 		pain[$bodyModPain] = 100
 		gs 'stat'
-		gt 'lab', 'BodyModded', $bodyModType, $bodyModDesc
+		gt 'tatiana_lab', 'BodyModded', $bodyModType, $bodyModDesc
 	else
 		*pl 'Tatiana says,"You don''t have enough mana to pull this off.  Rest and we can try again later."'
 	end
@@ -272,7 +272,7 @@ if $ARGS[0] = 'ListBuilder':
 			bodymodValue = dyneval("result = <<$bodyModIndx>>[<<i>>]")
 		end
 		$bodyModDescX = dyneval('$result = <<$bodyModDesc>>[<<i>>]')
-		$ListStr = $ListStr + "<br><a href=""EXEC:gs 'lab','BodyModActuate',<<bodyModMana>>,<<bodyModTime>>,'<<$bodyModStat>>',<<bodymodValue>>,'<<$bodyModDescX>>','<<$bodyModType>>','<<$bodyModPain>>','<<$bodyModExtra>>'""><<$bodyModDescX>></a>"
+		$ListStr = $ListStr + "<br><a href=""EXEC:gs 'tatiana_lab','BodyModActuate',<<bodyModMana>>,<<bodyModTime>>,'<<$bodyModStat>>',<<bodymodValue>>,'<<$bodyModDescX>>','<<$bodyModType>>','<<$bodyModPain>>','<<$bodyModExtra>>'""><<$bodyModDescX>></a>"
 		i += 1
 		jump 'BodyModLoop'
 	end
@@ -300,7 +300,7 @@ if $ARGS[0] = 'BodyModded':
 	$bodyModVal =  $ARGS[2]
 
 	cls & cla
-	act 'Thank you':gt 'lab', 'Tatiana'
+	act 'Thank you':gt 'tatiana_lab', 'Tatiana'
 
 	"You feel a bit drained and tingly all over.  You look in the mirror."
 	"Your <<$bodyModType>> is now <<$bodyModVal>>."
@@ -311,7 +311,7 @@ end
 
 if $ARGS[0] = 'Tatiana':
 	cls
-	$loc = 'lab'
+	$loc = 'tatiana_lab'
 	$metka = 'Tatiana'
 	minut += 5
 	gs 'stat'
@@ -346,12 +346,12 @@ if $ARGS[0] = 'Tatiana':
 			end
 		end
 
-		if tatisucsex ! 0 and tatisucsexask ! daystart: act 'Ask if she want''s to have sex': tatianasucsexask = daystart & gt 'lab', 'Tatianasucsexask'
+		if tatisucsex ! 0 and tatisucsexask ! daystart: act 'Ask if she want''s to have sex': tatianasucsexask = daystart & gt 'tatiana_lab', 'Tatianasucsexask'
 
-		if sucpcinfo >= 4: act 'Ask her about Succubae': gt 'lab', 'Tatianasuctalk'
+		if sucpcinfo >= 4: act 'Ask her about Succubae': gt 'tatiana_lab', 'Tatianasuctalk'
 	end
 
-	act 'Leave':gt 'lab', 'start'
+	act 'Leave':gt 'tatiana_lab', 'start'
 
 	act 'Ask for help with your appearance':
 		cla
@@ -360,16 +360,16 @@ if $ARGS[0] = 'Tatiana':
 		'"It''s possible but I will have to draw on your magical energy, it will cost some of your mana to perform a spell."'
 		'"Also, this will be painful.  The magic will force your flesh into new shapes."'
 
-		$HairColorTab =  func('lab', 'ListBuilder', 'Hair Color', 500, 60, '$hairColors','i',         'pcs_haircol','hair',	'')
-		$HairLengthTab = func('lab', 'ListBuilder', 'Hair Length',200, 120,'$hairTypes', 'hairTypes', 'pcs_hairlng','hair',	'')
-		$EyeColorTab =   func('lab', 'ListBuilder', 'Eye Color',  300, 120,'$eyeColors', 'i',         'pcs_eyecol',	'eye',	'')
-		$EyeLashTab =    func('lab', 'ListBuilder', 'Eye Lashes', 100, 30, '$eyeLashes', 'i',         'pcs_lashes',	'eye',	'')
-		$LipTab =        func('lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',         'pcs_lip',	'lip',	'')
-		$BreastTab =     func('lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','nbsize',		'breasts','magicf2b=0')
+		$HairColorTab =  func('tatiana_lab', 'ListBuilder', 'Hair Color', 500, 60, '$hairColors','i',         'pcs_haircol','hair',	'')
+		$HairLengthTab = func('tatiana_lab', 'ListBuilder', 'Hair Length',200, 120,'$hairTypes', 'hairTypes', 'pcs_hairlng','hair',	'')
+		$EyeColorTab =   func('tatiana_lab', 'ListBuilder', 'Eye Color',  300, 120,'$eyeColors', 'i',         'pcs_eyecol',	'eye',	'')
+		$EyeLashTab =    func('tatiana_lab', 'ListBuilder', 'Eye Lashes', 100, 30, '$eyeLashes', 'i',         'pcs_lashes',	'eye',	'')
+		$LipTab =        func('tatiana_lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',         'pcs_lip',	'lip',	'')
+		$BreastTab =     func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','nbsize',		'breasts','magicf2b=0')
 
-		$SkinTab = "<a href=""EXEC:gs 'lab','BodyModActuate',1000,240,'pcs_skin',100,'clear','Skin','chest',''"">Clear Skin</a>"
-		$VirginTab = "<a href=""EXEC:gs 'lab','BodyModActuate',1000,120,'pcs_vag',0,'renewed','Virginity','vaginal',''"">Renew Virginity</a>"
-		$SiliconeTab = "<a href=""EXEC:gs 'lab','BodyModActuate',1000,240,'fillimplant',0,'natural again','Boobs','breasts','brSurTemp = 0 & stringimplant = 0'"">Remove Silicone</a>"
+		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',100,'clear','Skin','chest',''"">Clear Skin</a>"
+		$VirginTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,120,'pcs_vag',0,'renewed','Virginity','vaginal',''"">Renew Virginity</a>"
+		$SiliconeTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'fillimplant',0,'natural again','Boobs','breasts','brSurTemp = 0 & stringimplant = 0'"">Remove Silicone</a>"
 
 		$SpellListStr = "<CENTER>
 	<TABLE CELLPADDING = '5'>
@@ -404,7 +404,7 @@ if $ARGS[0] = 'Tatiana':
 		killvar '$SiliconeTab'
 		killvar '$SpellListStr'
 
-		act 'No, no, I''ve changed my mind. Thank you':gt 'lab', 'Tatiana'
+		act 'No, no, I''ve changed my mind. Thank you':gt 'tatiana_lab', 'Tatiana'
 
 
 		act 'Restore you body to it''s original shape':
@@ -414,7 +414,7 @@ if $ARGS[0] = 'Tatiana':
 			'This will reduce excess fat, growth of body parts and reduce high levels of silicone, moving you closer to your original body shape.'
 			'Do you wish to try this spell?'
 
-			act 'No, no, I''ve changed my mind. Thank you':gt 'lab', 'Tatiana'
+			act 'No, no, I''ve changed my mind. Thank you':gt 'tatiana_lab', 'Tatiana'
 
 			if pcs_mana >= 40:
 				act 'That sounds great, let''s do it!':
@@ -428,7 +428,7 @@ if $ARGS[0] = 'Tatiana':
 					'Tatiana lowers her glasses and stares deeply into your eyes. It feels like time just stops being a thing and you are floating.'
 					'It seems very soon afterwards when you snap back to reality but the big clock on the lab wall tells you its been 30 minutes.'
 					'Your body has changed much as Tatiana said it would and she is already busy checking nothing went wrong.'
-					act 'Continue': gt 'lab', 'Tatiana'
+					act 'Continue': gt 'tatiana_lab', 'Tatiana'
 				end
 			end
 		end
@@ -447,7 +447,7 @@ if $ARGS[0] = 'Tatiana':
 				'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
 				'You have decided to achieve recognition Ivan force. Tatiana told you. You go to the apartment of Ivan. There vstretishsya with Gustav. It will help resolve the issue. Just see if he will go to the second level of the press, he was distraught. At the second level of the press he turns into a monster.'
 
-				act 'Leave':gt 'lab', 'Tatiana'
+				act 'Leave':gt 'tatiana_lab', 'Tatiana'
 			end
 
 			act 'Tricky decision':
@@ -457,7 +457,7 @@ if $ARGS[0] = 'Tatiana':
 				'<center><img <<$set_imgh>> src="images/pre/shared/karinpre.jpg"></center>'
 				'You have decided to achieve recognition Ivan cunning. Tatiana told you. You go to the apartment of Ivan. There we meet with you and obtyapaem owners.'
 
-				act 'Leave':gt 'lab', 'Tatiana'
+				act 'Leave':gt 'tatiana_lab', 'Tatiana'
 			end
 		end
 	elseif poverKAR = 2:
@@ -466,7 +466,7 @@ if $ARGS[0] = 'Tatiana':
 			poverKAR = 3
 			'You came to Tatiana and she sighed. "Yes, failed. Gustav caught a bullet in his head and his strength went up to the next level, it has cured, made almost invulnerable, but finally deprived of his mind. Gustav not only gained recognition for Ivan, and not just kill him, he blew part of the entrance his attack. But there are pluses. Cops think it was a gas explosion. But now you have to either pay the debt or goes to jail. "'
 
-			act 'Leave':gt 'lab', 'Tatiana'
+			act 'Leave':gt 'tatiana_lab', 'Tatiana'
 		end
 	end
 
@@ -478,7 +478,7 @@ if $ARGS[0] = 'Tatiana':
 			Tatianaday = daystart
 			'You study with Tatiana developing your intellect.'
 
-			act 'Leave':gt 'lab', 'Tatiana'
+			act 'Leave':gt 'tatiana_lab', 'Tatiana'
 		end
 
 		act 'Develop your inner spirit (1:00)':
@@ -488,14 +488,14 @@ if $ARGS[0] = 'Tatiana':
 			Tatianaday = daystart
 			'You meditate with Tatiana improving your spirituality.'
 
-			act 'Leave':gt 'lab', 'Tatiana'
+			act 'Leave':gt 'tatiana_lab', 'Tatiana'
 		end
 	end
 
 	! Show Actions for Learning Spells
-	gs 'spellList', 'teacherActions', '$basicSpells', 'lab', 'Tatiana'
-	gs 'spellList', 'teacherActions', '$healSpells', 'lab', 'Tatiana'
-	!gs 'spellList', 'teacherActions', '$beautySpells', 'lab', 'Tatiana'
+	gs 'spellList', 'teacherActions', '$basicSpells', 'tatiana_lab', 'Tatiana'
+	gs 'spellList', 'teacherActions', '$healSpells', 'tatiana_lab', 'Tatiana'
+	!gs 'spellList', 'teacherActions', '$beautySpells', 'tatiana_lab', 'Tatiana'
 
 	if pcs_magik >= 5 and spellavtoklon = 0:
 		act 'Learn technique preparation (1:00)':
@@ -504,7 +504,7 @@ if $ARGS[0] = 'Tatiana':
 			spellavtoklon = 1
 			'You learned the technique preparation. This technique allows you to enter into battle with the already created three clones.'
 
-			act 'Leave':gt 'lab', 'Tatiana'
+			act 'Leave':gt 'tatiana_lab', 'Tatiana'
 		end
 	end
 
@@ -515,7 +515,7 @@ if $ARGS[0] = 'Tatiana':
 			spellbefshild = 1
 			'You learned the technique of pre-shield. This technique allows you to enter into battle with a magical shield protecting you against physical impacts.'
 
-			act 'Leave':gt 'lab', 'Tatiana'
+			act 'Leave':gt 'tatiana_lab', 'Tatiana'
 		end
 	end
 !!	Succubus specific skill training.
@@ -532,9 +532,9 @@ if $ARGS[0] = 'Tatiana':
 				if 1 + (succublvl * 2) + tatisucsex < 20 and rand(0,100) < 90:
 					'After a moment, she gives herself a shake and pulls herself together, before saying, "There you go!"'
 					'She then stands up and goes back to her studying.'
-					act 'Finish': gt 'lab', 'Tatiana'
+					act 'Finish': gt 'tatiana_lab', 'Tatiana'
 				else
-					xgt 'lab', 'suctrainsex'
+					xgt 'tatiana_lab', 'suctrainsex'
 				end
 			end
 		elseif sucpcinfo >= 5 and sucskill < 2:
@@ -546,7 +546,7 @@ if $ARGS[0] = 'Tatiana':
 					gs 'stat'
 					'After a few minutes, you feel Tatiana break the link and say, "<<$pcs_nickname>>, you need to build up <i>two</i> days of reserve before we do this training."'
 					'She then stands up and goes back to her studying.'
-					act 'Finish': gt 'lab', 'Tatiana'
+					act 'Finish': gt 'tatiana_lab', 'Tatiana'
 					exit
 				end
 				minut += 55
@@ -558,10 +558,10 @@ if $ARGS[0] = 'Tatiana':
 				if tatisucsex >= 20 or rand(1,100) < 95:
 					'After several moments, she pulls herself together, opens her eyes, smiles at you, and says, "There, I knew I could do it!"'
 					'She then stands up and goes back to her studying.'
-					act 'Finish': gt 'lab', 'Tatiana'
+					act 'Finish': gt 'tatiana_lab', 'Tatiana'
 				else
 					'Then her eyes snap open and you feel arousal suddenly flooding the link!'
-					xgt 'lab', 'suctrainsex'
+					xgt 'tatiana_lab', 'suctrainsex'
 				end
 			end
 		elseif sucpcinfo >= 6 and sucskill < 3:
@@ -592,7 +592,7 @@ if $ARGS[0] = 'Tatiana':
 							gt 'city_center'
 						end
 					end
-					act 'Not Yet': gt 'lab', 'Tatiana'
+					act 'Not Yet': gt 'tatiana_lab', 'Tatiana'
 				end
 			elseif money >= 2000 and sctrainprep = -1:
 				act 'Ask her to redo the preparations':
@@ -610,7 +610,7 @@ if $ARGS[0] = 'Tatiana':
 							gt 'city_center'
 						end
 					end
-					act 'Not Yet': gt 'lab', 'Tatiana'
+					act 'Not Yet': gt 'tatiana_lab', 'Tatiana'
 				end
 			end
 		elseif sucpcinfo >= 7 and sucskill < 4 and maddildo = 1 and sucexcess >= 100:
@@ -633,16 +633,16 @@ if $ARGS[0] = 'Tatiana':
 						'As you''re finishing, you notice Tatiana has her eyes closed and is visibly trying to get ahold of herself.'
 						if tatisucsexday < daystart or rand(1,100) > 95:
 							'Then her eyes snap open and you feel arousal suddenly flooding the link!'
-							xgt 'lab', 'suctrainsex'
+							xgt 'tatiana_lab', 'suctrainsex'
 						else
 							cla
 							'After several moments, she pulls herself together, opens her eyes, smiles at you, and says, "There, I knew I could do it!"'
 							'She then stands up and goes back to her studying.'
-							act 'Finish': gt 'lab', 'Tatiana'
+							act 'Finish': gt 'tatiana_lab', 'Tatiana'
 						end
 					end
 				end
-				act 'Not Yet': gt 'lab', 'Tatiana'
+				act 'Not Yet': gt 'tatiana_lab', 'Tatiana'
 			end
 		end
 	end
@@ -673,7 +673,7 @@ if $ARGS[0] = 'Tatianasuctalk':
 		exit
 	end
 
-	if tatisucsex = 0 and tatisucsexask ! daystart: act 'Ask Tatiana if she wants to try Succubus Sex': tatisucsexask = daystart & gt 'lab', 'Tatianasucsexask'
+	if tatisucsex = 0 and tatisucsexask ! daystart: act 'Ask Tatiana if she wants to try Succubus Sex': tatisucsexask = daystart & gt 'tatiana_lab', 'Tatianasucsexask'
 
 	act 'Ask her to repeat what she knows about Succubae': gt 'succubus', 'tatianaask'
 
@@ -695,15 +695,15 @@ if $ARGS[0] = 'Tatianasuctalk':
 				act 'Ask her to tell you': gt 'succubus', 'tatianaask', 2
 			else
 				'No, I havn''t.'
-				act 'Continue': gt 'lab', 'Tatianasuctalk'
+				act 'Continue': gt 'tatiana_lab', 'Tatianasuctalk'
 			end
 		else
 			'No, I havn''t.'
-			act 'Continue': gt 'lab', 'Tatianasuctalk'
+			act 'Continue': gt 'tatiana_lab', 'Tatianasuctalk'
 		end
 	end
 
-	act 'Change topics': gt 'lab', 'Tatiana'
+	act 'Change topics': gt 'tatiana_lab', 'Tatiana'
 
 end
 
@@ -733,7 +733,7 @@ if $ARGS[0] = 'Tatianasucsexask':
 			'She gives you a wide eyed look before saying,'
 			if succublvl + TatianaSex < rand(0,6):
 				'"I''m sorry, <<$pcs_firstname>>, I just don''t have the time now."'
-				act 'Move on to something else': gt 'lab', 'Tatiana'
+				act 'Move on to something else': gt 'tatiana_lab', 'Tatiana'
 			else
 				'"I would love to!", with a wide smile.'
 				'She leads you over to the couch and you both strip.'
@@ -743,7 +743,7 @@ if $ARGS[0] = 'Tatianasucsexask':
 			if tatisucsexday <= daystart:
 				if 1 + (succublvl * 2) + tatisucsex < rand(1,20):
 					'"I''m sorry, <<$pcs_nickname>>, I just don''t have the time now."'
-					act 'Move on to something else': gt 'lab', 'Tatiana'
+					act 'Move on to something else': gt 'tatiana_lab', 'Tatiana'
 				else
 					'She gives you a "come hither" smile and says, "I would love to, <<$pcs_nickname>>!"'
 					'You both head toward the couch, stripping as you go.'
@@ -759,7 +759,7 @@ if $ARGS[0] = 'Tatianasucsexask':
 				'She looks at you with a sad smile and says,'
 				'"I''m sorry, <<$pcs_nickname>>, I need at least <<tatisucsexday - daystart>> more <<$scsextmp>>."'
 				killvar '$scsextmp'
-				act 'Move on to something else': gt 'lab', 'Tatiana'
+				act 'Move on to something else': gt 'tatiana_lab', 'Tatiana'
 			end
 		end
 	end
@@ -777,7 +777,7 @@ if $ARGS[0] = 'Tatianasexreject':
 		scpopt = 0
 		killvar '$sclocrt' & killvar '$scargrt'
 	end
-	act 'Finish': gt 'lab', 'Tatiana'
+	act 'Finish': gt 'tatiana_lab', 'Tatiana'
 end
 
 if $ARGS[0] = 'suctrainsex':
@@ -796,7 +796,7 @@ if $ARGS[0] = 'suctrainsex':
 	else
 		scfwon = 2
 		scpopt = 1
-		$sclocrt = 'lab'
+		$sclocrt = 'tatiana_lab'
 		$scargrt = 'Tatianasexreject'
 		'You only have moments to decide, do you give in and let <<$sucself1>> go or do you reign it in?'
 		act 'Continue': gt 'succubus', 'tatianasex'
@@ -815,7 +815,7 @@ if $ARGS[0] = 'suctraining':
 		'You start to answer her when she holds up her hand and says, "Wait, come sit on the couch and tell me."'
 		'She turns away from you and walks toward the couch.'
 
-		act 'Follow her': gt 'lab', 'Tatianasuctalk'
+		act 'Follow her': gt 'tatiana_lab', 'Tatianasuctalk'
 		exit
 	elseif sucpcinfo >= 6 and sucskill < 3 and sctrainprep = 1:
 		if tatisucsexday > daystart and tatisucsexday - 5 >= daystart:
@@ -840,7 +840,7 @@ if $ARGS[0] = 'suctraining':
 						'"Ok, I''ll dump the "battery" potion."'
 						'With that, she walks over to her workbench and dumps the contents of several beakers into a barrel that flairs with magic as she does so.'
 					end
-					act 'Continue': gt 'lab', 'start'
+					act 'Continue': gt 'tatiana_lab', 'start'
 				end
 				act 'No, never mind continue your preparations':
 					cla
@@ -905,14 +905,14 @@ if $ARGS[0] = 'suctraining':
 		else
 			'The barrier is down when you get to the lab and Tatiana calls from across the room, "You''re too late, I had to release the energy and we''ll need to start over."'
 			sctrainprep = -1
-			act 'Continue': gt 'lab', 'start'
+			act 'Continue': gt 'tatiana_lab', 'start'
 			exit
 		end
 	end
 !!	This is oops handling
 	sucbypass = 1
 	minut -= 5
-	gt 'lab', 'start'
+	gt 'tatiana_lab', 'start'
 end
 
 if $ARGS[0] = 'missions':
@@ -962,17 +962,17 @@ if $ARGS[0] = 'missions':
 		*clr & cla
 		'"Hey <<$pcs_firstname>>, are you up for a magical adventure?" Tatiana asks with a grin.'
 		act 'Always': gt 'tatiana_missions','start'
-		act 'Not right now':gt 'lab','start'
+		act 'Not right now':gt 'tatiana_lab','start'
 	elseif temp = 2:
 		*clr & cla
 		'"Hello <<$pcs_nickname>>, glad you''re here." Tatiana smiles at you. "What do you say? Feel ready for a mission?"'
 		act 'Sure, let''s do this': gt 'tatiana_missions','start'
-		act 'Not right now':gt 'lab','start'
+		act 'Not right now':gt 'tatiana_lab','start'
 	elseif temp = 3:
 		*clr & cla
 		'"Hello <<$pcs_nickname>>." Tatiana looks at you expectantly. "Would you like to do an investigation?"'
 		act 'Gladly': gt 'tatiana_missions','start'
-		act 'Not right now':gt 'lab','start'
+		act 'Not right now':gt 'tatiana_lab','start'
 	end
 	
 ! if TatianaMissionQW = 5: gt 'tatiana_missions', 'special'
@@ -993,5 +993,5 @@ if $ARGS[0] = 'missions':
 end
 
 
---- lab ---------------------------------
+--- tatiana_lab ---------------------------------
 

+ 4 - 4
locations/tatiana_missions.qsrc

@@ -9,7 +9,7 @@ $loc = 'tatiana_missions'
 
 gs 'themes', 'indoors'
 
-!!! TatianaMissionTotal ALWAYS has to be adjusted in 'lab','start' to match the TatianaMissionQW value of the latest mission that was added !!!
+!!! TatianaMissionTotal ALWAYS has to be adjusted in 'tatiana_lab','start' to match the TatianaMissionQW value of the latest mission that was added !!!
 !(TatianaMissionQW = 1 for intro, TatianaMissionQW = 2 for mission1, ...)
 
 if $ARGS[0] = 'start':
@@ -283,13 +283,13 @@ end
 !	'"<<$pcs_firstname>>, I a special mission for you. There is some kind of magic emanating from a bakery in Old Town, the people who have eaten there and show traces of the magic have no recollection of something having happened."'
 !	'"We don''t want to raise suspicion by going to the bakery as could be recognised, so we just want you to go there and buy one of their ''special cakes'' and bring it back here for me to test. I''m afraid you don''t have a choice in this one, we have no one else to send."'
 !	
-!!	act 'Accept': gt 'lab', 'start'
+!!	act 'Accept': gt 'tatiana_lab', 'start'
 !end
 
 !if $ARGS[0] = '1':
 !! mission text
-!!	act 'Accept': gt 'lab', 'start'
-!!	act 'Refuse': gt 'lab', 'start'
+!!	act 'Accept': gt 'tatiana_lab', 'start'
+!!	act 'Refuse': gt 'tatiana_lab', 'start'
 !end