10 Commits ce78670eab ... 4e22623185

Author SHA1 Message Date
  julzor 4e22623185 [fixes] the variable rolancooklesson was increased twice per event which lead to a dead end and the player missing 50% of the events 5 years ago
  KevinSmarts 460c8738f5 Merge remote-tracking branch 'julzor/master' 5 years ago
  KevinSmarts 8bbab5ae70 Merge remote-tracking branch 'sovietmercader/master' 5 years ago
  KevinSmarts 045bf90b35 [Fixes] Ownership of piercings when forced to get them by lover 5 years ago
  julzor 17ee2991dc [fixes] broken image links 5 years ago
  julzor aec19c7c8f [fixes] moved the leave option to the top and removed the color in korr 5 years ago
  julzor 209e10eabf [fixes] changed GT to gt 5 years ago
  julzor 2760dd5a7e [fixes] a goto in upper case (GT) breaks a link on the mainscreen in the android version 5 years ago
  julzor 33219f7032 [text edit] renamed the high street link to his new name 5 years ago
  sovietmercader a0ac652463 [fixed] missing horse bathing in gadriver 5 years ago
73 changed files with 419 additions and 437 deletions
  1. 1 1
      locations/Gadbana.qsrc
  2. 2 2
      locations/HotelHole.qsrc
  3. 6 6
      locations/HotelRoom.qsrc
  4. 2 2
      locations/Komp.qsrc
  5. 1 1
      locations/MDressing.qsrc
  6. 1 1
      locations/Nord.qsrc
  7. 1 1
      locations/SgrupDisco.qsrc
  8. 1 1
      locations/Terminal.qsrc
  9. 1 1
      locations/agentned.qsrc
  10. 1 1
      locations/autosalonF.qsrc
  11. 2 2
      locations/bed2.qsrc
  12. 4 4
      locations/bedr.qsrc
  13. 5 5
      locations/bedr2x.qsrc
  14. 4 4
      locations/bedrPar.qsrc
  15. 2 2
      locations/budilnik.qsrc
  16. 9 9
      locations/buklinik.qsrc
  17. 2 2
      locations/buklinik_event.qsrc
  18. 5 5
      locations/dinmother.qsrc
  19. 1 1
      locations/dort.qsrc
  20. 1 1
      locations/etoexhib.qsrc
  21. 1 1
      locations/experiment.qsrc
  22. 5 5
      locations/family.qsrc
  23. 2 2
      locations/fit.qsrc
  24. 1 1
      locations/foto.qsrc
  25. 96 0
      locations/gadriver.qsrc
  26. 2 2
      locations/gadukino.qsrc
  27. 2 2
      locations/gargazel.qsrc
  28. 1 1
      locations/gdk.qsrc
  29. 1 1
      locations/gdksport.qsrc
  30. 1 1
      locations/gkafe.qsrc
  31. 2 2
      locations/gschool_grounds.qsrc
  32. 12 12
      locations/gschool_lessons.qsrc
  33. 2 2
      locations/igorhome.qsrc
  34. 1 1
      locations/koncepod1.qsrc
  35. 18 24
      locations/korr.qsrc
  36. 3 3
      locations/korr2x.qsrc
  37. 1 1
      locations/lake.qsrc
  38. 1 1
      locations/lakecafe.qsrc
  39. 1 1
      locations/lesbimistress.qsrc
  40. 4 4
      locations/liam.qsrc
  41. 9 9
      locations/liames.qsrc
  42. 8 0
      locations/lover_change.qsrc
  43. 2 2
      locations/mey_home.qsrc
  44. 2 2
      locations/nordtrain.qsrc
  45. 3 3
      locations/obroom.qsrc
  46. 1 1
      locations/parks.qsrc
  47. 1 1
      locations/pavComplex.qsrc
  48. 2 2
      locations/pavComplexb2.qsrc
  49. 2 2
      locations/pavComplexb3.qsrc
  50. 1 1
      locations/pavIndustrial.qsrc
  51. 2 2
      locations/pavResidential.qsrc
  52. 5 5
      locations/pavSharedApt.qsrc
  53. 2 2
      locations/pod_ezd.qsrc
  54. 6 6
      locations/podrsex.qsrc
  55. 5 5
      locations/road.qsrc
  56. 113 229
      locations/rolanapt.qsrc
  57. 2 2
      locations/sauna.qsrc
  58. 1 1
      locations/saunawhore.qsrc
  59. 15 15
      locations/sbReksHome.qsrc
  60. 1 1
      locations/shulga_room.qsrc
  61. 1 1
      locations/shulgabath.qsrc
  62. 3 3
      locations/shulgabed.qsrc
  63. 3 3
      locations/sitr2x.qsrc
  64. 6 6
      locations/street.qsrc
  65. 1 1
      locations/tanhousezal.qsrc
  66. 2 2
      locations/torgcentr.qsrc
  67. 1 1
      locations/ugol.qsrc
  68. 4 4
      locations/vanr.qsrc
  69. 1 1
      locations/vanr2x.qsrc
  70. 1 1
      locations/vanrPar.qsrc
  71. 1 1
      locations/vecher.qsrc
  72. 1 1
      locations/yzal.qsrc
  73. 2 2
      locations/zsoft_gopskverGorSlut.qsrc

+ 1 - 1
locations/Gadbana.qsrc

@@ -152,7 +152,7 @@ if mira = 0:
 		end
 	end
 	if stanok > 0:'Your razor will last for <b><<stanok>></b> more shavings. <a href="exec:gs ''din_van'', ''shave_options''">Shave Options</a>.'
-	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, which you can use to ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'There''s a small shaving <a href="exec:gt ''mirror'', ''start''">mirror</a> resting on the window sill, which you can use to ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 	!WD: heal chafe
 	if mosolmaz>0:'On a shelf is a tube of ointment for chafing, which will be enough for <b><<mosolmaz>></b> applications.'

+ 2 - 2
locations/HotelHole.qsrc

@@ -106,11 +106,11 @@ end
 :skipresepevent
 '<center><H4>Pavlovsk hotel</H4></center>'
 '<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.hole.jpg"></center>'
-'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & GT ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
+'As you enter the Pavlovsk hotel you''re always surprised by how fancy it looks on the inside, given the shabby exterior. You can approach the <a href="exec:minut += 1 & gt ''hotel_resep''">reception desk</a> of the hotel where a cute brunette is currently manning the desk, she gives you a friendly nod when you get into her sight range.'
 if hour >= 12 and hour < 20 and proshotelopen = 1: '<a href="exec:gt ''HotelHole'',''Pavlin''">Pavlin</a> is sitting in the lobby looking around for fresh prey.'
 
 if hour >= 12 and hour <= 13 and GermanQW > 0:
-	'Next to the reception desk, you see a door labeled <a href="exec:minut += 1 & GT ''hoteladmin''">"Administration"</a>. That must be where the hotel manager works. The door is currently open.'
+	'Next to the reception desk, you see a door labeled <a href="exec:minut += 1 & gt ''hoteladmin''">"Administration"</a>. That must be where the hotel manager works. The door is currently open.'
 end
 
 if hotwait = 1:

+ 6 - 6
locations/HotelRoom.qsrc

@@ -17,8 +17,8 @@ gs 'stat'
 	'<center><b><font color = maroon>Your normal hotel room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.normal.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a <a href="exec:GT ''HotelRoom'',''tv''">TV</a>.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room also has a <a href="exec:gt ''HotelRoom'',''tv''">TV</a>.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
@@ -55,8 +55,8 @@ gs 'stat'
 	'<center><b><font color = maroon>Your luxury room</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.better.jpg"></center>'
-	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a small flat-screen <a href="exec:GT ''HotelRoom'',''tv''">TV</a>, right across the bed.'
+	'Your hotel room is not very large, but it has everything you need and is quite stylish. The large <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room also has a small flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'
@@ -92,8 +92,8 @@ gs 'stat'
 	'<center><b><font color = maroon>Your royal suite</font></b></center>'
 	'<center>You have paid to stay for <<hotelroom1day - daystart>> more nights in the room.</center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best.jpg"></center>'
-	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:GT ''mirror'',''start''">mirror</a>. The door to the <a href="exec:GT ''hotelroom'',''shower1''">bathroom</a> is to the right.'
-	'Your hotel room also has a huge flat-screen <a href="exec:GT ''HotelRoom'',''tv''">TV</a>, right across the bed.'
+	'Your hotel room is quite spacious, and is beautifully furnished. For a second, you wonder why a hotel in a town like Pavlovsk even has such a luxurious suite. The room is filled with expensive appliances. The gorgeous <a href="exec:gt ''bed2''">double bed</a> takes up most of the room. A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the entrance of the room. Next to the door, you can find a <a href="exec:gt ''mirror'',''start''">mirror</a>. The door to the <a href="exec:gt ''hotelroom'',''shower1''">bathroom</a> is to the right.'
+	'Your hotel room also has a huge flat-screen <a href="exec:gt ''HotelRoom'',''tv''">TV</a>, right across the bed.'
 	act'Go to the hotel lobby':
 		if $clothingworntype ! 'nude':
 			gt'hotelHole'

+ 2 - 2
locations/Komp.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 
 	!!act 'SunReview of the Dead':gt 'KGZstart'
 
-	if student > 0 and kursovik < 100:'You should probably do some of your <a href="exec:GT ''Komp'',''kursak''">coursework</a>.'
+	if student > 0 and kursovik < 100:'You should probably do some of your <a href="exec:gt ''Komp'',''kursak''">coursework</a>.'
 
 	if $LOC = 'shulga_room':
 		internet = 100000
@@ -50,7 +50,7 @@ if $ARGS[0] = 'brows':
 		'<center><img <<$set_imgh>> src="images/shared/accessories/computer/komp.jpg"></center>'
 		'You go to your favourite start page, while you try to decide on what you want to see right now.'
 
-		'A blinking banner for a <a href="exec:GT ''Komp'',''agent''">Kirsanova Real Estate Agency</a> keeps popping up in the corner.'
+		'A blinking banner for a <a href="exec:gt ''Komp'',''agent''">Kirsanova Real Estate Agency</a> keeps popping up in the corner.'
 
 		if home_owned[1] = 2 and husband = 0:act 'Rent your apartment out':gt 'Komp', 'sale'
 

+ 1 - 1
locations/MDressing.qsrc

@@ -14,7 +14,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/suburb/bdsm_club/dressingroom.jpg"></center>'
 'A huge dressing room. Mostly used by submissives to dress as staff and because of this, it is a safe space and games are not allowed.'
 'It contains several <a href="exec:gt ''wardrobe'', ''start''">wardrobes</a> (where you can choose outfits and organize your clothing).'
-'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:GT ''mirror'',''start''">mirrors</a> you can use.'
+'There are whole cabinets filled with designer clothing belonging to various club members and plenty of <a href="exec:gt ''mirror'',''start''">mirrors</a> you can use.'
 
 act 'Go to foyer': gt 'MHall', 'foyer'
 act 'Goto east wing hall': gt 'MHall', 'east'

+ 1 - 1
locations/Nord.qsrc

@@ -77,7 +77,7 @@ if $ARGS[0] = '':
 	if hour >= 9 and hour <= 17 and week > 1:'<a href="exec: minut += 5 & gt ''autotraidF'', ''start''">Car Dealership</a>'
 	if hour >= 9 and hour < 17 and week < 6:'<a href="exec: minut += 5 & gt ''dk'', ''start''">Community centre</a>'
 
-	if hour >= 9 and hour <= 17 and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3: '<a href="exec:GT ''buklinik'',''start''">Mercy clinic</a>'
+	if hour >= 9 and hour <= 17 and (StoryLine = 1 and SchoolAtestat = 0) or bumtolik > 3: '<a href="exec:gt ''buklinik'',''start''">Mercy clinic</a>'
 	if hour >= 8 and hour <= 20:'The parking lot, which is engulfed in bright lights, belongs to a <a href="exec: minut += 2 & gt ''shop'', ''start''">Supermarket</a>'
 	if hour >= 12 and hour <= 19:'Above the door to a basement room is a bright neon sign for the <a href="exec: minut += 5 & gt ''pirsingsalon'', ''start''">Tattoo & Piercing parlor</a>'
 	if tobiQW >= 1:'The old mansion, home to <a href="exec:gt ''kakuzu'', ''start''">Kakuzu</a>'

+ 1 - 1
locations/SgrupDisco.qsrc

@@ -43,7 +43,7 @@ if i < 61:jump 'markgruploop'
 *nl
 '<<$textgrup2>>'
 '<center>Most the cool kids are dancing, while the gopnics are standing in the corner of the room, keeping to themselves.</center>'
-if hour >= 21 and hour < 23 and week=5: '<center>At the entrance of the disco hall stands <a href="exec:GT ''VolleyTrenerSpeak''">Coach Mikhail Nikolayevich</a></center>'
+if hour >= 21 and hour < 23 and week=5: '<center>At the entrance of the disco hall stands <a href="exec:gt ''VolleyTrenerSpeak''">Coach Mikhail Nikolayevich</a></center>'
 '</table><center>'
 
 --- SgrupDisco ---------------------------------

+ 1 - 1
locations/Terminal.qsrc

@@ -10,7 +10,7 @@ gs 'stat'
 '<center><b><font color="maroon">Storage terminal</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/industrial/terminal/terminal0.jpg"></center>'
 'A large shipping center with many on and off load truck ports.'
-if trfatherQW = 4 and week >= 6 and hour >= 12 and hour < 14:'Near one of the dirty trucks is your <a href="exec:GT ''trFatherMisha''">father</a>.'
+if trfatherQW = 4 and week >= 6 and hour >= 12 and hour < 14:'Near one of the dirty trucks is your <a href="exec:gt ''trFatherMisha''">father</a>.'
 
 act 'Leave':
 	cla

+ 1 - 1
locations/agentned.qsrc

@@ -40,7 +40,7 @@ if $ARGS[0] = 'start':
 		if home_owned[3] > 0: 'An cottage located in the cooperative village'
 		if home_owned[5] = 1: 'A plot of land in the St. Petersburg suburbs'
 		*nl
-		'We are at your service if you decide to <a href="exec:GT ''agentned'',''sell''">sell</a>.'
+		'We are at your service if you decide to <a href="exec:gt ''agentned'',''sell''">sell</a>.'
 	end
 
 	act 'Leave':

+ 1 - 1
locations/autosalonF.qsrc

@@ -37,7 +37,7 @@ if $ARGS[0] = 'start':
 	'<TR><TD><a href="exec:GS ''carF1'',''car98''">Porsche Cayenne</a>.</TD><TD> - </TD><TD> New. Price: 5 million.RUB</TD></TR>'
 	'<TR><TD><a href="exec:GS ''carF1'',''car108''">Jaguar XKR-S</a>.</TD><TD> - </TD><TD> New. Price: 7 million.RUB</TD></TR>'
 	'<TR><TD><a href="exec:GS ''carF1'',''car100''">Mercedes-Benz S 600</a>.</TD><TD> - </TD><TD> New. Price: 8 million.RUB</TD></TR>'
-	'<TR><TD><a href="exec:GS ''carF1'',''car111''">Bentley Continental GT</a>.</TD><TD> - </TD><TD> New. Price: 10 million.RUB</TD></TR>'
+	'<TR><TD><a href="exec:GS ''carF1'',''car111''">Bentley Continental gt</a>.</TD><TD> - </TD><TD> New. Price: 10 million.RUB</TD></TR>'
 	'<TR><TD><a href="exec:GS ''carF1'',''car112''">Ferrari 458 Italia</a>.</TD><TD> - </TD><TD> New. Price: 20 million.RUB</TD></TR>'
 	'</TR></table>'
 

+ 2 - 2
locations/bed2.qsrc

@@ -14,9 +14,9 @@ if $ARGS[0] = '':
 	*nl
 
 	if budilnikOn = 0:
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 	else
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 
 	if pcs_makeup ! 1:'<b><font color="red">You need to wash off your makeup before going to bed.</font></b>'

+ 4 - 4
locations/bedr.qsrc

@@ -29,9 +29,9 @@ if rembedr = 0:
 	'A tight, little room with a <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
 	if budilnikOn = 0:
-		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 	else
-		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 	*nl
 	'An old wooden <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> stands near the door to the corridor.The windows are closed with faded, heavy curtains.'
@@ -41,9 +41,9 @@ else
 	'A bright and beautiful room, with a large, kingsized <a href="exec:gt ''bed'', ''start''">double bed</a>.'
 	*nl
 	if budilnikOn = 0:
-		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+		'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 	else
-		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+		'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 	end
 	*nl
 	'A modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) stands near the door to the corridor. Against the wall, stands a make-up table with a <a href="exec:gt ''mirror'', ''start''">mirror</a> on it.'

+ 5 - 5
locations/bedr2x.qsrc

@@ -24,18 +24,18 @@ gs 'themes', 'indoors'
 if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0:gt'tobiQW','start'
 'A bright and beautiful bedroom, with modern and stylish furniture.'
 *nl
-'The room is dominated by <a href="exec:GT ''bed'',''start''">full sized bed</a>'
+'The room is dominated by <a href="exec:gt ''bed'',''start''">full sized bed</a>'
 if budilnikOn = 0:
-	'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+	'There is an  <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 else
-	'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+	'There is an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on the bedside table, and it is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 end
 *nl
 'Near the entrance stands a modern <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a>.'
 *nl
-'Against the wall is a table with a <a href="exec:GT ''mirror'',''start''">mirror</a> above it.'
+'Against the wall is a table with a <a href="exec:gt ''mirror'',''start''">mirror</a> above it.'
 *nl
-if komp = 1:'On the other bedside table is your <a href="exec:GT ''Komp'',''start''">laptop</a>.'
+if komp = 1:'On the other bedside table is your <a href="exec:gt ''Komp'',''start''">laptop</a>.'
 *nl
 if husbandrinkday = daystart:
 	if husbanstrapon = 1:'Your husband is still passed out drunk, after you used a anal plug on him.'

+ 4 - 4
locations/bedrPar.qsrc

@@ -70,7 +70,7 @@ end
 'Your <a href="exec:gt ''bed'', ''start''">bed</a> stands opposite the wardrobe, and your <a href="exec:gt ''stol'' ,''stolPar''">desk</a> is next to it. Your sister''s bed is in the other corner.'
 *nl
 if popugai2 = 1:
-	'<a href="exec:GT ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
+	'<a href="exec:gt ''popu'',''start2''"><<$namepopu2>></a> is sitting in his cage'
 	if daystart - parbuydate <= 10: '<<$namepopu2>> starts squawking at you when you enter the room.'
 	if daystart - parbuydate > 10 and daystart - parbuydate <= 20: 'When <<$namepopu2>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
 	if daystart - parbuydate > 20 and daystart - parbuydate <= 30: 'When <<$namepopu2>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
@@ -96,9 +96,9 @@ if popugai2 = 1:
 	*nl
 end
 if budilnikOn = 0:
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & GT ''<<$loc>>''">off</a>.'
+	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 1 & gt ''<<$loc>>''">off</a>.'
 else
-	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & GT ''<<$loc>>''">on</a>.'
+	'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+' and is currently turned <a href="exec: budilnikOn = 0 & gt ''<<$loc>>''">on</a>.'
 end
 
 if tabletki > 0 and prezik + prezikcount + preziksabo > 0:
@@ -115,7 +115,7 @@ if sewing_kit = 1:
 	'You have <<tkan>> pieces of sewing fabric left.'
 end
 
-if komp = 1:'Your <a href="exec:gorodokKomp = 1 & GT ''Komp'',''start''">laptop</a> is on your desk.'
+if komp = 1:'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">laptop</a> is on your desk.'
 gorodokKomp = 0
 
 gad = 0

+ 2 - 2
locations/budilnik.qsrc

@@ -24,9 +24,9 @@ if $ARGS[0] = 'start':
 	'<center><b><a href="exec:gt ''budilnik'', ''Reset''">Reset</a> <a href="exec:gt ''budilnik'', ''Time''">Set Alarm</a></b></center>'
 	*nl
 	if budilnikOn = 0:
-		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 1 & GT ''budilnik'', ''start''"><b>off</a></b></center>'
+		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 1 & gt ''budilnik'', ''start''"><b>off</a></b></center>'
 	else
-		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 0 & GT ''budilnik'', ''start''"><b>on</b></a></center>'
+		'<center>Your alarm is currently turned <a href="exec: budilnikOn = 0 & gt ''budilnik'', ''start''"><b>on</b></a></center>'
 		'<center>The alarm is set to '+iif(timer < 10,'0<<timer>>','<<timer>>')+':'+iif(timerM < 10,'0<<timerM>>','<<timerM>>')+'.</center>'
 	end
 	act 'Finish':

+ 9 - 9
locations/buklinik.qsrc

@@ -244,15 +244,15 @@ if $ARGS[0] = 'olga2':
 	if bumtolik > 5:'- Hello, <<$pcs_nickname>>!'
 	if buklinikDay = daystart:'- Today there is no more work, we can relax.'
 	if bumtolik >= 7 and buklinikDay ! daystart:'- <<$pcs_nickname>>, We need help <a href="exec:gt ''buklinik_event'', ''pos6''">feed the needy</a>.'
-	if bumtolik >= 8 and buklinikDay ! daystart: '- <<$pcs_nickname>>, here is the address of one <a href="exec:GT ''buklinik_event'',''pos8''">elderly man</a>, go see him help with the housework.'
-	if bumtolik = 9 and buklinikDay ! daystart: '- <<$pcs_nickname>>, Need help persuade a wino not wander the streets, and come to live with <a href="exec:GT ''buklinik_event'',''pos9''">to_us</a>.'
-	if bumtolik = 10 and buklinikDay ! daystart: '- We need a babysitter for one very <a href="exec:GT ''buklinik_event'',''event0''">a strange man</a>.'
-	if bumtolik = 11 and buklinikDay ! daystart: '- <<$pcs_nickname>>, you need to go to <a href="exec:GT ''buklinik_event'',''entrance'',0">Michael</a>.'
-	if bumtolik = 12 and buklinikDay ! daystart: '- Waiting for you again <a href="exec:GT ''buklinik_event'',''entrance'',1">Michael</a>.'
-	if bumtolik = 13 and buklinikDay ! daystart: '- <<$pcs_nickname>>, waiting for you again <a href="exec:GT ''buklinik_event'',''entrance'',2">Michael</a>.'
-	if bumtolik = 14 and buklinikDay ! daystart: '- <<$pcs_nickname>>, <a href="exec:GT ''buklinik_event'',''entrance'',3">Michael</a> is waiting for you.'
-	if bumtolik = 15 and buklinikDay ! daystart: '- <a href="exec:GT ''buklinik_event'',''entrance'',4">Michael</a> is Waiting for you.'
-	if bumtolik = 16 and week = 1 and buklinikDay ! daystart: '- <a href="exec:GT ''buklinik_event'',''entrance'',5">Michael</a> is Waiting for you.'
+	if bumtolik >= 8 and buklinikDay ! daystart: '- <<$pcs_nickname>>, here is the address of one <a href="exec:gt ''buklinik_event'',''pos8''">elderly man</a>, go see him help with the housework.'
+	if bumtolik = 9 and buklinikDay ! daystart: '- <<$pcs_nickname>>, Need help persuade a wino not wander the streets, and come to live with <a href="exec:gt ''buklinik_event'',''pos9''">to_us</a>.'
+	if bumtolik = 10 and buklinikDay ! daystart: '- We need a babysitter for one very <a href="exec:gt ''buklinik_event'',''event0''">a strange man</a>.'
+	if bumtolik = 11 and buklinikDay ! daystart: '- <<$pcs_nickname>>, you need to go to <a href="exec:gt ''buklinik_event'',''entrance'',0">Michael</a>.'
+	if bumtolik = 12 and buklinikDay ! daystart: '- Waiting for you again <a href="exec:gt ''buklinik_event'',''entrance'',1">Michael</a>.'
+	if bumtolik = 13 and buklinikDay ! daystart: '- <<$pcs_nickname>>, waiting for you again <a href="exec:gt ''buklinik_event'',''entrance'',2">Michael</a>.'
+	if bumtolik = 14 and buklinikDay ! daystart: '- <<$pcs_nickname>>, <a href="exec:gt ''buklinik_event'',''entrance'',3">Michael</a> is waiting for you.'
+	if bumtolik = 15 and buklinikDay ! daystart: '- <a href="exec:gt ''buklinik_event'',''entrance'',4">Michael</a> is Waiting for you.'
+	if bumtolik = 16 and week = 1 and buklinikDay ! daystart: '- <a href="exec:gt ''buklinik_event'',''entrance'',5">Michael</a> is Waiting for you.'
 	!bumtolik = 3000 if michael events stoped.
 	if bumtolik = 5:
 		bumtolik = 6

+ 2 - 2
locations/buklinik_event.qsrc

@@ -201,7 +201,7 @@ if $ARGS[0] = 'hall':
 	'<center><img <<$set_imgh>> src="images/locations/city/industrial/mercyclinic/kor.jpg"></center>'
 
 	if nanny_vika = 1:
-		'Near the mirror stand and krasitsja <a href="exec:GT ''buklinik_event'',''vika''">Vika</a>.'
+		'Near the mirror stand and krasitsja <a href="exec:gt ''buklinik_event'',''vika''">Vika</a>.'
 		act 'Go': gt 'nord'
 	end
 	act 'Bathroom Michael': gt 'buklinik_event', 'room'
@@ -230,7 +230,7 @@ if $ARGS[0] = 'room':
 			act 'Finish cleaning': gt $loc, $metka
 		end
 	end
-	'<a href="exec:GT ''buklinik_event'',''misha''">Michael</a> lying in bed and reading a book.'
+	'<a href="exec:gt ''buklinik_event'',''misha''">Michael</a> lying in bed and reading a book.'
 
 	act 'Out': gt 'buklinik_event', 'hall'	
 end

+ 5 - 5
locations/dinmother.qsrc

@@ -68,27 +68,27 @@ $d_mother[3]={
 }
 $d_mother[4] = {
 	*clr
-	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/posuda'+rand(1,3)+'.jpg"></center><br>Your <a href="exec:GT ''mother''"><<$npc_nickname[''A29'']>></a> stands near the sink, washing dishes.'
+	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/posuda'+rand(1,3)+'.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> stands near the sink, washing dishes.'
 }
 
 $d_mother[5] = {
 	*clr
-	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/gotovka.jpg"></center><br>Your <a href="exec:GT ''mother''"><<$npc_nickname[''A29'']>></a> is preparing meals.'
+	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/gotovka.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is preparing meals.'
 }
 
 $d_mother[6] = {
 	*clr
-	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/tea.jpg"></center><br>Your <a href="exec:GT ''mother''"><<$npc_nickname[''A29'']>></a> is drinking tea.'
+	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/tea.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is drinking tea.'
 }
 
 $d_mother[7] = {
 	*clr
-	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(1,11)+'.jpg"></center><br>Your <a href="exec:GT ''mother''"><<$npc_nickname[''A29'']>></a> is busy in the kitchen and unaware of your presence.'
+	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost'+rand(1,11)+'.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is busy in the kitchen and unaware of your presence.'
 }
 
 $d_mother[8] = {
 	*clr
-	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka'+rand(1,3)+'.jpg"></center><br>Your <a href="exec:GT ''mother''"><<$npc_nickname[''A29'']>></a> is cleaning with a broom in her hand.'
+	$result = '<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/uborka'+rand(1,3)+'.jpg"></center><br>Your <a href="exec:gt ''mother''"><<$npc_nickname[''A29'']>></a> is cleaning with a broom in her hand.'
 }
 
 --- dinmother ---------------------------------

+ 1 - 1
locations/dort.qsrc

@@ -14,7 +14,7 @@ $location_type = 'public_outdoors'
 minut += 60
 gs'stat'
 
-!'<a href="exec:GT ''nowostreet'',''start''">Buildings</a> '
+!'<a href="exec:gt ''nowostreet'',''start''">Buildings</a> '
 
 act 'Head to the station':gt 'nordtrain', 'inside'
 act 'Walk to the lake':gt 'lake', 'start'

+ 1 - 1
locations/etoexhib.qsrc

@@ -911,7 +911,7 @@ if $ARGS[0] = 'pos24tk':
 	'<center><b><font color = maroon>Teacher</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/altschool/ptu_tk.jpg"></center>'
 	'A place for the teachers to relax.'
-	'On the wall near the front door hanging <a href="exec:GT ''mirror'',''start''">mirror</a>.'
+	'On the wall near the front door hanging <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	'In one corner there is a small old sofa.'
 
 	$prositdirizv = {

+ 1 - 1
locations/experiment.qsrc

@@ -1449,7 +1449,7 @@ if $ARGS[0] = 'testarea:treatment:room:shower':
 	'<center><h3>Experiment private - bathroom</h3></center>'
 	'<center><img <<$set_imgh>> src="images\locations\shared\clinic\experiment\roomshower.jpg"></center>'
 	*nl
-	'The bathroom has a small, hospital-like shower, a toilet, some clean razors, an enema kit and a sink with <a href="exec:GT ''mirror'',''start''">mirror</a>.'
+	'The bathroom has a small, hospital-like shower, a toilet, some clean razors, an enema kit and a sink with <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	
 	if klisma = 0: klisma = 1 & klisma_borrowed = 1
 	

+ 5 - 5
locations/family.qsrc

@@ -1,8 +1,8 @@
 # family
 if daystart ! m_day:
 	m_day = daystart
-	father_go = rand(0, 1)
-	mother_go = rand(0, 1)
+	father_go = rand(0,1)
+	mother_go = rand(0,1)
 end
 
 indorf = 0
@@ -73,7 +73,7 @@ if StoryLine = 1:
 				if hour = 10:
 					sisterHere = 2
 					sisterdialog = 3
-					'Your sister <a href="exec:GT ''sister''">Anya</a> is getting ready to go for a walk.'
+					'Your sister <a href="exec:gt ''sister''">Anya</a> is getting ready to go for a walk.'
 				end
 			end
 
@@ -102,11 +102,11 @@ if StoryLine = 1:
 		if $loc = 'gdk':
 			if week < 6:
 				if hour >= 16 and hour < 18:
-					'Your sister <a href="exec:GT ''sister'', ''gdk''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
+					'Your sister <a href="exec:gt ''sister'', ''gdk''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 				end
 			elseif week >= 6:
 				if hour >= 11 and hour < 18:
-					'Your sister <a href="exec:GT ''sister'', ''gdk''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
+					'Your sister <a href="exec:gt ''sister'', ''gdk''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 				end
 			end
 		end

+ 2 - 2
locations/fit.qsrc

@@ -264,8 +264,8 @@ if $ARGS[0] = 'gym':
 	'In the fitness center there are a lot of different classes and clubs, designed to improve physical development.'
 
 	if StoryLine = 1:
-		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:GT ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
-		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>'
+		if hour >= 10 and hour < 12 and week = 7 and centr = 1: 'In the hall you see <a href="exec:gt ''VolleyTrenCentr''">Mikhail Nikolaevich</a> talking with a strange man.'
+		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'

+ 1 - 1
locations/foto.qsrc

@@ -699,7 +699,7 @@ if $ARGS[0] = 'bathroom':
 	gs'stat'
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/models.jpg"></center>'
-	'A gaggle of models crowd the <a href="exec:GT ''mirror'',''start''">mirrors</a> and sinks, loudly chatting, giggling, and generally gossiping about life in the city and the studio.'
+	'A gaggle of models crowd the <a href="exec:gt ''mirror'',''start''">mirrors</a> and sinks, loudly chatting, giggling, and generally gossiping about life in the city and the studio.'
 	*nl
 	'Why they don''t do their makeup in the back where the mirrors and the lights are better is beyond you. But it can''t be helped you suppose. The bathroom <i>is</i> the traditional place for girls to gossip after all.'
 	act'Go to the studio floor':gt'foto','studio'

+ 96 - 0
locations/gadriver.qsrc

@@ -467,6 +467,102 @@ if $ARGS[0] = 'gadbitch':
 				end
 			end
 		end
+		if horse_river = 2:
+			act 'Look at Desperado':
+				*clr & cla
+				
+				'<center><img <<$set_imgh>> src="images/locations/gadukino/river/horse_river.jpg"></center>'
+				'You see Desperado happily walking around in the river.'
+				
+				if $clothingworntype = 'swimwear' or $clothingworntype = 'nude':
+					act 'Wash Desperado':
+						*clr & cla
+						
+						cumspclnt = 4
+						gs 'cum_cleanup'
+						minut += 30
+						pcs_sweat = 10 + rand(0,4)
+						pcs_mood += 5
+						pcs_willpwr += 5
+						if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
+						hndiwrk_exp += rand(1,3)
+						grandmahelp += 1
+						horse_river = 3
+						gs 'stat'
+						
+						if $clothingworntype = 'nude':
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_nude.jpg"></center>'
+						elseif $clothingworntype = 'swimwear':
+							'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_swim.jpg"></center>'
+						end
+						'You jump in the river and swim over to Desperado. You take your time, washing his beautiful chestnut coat.'
+						'After half an hour, you are satisfied with your work and Desperado is ready to be taken back home.'
+						
+						act 'Get out of the water':
+							minut += 5
+							gt'gadriver', 'gadbitch'
+						end
+					end
+					if Mira_Loc = 1 and npc_rel['A60'] > 0:
+						act 'Wash Desperado with Mira':
+							*clr & cla
+							
+							cumspclnt = 4
+							gs 'cum_cleanup'
+							minut += 30
+							npc_rel['A60'] += 1
+							pcs_sweat = 10 + rand(0,4)
+							pcs_mood += 5
+							pcs_willpwr += 5
+							if pcs_inhib < 50 or $clothingworntype = 'nude': inhib_exp += rand(1,3)
+							hndiwrk_exp += rand(1,3)
+							grandmahelp += 1
+							horse_river = 3
+							gs 'stat'
+							
+							if $clothingworntype = 'nude':
+								'<center><img <<$set_imgh>> src="images/characters/village/mira/wash_horse_mira_nude.jpg"></center>'
+							elseif $clothingworntype = 'swimwear':
+								'<center><img <<$set_imgh>> src="images/locations/gadukino/river/wash_horse_mira_swim.jpg"></center>'
+							end
+							'You invite Mira to wash Desperado with you; having nothing better to do she agrees.'
+							'Both of you swim over to Desperado and begin to splash water on him. You chat with Mira and sometimes splash her instead.'
+							'After half an hour, you think Desperado looks cleaner than before and is ready to be taken back home.'
+							
+							act 'Get out of the water':
+								minut += 5
+								gt'gadriver', 'gadbitch'
+							end
+						end
+					end
+					
+				else
+					'You cannot wear regular clothes to wash Desperado.'
+					act 'Return': gt'gadriver', 'gadbitch'
+				end
+			end
+		end
+		if horse_river = 3:
+			act 'Lead Desperado back home':
+				if $clothingworntype = 'swimwear':
+					cla
+					'You need to dress in regular clothes first.'
+					act'Return':gt'gadriver', 'gadbitch'
+				elseif $clothingworntype = 'nude':
+					cla
+					'You need to put some clothes on first.'
+					act'Return':gt'gadriver', 'gadbitch'
+				else
+					minut += 30
+					hndiwrk_exp += rand(0,3)
+					grandmahelp += rand(0,1)
+					horse_river = 0
+					gs 'stat'
+					
+					gt'Gadsarai'
+				end
+			end
+		end
 	end
 	if ARRSIZE('swimwear') > 0:
 		act 'Get changed':gt 'changingroom', 'view_swim_list'

+ 2 - 2
locations/gadukino.qsrc

@@ -95,10 +95,10 @@ if $ARGS[0] = '':
 !MiraLoc = 5 (Mira with gop)
 !---------------------------------------------
 
-		if hour >= 17 and hour < 20:'Not far from the house is <a href="exec:GT ''mitka''">Mitka Kingpin</a>'
+		if hour >= 17 and hour < 20:'Not far from the house is <a href="exec:gt ''mitka''">Mitka Kingpin</a>'
 		if hour >= 20 and sunWeather = 1:
 			!MiraLoc = 0
-			'Not far from the house sits a group of country <a href="exec:GT ''mitkabuh''">youths</a>'
+			'Not far from the house sits a group of country <a href="exec:gt ''mitkabuh''">youths</a>'
 		end
 	!125e
 	!Looks like no reference to Gadmarket exists. Adding it...FinnMacha

+ 2 - 2
locations/gargazel.qsrc

@@ -23,11 +23,11 @@ end
 act 'Leave the garage':minut += 5 & gt 'pavComplex', 'garages'
 
 if father_go = 1 and hour >= 16 and hour < 20:
-	'Your <a href="exec:GT ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
+	'Your <a href="exec:gt ''garfather''">stepfather</a> is in the garage, working on his Gazelle pickup truck.'
 end
 
 if father_go=1 and hour>=20 and hour<21:
-	'Your <a href="exec:GT ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
+	'Your <a href="exec:gt ''garfather''">stepfather and uncle Misha</a> are in the garage, drinking vodka.'
 	set fatherdrunk=1
 end
 

+ 1 - 1
locations/gdk.qsrc

@@ -15,7 +15,7 @@ act 'Leave': minut += 2 & gt 'pavResidential'
 if hour >= 20 and hour <= 23 and week >= 5 and week < 7:
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/dk_night.jpg"></center>'
 	'The entrance to the Community Centre is full of young people, the guys are just hanging around smoking and joking. The girls in small groups, all dressed up and gossiping. You see the bushes moving, Pavlovsks'' famous make out garden.'
-	'You hear people in the alley beside the club. <a href="exec:minut += 5 & GT ''ugel''">Investigate</a>.'
+	'You hear people in the alley beside the club. <a href="exec:minut += 5 & gt ''ugel''">Investigate</a>.'
 	if gdkin_in = daystart:
 		act 'Return to the dance':gt 'gdkin'
 	elseif money >= 25:

+ 1 - 1
locations/gdksport.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/gym/volley/gdksport.jpg"></center>'
 	'The community center sports club offers lessons in <a href="exec: gt ''gdksport'',''racing1''">Racing</a>, <a href="exec:gt ''gdksport'',''dance1''">Dance</a> and <a href="exec:gt ''gdksport'',''vball1''">Volleyball</a>. All lessons start before 18:00'
 	*nl
-	'In the locker room is a <a href="exec:GT ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'In the locker room is a <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	
 	if kotovLoveQW > 0 and hour = 16:
 		'You see <a href="exec:minut += 3 & gt ''kotovEv''">Vitek Kotov</a> with a large sports bag entering the sports club.'

+ 1 - 1
locations/gkafe.qsrc

@@ -87,7 +87,7 @@ if $ARGS[0] = '':
 				if hour >= 6 and hour < 16 and StoryLine > 0:
 					'Your <a href="exec:gt ''mother''">mother</a> is currently working at the cafe bar.'
 				else
-					'The bar owner <a href="exec:GT ''gkafe'', ''boris''">Borislav</a> is currently taking orders in the bar. Most people call him Slava.'
+					'The bar owner <a href="exec:gt ''gkafe'', ''boris''">Borislav</a> is currently taking orders in the bar. Most people call him Slava.'
 				end
 			end
 

+ 2 - 2
locations/gschool_grounds.qsrc

@@ -211,7 +211,7 @@ if $ARGS[0] = 'main':
 		end
 
 		if Enable_tablemap = 0:
-			if LariskaHomeIn > 0:'<a href="exec:minut += 1 & GT ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
+			if LariskaHomeIn > 0:'<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a> impatiently walks back and fourth across the courtyard, as if she''s waiting for someone.'
 			if JuliaMilLernQW >= 1:'<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milova</a> is sitting somewhere on the school courtyard, reading a book.'
 			if NatBelLernQW >= 1:'<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a> is standing in a corner.'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0:'<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a> is waiting for you near the school entrance.'
@@ -234,7 +234,7 @@ if $ARGS[0] = 'main':
 		else
 			!display friends in table if switch is on. 
 			st_count=0 & $show_table=''
-			if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & GT ''LariskaGo''">Lariska Gruzdev</a>','5'
+			if LariskaHomeIn > 0:gs'show_table','<a href="exec:minut += 1 & gt ''LariskaGo''">Lariska Gruzdev</a>','5'
 			if JuliaMilLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''JuliaMilGo''">Julia Milov</a>','5'
 			if NatBelLernQW >= 1:gs'show_table','<a href="exec:minut += 1 & gt ''NatBelGo''">Natasha Belova</a>','5'
 			if artemLernQW >= 1 and artemVitokQW ! 2 and artemblok = 0:gs'show_table','<a href="exec:minut += 15 & gt ''artemEv'', ''start''">Artem Chebotarev</a>','5'

+ 12 - 12
locations/gschool_lessons.qsrc

@@ -3393,73 +3393,73 @@ if $ARGS[0] = 'npc_data':
 	$school_static_num[26] = 'A26'
 	npcPol[26] = 0
 	grupTipe[26] = 6
-	$npcGo[26] = '<a href="exec:numnpc = 26 & GT ''Snpc''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
+	$npcGo[26] = '<a href="exec:numnpc = 26 & gt ''Snpc''"><<$npc_firstname[''A26'']>> <<$npc_lastname[''A26'']>></a>'
 
 !!Ilya Yenotin
 	$school_static_num[48] = 'A130'
 	npcPol[48] = 0
 	grupTipe[48] = 6
-	$npcGo[48] = '<a href="exec:numnpc = 48 & GT ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
+	$npcGo[48] = '<a href="exec:numnpc = 48 & gt ''Snpc''"><<$npc_firstname[''A130'']>> <<$npc_lastname[''A130'']>></a>'
 
 !!Viktor Pavlovich
 	$school_static_num[49] = 'A131'
 	npcPol[49] = 0
 	grupTipe[49] = 6
-	$npcGo[49] = '<a href="exec:numnpc = 49 & GT ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
+	$npcGo[49] = '<a href="exec:numnpc = 49 & gt ''Snpc''"><<$npc_firstname[''A131'']>> <<$npc_lastname[''A131'']>></a>'
 
 !!Aleksandrina Volkov
 	$school_static_num[50] = 'A134'
 	npcPol[50] = 1
 	grupTipe[50] = 6
-	$npcGo[50] = '<a href="exec:numnpc = 50 & GT ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
+	$npcGo[50] = '<a href="exec:numnpc = 50 & gt ''Snpc''"><<$npc_firstname[''A134'']>> <<$npc_lastname[''A134'']>></a>'
 
 !!Yeva Sokoloff
 	$school_static_num[51] = 'A135'
 	npcPol[51] = 1
 	grupTipe[51] = 6
-	$npcGo[51] = '<a href="exec:numnpc = 51 & GT ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
+	$npcGo[51] = '<a href="exec:numnpc = 51 & gt ''Snpc''"><<$npc_firstname[''A135'']>> <<$npc_lastname[''A135'']>></a>'
 
 !!Serafim Ivanov
 	$school_static_num[52] = 'A129'
 	npcPol[52] = 0
 	grupTipe[52] = 6
-	$npcGo[52] = '<a href="exec:numnpc = 52 & GT ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
+	$npcGo[52] = '<a href="exec:numnpc = 52 & gt ''Snpc''"><<$npc_firstname[''A129'']>> <<$npc_lastname[''A129'']>></a>'
 
 !!Olga Aleksandrov
 	$school_static_num[53] = 'A136'
 	npcPol[53] = 1
 	grupTipe[53] = 6
-	$npcGo[53] = '<a href="exec:numnpc = 53 & GT ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
+	$npcGo[53] = '<a href="exec:numnpc = 53 & gt ''Snpc''"><<$npc_firstname[''A136'']>> <<$npc_lastname[''A136'']>></a>'
 
 !!Raven Braakman
 	$school_static_num[54] = 'A137'
 	npcPol[54] = 1
 	grupTipe[54] = 6
-	$npcGo[54] = '<a href="exec:numnpc = 54 & GT ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
+	$npcGo[54] = '<a href="exec:numnpc = 54 & gt ''Snpc''"><<$npc_firstname[''A137'']>> <<$npc_lastname[''A137'']>></a>'
 
 !!Arina Orlov
 	$school_static_num[55] = 'A138'
 	npcPol[55] = 1
 	grupTipe[55] = 6
-	$npcGo[55] = '<a href="exec:numnpc = 55 & GT ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
+	$npcGo[55] = '<a href="exec:numnpc = 55 & gt ''Snpc''"><<$npc_firstname[''A138'']>> <<$npc_lastname[''A138'']>></a>'
 
 !!Ruslan Kuznetsov
 	$school_static_num[56] = 'A132'
 	npcPol[56] = 0
 	grupTipe[56] = 6
-	$npcGo[56] = '<a href="exec:numnpc = 56 & GT ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
+	$npcGo[56] = '<a href="exec:numnpc = 56 & gt ''Snpc''"><<$npc_firstname[''A132'']>> <<$npc_lastname[''A132'']>></a>'
 
 !!Makar Vasilyev
 	$school_static_num[58] = 'A128'
 	npcPol[58] = 0
 	grupTipe[58] = 6
-	$npcGo[58] = '<a href="exec:numnpc = 58 & GT ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
+	$npcGo[58] = '<a href="exec:numnpc = 58 & gt ''Snpc''"><<$npc_firstname[''A128'']>> <<$npc_lastname[''A128'']>></a>'
 
 !!Rolan Matveev
 	$school_static_num[57] = 'A133'
 	npcPol[57] = 0
 	grupTipe[57] = 6
-	$npcGo[57] = '<a href="exec:numnpc = 57 & GT ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
+	$npcGo[57] = '<a href="exec:numnpc = 57 & gt ''Snpc''"><<$npc_firstname[''A133'']>> <<$npc_lastname[''A133'']>></a>'
 end
 
 --- gschool_lessons ---------------------------------

+ 2 - 2
locations/igorhome.qsrc

@@ -69,7 +69,7 @@ if $ARGS[0] = 'hallway':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/kor.jpg"></center>'
 	'This is the entrance hall to Igor''s house, it is tastefully decorated. It leads to all the other rooms in the house.'
-	act 'Leave Igor''s home': gt 'pavResidential'
+	act '<b>Leave Igor''s home</b>': gt 'pavResidential'
 	act 'Igor''s Room': gt 'igorhome','igorroom'
 	act 'Bathroom': gt 'igorhome','bathroom'
 	act 'Igor''s sister''s room': gt 'igorhome','sisterroom'
@@ -94,7 +94,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/igorhome/vann.jpg"></center>'
 	'The bathroom has a large sink area and tile floors. The toilet sits along the far wall. There is also a walk-in shower and bath tub. It all looks very nice.'
-	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 	*nl
 	act 'Leave the bathroom': gt 'igorhome','hallway'
 	gs 'din_van', 'private'

+ 1 - 1
locations/koncepod1.qsrc

@@ -110,7 +110,7 @@ if $ARGS[0] = 'vnr2x':
     gs'stat'
     '<center><B><font color=maroon>Bathroom</font></B></center>'
     '<center><img <<$set_imgh>> src="images/locations/oldtown/vacanthouse/bathroom.jpg" ></center>'
-    'Above the washbasin hangs an <a href="exec:GT ''mirror'',''start''">oval mirror</a>.'
+    'Above the washbasin hangs an <a href="exec:gt ''mirror'',''start''">oval mirror</a>.'
     if psiho = 2 and psihb = 1 and psihc = 0 and psi1day = 0:dynamic $pavser4
 
 	act 'Go to the hall':gt'koncepod1','krr2x'

+ 18 - 24
locations/korr.qsrc

@@ -13,9 +13,7 @@ $location_type = 'private'
 killvar '$locclass'
 if sound = 0:PLAY 'sound/korr.mp3',30
 
-if courtletter_date <= daystart and courtletter_date ! 0:
-	gt 'sentence', 'letter'
-end
+if courtletter_date <= daystart and courtletter_date ! 0: gt 'sentence', 'letter'
 
 if lesbiday + 14 <= daystart and lesbiQW >= 11 and hour >= 19 and santehnikDolg = 0:
 	if RAND(0,100) > 82 and husband = 0:
@@ -25,14 +23,8 @@ if lesbiday + 14 <= daystart and lesbiQW >= 11 and hour >= 19 and santehnikDolg
 	end
 end
 
-act 'The bedroom':gt 'bedr'
-act 'The bathroom':gt 'vanr'
-act 'The kitchen':gt 'kuhr'
-act 'The living room':gt 'sitr'
-
-act '<font color="maroon">Apartment hallway</font>':
-	cls
-
+act '</b>Go to the stairwell</b>':
+	*clr & cla
 	if $clothingworntype = 'nude':
 		'<b><font color="red">You need to get dressed before going out.</font></b>'
 		xgt $curloc
@@ -44,9 +36,8 @@ act '<font color="maroon">Apartment hallway</font>':
 	end
 end
 
-act '<b><font color="maroon">Go outside</font></b>':
-	cls
-
+act '<b>Go to the street</b>':
+	*clr & cla
 	if $clothingworntype = 'nude':
 		'<b><font color="red">You need to get dressed before going out.</font></b>'
 		xgt $curloc
@@ -59,8 +50,11 @@ act '<b><font color="maroon">Go outside</font></b>':
 	end
 end
 
+act 'The bedroom':gt 'bedr'
+act 'The bathroom':gt 'vanr'
+act 'The kitchen':gt 'kuhr'
+act 'The living room':gt 'sitr'
 
-clr
 popolaini = 0
 saunaYouRoom = 0
 boycherdaksex = 0
@@ -106,12 +100,12 @@ if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 	'<b><font color="red">, the doorbell rings</font></b>'
 
 	act 'Go to the door':
-		cls
+		*clr & cla
 		gs 'stat'
 		'You go to the door and look through the peephole. You see a dark male figure. Apparently the man heard you and says through the door. "It''s me. Plumber Grisha. You owe me money, remember?"'
 
 		act 'Answer the door':
-			cls
+			*clr & cla
 			money -= santehnikDolg
 			santehnikDolg = 0
 			gs 'stat'
@@ -123,7 +117,7 @@ if hour >= 9 and hour <= 20 and santehnikDolg > 0 and money >= santehnikDolg:
 end
 
 if IvanPodstavaQW = 3 and hour >= 9 and hour <= 20:
-	cls
+	*clr & cla
 	IvanPodstavaQW = 4
 
 	if DolgRS <= moneySUM:
@@ -146,7 +140,7 @@ if IvanPodstavaQW = 3 and hour >= 9 and hour <= 20:
 		'For you police patrol arrived and took you to court. At trial, you were given five years of general regime, is obliged to pay debt <<DolgRS>>.'
 
 		act 'Sit on the area':
-			cls
+			*clr & cla
 			srok_kolvo = 1
 			srok_otsidki += 5
 			salo = 10
@@ -195,25 +189,25 @@ if IvanPodstavaDay ! daystart and IvanPodstavaQW = 1 and hour >= 8 and hour <= 2
 	'<b><font color="red">The doorbell rings</font></b>'
 
 	act 'Come to the door':
-		cls
+		*clr & cla
 		gs 'stat'
 		'You came to the door and looked through the peephole. On the site you saw a few men. In the darkness you have seen them on their caps. One of the men said to you through the door. <<$pcs_nickname>> <<$pcs_lastname>> open, police.'
 
 		act 'Answer the door':
-			cls
+			*clr & cla
 			minut += 60
 			IvanPodstavaQW = 2
 			gs 'stat'
 			'You opened the door to police wondering what they need from you. In the room were several men in uniform and with them several men in civilian clothes. Lean and skinny guy with stubble week and a pistol in a holster on a belt tied armpit said. "Understood, take your seats. Who will search in the apartment of the citizen who is accused of stealing." The investigator turned to you. "That''s a warrant for your arrest, this, this search warrant. Could you read it." Policemen full searched your apartment. Soon, one of them came out and said. Here are found the keys, according to the description it is just the keys to the office and the safe where the money was stolen. Witnesses signed the protocol that gave them the investigator. He frowned at you and nodded policeman, who started your hands behind your back and your wrists snap handcuffs.'
 
 			act 'Go with the police':
-				cls
+				*clr & cla
 				minut += 60
 				gs 'stat'
 				'Brought you out of the house in handcuffs and put in a police UAZ. After, steel doors slam and UAZ car started shaking and growling at each bump. Finally you have arrived somewhere and you taking from UAZ performed in the office to have a friend you investigator. He took off the handcuffs and offered you a seat. You took a hard and uncomfortable chair, and an investigator in the meantime turned on the TV and put a video cassette. On the screen was a picture of a security camera in bystroeshke. There was visible corridor. Soon appeared in the corridor you. You came to the door and opened it entered the office. After a while, the door opened and you are out of the office with a thick envelope. Investigator turned a VCR tape and pulled, after which he put another tape. On the next cabinet drawer was Anatoly Chubais. The front door opened and it included you, holding keys in hand. You went to the safe and opened it with the key. Got envelope. <<$burgerIvanText>>. Investigator turned the TV off and pulled out 				a plastic bag with table keys. He threw them on the table, and finally spoke. "Tests showed it really the keys to the office and the safe owner bystroezhki. During the search they were found in your apartment. Surveillance cameras on the record clearly shows how you entered the office and stole 650 thousand." He took out the protocol and taking pen in hand began to write. Filled a slate floor, he raised his dark eyes on you and said. "Confession will help you in court. All the same, it is the first time and provided that you return the money, you may be given a suspended sentence, if you admit your guilt."'
 
 				act 'Sign confession':
-					cls
+					*clr & cla
 					minut += 60
 					gs 'stat'
 					'You sign a confession and an investigator barked "duty." Policeman entered the room. The investigator nodded showing him you get her.'
@@ -222,7 +216,7 @@ if IvanPodstavaDay ! daystart and IvanPodstavaQW = 1 and hour >= 8 and hour <= 2
 				end
 
 				act 'Tell how it was':
-					cls
+					*clr & cla
 					minut += 60
 					gs 'stat'
 					'You were telling the investigator how everything was. As a manager Ivan Framed you. But the investigator listened to you in half an ear. Finally, he slammed his fist on the table and yelled at you, "I was not born yesterday, that would feed me such nonsense:If you will not cooperate, I''ll rot!" Policeman entered the room. The investigator nodded showing him you get her.'

+ 3 - 3
locations/korr2x.qsrc

@@ -31,9 +31,9 @@ end
 '<center><img <<$set_imgh>> src="images/locations/oldtown/apartment/korr2x.jpg"></center>'
 
 if umbrella > 0:'On a hook hangs a umbrella'
-if sobaka = 1:'Near the entrance to the bedroom is your <a href="exec:GT ''soba'',''start''"><<$namesob>></a>'
-if krolik = 1:'On the floor, resting is <a href="exec:GT ''krol'',''start''"><<$namekrol>></a>'
-if popugai = 1:'In the cell, sitting is <a href="exec:GT ''popu'',''start''"><<$namepopu>></a>'
+if sobaka = 1:'Near the entrance to the bedroom is your <a href="exec:gt ''soba'',''start''"><<$namesob>></a>'
+if krolik = 1:'On the floor, resting is <a href="exec:gt ''krol'',''start''"><<$namekrol>></a>'
+if popugai = 1:'In the cell, sitting is <a href="exec:gt ''popu'',''start''"><<$namepopu>></a>'
 if parkday ! daystart and parkblackmail = 1:
 	parkblackmail = 2
 	parkday = daystart

+ 1 - 1
locations/lake.qsrc

@@ -26,7 +26,7 @@ if $ARGS[0] = 'start':
 
 	'A large lake close to the city, it is a favorite destination of residents in the summer.'
 	if $clothingworntype ! 'swimwear':
-		'There is a winding <a href="exec:GT ''dort'',''start''">path</a> leading to the railway station in the city industrial region.'
+		'There is a winding <a href="exec:gt ''dort'',''start''">path</a> leading to the railway station in the city industrial region.'
 	else
 		'You can see the winding path to the railway station in the city industrial region, you should get properly dressed if you want to go there.'
 	end

+ 1 - 1
locations/lakecafe.qsrc

@@ -58,7 +58,7 @@ if $ARGS[0] = 'main':
 			end
 		end
 
-		if hour => 23:'In a fairly secluded corner of the diner, several <a href="exec:GT ''lakecafe'',''bandits''">shady looking men</a> are sitting around a small table. They talk in hushed voices amongst each another, and look like they might very well be criminals.'
+		if hour => 23:'In a fairly secluded corner of the diner, several <a href="exec:gt ''lakecafe'',''bandits''">shady looking men</a> are sitting around a small table. They talk in hushed voices amongst each another, and look like they might very well be criminals.'
 
 		'The diner has a single <a href="exec:gt ''laketoilet'', ''main''">toilet</a> available, for both males and females.'
 

+ 1 - 1
locations/lesbimistress.qsrc

@@ -1957,7 +1957,7 @@ if $ARGS[0] = 'BDSMEV':
 			gs 'arousal', 'end'
 			gs 'stat'
 				
-			act 'Go to the BDSM club':BDSMtaxi = 1 & GT 'BDSM_Club','start'
+			act 'Go to the BDSM club':BDSMtaxi = 1 & gt 'BDSM_Club','start'
 		end
 	end
 end

+ 4 - 4
locations/liam.qsrc

@@ -41,9 +41,9 @@ end
 'Later, the rich bought land off the poor here and knocked down the wooden shacks and farm houses to build large houses. As the city continued to grow rapidly, it became a desirable suburb.'
 'Since then even the old huts, have been improved, extended and modernized. The old buildings and beautiful park make it popular with tourists.'
 
-'Not far from here is the quiet <a href="exec:GT ''liames'',''start''">high street</a>.'
-'Close by is a narrow street leading to a <a href="exec:GT ''dvor'',''start''">vacant house</a>.'
-'You see a <a href="exec:GT ''ugol'',''start''">passage</a> between the houses lead to a courtyard.'
+'Not far from here is the quiet <a href="exec:gt ''liames'',''start''">high street</a>.'
+'Close by is a narrow street leading to a <a href="exec:gt ''dvor'',''start''">vacant house</a>.'
+'You see a <a href="exec:gt ''ugol'',''start''">passage</a> between the houses lead to a courtyard.'
 if car > 0 and cardrive = 14:
 	'I parked at the curb <a href="exec:GS ''carF'',''start''">your <<$car>></a>.'
 end
@@ -62,7 +62,7 @@ if hour >= 13 and hour <= 15 and bodimodel = 1 and arts = 0 and tusa = 1:
 	end
 end
 
-if arts = 1:'Apartment <a href="exec:GT ''Marin'',''start''">Marina</a>'
+if arts = 1:'Apartment <a href="exec:gt ''Marin'',''start''">Marina</a>'
 
 act 'Walk to the St Petersburg to Pavlovsk road (5 min)':minut += 5 & nroad = 15 & gt'road'
 

+ 9 - 9
locations/liames.qsrc

@@ -25,11 +25,11 @@ set minut+=10
 '<center><B>High street</B></center>'
 '<center><img <<$set_imgh>> src="images/locations/oldtown/liames.jpg" ></center>'
 'Not so much of a street, more of a connection of several streets including cafes and shops.'
-'A street runs straight to the <a href="exec:GT ''liam'',''start''">Town center</a>.'
-'Street leads to the Old Town <a href="exec:GT ''parks'',''start''">park</a>.'
-if hour >= 8 and hour <= 20:'A small <a href="exec:GT ''larek'',''start''">shop</a> is currently open.'
-if hour >= 10 and hour <= 22: 'A <a href="exec:GT ''liamelkafe'',''start''">tiny cafe</a> displays a street sign outside its door.'
-if hour >= 8 and hour <= 17 and exhibitionQW > 3:'The <a href="exec:GT ''exhibitionistshop'',''start''">exhibitionist shop</a> is just down a small side street from here.'
+'A street runs straight to the <a href="exec:gt ''liam'',''start''">Town center</a>.'
+'Street leads to the Old Town <a href="exec:gt ''parks'',''start''">park</a>.'
+if hour >= 8 and hour <= 20:'A small <a href="exec:gt ''larek'',''start''">shop</a> is currently open.'
+if hour >= 10 and hour <= 22: 'A <a href="exec:gt ''liamelkafe'',''start''">tiny cafe</a> displays a street sign outside its door.'
+if hour >= 8 and hour <= 17 and exhibitionQW > 3:'The <a href="exec:gt ''exhibitionistshop'',''start''">exhibitionist shop</a> is just down a small side street from here.'
 
 if home_owned[4] = 1:
 	act '<b>Go home</b>':gt'korr2x'
@@ -42,9 +42,9 @@ end
 act 'wait':gs 'obj_din', 'wait'
 
 if home_owned[4] = 1 and hour = meethour:
-	if svidanie[0] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 0 & GT ''lover_meet'',''start''"><<$loverdesc[0]>></a></b>'
-	if svidanie[1] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 1 & GT ''lover_meet'',''start''"><<$loverdesc[1]>></a></b>'
-	if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & GT ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
+	if svidanie[0] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 0 & gt ''lover_meet'',''start''"><<$loverdesc[0]>></a></b>'
+	if svidanie[1] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 1 & gt ''lover_meet'',''start''"><<$loverdesc[1]>></a></b>'
+	if svidanie[2] = 1:'<b>Near the entrance you expect <a href="exec:lover_number = 2 & gt ''lover_meet'',''start''"><<$loverdesc[2]>></a></b>'
 end
 
 streetrand = RAND(0,100)
@@ -69,7 +69,7 @@ if stallionQ = 3:
 	*clr
 	cla
 	'There is a rumbling in your stomach, you need to use the restroom. Luckily there appears to be a public restroom tucked into the corner of a building. Unluckily, the female one has a sign saying it is out of order.'
-	act 'Use the Men''s Restroom':GT 'stallion','start'
+	act 'Use the Men''s Restroom':gt 'stallion','start'
 	act 'Hold it':stallionQ = 1 & gt 'liames'
 end
 

+ 8 - 0
locations/lover_change.qsrc

@@ -209,6 +209,7 @@ if $ARGS[0] = 'Pier':
 								'The artist takes a look at your unpierced ears, and with a quick sharp pain, pierces them.'
 								'<center><img <<$set_imgh>> src="images/pc/body/piercings/c1.jpg"></center>'
 								pirsC = 1
+								pirsC1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'ears', 'pierce'
@@ -218,6 +219,7 @@ if $ARGS[0] = 'Pier':
 								'He asks you to stick out your tongue. You comply and then start to regret it as he pierces your tongue.'
 								'<center><img <<$set_imgh>> src="images/pc/body/piercings/a1.jpg"></center>'
 								pirsA = 1
+								pirsA1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'tongue', 'pierce'
@@ -227,6 +229,7 @@ if $ARGS[0] = 'Pier':
 								'The artist gently holds your lip as he drives the needle through to pierce it.'
 								'<center><img <<$set_imgh>> src="images/pc/body/piercings/b1.jpg"></center>'
 								pirsB = 1
+								pirsB1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'lips', 'pierce'
@@ -236,6 +239,7 @@ if $ARGS[0] = 'Pier':
 								'You feel a sharp pain in your nose as he pierces your nose.'
 								'<center><img <<$set_imgh>> src="images/pc/body/piercings/d1.jpg"></center>'
 								pirsD = 1
+								pirsD1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'nose', 'pierce'
@@ -245,6 +249,7 @@ if $ARGS[0] = 'Pier':
 								'The artist moves to above your eyes and quickly pierces your eyebrow.'
 								'<center><img <<$set_imgh>> src="images/pc/body/piercings/e1.jpg"></center>'
 								pirsE = 1
+								pirsE1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'eyebrows', 'pierce'
@@ -255,6 +260,7 @@ if $ARGS[0] = 'Pier':
 								'<center><img <<$set_imgh>> src="images/pc/body/piercings/n1.jpg"></center>'
 								pcs_horny += 2
 								pirsN = 1
+								pirsN1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'tummy', 'pierce'
@@ -265,6 +271,7 @@ if $ARGS[0] = 'Pier':
 								!!'<center><img <<$set_imgh>> src="images/pc/body/piercings/f1.jpg"></center>'
 								pcs_horny += 5
 								pirsF = 1
+								pirsF1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'nipples', 'pierce'
@@ -276,6 +283,7 @@ if $ARGS[0] = 'Pier':
 								!!'<center><img <<$set_imgh>> src="images/pc/body/piercings/g1.jpg"></center>'
 								pcs_horny += 7
 								pirsG = 1
+								pirsG1_owned = 1
 								pierCount += 1
 								pierWearCount += 1
 								gs 'pain', 7, 'pubic', 'pierce'

+ 2 - 2
locations/mey_home.qsrc

@@ -309,7 +309,7 @@ if $ARGS[0] = '2':
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/hotel/hotel.room.best1.jpg"></center>'
 	'A luxurious bathroom looking like the five-star hotel bathrooms you read about in the magazines.'
-	'Above the beautiful vanity and sink there is a huge <a href="exec:GT ''mirror'',''start''">mirror</a>.'
+	'Above the beautiful vanity and sink there is a huge <a href="exec:gt ''mirror'',''start''">mirror</a>.'
 	!acts copy from [shulgabath]
 	act 'Return to the hallway': gt 'mey_home', 'start'
 	gs 'din_van', 'private'
@@ -331,7 +331,7 @@ if $ARGS[0] = '3':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/meynolds/guestroom.jpg"></center>'
 	'It feels and looks like a standard room in a hotel. There is a <a href="exec:gt ''bed'', ''start''">bed</a> and an <a href="exec:gt ''budilnik'', ''start''">alarm clock</a>, a small <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing) and a desk.'
 	'A <a href="exec:gt ''mirror'', ''start''">mirror</a> hangs on the wall near the front door.'
-	if komp = 1:'Your <a href="exec:GT ''Komp'',''start''">laptop</a> is on the desk.'
+	if komp = 1:'Your <a href="exec:gt ''Komp'',''start''">laptop</a> is on the desk.'
 
 	act 'Exit to hallway':
 		if ($clothingworntype = 'nude' or $clothingworntype = 'swimwear'):

+ 2 - 2
locations/nordtrain.qsrc

@@ -12,7 +12,7 @@ if $ARGS[0] = 'inside':
 	*clr & cla
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/train/vokzalholle.jpg" ></center>'
-	'There is a <a href="exec:GT ''dort''">path</a> leading off in to the distance, in the direction of the lake.'
+	'There is a <a href="exec:gt ''dort''">path</a> leading off in to the distance, in the direction of the lake.'
 	act 'Leave the station': minut += 2 & gt 'nordtrain', 'outside'
 	*nl
 	if Trainpass_day > daystart:
@@ -42,7 +42,7 @@ if $ARGS[0] = 'outside':
 	end
 
 	if RAND(1,100) > 70:
-		'You see a <a href="exec:GT ''etoexhib'',''pos54''">suspicious character</a>.'
+		'You see a <a href="exec:gt ''etoexhib'',''pos54''">suspicious character</a>.'
 		!fakes use 2 for aware of need for, 1 for have, otherwise 0
 		if fakepassport = 2 or fakediplom = 2:
 		'When you pass by the suspicious character, he whispers to you: "I have what you want, miss"'

+ 3 - 3
locations/obroom.qsrc

@@ -19,9 +19,9 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/obroom.jpg"></center>'
 	'This is your room which you share with another girl named Vika Zhurova.'
 	'At the right of the entrance you find an old <a href="exec:gt ''wardrobe'', ''start''">wardrobe</a> (where you can choose outfits and organize your clothing).'
-	'There''s a <a href="exec:GT ''mirror'',''start''">mirror</a> hanging on the wall.'
-	'Your <a href="exec:GT ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
-	if komp = 1:'There''s a <a href="exec:GT ''Komp'',''start''">laptop</a> laying on your bed.'
+	'There''s a <a href="exec:gt ''mirror'',''start''">mirror</a> hanging on the wall.'
+	'Your <a href="exec:gt ''bed'',''start''">bed</a> is positioned in one of the corners of the room.'
+	if komp = 1:'There''s a <a href="exec:gt ''Komp'',''start''">laptop</a> laying on your bed.'
 	''
 	if hour > 14 and hour < 20 and npc_rel['A220']>=60 and birthday = day and birthmonth = month and vikaslut = 1 and bordel = 1 and slutty > 0 and b_vika_present_Day!day:
 		vika_sleep = 0

+ 1 - 1
locations/parks.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 	'These gardens of the old palace have been sculpted over many years into wonderful, landscaped gardens with a tranquil atmosphere.'
 	'The old park is a favorite vacation spot for tourists and the main feature of old town.'
 
-	'Wander deeper into the <a href="exec:GT ''lug'',''start''">park</a> .'
+	'Wander deeper into the <a href="exec:gt ''lug'',''start''">park</a> .'
 
 
 	act 'Go to the high street': minut += 10 &  gt 'liames'

+ 1 - 1
locations/pavComplex.qsrc

@@ -109,7 +109,7 @@ if $ARGS[0] = 'start':
 	else
 		st_count=0 & $show_table=''
 		if (npc_rel['A112'] >=70) or (npc_rel['A112'] >=30 and week < 6 and hour >= 14 and hour <= 23) or (week >= 6 and hour >= 10 and hour < 14) or (week < 6 and hour >= 14 and hour <= 23) or (hour >= 0 and hour < 2):
-			gs'show_table','Apartment of Uncle <a href="exec:minut += 15 & GT ''shulgahome''" >Shulgin</a>.','3'
+			gs'show_table','Apartment of Uncle <a href="exec:minut += 15 & gt ''shulgahome''" >Shulgin</a>.','3'
 		else
 			gs'show_table','Apartment of Uncle Shulgin..','3'
 		end

+ 2 - 2
locations/pavComplexb2.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'etaj_1':
 	'<<$pod_ev_rnd>>'
 
 	'There''s a <a href="exec: gt ''pavComplexb2'', ''housemates''">list</a> of the people who live here on the wall.'
-	'Someone put up some <a href="exec:GT ''pavComplexb2'',''pod_objava''">advertisements</a> on the wall, near the entrance.'
+	'Someone put up some <a href="exec:gt ''pavComplexb2'',''pod_objava''">advertisements</a> on the wall, near the entrance.'
 	act 'Leave the building': minut += 1 & gt 'pavcomplex', 'start'
 	act 'Go up to the second floor': minut +=1 & gt 'pavComplexb2','etaj_2'
 	act 'Take the elevator': gt 'pavComplexb2','lift','etaj_1'
@@ -195,7 +195,7 @@ if $ARGS[0] = 'lift':
 	minut +=1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:GT ''pavComplexb2'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pavComplexb2'',''elev_objava''">notification</a> in the elevator.</center>'
 	act 'Push button: floor 1': gt 'pavComplexb2','etaj_1'
 	act 'Push button: floor 2': gt 'pavComplexb2','etaj_2'
 	act 'Push button: floor 3': gt 'pavComplexb2','etaj_3'

+ 2 - 2
locations/pavComplexb3.qsrc

@@ -47,7 +47,7 @@ if $ARGS[0] = 'etaj_1':
 	'<<$pod_ev_rnd>>'
 
 	'There''s a <a href="exec: dynamic $housemates">list</a> of the people who live here on the wall.'
-	'Someone put up some <a href="exec:GT ''pavComplexb3'',''pod_objava''">advertisements</a> on the wall, near the entrance.'
+	'Someone put up some <a href="exec:gt ''pavComplexb3'',''pod_objava''">advertisements</a> on the wall, near the entrance.'
 	act 'Leave the building': minut += 1 & gt 'pavcomplex', 'start'
 	act 'Go up to the second floor': minut +=1 &  gt 'pavComplexb3','etaj_2'
 	act 'Take the elevator': gt 'pavComplexb3','lift','etaj_1'
@@ -198,7 +198,7 @@ if $ARGS[0] = 'lift':
 	minut +=1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:GT ''pavComplexb3'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pavComplexb3'',''elev_objava''">notification</a> in the elevator.</center>'
 	act 'Push button: floor 1': gt 'pavComplexb3','etaj_1'
 	act 'Push button: floor 2': gt 'pavComplexb3','etaj_2'
 	act 'Push button: floor 3': gt 'pavComplexb3','etaj_3'

+ 1 - 1
locations/pavIndustrial.qsrc

@@ -80,7 +80,7 @@ if week < 7 and hour >= 8 and hour < 15:
 end
 
 if week < 6 and hour >= 8 and hour < 20:
-	*pl 'The local <a href="exec:torg = 0 & GT ''budgetclothes'',''start''">G&M Store</a> is currently open.'
+	*pl 'The local <a href="exec:torg = 0 & gt ''budgetclothes'',''start''">G&M Store</a> is currently open.'
 else
 	*pl 'The local G&M Store is currently closed. Opening hours are Monday to Friday, between 08:00 to 20:00.'
 end

+ 2 - 2
locations/pavResidential.qsrc

@@ -122,7 +122,7 @@ if Enable_tablemap = 0:
 	if IgorLoverQW > 0 and IdorBlock = 0:'<a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>, one of your classmates, lives in one of the fancier houses in town.'
 	!if katjaFirstKiss >= 1:'<a href="exec:minut += 15 & gt ''KatjaHome''">Katja Meynold</a>, one of your classmates, lives in the richer part of town.'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: 'Large private house where the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a> live.'
-	if LariskaHomeIn > 0: '<a href="exec:minut += 10 & GT ''LariskaHome''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
+	if LariskaHomeIn > 0: '<a href="exec:minut += 10 & gt ''LariskaHome''">Lariska Gruzdev</a>, one of your classmates, lives about 10 minutes away from your parents.'
 	if beinalbinahome > 0:'<a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>, one of your classmates, lives in one of the few luxurious mansions Pavlovsk has to offer.'
 else
 	st_count=0 & $show_table=''
@@ -130,7 +130,7 @@ else
 	if IgorLoverQW > 0 and IdorBlock = 0:gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
 	!if katjaFirstKiss >= 1:gs'show_table','house of <a href="exec:minut += 10 & gt ''KatjaHome''">Katja Meynold</a>.','3'
 	if katjaFirstKiss >= 1 or mey_vika['mey_vika_qw'] >= 27 or mey_vika['key'] = 1: gs'show_table','House of the <a href="exec:minut += 10 & gt''mey_home'', ''door''">Meynold twins</a>','3'
-	if LariskaHomeIn > 0:gs'show_table','House of <a href="exec:minut += 10 & GT ''LariskaHome''" >Lariska Gruzdevaya</a>, in richer part','3'
+	if LariskaHomeIn > 0:gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome''" >Lariska Gruzdevaya</a>, in richer part','3'
 	if beinalbinahome > 0:gs'show_table','Luxurious mansion of <a href="exec:minut += 10 & gt ''albinaporog''">Albina Barlovskaya</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end

+ 5 - 5
locations/pavSharedApt.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'advertNo30':
 	seenAd = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/pod_ob'+rand(1,2)+'.jpg"></center>'
-	'<br>As you pass by the advertisements, you notice a sign - "сдаeтся в аренду комната" (Room for rent!). Some guys are looking for a roommate. They live in an apartment in of the other buildings in the apartment complex.'
+	'<br>As you pass by the advertisments, you notice a sign - "сдаeтся в аренду комната" (Room for rent!). Some guys are looking for a roommate. They live in an apartment in of the other buildings in the apartment complex.'
 	act 'Continue':gt 'pod_ezd','etaj_1'
 end
 
@@ -573,7 +573,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 	*nl
 	'Modest bathroom, containing all that young people need for their daily life, such as:'
-	'A Shower, toilet, <a href="exec:GT ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, a sink and even a bath tub.'
+	'A Shower, toilet, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a sink and even a bath tub.'
 	*nl
 	gs 'din_van', 'private'
 	gs 'stat'
@@ -691,9 +691,9 @@ if $ARGS[0] = 'pcsRoom':
 	*nl
 	'Beside the sofa bed, is an old cabinet, with your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> on top.'
 	if budilnikOn = 0:
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''pavSharedApt'',''pcsRoom''">off</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & gt ''pavSharedApt'',''pcsRoom''">off</a>.'
 	else
-		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''pavSharedApt'',''pcsRoom''">on</a>.'
+		'Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & gt ''pavSharedApt'',''pcsRoom''">on</a>.'
 	end
 	*nl
 	if TV = 0:$TV = 'a great place for a TV, if you had one.'
@@ -714,7 +714,7 @@ if $ARGS[0] = 'pcsRoom':
 	gs 'exercise', 'start'
 	*nl
 
-	if komp = 1:'Your <a href="exec:gorodokKomp = 1 & GT ''Komp'',''start''">laptop</a> is sitting on small table.'
+	if komp = 1:'Your <a href="exec:gorodokKomp = 1 & gt ''Komp'',''start''">laptop</a> is sitting on small table.'
 
 	if student > 0 and kursovik < 100:
 		act 'Do coursework (1:00)':

+ 2 - 2
locations/pod_ezd.qsrc

@@ -48,7 +48,7 @@ if $ARGS[0] = 'etaj_1' or $ARGS[0] = '':
 	if seenAd = 0: gt 'pavSharedApt', 'advertNo30'
 	
 	'There''s a <a href="exec: dynamic $housemates">list</a> of the people who live here on the wall.'
-	'Someone put up some <a href="exec:GT ''pod_ezd'',''pod_objava''">advertisements</a> on the wall, near the entrance.'
+	'Someone put up some <a href="exec:gt ''pod_ezd'',''pod_objava''">advertisements</a> on the wall, near the entrance.'
 	act 'Leave the building':
 		if hour < 4 and motherWorry = 0 and age < 18:
 			'<font color=red>Are you sure? Your mother will worry if you go out at this time.</font>'
@@ -309,7 +309,7 @@ if $ARGS[0] = 'lift':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:GT ''pod_ezd'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pod_ezd'',''elev_objava''">notification</a> in the elevator.</center>'
 	act 'Push button: floor 1': gt 'pod_ezd','etaj_1'
 	act 'Push button: floor 2': gt 'pod_ezd','etaj_2'
 	act 'Push button: floor 3': gt 'pod_ezd','etaj_3'

+ 6 - 6
locations/podrsex.qsrc

@@ -51,7 +51,7 @@ if $ARGS[0] = 'suck':
 
 	if pdsxbj = 0: pdsxbj = 1
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/sex/pod/minet<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/minet<<picrand>>.jpg"></center>'
 	'You look the other girl deep in the eyes while the two of you suck the man''s cock, touching her tongue with yours when you reach it around his shaft. Then the two of you take turns sucking him off enthusiastically, while the other licks his balls.'
 	
 	gs 'arousal', 'bj', 10, 'sub', 'group'
@@ -69,7 +69,7 @@ if $ARGS[0] = 'suck':
 	if sexvar > 0:xgt 'podrsex', 'var'
 	if sexvar = 0:
 		*clr
-		'<br><center><img <<$set_imgh>> src="images/locations/shared/sex/pod/cum<<picrand>>.jpg"></center>'
+		'<br><center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/cum<<picrand>>.jpg"></center>'
 		spafinloc = 12
 		gs 'cum_manage'
 		gs 'podrsex', 'end'
@@ -88,7 +88,7 @@ if $ARGS[0] = 'pussy':
 	
 	if pdsxsex = 0: pdsxsex = 1
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/sex/pod/uvag<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/uvag<<picrand>>.jpg"></center>'
 	'The man eagerly penetrates your pussy, and begins to thrust his length inside you over and over bringing you pleasure.'
 	
 	gs 'arousal', 'vaginal', 10, 'sub', 'group'
@@ -118,7 +118,7 @@ if $ARGS[0] = 'ass':
 
 	if pdsxanal = 0: pdsxanal = 1
 
-	'<center><img <<$set_imgh>> src="images/locations/shared/sex/pod/uanal<<picrand>>.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/uanal<<picrand>>.jpg"></center>'
 	'The man slowly works the tip of his cock inside your ass, and halts for a moment so you can get used to the sensation. Then he begins to thrust his length inside you, fucking you more and more intensely with less regard for your feelings and more for his own pleasure.'
 	
 	gs 'arousal', 'anal', 10, 'sub', 'group'
@@ -155,7 +155,7 @@ if $ARGS[0] = 'voy':
 	end
 	if rand(0,1) = 0:
 		pos = 4
-		'<center><img <<$set_imgh>> src="images/locations/shared/sex/pod/vag<<picrand>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/vag<<picrand>>.jpg"></center>'
 		'While the other girl is enjoying getting her pussy fucked, you find that she''ll do whatever you want her to do. She eagerly licks your pussy when you put it on her mouth, and lap up her sweet juices while the guy rams his cock inside her repeatedly.'
 		
 		gs 'arousal', 'cuni', 10, 'lesbian', 'dom', 'group'
@@ -163,7 +163,7 @@ if $ARGS[0] = 'voy':
 		
 	else
 		pos = 5
-		'<center><img <<$set_imgh>> src="images/locations/shared/sex/pod/anal<<picrand>>.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/shared/sex/sexdvanadva/anal<<picrand>>.jpg"></center>'
 		'While the other girl is enjoying getting her ass fucked, you find that she''ll do whatever you want her to do. She eagerly licks your pussy when you put it on her mouth, and lap up her sweet juices while the guy rams his cock inside her repeatedly.'
 	
 		gs 'arousal', 'cuni', 10, 'lesbian', 'dom', 'group'

+ 5 - 5
locations/road.qsrc

@@ -21,11 +21,11 @@ if $ARGS[0] = '':
 	'Calling it a highway would be too much credit, but this road is the main way to get from St. Petersburg to the town of Pavlovsk, 20km away. Smaller villages named Gadukino and Pushkin can be found along the way. Cars are driving by you at a high speed.'
 
 	if car > 0 and cardrive = 22 and ncarroad = nroad:'You parked <a href="exec:gs ''carF'', ''start''">your <<$car>></a> next to the road.'
-	if nroad = 0:act 'Go to the City Industrial Region (0:15)':minut += 15 & gt 'nord'
+	if nroad = 0:act 'Walk to the City Industrial Region (0:15)':minut += 15 & gt 'nord'
 	if nroad = 16:act 'Check out the construction site (1:00)':minut += 60 & gt 'obekt'
 	if nroad = 20:
-		act 'Go to Pavlovsk train station (0:15)': minut += 15 & gt 'pavtrain'
-		act 'Go to Pavlovsk high street (0:15)': minut += 15 & gt 'pavCommercial'
+		act 'Walk to Pavlovsk train station (0:15)': minut += 15 & gt 'pavtrain'
+		act 'Walk to Pavlovsk commercial area (0:15)': minut += 15 & gt 'pavCommercial'
 	end
 	if nroad < 20:act 'Walk towards Pavlovsk (1:00)':minut += 60 & nroad += 1 & gt $curloc
 	if nroad > 0:act 'Walk towards St. Petersburg (1:00)':minut += 60 & nroad -= 1 & gt $curloc
@@ -84,7 +84,7 @@ if $ARGS[0] = '':
 
 	if nroad = 0:
 		'You''re on the outskirts of St. Petersburg. You see a number of crudely made huts near the trees, a bunch of homeless people must have sought shelter here.'
-		'A <a href="exec:minut+=5&GT ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break, and is having a cigarette. He could probably bring you to Pavlovsk, for a price...'
+		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break, and is having a cigarette. He could probably bring you to Pavlovsk, for a price...'
 	elseif nroad = 1:
 		'You''re not very far from St. Petersburg. You see a bunch of <a href="exec:minut += 15 & gt ''psiklin'',''start''">luxury houses</a> not far from the road. That settlement looks like it''s very expensive to live in.'
 	elseif nroad = 2:
@@ -125,7 +125,7 @@ if $ARGS[0] = '':
 		''
 	elseif nroad = 20:
 		'The main road ends at the old provincial town of Pavlovsk. You can see the castle from a distance.'
-		'A <a href="exec:minut+=5&GT ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break, and is having a cigarette. He could probably bring you to St. Petersburg, for a price...'
+		'A <a href="exec:minut += 5 & gt ''furi''">lorry</a> is parked next to the road. The driver is currently taking a break, and is having a cigarette. He could probably bring you to St. Petersburg, for a price...'
 		'A small road leads to an almost hidden old <a href="exec:gt ''brothel'', ''lobby''">hotel</a>. Usually tourists use it when passing by or when visiting the old town of Pavlovsk.'
 	end
 end

+ 113 - 229
locations/rolanapt.qsrc

@@ -257,8 +257,6 @@ if $ARGS[0] = 'kitchen':
 			act 'Approach Rolan':
 				*clr & cla
 				minut += 5
-				rolancooklesson += 1
-				rolan_cooklesson_day = daystart
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
 				'As soon as you walk toward Rolan he stands up and tries to escape, but you manage to stop him...'
@@ -268,12 +266,10 @@ if $ARGS[0] = 'kitchen':
 				'Rolan sighs. He doesn''t want to do this, but you''re not giving him a choice.'
 				act 'Start lesson': gt 'rolanapt', 'chef'
 			end
-		elseif rolancooklesson > 2 and rolancooklesson =< 6 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
+		elseif rolancooklesson > 2 and rolancooklesson <= 6 and rolan_cooklesson_day ! daystart and $wornpantytype ! 'none':
 			act 'Approach Rolan':
 				*clr & cla
 				minut += 5
-				rolancooklesson += 1
-				rolan_cooklesson_day = daystart
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro3.jpg"></center>'
 				'This time, Rolan doesn''t attempt to flee. "<i>Good</i>," you think, this lesson should go smoother than usual.'
@@ -871,8 +867,7 @@ end
 
 if $ARGS[0] = 'chef':
 	if rolancooklesson = 1:
-		cla
-		*clr
+		*clr & cla
 		minut += 60
 		rolancooklesson += 1
 		rolan_cooklesson_day = daystart
@@ -883,70 +878,60 @@ if $ARGS[0] = 'chef':
 		*nl
 		'"Oh , I''m not getting mad. When I get mad, you''ll know it. So now let''s get started."'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			'<center><b><font color = maroon>Introduction course</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro1.jpg"></center>'
 			'"First of all, we have to clean the kitchen. A good cook takes care of his kitchen and never leaves the dishes dirty. We''ll start by washing them."'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				'<center><b><font color = maroon>Introduction course</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro2.jpg"></center>'
 				'"Once the dishes are washed, you have to dry them. This can be tedious but I assure you, there is a benefit to drying them."'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					'<center><b><font color = maroon>Introduction course</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro3.jpg"></center>'
 					'"When you leave your dishes wet, you will raise the humidity in the kitchen and mold can grow. This leaves a moldy smell that can affect your food. See, we just started and you have already learned something!"'
 					*nl
 					'Rolan simply nods his head.'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						'<center><b><font color = maroon>Introduction course</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro4.jpg"></center>'
 						'"You''re a good listener, Rolan. I didn''t expect you to be interested in cleaning considering the state of your kitchen, but I have to reconsider my plans. Do you want to ask me something? I''m more than happy to explain"'
 						*nl
 						'Rolan''s eyes have wandered down to your chest. "M-miss <<$pcs_lastname>>, y-your... br-br-bre-brea..."'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							'<center><b><font color = maroon>Introduction course</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro5.jpg"></center>'
 							'You look down at yourself and notice your predicament. "Oh? Thank you, Rolan. You''re quite the gentleman. Not every man would warn a girl in this condition."'
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								'<center><b><font color = maroon>Introduction course</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro6.jpg"></center>'
 								'You pull your shirt back up, "But we don''t want a distraction, or we''ll never be able to finish!"'
 								*nl
 								'"Yes, Miss <<$pcs_lastname>>," mumbles, disappointedly.'
 								act 'Continue':
-									cla
-									*clr
+									*clr & cla
 									'<center><b><font color = maroon>Introduction course</font></b></center>'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro7.jpg"></center>'
 									'"Good, we''ve finished drying the dishes, and the kitchen seems clean enough. Our next step is to organize our kitchen. You need to have easy access to your cooking tools. You can''t leave something on the stove while you search for your utensils; you''ll burn the food!"'
 									act 'Continue':
-										cla
-										*clr
+										*clr & cla
 										'<center><b><font color = maroon>Introduction course</font></b></center>'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro8.jpg"></center>'
 										'"Spatula..."'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>Introduction course</font></b></center>'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro9.jpg"></center>'
 											'You look around through various cabinets, "Your pans. Where do you keep your pans?"'
 											*nl
 											'An unsure look crosses Rolan''s face, "Eeemh, I think they are in the oven..."'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Introduction course</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro10.jpg"></center>'
 												'You look at him, slightly bewildered, "The oven? Why would you keep them there? They''re the most useful tool in any kitchen!"'
@@ -957,14 +942,12 @@ if $ARGS[0] = 'chef':
 												*nl
 												'"Oh, alright, Miss <<$pcs_lastname>>."'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													'<center><b><font color = maroon>Introduction course</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro11.jpg"></center>'
 													'"The pot will be useful for soup cooking, as I''m sure you''re well aware of..."'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Introduction course</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro12.jpg"></center>'
 														'"And lastly, an apron! Every good chef has one. It can be useful to hold your utensils like our spatula, whisks, spoons, nail files..."'
@@ -973,26 +956,22 @@ if $ARGS[0] = 'chef':
 														*nl
 														'"Yes, Rolan. You can trim your nails while waiting for something to finish on the stove or in the oven. But, you''re a man, so you probably just bite your nails. Well, an apron has plenty of pockets so you can just put your hands in them too," you say with a laugh. "Of course, the main function of an apron is to keep your clothes clean."'
 														act 'Continue':
-															cla
-															*clr
+															*clr & cla
 															'<center><b><font color = maroon>Introduction course</font></b></center>'
 															'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro13.jpg"></center>'
 															'"Like, for example, when you''re using flour," you begin lightly dusting some flour on the counter.'
 															act 'Continue':
-																cla
-																*clr
+																*clr & cla
 																'<center><b><font color = maroon>Introduction course</font></b></center>'
 																'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro14.jpg"></center>'
 																'"It has a nasty habit of getting everywhere," you giggle.'
 																act 'Continue':
-																	cla
-																	*clr
+																	*clr & cla
 																	'<center><b><font color = maroon>Introduction course</font></b></center>'
 																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro15.jpg"></center>'
 																	'"Knives are important, too. A dull blade increases the chance that you could cut yourself when slicing food."'
 																	act 'Continue':
-																		cla
-																		*clr
+																		*clr & cla
 																		'<center><b><font color = maroon>Introduction course</font></b></center>'
 																		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro16.jpg"></center>'
 																		'"I think that''s enough for today. Do you have any questions about what we''ve discussed, Rolan?"'
@@ -1001,8 +980,7 @@ if $ARGS[0] = 'chef':
 																		*nl
 																		'"Okay, then. In that case, I will give you a shopping list for our next lesson."'
 																		act 'Continue':
-																			cla
-																			*clr
+																			*clr & cla
 																			'<center><b><font color = maroon>Introduction course</font></b></center>'
 																			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/intro/intro17.jpg"></center>'
 																			'"Hmm, I think we should make a borscht. Yes, that''s it! Let''s see," you begin to make a list of ingredients. "Of course, we''ll need vegetable broth, beets, carrots, onions, tomatoes, cabbage, some salt, lemon juice, pepper and sour cream. Yes, I think that''s everything. Okay Rolan get those ingredients soon."'
@@ -1029,8 +1007,7 @@ if $ARGS[0] = 'chef':
 			end
 		end
 	elseif rolancooklesson = 2:
-		cla
-		*clr
+		*clr & cla
 		minut += 60
 		rolancooklesson += 1
 		rolan_cooklesson_day = daystart
@@ -1043,8 +1020,7 @@ if $ARGS[0] = 'chef':
 		*nl
 		'You sigh to yourself, "Rolan."'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			'<center><b><font color = maroon>Borscht</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht0.jpg"></center>'
 			*nl
@@ -1052,32 +1028,28 @@ if $ARGS[0] = 'chef':
 			*nl
 			'You pour the broth into a pot and place it on the stove. Rolan sighs to himself, "Dammit."'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				'<center><b><font color = maroon>Borscht</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht1.jpg"></center>'
 				'You poke your tongue out at Rolan, "At least you got all the vegetables. From the looks of things, I''d guess you''ve never had this many vegetables in your kitchen all at once."'
 				*nl
 				'"That is because I''m a man, not a rabbit!" You try to stiffle your laughter. It doesn''t work, but even Rolan can''t help but smile at his words.'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					'<center><b><font color = maroon>Borscht</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht2.jpg"></center>'
 					'"Now, we need to peel our vegetables."'
 					*nl
 					'"What? Peel them, that''s new," Rolan looks a bit puzzled.'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						'<center><b><font color = maroon>Borscht</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht3.jpg"></center>'
 						'Once the peeling is done, you hand a knife to Rolan, "You have to cut them into little pieces. There''s no rush, our broth still isn''t ready."'
 						*nl
 						'"This sure is a lot of work for just borscht," Rolan complains.'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							'<center><b><font color = maroon>Borscht</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht4.jpg"></center>'
 							if npc_rel['A11'] > 40:
@@ -1086,8 +1058,7 @@ if $ARGS[0] = 'chef':
 								'Your phone buzzes. It''s your mother wondering where you are...'
 							end
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								'<center><b><font color = maroon>Borscht</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht5.jpg"></center>'
 								if npc_rel['A11'] > 40:
@@ -1096,32 +1067,27 @@ if $ARGS[0] = 'chef':
 									'You snap a photo of yourself and text: "I''m at a friend''s house helping them cook. Be home soon."'
 								end
 								act 'Continue':
-									cla
-									*clr
+									*clr & cla
 									'<center><b><font color = maroon>Borscht</font></b></center>'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht6.jpg"></center>'
 									'You finish sending your text just as Rolan has finished cutting up the last of the vegetables.'
 									act 'Continue':
-										cla
-										*clr
+										*clr & cla
 										'<center><b><font color = maroon>Borscht</font></b></center>'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht7.jpg"></center>'
 										'You check on the broth, "It''s nearly ready, we can add the vegetables now."'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>Borscht</font></b></center>'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht8.jpg"></center>'
 											'You grab a bowl to put the vegetables in,'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Borscht</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht9.jpg"></center>'
 												'You give the prepared broth a quick stir before you start adding the vegetables.'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													'<center><b><font color = maroon>Borscht</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht10.jpg"></center>'
 													'"Okay, mix the vegetables in the broth and let it cook 20 minutes. Oh, don''t forget to cover the pot! Hmm, where did I put the apron? Rolan? I don''t want to dirty my clothes..."'
@@ -1130,22 +1096,19 @@ if $ARGS[0] = 'chef':
 													*nl
 													'"Rolan? Earth to Rolan?" He looks up at you. You sigh to yourself before spotting the apron. "Nevermind, I found it."'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Borscht</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht11.jpg"></center>'
 														'You spend the next few minutes in silence. You notice Rolan occasionally sneaking glances at your chest again. Finally you speak up, "Okay, now we can add the cabbage and some butter, then cook for another 20 minutes. We can leave the top off this time."'
 														*nl
 														'"Hmm, take your top off, yes, yes. That''s good." What is Rolan even talking about?'
 														act 'Continue':
-															cla
-															*clr
+															*clr & cla
 															'<center><b><font color = maroon>Borscht</font></b></center>'
 															'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht12.jpg"></center>'
 															'Another awkwardly silent 20 minutes goes by. "Time to test taste." You grab a ladle, and take a careful sip, "Okay, not bad, not bad. Let''s stir in some lemon juice, but not too much."'
 															act 'Continue':
-																cla
-																*clr
+																*clr & cla
 																'<center><b><font color = maroon>Borscht</font></b></center>'
 																'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht13.jpg"></center>'
 																'"We''re almost done... is everything clear, Rolan?"'
@@ -1155,14 +1118,12 @@ if $ARGS[0] = 'chef':
 																*nl
 																'"Now, we just have to let it sit for an hour or so. You can reheat it or just leave it at room temperature. Add some sour cream and..."'
 																act 'Continue':
-																	cla
-																	*clr
+																	*clr & cla
 																	'<center><b><font color = maroon>Borscht</font></b></center>'
 																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/borsh/borscht.jpg"></center>'
 																	'"Voila! Here is our borscht... it''s actually better to eat the next day!"'
 																	act 'Continue':
-																		cla
-																		*clr
+																		*clr & cla
 																		'<center><b><font color = maroon>Dishes</font></b></center>'
 																		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes4.jpg"></center>'
 																		'As Rolan is eating, you tell him, "Don''t forget to clean the dishes when you''re done, so next time they are ready to be used. Here''s a list of ingredients you''ll need for our next lesson. I''ll see you later!"'
@@ -1194,22 +1155,19 @@ if $ARGS[0] = 'chef':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/fridge2.jpg"></center>'
 		'"Today, we''re going to make an Olivier salad, even though it''s not New Years. I think you should already have everything," you begin to grab the ingredients from around the kitchen. "Hmm, a can of sweet peas, a medium sized potato, carrots, eggs, a cucumber, oh! Can''t forget the olive oil. Yup, that''s everything!"'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver0.jpg"></center>'
 			'"First, we need to boil some water."'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver1.jpg"></center>'
 				'"Then, while that''s going, we''ll prepare our vegetables." You move over to the sink and start rinsing the vegetables. "I know you find this part quite a-peeling," you jest.'
 				*nl
 				'You can''t see him, but you can sense Rolan''s eyes rolling at your lame pun.'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver2.jpg"></center>'
 					'"We can add these straight to the water, we''ll dice them up later so it''ll be a bit easier this time. That''ll need about 20 minutes, so Rolan?"'
@@ -1220,16 +1178,14 @@ if $ARGS[0] = 'chef':
 					*nl
 					'"Sure, just give me a moment." Rolan leaves the kitchen but returns almost immediately.'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver3.jpg"></center>'
 						'You hear a strange noise.'
 						*nl
 						'You turn to look at Rolan, "What are you doing?"'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver4.jpg"></center>'
 							'"You wanted me to crack the eggs, no?"'
@@ -1238,34 +1194,29 @@ if $ARGS[0] = 'chef':
 							*nl
 							'"Perhaps a hammer would work better?"'
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver5.jpg"></center>'
 								'You can''t help but laugh at the situation. "Okay, here, let me show you have to crack an egg."'
 								*nl
 								'You grab the eggs from Rolan and move over to a mixing bowl.'
 								act 'Continue':
-									cla
-									*clr
+									*clr & cla
 									'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver6.jpg"></center>'
 									'"Now we''ll use our mixer here to make the mayonnaise. The secret is to pour the oil in really slowly..."'
 									act 'Continue':
-										cla
-										*clr
+										*clr & cla
 										'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver7.jpg"></center>'
 										'A few moments later, the mayonnaise is ready. You lick a little excess mayo from your fingers, "Mmm, that''s good..."'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver8.jpg"></center>'
 											'"Alright, mayo''s done, and the vegetables should be boiled by now. Get them out of the water, but be careful, they''re very hot! I need to change my clothes."'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver9.jpg"></center>'
 												'You return to the kitchen a few minutes later. You''ve removed your clothes and replaced them with only an apron, "Here, what do you think?"'
@@ -1276,44 +1227,38 @@ if $ARGS[0] = 'chef':
 												*nl
 												'He looks a bit flustered, "Uhh, sure, Miss <<$pcs_lastname>>... whatever you say."'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver10.jpg"></center>'
 													'You begin dicing the potatoes and carrots into pieces with Rolan''s help.'
 													*nl
 													'"You see, they were a lot easier to dice this way. Now we''ll add them back to the pot and pour in the mayonnaise."'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver11.jpg"></center>'
 														'"We spray a little cold water to keep the vegetables from cooking our mayonnaise. That''s kinda important, so at least remember this part, Rolan!"'
 														act 'Continue':
-															cla
-															*clr
+															*clr & cla
 															'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 															'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver12.jpg"></center>'
 															'You accidentally spray yourself with water. "...Well, it''s a good thing I remembered the apron!"'
 															act 'Continue':
-																cla
-																*clr
+																*clr & cla
 																'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver13.jpg"></center>'
 																'"I''m absolutely drenched!"'
 																*nl
 																'Rolan says nothing.'
 																act 'Continue':
-																	cla
-																	*clr
+																	*clr & cla
 																	'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver14.jpg"></center>'
 																	'"Need to drain the water from our salad." You prop a foot up on the counter, giving Rolan quite the view, "And I guess i need to air out as well!"'
 																	*nl
 																	'Rolan is trying his best not to stare. You think you hear him mutter, "Don''t look, don''t look, don''t look..."'
 																	act 'Continue':
-																		cla
-																		*clr
+																		*clr & cla
 																		'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver15.jpg"></center>'
 																		'"Rolan, you don''t mind if I leave my leg up like this, do you?"'
@@ -1322,50 +1267,43 @@ if $ARGS[0] = 'chef':
 																		*nl
 																		'"Thank you. I need to let my panties dry out. I don''t want to catch a cold and miss our days together."'
 																		act 'Continue':
-																			cla
-																			*clr
+																			*clr & cla
 																			'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver16.jpg"></center>'
 																			'"Now, where were we? Oh yes, now that the vegetables are cooled off, we can mix in the mayonnaise."'
 																			act 'Continue':
-																				cla
-																				*clr
+																				*clr & cla
 																				'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver17.jpg"></center>'
 																				'"Oh! I nearly forgot!"'
 																				act 'Continue':
-																					cla
-																					*clr
+																					*clr & cla
 																					'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver18.jpg"></center>'
 																					'You bend over and start searching through some cabinets, "Where did we leave the salt and pepper?"'
 																					*nl
 																					'Rolan has a clear view of your wet panties. His eyes are fixated on them.'
 																					act 'Continue':
-																						cla
-																						*clr
+																						*clr & cla
 																						'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver19.jpg"></center>'
 																						'"You don''t want to add too much, otherwise it''ll take away from the flavor and remove all our hard work."'
 																						*nl
 																						'Rolan nods mindlessly along, "...remove the panties, yes, very hard."'
 																						act 'Continue':
-																							cla
-																							*clr
+																							*clr & cla
 																							'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver20.jpg"></center>'
 																							'You giggle at Rolan''s obvious staring. He is so easy. "There, that''s one more meal you can now make Like our borscht, this can be eaten now or you can wait another day and really let the flavors mix together!"'
 																							act 'Continue':
-																								cla
-																								*clr
+																								*clr & cla
 																								'<center><b><font color = maroon>Olivier Salad</font></b></center>'
 																								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/russalad/oliver.jpg"></center>'
 																								'"You need to remember to store this in your refrigerator. Make sure to cover the top with cellophane to keep it fresh, it should last up to about 3 days."'
 																								*nl
 																								'"Wrap the panties and refrigerate, yes."'
 																								act 'Continue':
-																									cla
-																									*clr
+																									*clr & cla
 																									'<center><b><font color = maroon>Dishes</font></b></center>'
 																									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes0.jpg"></center>'
 																									'"Here''s your next list of ingredients, and don''t forget the dishes!" You blow him a kiss as you walk out.'
@@ -1410,26 +1348,22 @@ if $ARGS[0] = 'chef':
 		*nl
 		'Rolan seems to be at a loss for words.'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			'<center><b><font color = maroon>Blini</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini0.jpg"></center>'
 			'"First, we''ll take our eggs and flour and get to work on the batter."'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				'<center><b><font color = maroon>Blini</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini1.jpg"></center>'
 				'"And while we''re doing that, we''ll let our pan get heated up."'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					'<center><b><font color = maroon>Blini</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini2.jpg"></center>'
 					'You crack the eggs into a bowl, "Now, we whisk our eggs."'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						'<center><b><font color = maroon>Blini</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini3.jpg"></center>'
 						'You continue, "...and we add the flour and milk..."'
@@ -1440,20 +1374,17 @@ if $ARGS[0] = 'chef':
 						*nl
 						'"But why?" Rolan asks.'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							'<center><b><font color = maroon>Blini</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini4.jpg"></center>'
 							'"The batter needs to be smooth and creamy. If you''re mixing by hand, it''s much easier to tell. If you use the mixer, you might overdo it and the batter would be lumpy. Lumpy batter makes bad blini."'
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								'<center><b><font color = maroon>Blini</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini5.jpg"></center>'
 								'You finish mixing the batter and check the pan, "Hand mixing also helps pass the time, and now our pan is heated and ready."'
 								act 'Continue':
-									cla
-									*clr
+									*clr & cla
 									'<center><b><font color = maroon>Blini</font></b></center>'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini6.jpg"></center>'
 									'"These shouldn''t take too long, just a minute or two for each side."'
@@ -1461,22 +1392,19 @@ if $ARGS[0] = 'chef':
 									'You continue, "The best part of blini, I think, is the flipping."'
 									act 'Flip':
 										if pcs_agil >= 40 and pcs_agil < 60:
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>Now do a barrel roll.</font></b></center>'
 											'<center><video src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/flipag40.mp4"></center>'
 											'"Miss <<$pcs_lastname>>! Wow! I didn''t expect that!"'
 											*nl
 											'You wink at him, "Pretty soon, you''ll be able to do this as well. All the girls will be flocking here for breakfast!"'
 										elseif	pcs_agil >= 60:
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>You rolled a 20!</font></b></center>'
 											'<center><video src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/flipag60.mp4"></center>'
 											'During your trick, Rolan was given quite the view of your legs, especially your panties.'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Blini</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini8.jpg"></center>'
 												'You stare at Rolan in amusement, "What? Cat got your tongue?"'
@@ -1485,16 +1413,14 @@ if $ARGS[0] = 'chef':
 												*nl
 												'You laugh, "Oh, I guess you''ll be taking our lessons a little more seriously now?"'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													'<center><b><font color = maroon>Blini</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini.jpg"></center>'
 													'You hand Rolan a prepared plate, "Here are the blinis. You can serve them with cream and jam. Enjoy, sleepyhead!"'
 													*nl
 													'Rolan eyes his plate, "Miss <<$pcs_lastname>>, they look delicious!"'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Blini</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes3.jpg"></center>'
 														'"Rolan, please remember to clean up the kitchen after you finish eating!"'
@@ -1507,30 +1433,26 @@ if $ARGS[0] = 'chef':
 												end
 											end
 										else
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>You rolled a 1.</font></b></center>'
 											'<center><video src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/flipag30.mp4"></center>'
 											'Embarrassed, you exclaim, "Oops! That wasn''t supposed to happen!"'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Blini</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini7.jpg"></center>'
 												'Rolan asks in a mocking tone, "Miss <<$pcs_lastname>>... are you sure you''ve done this before?"'
 												*nl
 												'You try to save face, "Yes, yes, yes! I just, uh, wanted to show <b>YOU</b> what <b>NOT</b> to do. Haha, yeah, that''s right!"'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													'<center><b><font color = maroon>Blini</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini.jpg"></center>'
 													'A few minutes later, you''ve prepared another blini. You didn''t bother to show off this time. "Here are our pancakes. You can serve them with cream and jam. Here try these sleepy head."'
 													*nl
 													'Rolan eyes his plate, "Miss <<$pcs_lastname>>, they look delicious!"'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Blini</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes3.jpg"></center>'
 														'"Rolan, please remember to clean up the kitchen after you finish eating!"'
@@ -1544,16 +1466,14 @@ if $ARGS[0] = 'chef':
 											end
 										end
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>Blini</font></b></center>'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blini/blini.jpg"></center>'
 											'You hand Rolan a prepared plate, "Here are the blinis. You can serve them with cream and jam. Enjoy, sleepyhead!"'
 											*nl
 											'Rolan eyes his plate, "Miss <<$pcs_lastname>>, they look delicious!"'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Blini</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes3.jpg"></center>'
 												'"Rolan, please remember to clean up the kitchen after you finish eating!"'
@@ -1573,8 +1493,7 @@ if $ARGS[0] = 'chef':
 			end
 		end
 	elseif rolancooklesson = 5:
-		cla
-		*clr
+		*clr & cla
 		minut += 10
 		rolancooklesson += 1
 		rolan_cooklesson_day = daystart
@@ -1583,8 +1502,7 @@ if $ARGS[0] = 'chef':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/fridge3.jpg"></center>'
 		'You begin rummaging through the kitchen, "Hmm, cider vinegar, bread flour, rye flour, dark corn syrup, brown sugar, unsweetened cocoa powder, instant coffee granules, active dry yeast, butter, water. Perfect!" You turn to face Rolan, "Today, I''m going to show you how to bake some black bread."'
 		act 'Continue':
-		    cla
-			*clr
+		   *clr & cla
 			minut += 10
 			gs 'stat'
 			'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1595,8 +1513,7 @@ if $ARGS[0] = 'chef':
 			*nl
 			'You continue, "The recipe doesn''t mention it, but we''re also going to add a little milk."'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				minut += 5
 				gs 'stat'
 				'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1609,8 +1526,7 @@ if $ARGS[0] = 'chef':
 				*nl
 				'"No, it''s not." Your grin grows wider, "I happen to really like milk!"'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					minut += 5
 					gs 'stat'
 					'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1623,8 +1539,7 @@ if $ARGS[0] = 'chef':
 					*nl
 					'He nods along, "Of course, Miss <<$pcs_lastname>>."'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						minut += 10
 						gs 'stat'
 						'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1637,16 +1552,14 @@ if $ARGS[0] = 'chef':
 						*nl
 						'As you leave the room to ''change'' you swear you hear Rolan mutter, "...she is going to be the death of me, I just know it..."'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							minut += 10
 							gs 'stat'
 							'<center><b><font color = maroon>Black Bread</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blackbread/blackb4.jpg"></center>'
 							'You re-enter the room a few minutes later, your clothes replaced with only the apron. "There, now we can <i>really</i> get to work."'
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								minut += 10
 								gs 'stat'
 								'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1655,8 +1568,7 @@ if $ARGS[0] = 'chef':
 								*nl
 								'Rolan is trying his damnedest to pay attention to your instructions."Uh-huh..."'
 								act 'Continue':
-									cla
-									*clr
+									*clr & cla
 									minut += 60
 									gs 'stat'
 									'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1665,8 +1577,7 @@ if $ARGS[0] = 'chef':
 									*nl
 									'You and Rolan spend the next hour making small talk. He can''t help but occasionally stare at your exposed panties.'
 									act 'Continue':
-										cla
-										*clr
+										*clr & cla
 										minut += 10
 										gs 'stat'
 										'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1675,8 +1586,7 @@ if $ARGS[0] = 'chef':
 										*nl
 										'You try conversing with Rolan again, but by this point the poor man is almost mute. You note the time and tell him to preheat the oven.'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											minut += 10
 											gs 'stat'
 											'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1685,8 +1595,7 @@ if $ARGS[0] = 'chef':
 											*nl
 											'You can feel his eyes trailing you as you exit the room.'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												minut += 30
 												gs 'stat'
 												'<center><b><font color = maroon>Black Bread</font></b></center>'
@@ -1699,16 +1608,14 @@ if $ARGS[0] = 'chef':
 												*nl
 												'"Alright..."'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													minut += 10
 													gs 'stat'
 													'<center><b><font color = maroon>Black Bread</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/blackbread/blackbread.jpg"></center>'
 													'You hand Rolan a plate with a couple of fresh cut slices, "There, our black bread is finished and ready to eat!"'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Black Bread</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes1.jpg"></center>'
 														'"You will remember to clean the dishes before our next lesson, won''t you Rolan?" You hear a muffled reply from the man as he eats, though you couldn''t tell if it was a positive or negative reply. You should just stop asking him at this point.'
@@ -1726,8 +1633,7 @@ if $ARGS[0] = 'chef':
 			end
 		end
 	elseif rolancooklesson = 6:
-		cla
-		*clr
+		*clr & cla
 		minut += 60
 		rolancooklesson += 1
 		rolan_cooklesson_day = daystart
@@ -1739,8 +1645,7 @@ if $ARGS[0] = 'chef':
 		*nl
 		'"No, no, of course not, Miss <<$pcs_lastname>>! I honestly forgot! I should have something you could wear, just give me one moment, please!" He hurries out of the room. You start gathering ingredients.'
 		act 'Continue':
-		    cla
-			*clr
+		    *clr & cla
 			'<center><b><font color = maroon>Stroganoff</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff0.jpg"></center>'
 			'Rolan returns with an old shirt. You slipped off your own clothes and put it on. "Okay, today we''re going to make Beef Stroganoff!"'
@@ -1749,8 +1654,7 @@ if $ARGS[0] = 'chef':
 			*nl
 			'"Yes, what is it?"'
 			act 'Continue':
-				cla
-				*clr
+				*clr & cla
 				'<center><b><font color = maroon>Stroganoff</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff1.jpg"></center>'
 				'"Well, it''s just that, Miss <<$pcs_lastname>>..." He seems hesitant to continue, "I thought you were vegetarian or something..."'
@@ -1761,37 +1665,32 @@ if $ARGS[0] = 'chef':
 				*nl
 				'"Oh, that''s just because we needed to work our way up. It''s much easier to work with vegetables to start with. I wouldn''t expect you to live off only bread and vegetables. You''re a man, not a rabbit, after all!" You laugh remembering your earlier lessons.'
 				act 'Continue':
-					cla
-					*clr
+					*clr & cla
 					'<center><b><font color = maroon>Stroganoff</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff2.jpg"></center>'
 					'"We''ll get rid of the excess fat on this meat by searing it..."'
 					act 'Continue':
-						cla
-						*clr
+						*clr & cla
 						'<center><b><font color = maroon>Stroganoff</font></b></center>'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff3.jpg"></center>'
 						'"It doesn''t need too long, the beef will actually finish cooking when we add it to the stew."'
 						*nl
 						'As you''re moving the beef from the pan to a plate, your shirt slides up giving Rolan an unobstructed view of your panties.'
 						act 'Continue':
-							cla
-							*clr
+							*clr & cla
 							'<center><b><font color = maroon>Stroganoff</font></b></center>'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff4.jpg"></center>'
 							'You wipe your brow, "Whew! I got a little hot there, this shirt doesn''t breathe too well. I hope you don''t mind if I take it off..."'
 							*nl
 							'Rolan doesn''t raise any objections as you pull the shirt off.'
 							act 'Continue':
-								cla
-								*clr
+								*clr & cla
 								'<center><b><font color = maroon>Stroganoff</font></b></center>'
 								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff5.jpg"></center>'
 								'"I hope you''re paying attention to this stew, Rolan. Rolan?" You turn to face him, his eyes are glued to your panties.'
 								if pcs_inhib > 50 and $wornpantytype ! 'none':
 									act 'Tease Rolan further':
-										cla
-										*clr
+										*clr & cla
 										'<center><b><font color = maroon>Stroganoff</font></b></center>'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff6.jpg"></center>'
 										'You sigh and start to put the shirt back on, but then...'
@@ -1799,8 +1698,7 @@ if $ARGS[0] = 'chef':
 										*nl
 										'Rolan doesn''t speak.'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											gs 'panties', 'remove'
 											arousal += 5
 											gs 'stat'
@@ -1810,16 +1708,14 @@ if $ARGS[0] = 'chef':
 											*nl
 											'Rolan only whimpers as he watches your panties slide down your legs.'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Stroganoff</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff8.jpg"></center>'
 												'"We don''t want distractions..."'
 												*nl
 												'Rolan''s eyes look like they might pop out of his head.'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													arousal += 5
 													gs 'stat'
 													'<center><b><font color = maroon>Stroganoff</font></b></center>'
@@ -1828,16 +1724,14 @@ if $ARGS[0] = 'chef':
 													*nl
 													'"N-no, p-please..."'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Stroganoff</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff10.jpg"></center>'
 														'"There, now we''re free to focus on the food."'
 														*nl
 														'"P-please... M-miss <<$pcs_lastname>>... i-it''s worse..."'
 														act 'Continue':
-															cla
-															*clr
+															*clr & cla
 															arousal += 5
 															gs 'panties', 'wear'
 															gs 'stat'
@@ -1848,26 +1742,22 @@ if $ARGS[0] = 'chef':
 															*nl
 															'Short of breath, Rolan manages to respond. "Y-yes."'
 															act 'Continue':
-																cla
-																*clr
+																*clr & cla
 																'<center><b><font color = maroon>Stroganoff</font></b></center>'
 																'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff12.jpg"></center>'
 																'You return your focus to the cooking lesson, "Next, we can add the rest of our ingredients to the pot."'
 																act 'Continue':
-																	cla
-																	*clr
+																	*clr & cla
 																	'<center><b><font color = maroon>Stroganoff</font></b></center>'
 																	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff13.jpg"></center>'
 																	'"Soon, we can add our beef to the mix and let it cook for a few more minutes."'
 																	act 'Continue':
-																		cla
-																		*clr
+																		*clr & cla
 																		'<center><b><font color = maroon>Stroganoff</font></b></center>'
 																		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff.jpg"></center>'
 																		'You prepare a bowl for poor Rolan, still in shock over your earlier show, "Our Stroganoff is ready!"'
 																		act 'Continue':
-																			cla
-																			*clr
+																			*clr & cla
 																			'<center><b><font color = maroon>Stroganoff</font></b></center>'
 																			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes2.jpg"></center>'
 																			'"I hope you''ve enjoyed these lessons, Rolan. I know I have. Oh, and don''t forget the dishes, dear!"'
@@ -1884,16 +1774,14 @@ if $ARGS[0] = 'chef':
 									end
 								end
 								act 'Hey':
-									cla
-									*clr
+									*clr & cla
 									'<center><b><font color = maroon>Stroganoff</font></b></center>'
 									'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff14.jpg"></center>'
 									'You feel a bit bad for Rolan, perhaps you pushed things too far? "...no, Rolan. This is not good. We are working here, you should be focused..."'
 									*nl
 									'"I-I''m sorry..." You put the shirt back on, making sure to cover yourself as much as possible.'
 									act 'Continue':
-										cla
-										*clr
+										*clr & cla
 										'<center><b><font color = maroon>Stroganoff</font></b></center>'
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff15.jpg"></center>'
 										'"It''s okay, Rolan. But we should get back to our cooking."'
@@ -1902,26 +1790,22 @@ if $ARGS[0] = 'chef':
 										*nl
 										'You turn your attention back to the stove, "Okay, so... where were we?"'
 										act 'Continue':
-											cla
-											*clr
+											*clr & cla
 											'<center><b><font color = maroon>Stroganoff</font></b></center>'
 											'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff12.jpg"></center>'
 											'You begin to add the remainder of the ingredients to the pot.'
 											act 'Continue':
-												cla
-												*clr
+												*clr & cla
 												'<center><b><font color = maroon>Stroganoff</font></b></center>'
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff13.jpg"></center>'
 												'"Soon, we can add our beef to the mix and let it cook for a few more minutes."'
 												act 'Continue':
-													cla
-													*clr
+													*clr & cla
 													'<center><b><font color = maroon>Stroganoff</font></b></center>'
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/stroganoff/stroganoff.jpg"></center>'
 													'You prepare a bowl for Rolan, who has been noticeably quiet for the past few minutes, though he hasn''t been staring at you like before. "Here, our Stroganoff is ready!"'
 													act 'Continue':
-														cla
-														*clr
+														*clr & cla
 														'<center><b><font color = maroon>Stroganoff</font></b></center>'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/aptrolan/kitch/lesson/dishes2.jpg"></center>'
 														'"I hope you''ve enjoyed our cooking lessons, Rolan. Oh, don''t forget the dishes, dear!"'

+ 2 - 2
locations/sauna.qsrc

@@ -96,9 +96,9 @@ if $ARGS[0] = 'saunaroom':
 	'<br>Hanging on the wall is a dirty <a href="exec:gt ''mirror'', ''start''">mirror</a>. The floor is littered with dozens of porn magazines, and a selection of adult toys are scattered throughout the room. There''s so much crap laying around, there''s barely enough space to do some basic <a href="exec:gt ''sauna'', ''saunafitness''">exercise</a>.'
 
 	if budilnikOn = 0:
-		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & GT ''sauna'', ''saunaroom''">off</a>.'
+		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 1 & gt ''sauna'', ''saunaroom''">off</a>.'
 	else
-		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & GT ''sauna'', ''saunaroom''">on</a>.'
+		'<br>Your <a href="exec:gt ''budilnik'', ''start''">alarm clock</a> is set for <<timer>> hours <<timerM>> minutes and currently turned <a href="exec: budilnikOn = 0 & gt ''sauna'', ''saunaroom''">on</a>.'
 	end
 
 	if SaunaWhore > 0 and money > 0 and workDolg > 0:

+ 1 - 1
locations/saunawhore.qsrc

@@ -1034,7 +1034,7 @@ if $ARGS[0] = 'bathroom':
 	'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
 	''
 	'You enter the staff bathroom, which is usually cleaned by the girls that have only just started work here, voluntary or otherwise.'
-	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet, and basin.'
+	'There is a <a href="exec:gt ''mirror'', ''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower, toilet, and basin.'
 
 	act 'Return to foyer': minut += 1 & gt 'saunawhore', 'saunawork'
 

+ 15 - 15
locations/sbReksHome.qsrc

@@ -82,19 +82,19 @@ if $ARGS[0] = 'party_home':
 	gs'stat'
 	'<center><b><font color = maroon>Rex''s Room</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_1_' + rand(1,5) + '.jpg"></center>'
-	'Sitting at a table and drinking with your friends, sitting to one side of you sharing a bottle as always is <a href="exec:GT ''lena'',''lena''">Lena</a> who is always fun, her slightly more reserved friend <a href="exec:GT ''ira'',''ira''">Ira</a>, and always up beat <a href="exec:GT ''reks'',''party''">Rex</a>.'
-	'To your other side sits your sister <a href="exec:GT ''sister_party'',''sister_party''">Anya</a> drinking already and <a href="exec:GT ''roma''">Roma</a>, whom himself sits just a bit away looking more serious than normal, plus lots of <a href="exec:GT ''party_girls'',''party_girls''">girls</a> and <a href="exec:GT ''party_boys'',''party_boys''">guys</a> you barely know.'
-	if alko < 3:'One of the guys offers you a bottle to <a href="exec:GT ''sbReksHome'',''party_drink''">drink</a> from as they say "A little more to set the mood."'
+	'Sitting at a table and drinking with your friends, sitting to one side of you sharing a bottle as always is <a href="exec:gt ''lena'',''lena''">Lena</a> who is always fun, her slightly more reserved friend <a href="exec:gt ''ira'',''ira''">Ira</a>, and always up beat <a href="exec:gt ''reks'',''party''">Rex</a>.'
+	'To your other side sits your sister <a href="exec:gt ''sister_party'',''sister_party''">Anya</a> drinking already and <a href="exec:gt ''roma''">Roma</a>, whom himself sits just a bit away looking more serious than normal, plus lots of <a href="exec:gt ''party_girls'',''party_girls''">girls</a> and <a href="exec:gt ''party_boys'',''party_boys''">guys</a> you barely know.'
+	if alko < 3:'One of the guys offers you a bottle to <a href="exec:gt ''sbReksHome'',''party_drink''">drink</a> from as they say "A little more to set the mood."'
 	!You''re drunk
 	if alko >= 3:
 		*clr
 		gs'stat'
 		'<center><b><font color = maroon>Rex''s Room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_party_home_1_' + rand(1,5) + '.jpg"></center>'
-		'After awhile everyone gets up to go dance and drink. Only a few <a href="exec:GT ''party_girls'',''party_girls''">girls</a>, are left in the room, who are fun to hang out and gossip with.'
-		iif(party_girls_talk >= 2,'You <a href="exec:GT ''party_girls'',''talk''">chat</a> and gossip with them. One of the girls pulls out some marijuana and invites all of you to <a href="exec:GT ''party_girls'',''smoke''">have a smoke</a>.','You <a href="exec:GT ''party_girls'',''talk''">chat</a> and gossip with them.')
+		'After awhile everyone gets up to go dance and drink. Only a few <a href="exec:gt ''party_girls'',''party_girls''">girls</a>, are left in the room, who are fun to hang out and gossip with.'
+		iif(party_girls_talk >= 2,'You <a href="exec:gt ''party_girls'',''talk''">chat</a> and gossip with them. One of the girls pulls out some marijuana and invites all of you to <a href="exec:gt ''party_girls'',''smoke''">have a smoke</a>.','You <a href="exec:gt ''party_girls'',''talk''">chat</a> and gossip with them.')
 		if pcs_mood = 100 and pcs_horny >= 50 and girls_smoke > 1:
-			'All the girls are in a good mood, and several of them excited pull you with them to have some <a href="exec:GT ''party_girls'',''fun''">fun</a>.'
+			'All the girls are in a good mood, and several of them excited pull you with them to have some <a href="exec:gt ''party_girls'',''fun''">fun</a>.'
 		end
 	end
 	act 'Go to the living room':gt'sbReksHome','party_gost'
@@ -132,14 +132,14 @@ if $ARGS[0] = 'party_gost':
 	if alko < 3:
 		'<center><b><font color = maroon>Living room</font></b></center>'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_3.jpg"></center>'
-		'This is a large living room, hardly anyone is here, most are all still sitting in the other room talking and drinking. Only one <a href="exec:GT ''party_boy'',''party_boy''">guy</a> is in here tinkering with a turntable.'
+		'This is a large living room, hardly anyone is here, most are all still sitting in the other room talking and drinking. Only one <a href="exec:gt ''party_boy'',''party_boy''">guy</a> is in here tinkering with a turntable.'
 	elseif alko >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/reksparty_4_' + rand(1,8) + '.jpg"></center>'
-		'The party is in full swing. In one corner a <a href="exec:GT ''party_boy'',''party_boy''">guy</a> the party DJ is spinning the beats at the turntable. You want to give it a try and <a href="exec:gt ''dinParty'', ''dance''">spin some beats</a>.'
-		'<a href="exec:GT ''roma''">Roma</a> and <a href="exec:GT ''sister_party'',''sister_party''">Anya</a> are locked together having fun dancing.'
-		if Rex_Love =0:'<a href="exec:GT ''reks'',''party''">Rex</a> is having fun dancing with some <a href="exec:GT ''party_girls'',''party_girls''">girls</a>.'
-		if Rex_Love =1:'You are dancing with some <a href="exec:GT ''party_girls'',''party_girls''">girls</a> and <a href="exec:GT ''reks'',''party''">Rex</a>, who looks at you with loving eyes.'
-		'<a href="exec:GT ''lena'',''lena''">Lena</a> and <a href="exec:GT ''ira'',''ira''">Ira</a> are having fun in the company of drunken <a href="exec:GT ''party_boys'',''party_boys''">guys</a>.'
+		'The party is in full swing. In one corner a <a href="exec:gt ''party_boy'',''party_boy''">guy</a> the party DJ is spinning the beats at the turntable. You want to give it a try and <a href="exec:gt ''dinParty'', ''dance''">spin some beats</a>.'
+		'<a href="exec:gt ''roma''">Roma</a> and <a href="exec:gt ''sister_party'',''sister_party''">Anya</a> are locked together having fun dancing.'
+		if Rex_Love =0:'<a href="exec:gt ''reks'',''party''">Rex</a> is having fun dancing with some <a href="exec:gt ''party_girls'',''party_girls''">girls</a>.'
+		if Rex_Love =1:'You are dancing with some <a href="exec:gt ''party_girls'',''party_girls''">girls</a> and <a href="exec:gt ''reks'',''party''">Rex</a>, who looks at you with loving eyes.'
+		'<a href="exec:gt ''lena'',''lena''">Lena</a> and <a href="exec:gt ''ira'',''ira''">Ira</a> are having fun in the company of drunken <a href="exec:gt ''party_boys'',''party_boys''">guys</a>.'
 	end
 	act 'Go to the Rex''s room':gt'sbReksHome','party_home'
 	act 'Go to the kitchen':gt'sbReksHome','party_kuh'
@@ -157,9 +157,9 @@ if $ARGS[0] = 'party_kuh':
 	gs'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/party/kuh.jpg"></center>'
-	'The kitchen is spacious, but kinda dirty. The kitchen table is covered in cans and bottles of beer as well as 5th''s of booze. You can grab any bottle you want and <a href="exec:GT ''sbReksHome'',''party_drink''">drink</a>.'
+	'The kitchen is spacious, but kinda dirty. The kitchen table is covered in cans and bottles of beer as well as 5th''s of booze. You can grab any bottle you want and <a href="exec:gt ''sbReksHome'',''party_drink''">drink</a>.'
 	if party_dj =1 and dj_beer < 1:'You grab two bottles and <a href="exec:gt ''dinParty'', ''dj''">take</a> them for the DJ.'
-	if alko >= 3: 'Some <a href="exec:GT ''party_boys'',''party_boys''">guys</a> bang their empty drinks down on the table, refilling they offer a cup to you and try to get you to <a href="exec:GT ''party_boys'',''drink''">drink</a> with them.'
+	if alko >= 3: 'Some <a href="exec:gt ''party_boys'',''party_boys''">guys</a> bang their empty drinks down on the table, refilling they offer a cup to you and try to get you to <a href="exec:gt ''party_boys'',''drink''">drink</a> with them.'
 	act 'Go to the living room':gt'sbReksHome','party_gost'
 end
 
@@ -177,7 +177,7 @@ if $ARGS[0] = 'party_toilet':
 	'<center><b><font color = maroon>Toilet</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/rekshome/toilet.jpg"></center>'
 
-	'Here you can wash your face, freshen up or touch up your make up at <a href="exec:GT ''mirror'',''start''">mirrors</a>.'
+	'Here you can wash your face, freshen up or touch up your make up at <a href="exec:gt ''mirror'',''start''">mirrors</a>.'
 	if pcs_horny > 50:'Feeling yourself ready to burst with desire, you can''t take it anymore and begin to <a href="exec:gt ''dinParty'', ''toilet_mast''">masturbate</a>.'
 	act 'Go to the living room':gt 'sbReksHome','party_gost'
 	if cumloc[11] = 1 or cumloc[12] = 1:

+ 1 - 1
locations/shulga_room.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 		end
 	end
 
-	'There are two sofas next to a <a href="exec: gt ''shulga_room'', ''shultv''">TV</a>, and a <a href="exec:GT ''Komp'',''start''">laptop</a> sitting on a table covered in empty beer bottles.'
+	'There are two sofas next to a <a href="exec: gt ''shulga_room'', ''shultv''">TV</a>, and a <a href="exec:gt ''Komp'',''start''">laptop</a> sitting on a table covered in empty beer bottles.'
 	if hour >= 0 and hour < 7: '<a href="exec: gt ''shulga_room'', ''shulga_bazar_sleep''">Vasily</a> is sleeping on the big couch'
 
 	shulga_room_rnd = RAND(0,2)

+ 1 - 1
locations/shulgabath.qsrc

@@ -30,7 +30,7 @@ if $ARGS[0] = 'start':
 	'<center><b><font color = maroon>Bathroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/vanna.jpg"></center>'
 	*nl
-	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec:GT ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and bath tub.'
+	'Uncle Sergey''s bathroom is small and very unpretentious. Nevertheless, it has everything a bathroom needs. There is a <a href="exec:gt ''mirror'',''start''">mirror</a> above the sink, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, a shower and bath tub.'
 	*nl
 
 	act 'Return to the hallway': gt'shulgahall'

+ 3 - 3
locations/shulgabed.qsrc

@@ -17,10 +17,10 @@ if $ARGS[0] = '' or $ARGS[0] = 'wakeup':
 	*nl
 	'Sergey''s bedroom looks just like any other bedroom. There''s a large bed, a television with a VCR connected to it, and a large cabinet to store clothes in. A random amount of junk is deposited on one of the nightstands.'
 
-	if hour < 7 or hour >= 23: 'When you come in you see that<<$serg_obr>> <a href="exec:GT ''Serge_Shulgin'',''sleep''">Sergey</a> is currently on his bed, sound asleep.'
+	if hour < 7 or hour >= 23: 'When you come in you see that<<$serg_obr>> <a href="exec:gt ''Serge_Shulgin'',''sleep''">Sergey</a> is currently on his bed, sound asleep.'
 
-	if week < 6 and ((hour >= 16 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec:GT ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
-	if week >= 6 and ((hour >= 7 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec:GT ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
+	if week < 6 and ((hour >= 16 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec:gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
+	if week >= 6 and ((hour >= 7 and hour < 18) or (hour >= 21 and hour < 23)): 'When you come in you see that<<$serg_obr>> <a href="exec:gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
 
 	if week < 6 and hour >= 7 and hour < 16: gs 'shulgabed', 'sleep'
 

+ 3 - 3
locations/sitr2x.qsrc

@@ -24,11 +24,11 @@ gs 'themes', 'indoors'
 '<center><b><font color = maroon>Hall</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/sitr2.jpg"></center>'
 
-'huge plasma <a href="exec:GT ''TV'',''start''">TV</a>'
+'huge plasma <a href="exec:gt ''TV'',''start''">TV</a>'
 
-'luxurious <a href="exec:GT ''divan'',''start''">leather sofa</a>'
+'luxurious <a href="exec:gt ''divan'',''start''">leather sofa</a>'
 
-'modern <a href="exec:GT ''stol'',''start''">curbstones</a>'
+'modern <a href="exec:gt ''stol'',''start''">curbstones</a>'
 
 if obruch > 0:'In the corner stands a hoop.'
 if skak > 0:'On a shelf is a jump rope.'

+ 6 - 6
locations/street.qsrc

@@ -108,11 +108,11 @@ else
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
 		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalia Petrovnas</a> apartment.'
 	elseif lesbiday ! daystart and subdom = 2:
-		gs'show_table','<a href="exec:GT ''lesbisubhouse'', ''start''">Your slaves</a> apartment.','3'
+		gs'show_table','<a href="exec:gt ''lesbisubhouse'', ''start''">Your slaves</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
-		gs'show_table','<a href="exec:GT ''lesbidomhouse'', ''start''">Mistress''</a> apartment.','3'
+		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''</a> apartment.','3'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 13:
-		gs'show_table','<a href="exec:GT ''lesbimistress'', ''start''">Mistress''</a> apartment.','3'
+		gs'show_table','<a href="exec:gt ''lesbimistress'', ''start''">Mistress''</a> apartment.','3'
 	end
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
@@ -137,11 +137,11 @@ if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
 		'<a href="exec:gt ''lesbidomhouse'', ''start''">Natalia Petrovna''s</a> apartment.'
 	elseif lesbiday ! daystart and subdom = 2:
-		'<a href="exec:GT ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.'
+		'<a href="exec:gt ''lesbisubhouse'', ''start''">Your slave''s</a> apartment.'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 2 and lesbiQW < 13:
-		'<a href="exec:GT ''lesbidomhouse'', ''start''">Mistress''</a> apartment.'
+		'<a href="exec:gt ''lesbidomhouse'', ''start''">Mistress''</a> apartment.'
 	elseif lesbiday ! daystart and hour >= 8 and hour < 22 and lesbiQW >= 13:
-		'<a href="exec:GT ''lesbimistress'', ''start''">Mistress''</a> apartment.'
+		'<a href="exec:gt ''lesbimistress'', ''start''">Mistress''</a> apartment.'
 	end
 end
 

+ 1 - 1
locations/tanhousezal.qsrc

@@ -574,7 +574,7 @@ elseif hour > 17 and hour < 20 and housezalrand > 8 and nikslut = 1 and niksexda
 	end
 end				
 
-if hour >= 20 and hour < 23 and tanwork = 1: 'You see <a href="exec:GT ''tanNicholas''">Nicholas</a>, the head of the household, sitting on the couch, relaxing after a doubtlessly busy day with a glass of whiskey in his hand, lazily flipping through channels.'
+if hour >= 20 and hour < 23 and tanwork = 1: 'You see <a href="exec:gt ''tanNicholas''">Nicholas</a>, the head of the household, sitting on the couch, relaxing after a doubtlessly busy day with a glass of whiskey in his hand, lazily flipping through channels.'
 
 --- tanhousezal ---------------------------------
 

+ 2 - 2
locations/torgcentr.qsrc

@@ -66,9 +66,9 @@ end
 		*p ' - '
 	*p'<a href="exec:gt ''butik'', ''start''">Mon Chéri</a>'
 		*p ' - '
-	*p '<a href="exec:torg = 1 & GT ''budgetclothes'',''start''">G&M Store</a>'
+	*p '<a href="exec:torg = 1 & gt ''budgetclothes'',''start''">G&M Store</a>'
 		*p ' - '
-	*p '<a href="exec:GT ''NewCloShop'',''start''">Fashionista</a>'
+	*p '<a href="exec:gt ''NewCloShop'',''start''">Fashionista</a>'
 	
 	*nl
 	*nl

+ 1 - 1
locations/ugol.qsrc

@@ -6,7 +6,7 @@ gs 'stat'
 
 act 'Leave':gt 'liam'
 
-'<a href="exec:GT ''artstudia'',''bodimod1''">Quiet courtyard</a>.'
+'<a href="exec:gt ''artstudia'',''bodimod1''">Quiet courtyard</a>.'
 
 if pcs_horny >= 90 and pcs_inhib > 30: 
     act 'Masturbate':

+ 4 - 4
locations/vanr.qsrc

@@ -25,12 +25,12 @@ gs 'themes', 'indoors'
 
 if remvanr = 0:
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/vanr.jpg"></center>'
-	'Your bathroom is old and in a bad state, the suite is unattractive and stained but at least the <a href="exec:GT ''mirror'',''start''">mirror</a> is reasonably new. '
-	'Your ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' sits on the small shelf, below the mirror.'
+	'Your bathroom is old and in a bad state, the suite is unattractive and stained but at least the <a href="exec:gt ''mirror'',''start''">mirror</a> is reasonably new. '
+	'Your ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' sits on the small shelf, below the mirror.'
 elseif remvanr = 1:
 	'<center><img <<$set_imgh>> src="images/locations/shared/bathroom/vanr2.jpg"></center>'
-	'Your bathroom is new and in good condition, the suite is modern, your <a href="exec:GT ''mirror'',''start''">mirror</a> is perfect and everything looks clean and fresh.'
-	'Your ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' sits on the small shelf, below the mirror.'
+	'Your bathroom is new and in good condition, the suite is modern, your <a href="exec:gt ''mirror'',''start''">mirror</a> is perfect and everything looks clean and fresh.'
+	'Your ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' sits on the small shelf, below the mirror.'
 end
 
 	gs 'din_van', 'private'

+ 1 - 1
locations/vanr2x.qsrc

@@ -21,7 +21,7 @@ gs'stat'
 gs 'themes', 'indoors'
 '<center><b><font color = maroon>Bathroom</font></b></center>'
 '<center><img <<$set_imgh>> src="images/locations/oldtown/apartment/vanr2x.jpg"></center>'
-'Above the sink hangs a <a href="exec:GT ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
+'Above the sink hangs a <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair.'
 
 gs 'din_van', 'private'
 gs 'din_van', 'misery'

+ 1 - 1
locations/vanrPar.qsrc

@@ -17,7 +17,7 @@ if $ARGS[0] = '':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/home/vanrpar.jpg"></center>'
 	'The bathroom is very small and unimpressive. Nevertheless, it has everything you need:'
 	*nl
-	'A shower, toilet, sink, <a href="exec:GT ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:GT ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
+	'A shower, toilet, sink, <a href="exec:gt ''mirror'',''start''">mirror</a>, where you can ' + iif(pcs_hairbsh = 0,'<a href="exec:gt ''mirror'',''brush''">brush</a>','brush') + ' your hair, and even a bath tub.'
 	*nl
 
 	if vanr_lock = 0:

+ 1 - 1
locations/vecher.qsrc

@@ -9,7 +9,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/university/dorm/sex/party/vecher.jpg"></center>'
 
 	'You turn up to a Friday night party.'
-	'A large crowd gathers on the senior''s floor, some people looking for others to play<a href="exec:GT ''vecher'',''twister''">twister</a>.'
+	'A large crowd gathers on the senior''s floor, some people looking for others to play<a href="exec:gt ''vecher'',''twister''">twister</a>.'
 	act 'Leave':gt 'dorm', 'korr'
 
 	act 'Dance':

+ 1 - 1
locations/yzal.qsrc

@@ -15,7 +15,7 @@ gs 'stat'
 if ymanrem[7] = 0:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/ynill.jpg"></center>'
 if ymanrem[7] = 1:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yrem.jpg"></center>'
 if ymanrem[7] = 2:'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/yzal.jpg"></center>'
-if ymanrem[7] = 2:'You can watch <a href="exec:GT ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
+if ymanrem[7] = 2:'You can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
 gs 'subkid'
 
 act 'Leave the room':minut += 1 & gt 'ymans'

+ 2 - 2
locations/zsoft_gopskverGorSlut.qsrc

@@ -172,9 +172,9 @@ if $ARGS[0] = '2':
 	'<<$beer_text_bazar>>'
 	''
 
-	if alko<6:'Go into the bushes for a <a href="exec:GT ''zsoft_gopskverGorSlut'',''piss''">pee break</a>.'
+	if alko<6:'Go into the bushes for a <a href="exec:gt ''zsoft_gopskverGorSlut'',''piss''">pee break</a>.'
 	r_event_p=rand(1,100)
-	if r_event_p <= 15 and alko < 6:'The guys suggest: "Hey <<$pcs_nickname>>, show us your tits!" (<a href="exec:GT ''zsoft_gopskverGorSlut'',''siski''">Show them.</a>)'
+	if r_event_p <= 15 and alko < 6:'The guys suggest: "Hey <<$pcs_nickname>>, show us your tits!" (<a href="exec:gt ''zsoft_gopskverGorSlut'',''siski''">Show them.</a>)'
 
 	if alko<6:act 'Leave':gt 'gskver', 'start'