Updated Havana (fit) to use new location function and to use the tampon call.

Updated Artemhome and Anushka's Pav home to new location function and restructure code

locations/anushapt.qsrc

@@ -13,26 +13,18 @@
 !---------------------------------------------
 
 if $ARGS[0] = 'home':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'home'
 	menu_off = 0
 	$track_loop = ''
-	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$locM_arg = $ARGS[0]
-	$locM = 'anushapt'
-	$loc_arg = $ARGS[0]
-	$loc = 'anushapt'
-	$location_type = 'private'
-	clr
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
 	minut += 1
 	bonusZ = 0
-	gs 'stat'
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
+	$location_type = 'private'	
 	gs 'themes', 'indoors'
-
+	gs 'stat'
 	if anushkaQW['home_day'] ! daystart:
 		anushkaQW['home_day'] = daystart
 		AnushkaLoc = 0
@@ -292,14 +284,12 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'hallway'
+	*clr & cla
 	menu_off = 0
 	killvar '$locclass'
-	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$location_type = 'indoors'
-	*clr & cla
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
+	$location_type = 'indoors'	
 	minut += 1
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
@@ -332,18 +322,13 @@ if $ARGS[0] = 'hallway':
 end
 
 if $ARGS[0] = 'bathroom':
-	CLOSE ALL
-	$menu_loc = 'anushapt'
-	$menu_arg = 'bathroom'
-	$loc_arg = 'bathroom'
-	$loc = 'anushapt'
-	$locM_arg = 'bathroom'
-	$locM = 'anushapt'
 	menu_off = 0
 	*clr & cla
 	minut += 1
-	gs 'stat'
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$location_type = 'bathroom'
+	gs 'stat'
+	
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom.jpg"></center>'
 	'The bathroom has seen better days. It looks like it hasn''t been cleaned for quite some time, with mold growing in the corners of the walls and floor.'
@@ -430,14 +415,11 @@ end
 
 if $ARGS[0] = 'nushshower':
 	menu_off = 1
-	CLOSE ALL
 	*clr & cla
-	$loc_arg = 'bathroom'
-	$loc = 'anushapt'
-	$locM_arg = 'bathroom'
-	$locM = 'anushapt'
-	gs 'stat'
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$location_type = 'bathroom'
+	gs 'stat'
+	
 	AnushkaLoc = 7
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/anushapt/bathroom/dry1.jpg"></center>'
@@ -733,16 +715,14 @@ if $ARGS[0] = 'snack':
 end
 
 if $ARGS[0] = 'livingroom':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'livingroom'
 	menu_off = 0
-	CLOSE ALL
 	*clr & cla
 	if livingev_day ! daystart:
 		livingev = rand (1, 5)
 	else
 		livingev = 0
 	end
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$locclass = 'livingr'
 	minut += 1
 	gs 'stat'
@@ -1056,12 +1036,7 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$loc = 'anushapt'
-	$loc_arg = 'kitchen'
-	$menu_loc = 'anushapt'
-	$menu_arg = 'kitchen'
 	menu_off = 0
-	CLOSE ALL
 	*clr & cla
 	if kitchenev_day ! daystart:
 		kitchenev = rand (1, 5)
@@ -1069,6 +1044,7 @@ if $ARGS[0] = 'kitchen':
 		kitchenev = 0
 	end
 	minut += 1
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	$locclass = 'kitr'
 	gs 'stat'
 	gs 'kit_din'
@@ -1210,11 +1186,10 @@ if $ARGS[0] = 'fridge':
 end
 
 if $ARGS[0] = 'anushparents':
-	$menu_loc = 'anushapt'
-	$menu_arg = 'anushparents'
 	menu_off = 0
-	CLOSE ALL
+
 	*clr & cla
+	gs 'shortgs', 'setloc', 'anushapt', $ARGS[0]
 	minut += 1
 	gs 'stat'
 	'<center><b><font color = maroon>Anushka''s parent''s room</font></b></center>'

locations/artemhome.qsrc

@@ -34,25 +34,21 @@
 !---------------------------------------------
 
 if $ARGS[0] = 'home':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'home'
+	clr
 	menu_off = 0
 	$track_loop = ''
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$locM_arg = 'home'
-	$locM = 'artemhome'
-	$loc_arg = 'home'
-	$loc = 'artemhome'
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$location_type = 'private'
-	clr
+	gs 'themes', 'indoors'		
 	popolaini = 0
 	saunaYouRoom = 0
 	boycherdaksex = 0
 	minut += 1
 	bonusZ = 0
 	gs 'stat'
-	gs 'themes', 'indoors'
+	
 	
 !! Artem''s location, he is out on Wednesday from 15-22
 	if week = 3 and hour >= 15 and hour < 22:
@@ -173,19 +169,13 @@ if $ARGS[0] = 'home':
 end
 
 if $ARGS[0] = 'hallway':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'hallway'
 	menu_off = 0
 	killvar '$locclass'
 	CLOSE ALL
 	if sound = 0:PLAY 'sound/korr.mp3',30
-	$location_type = 'indoors'
-	$locM_arg = 'hallway'
-	$locM = 'artemhome'
-	$loc_arg = 'hallway'
-	$loc = 'artemhome'
 	*clr & cla
 	minut += 1
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]	
 	gs 'stat'
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/hall.jpg"></center>'
@@ -212,18 +202,14 @@ end
 
 if $ARGS[0] = 'bathroom':
 	CLOSE ALL
-	$menu_loc = 'artemhome'
-	$menu_arg = 'bathroom'
-	$loc_arg = 'bathroom'
-	$loc = 'artemhome'
-	$locM_arg = 'bathroom'
-	$locM = 'artemhome'
+	
 	if ArtemLoc ! 3:
 		menu_off = 0
 		*clr & cla
-		minut += 1
-		gs 'stat'
+		minut += 1		
+		gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 		$location_type = 'bathroom'
+		gs 'stat
 		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/bathroom.jpg"></center>'
 		'The first thing you notice are the god awful green tiles with matching sink in the bathroom. You don''t know who picked it, but they obviously don''t have good taste. Other than that, it''s a fairly typical bathroom.'
@@ -270,19 +256,14 @@ if $ARGS[0] = 'bathroom':
 end
 
 if $ARGS[0] = 'artemroom':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'artemroom'
-	$locM_arg = 'artemroom'
-	$locM = 'artemhome'
-	$loc_arg = 'artemroom'
-	$loc = 'artemhome'
-	menu_off = 0
-	$locclass = 'bedr'
+	menu_off = 0	
 	CLOSE ALL
 	$track_loop = ''
 	music_loop = 1
 	*clr & cla
 	minut += 1
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
+	$locclass = 'bedr'
 	gs 'stat'
 	'<center><h4><font color="maroon">Artem''s Room</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/artemroom.jpg"></center>'
@@ -592,12 +573,6 @@ if $ARGS[0] = 'snack':
 end
 	
 if $ARGS[0] = 'livingroom':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'livingroom'
-	$locM_arg = 'livingroom'
-	$locM = 'artemhome'
-	$loc_arg = 'livingroom'
-	$loc = 'artemhome'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -606,6 +581,7 @@ if $ARGS[0] = 'livingroom':
 	else
 		livingev = 0
 	end
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$locclass = 'livingr'
 	minut += 1
 	gs 'stat'
@@ -871,12 +847,6 @@ if $ARGS[0] = 'livingroom':
 end
 
 if $ARGS[0] = 'kitchen':
-	$locM_arg = 'kitchen'
-	$locM = 'artemhome'
-	$loc_arg = 'kitchen'
-	$loc = 'artemhome'
-	$menu_loc = 'artemhome'
-	$menu_arg = 'kitchen'
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
@@ -886,6 +856,7 @@ if $ARGS[0] = 'kitchen':
 		kitchenev = 0
 	end
 	minut += 1
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	$locclass = 'kitr'
 	gs 'stat'
 	gs 'kit_din'
@@ -1133,17 +1104,13 @@ if $ARGS[0] = 'fridge':
 end 
 	
 if $ARGS[0] = 'artemparents':
-	$menu_loc = 'artemhome'
-	$menu_arg = 'artemparents'
-	$locM_arg = 'artemparents'
-	$locM = 'artemhome'
-	$loc_arg = 'artemparents'
-	$loc = 'artemhome'
+	
 	menu_off = 0
 	CLOSE ALL
 	*clr & cla
 	minut += 1
 	temp = rand(0,1)
+	gs 'shortgs', 'setloc', 'artemhome', $ARGS[0]
 	gs 'stat'
 	'<center><b><font color = maroon>Artem''s parent''s room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/artemhome/parroom.jpg"></center>'

locations/emp_functions.qsrc

@@ -466,7 +466,6 @@ if $ARGS[0] = 'del_evt':
 	end 
 end
 
-
 if $ARGS[0] = 'evt_day_suffix':
 
 	if ARGS[1] ! '': 

locations/fit.qsrc

@@ -3,10 +3,7 @@
 CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
-	$loc = 'fit'
-	$loc_arg = 'start'
-	$menu_loc = 'fit'
-	$menu_arg = 'start'
+	gs 'shortgs', 'setloc', 'fit', $ARGS[0]
 	killvar '$locclass'
 	menu_off = 0
 	minut += 5
@@ -41,12 +38,14 @@ if $ARGS[0] = 'start':
 	act 'Leave': killvar 'epayments' & minut += 5 & gt 'city_center'
 	
 	if abonement > 0:
-		act 'Go to the dressing room': gt 'fit', 'dressing room'
+		act 'Go to the dressing room': gt 'fit', 'dressing_room'
+
 	elseif money > 100:
 		act 'Use the pool (100 <b>₽</b>)':
 			money -= 100
 			gs 'stat'
-			gt 'fit', 'dressing room'
+			gt 'fit', 'dressing_room'
+
 		end
 	end
 
@@ -80,15 +79,10 @@ if $ARGS[0] = 'start':
 
 end
 
-if $ARGS[0] = 'dressing room':
-	$locM = 'fit'
-	$locM_arg = 'dressing room'
-	$sexloc = 'fit'
-	$loc = 'fit'
-	$loc_arg = 'dressing room'
-	$menu_loc = 'fit'
-	$menu_arg = 'dressing room'
+if $ARGS[0] = 'dressing_room':
+	gs 'shortgs', 'setloc', 'fit', $ARGS[0]
 	menu_off = 0
+	$sexloc = 'fit'
 	$location_type = 'private'
 	$locclass = 'changingroom'
 	*clr & cla
@@ -114,7 +108,8 @@ if $ARGS[0] = 'dressing room':
         else
             cla
             msg'<b><font color = red>You need to get dressed.</font></b>'
-            act 'Return': gt 'fit', 'dressing room'
+            act 'Return': gt 'fit', 'dressing_room'
+
         end
     end
 
@@ -133,7 +128,8 @@ if $ARGS[0] = 'dressing room':
 			'You go into the bathroom and turn on the shower. You lather your body and wash in the shower.'
 			if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 
-			act 'Get out of the shower':gt 'fit', 'dressing room'
+			act 'Get out of the shower':gt 'fit', 'dressing_room'
+
 		end
 	else
 		'<font color="red">You''ve run out of shampoo and will have to buy some more before you can wash yourself.</font>'
@@ -181,7 +177,8 @@ if $ARGS[0] = 'dressing room':
 				begsec = 1
 				'You signed up for the track team.'
 
-				act 'Leave':gt 'fit', 'dressing room'
+				act 'Leave':gt 'fit', 'dressing_room'
+
 			end
 		elseif $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= 40 and pcs_energy >= 20:
 			act 'Go to team practice':gt 'beg', 'start'
@@ -209,6 +206,7 @@ if $ARGS[0] = 'dressing room':
 			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
 		end
 	end
+	dynamic $tampon
 end
 
 if $ARGS[0] = 'fitgirl':
@@ -216,7 +214,7 @@ if $ARGS[0] = 'fitgirl':
 	'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/idle0.jpg"></center>'
 	'The girl notices you looking and returns the smile. She undresses and taking some toiletries goes into the shower.'
 
-	act 'Turn away':gt 'fit', 'dressing room'
+	act 'Turn away':gt 'fit', 'dressing_room'
 
 	act 'Follow her':
 		*clr & cla
@@ -229,7 +227,7 @@ if $ARGS[0] = 'fitgirl':
 		'<center><img <<$set_imgh>> src="images/characters/city/tanya/gym/shower0.jpg"></center>'
 		'There''s no one in the shower, except this girl. The girl looks around and seeing you smiles again then turns away.'
 
-		act 'Leave the shower':gt 'fit', 'dressing room'
+		act 'Leave the shower':gt 'fit', 'dressing_room'
 
 		gs 'willpower', 'misc', 'force'
 		if will_cost <= pcs_willpwr:
@@ -246,7 +244,8 @@ if $ARGS[0] = 'fitgirl':
 				if pcs_apprnc < 80:
 					'The girl pushes you off, and shouts something very rude about you and each and everyone of your relatives, you run out to the locker room.'
 
-					act 'Go':gt 'fit', 'dressing room'
+					act 'Go':gt 'fit', 'dressing_room'
+
 				elseif pcs_apprnc >= 80:
 					'The girl quickly turns around. She looks a little bit puzzled as she realizes that it was you who grabbed her. She probably expected to see a guy and isn''t sure what to do.'
 
@@ -272,7 +271,8 @@ if $ARGS[0] = 'fitgirl':
 							gs 'arousal', 'end'
 							'The girl smiles at you, but removes your hand and leaves, blowing you a kiss.'
 
-							act 'Continue':gt 'fit', 'dressing room'
+							act 'Continue':gt 'fit', 'dressing_room'
+
 						elseif pcs_apprnc >= 100:
 							cla
 							*clr
@@ -318,7 +318,8 @@ if $ARGS[0] = 'tanyaIntroduction':
 	'"Nope. You seduced me. I have never been with a girl before and I think I earned this as a memento." With these words, Tanya slips your panties in her pocket.'
 	'"My name is Tanya by the way. I live only a short distance from here with my parents. You might come over if you like. Usually I''m home in the late afternoon. We could continue were we left off." she winks at you and leaves.'
 	'<i>You can now visit Tanya at her parents home in the Downtown area once a day after 16:00.</i>'
-	act 'Back':gt 'fit', 'dressing room'
+	act 'Back':gt 'fit', 'dressing_room'
+
 end
 
 if $ARGS[0] = 'gym':
@@ -340,7 +341,7 @@ if $ARGS[0] = 'gym':
 		if hour >= 10 and hour < 12 and week = 7 and centr = 2 and ricewine < 2: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Guang</a>'
 	end
 
-	gs 'fit', 'exercise end'
+	gs 'fit', 'exercise_end'
 
 	if pcs_energy >= 15:
 		act 'Aerobics (Burn fat)':
@@ -357,7 +358,7 @@ if $ARGS[0] = 'gym':
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -375,7 +376,7 @@ if $ARGS[0] = 'gym':
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -392,7 +393,7 @@ if $ARGS[0] = 'gym':
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -410,7 +411,7 @@ if $ARGS[0] = 'gym':
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -428,7 +429,7 @@ if $ARGS[0] = 'gym':
 			if pcs_stam < 30:
 				*nl
 				'You are too tired to do any more exercise and will have to rest and regain some stamina.'
-				gs 'fit', 'exercise end'
+				gs 'fit', 'exercise_end'
 			else
 				act'Continue': gt 'fit', 'gym'
 			end
@@ -444,7 +445,7 @@ if $ARGS[0] = 'gym':
 	end
 end
 
-if $ARGS[0] = 'exercise end':
+if $ARGS[0] = 'exercise_end':
 	menu_off = 1
 	RESULT = rand(0, 19)
 
@@ -455,7 +456,8 @@ if $ARGS[0] = 'exercise end':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal1.jpg"></center>'
 			'You see a nice guy on the weight machine.'
 
-			act 'Continue':gt 'fit', 'dressing room'
+			act 'Continue':gt 'fit', 'dressing_room'
+
 			act 'Flirt':
 				cla
 				*clr
@@ -483,8 +485,8 @@ if $ARGS[0] = 'exercise end':
 					*clr & cla
 					gs 'willpower', 'pay', 'self'
 					gs 'stat'
-					gt 'fit', 'dressing room'
-					
+					gt 'fit', 'dressing_room'
+
 					'Event text'
 					
 					act 'Next action': gt 'farawayistan'
@@ -512,7 +514,7 @@ if $ARGS[0] = 'exercise end':
 			cla
 			'As you finish training, a fit girl offers to play a little squash with her as she waits for her boyfriend to came.'
 
-			act 'Refuse':gt 'fit', 'dressing room'
+			act 'Refuse':gt 'fit', 'dressing_room'
 
 			act 'Agree':
 				cla
@@ -523,8 +525,7 @@ if $ARGS[0] = 'exercise end':
 				'He stands just behind you and puts one hand on your hand, guiding your racket and showing you how to strike the ball. The other hand starts stroking your hips gradually approaching your crotch.'
 				'You feel his cock resting against your back and looking at the girl, you know that she understands what is going on and that the man is her boyfriend.'
 
-				act 'Escape from these perverts':gt 'fit', 'dressing room'
-
+				act 'Escape from these perverts':gt 'fit', 'dressing_room'
 				act 'Enjoy':
 					guy += 1
 					girl += 1
@@ -541,7 +542,7 @@ if $ARGS[0] = 'exercise end':
 			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal6.jpg"></center>'
 			'You train near to a girl and engage in conversation, two guys obviously take you for girlfriends and try to chat you up.'
 
-			act 'Continue':gt 'fit', 'dressing room'
+			act 'Continue':gt 'fit', 'dressing_room'
 
 			act 'Flirt back':
 				cla
@@ -550,8 +551,7 @@ if $ARGS[0] = 'exercise end':
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/sex/zal7.jpg"></center>'
 				'You flirt with a guy, and notice that he is getting very excited and constantly glancing behind you. Turning, you see that the girl is already on her haunches and sucking the second guy with gusto.'
 
-				act 'Leave':gt 'fit', 'dressing room'
-
+				act 'Leave':gt 'fit', 'dressing_room'
 				act 'Suck':
 					guy += 2
 					girl += 1
@@ -567,7 +567,7 @@ if $ARGS[0] = 'exercise end':
 				end
 			end
 		else
-			gt 'fit', 'dressing room'
+			gt 'fit', 'dressing_room'
 		end
 	end
 end
@@ -587,7 +587,7 @@ if $ARGS[0] = 'kickboxing':
 	'Around it there are various punching bags of different sizes and weights and a couple of coaches with practice pads.'
 	'You can try your luck in a fight here on Saturdays but safety concerns limit everyone to a maximum of 1 bout per week.'
 
-	act 'Return to dressing room': gt 'fit', 'dressing room'
+	act 'Return to dressing room': gt 'fit', 'dressing_room'
 
 	act 'Work on your jabs':
 		cla
@@ -637,7 +637,7 @@ if $ARGS[0] = 'kickboxing':
 		act 'Leave':gt 'fit', 'kickboxing'
 	end
 
-	act 'Sparing (training bout in the ring)':
+	act 'Sparring (training bout in the ring)':
 		cla
 		*clr
 		'You need to choose a partner for sparring'