Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife

locations/ballet_secrets.qsrc

@@ -22,9 +22,9 @@ if $ARGS[0] = 'init':
   if week < 7 and hour >= 9 and hour <= 17:
     'You enter the shop and greeted by a riot of displays showcasing ballet and other dance equipment. A woman is sewing something in the corner and glances at you before continuing.'
     if balletqw['ballet_secrets'] = 1:
-      act 'Approach the woman': gt $loc, 'first_visit'
+      act 'Approach the woman': gt 'ballet_secrets', 'first_visit'
     else
-      act 'Enter studio area': gt $loc, 'reception'
+      act 'Enter studio area': gt 'ballet_secrets', 'reception'
       !! act 'Talk to assistant':
       !! act'Look at equipment'
       !! act 'look at dance wear'
@@ -33,7 +33,7 @@ if $ARGS[0] = 'init':
   else
     'You look at the shop window and realise it''s closed, there is a security door to the left of you that allows you access the studio areas if you are a member.'
     if balletqw['membership'] >= daystart:
-      act 'Swipe membership card': gt $loc, 'reception'
+      act 'Swipe membership card': gt 'ballet_secrets', 'reception'
     end
   end
 
@@ -60,7 +60,7 @@ if $ARGS[0] = 'first_visit':
   '"Of course as you are aware the school is sponsoring these costs, but only for the first year she says and you will need to manage your own equipment after this.", Madame Pushkina advises.'
   '"Is there anything else you neeed? No? Good, I will see you again in two weeks for your final shoe fitting. I would like to extend my congratulations and wish you a successful career Ms. <<$pcs_lastname>>."'
   act 'Leave': gt 'pushkin_sq'
-  act 'Return to shop': gt $loc, 'init'
+  act 'Return to shop': gt 'ballet_secrets', 'init'
   
 
 end
@@ -83,18 +83,18 @@ if $ARGS[0] = 'reception':
   'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the gym hall to refill your water bottle.'
  
 
-  act 'Return to shop': gt $loc, 'init'
-  act 'Changing rooms': gt $loc, 'changing_room'
+  act 'Return to shop': gt 'ballet_secrets', 'init'
+  act 'Changing rooms': gt 'ballet_secrets', 'changing_room'
   !! if membership not active:
   if balletqw['membership'] = 0 or balletqw['membership'] < daystart:
-    act 'Discuss membership': gt $loc, 'enrol'
+    act 'Discuss membership': gt 'ballet_secrets', 'enrol'
   elseif hour <= 15 and $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and pcs_stam >= stammax / 5 and pcs_energy >= 20:
     !! link to services:
     !! if membership active
-    !! act 'Attend Physio': gt $loc, 'physio'
-    !! act 'Attend a gymnastics class.': gt $loc, 'gymnastics_courses'
-    !! act 'Attend a dance class': gt $loc, 'ballet_courses'
-    act 'Attend a yoga class': gt $loc, 'yoga_courses'
+    !! act 'Attend Physio': gt 'ballet_secrets', 'physio'
+    !! act 'Attend a gymnastics class.': gt 'ballet_secrets', 'gymnastics_courses'
+    !! act 'Attend a dance class': gt 'ballet_secrets', 'ballet_courses'
+    act 'Attend a yoga class': gt 'ballet_secrets', 'yoga_courses'
   elseif hour >= 16:
     'All the evening classes have started today, you need to be here before 16:00 to ensure you can attend.'
   end
@@ -116,7 +116,7 @@ if $ARGS[0]= 'enrol':
   elseif balletqw['membership'] ! 0:
     'You approach the reception to renew your membership.'
   end
-  act 'Return to the studio entrance': gt $loc, 'reception'
+  act 'Return to the studio entrance': gt 'ballet_secrets', 'reception'
 
   'The gym offers a weekly or monthly subscription for of 1,500<b> ₽</b>  or 5,000<b> ₽</b> respectively to use the facilities with some courses included. Physio appointments are charged seperately.'
   'The subscriptions includes classes in gymnastics, yoga and introductory ballet. For advanced classes there is an additional instructor charge. A physical trainer is on hand to assist at all times if you so need one.'
@@ -141,7 +141,7 @@ if $ARGS[0] = 'changing_room':
   '<center><h2>Changing Room</h2></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/gym/locker.jpg"></center>'
 
-  act 'Return to the studio reception': gt $loc, 'reception'
+  act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
   if mc_inventory['shampoo'] > 0:
 		act 'Take a shower (0:15)':
 			cla
@@ -157,7 +157,7 @@ if $ARGS[0] = 'changing_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 $loc, 'changing_room'
+			act 'Get out of the shower':gt 'ballet_secrets', 'changing_room'
 
 		end
 	else
@@ -186,7 +186,7 @@ if $ARGS[0] = 'changing_room':
 			gs 'sweat', 'deo'
 			iif(func('body_din','pregnancyVisibility') = 1, '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant_preg.jpg"></center>', '<center><img <<$set_imgh>> src="images/shared/home/bathroom/deodorant.jpg"></center>')
 			'You apply deodorant to your armpits. It will keep you feeling fresh and clean for longer.'
-			act 'Continue': menu_off = 0 & gt $loc, $loc_arg
+			act 'Continue': menu_off = 0 & gt 'ballet_secrets', 'changing_room'
 		end
 	end
 	dynamic $tampon
@@ -272,12 +272,12 @@ if $ARGS[0] = 'yoga_courses':
       gs 'pain', 2, 'chest', 'stretch'
 
       killvar 'lesson_tier'
-      act 'Return to the studio reception': gt $loc, 'reception'
+      act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
     end
   else 
     'There is another fitness class in progress and no more yoga sessions today.'
   end
-  act 'Return to the studio reception': gt $loc, 'reception'
+  act 'Return to the studio reception': gt 'ballet_secrets', 'reception'
 end 
 
 !! Shopping

locations/uni_lessonsev1.qsrc

@@ -183,6 +183,7 @@ if $ARGS[0] = 'patient_care':
 	elseif temp = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/teaching_methods/girl_goofing.jpg"></center>'
 		'Today''s lecture is rather boring, so you look around to see if anything exciting is happening. All you see is Vicky making a funny face at you when you glance in her direction.'
+		act 'Wait for the end of the lesson': gt 'uni_lessons', 'short_break'
 	elseif temp = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/island/university/classroom/general_education/girls_dryhump.jpg"></center>'
 		'During the halftime break, you relax as the class was pretty mentally exhausting and look around to see how others are handling all the information you''re getting bombarded with. The twins start giggling before one of them grabs the other, bends her over the table and starts humping her hard and rough.'