42 Commits 23681272a4 ... 7baef5855f

Author SHA1 Message Date
  KevinSmarts 7baef5855f Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten 0d2f8ff68d [text edit] Minor spelling error in casino. 4 years ago
  KevinSmarts fada498a9d Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  VioletKitten ed64ffcec6 [text edit] Minor spelling error. 4 years ago
  VioletKitten 304d374d15 [fixes] Missing colon in sexshop. 4 years ago
  KevinSmarts dcade84c34 [fixes] Extra commas removed, found by analyser 4 years ago
  KevinSmarts 350d947b15 Merge remote-tracking branch 'netuttki/master' 4 years ago
  Netuttki a070c6335d Updated with the new location names. 4 years ago
  Netuttki 19590ad6b2 Updated to refer to the new location names 4 years ago
  Netuttki 3a59dc3d1d Added city_ prefix and removed capital letters where needed 4 years ago
  Netuttki dfc00b0303 Renamed narkopriton to city_drugden 4 years ago
  Netuttki 7eaf65ca66 Renamed poli to city_clinic 4 years ago
  Netuttki fb837d4331 Renamed clener to city_smalloffice and torgpred to city_trademission 4 years ago
  Netuttki 5eaece4db0 Renamed poli to city_clinic 4 years ago
  Netuttki ee1f849614 Renaming the drug den related files to have the city_ prefix. 4 years ago
  Netuttki 03f04f96ef Renamed klofdomhouse to city_jorahouse 4 years ago
  Netuttki e121db02a3 Renamed Roadhouse coffee location and related files to city_kafe* 4 years ago
  KevinSmarts 20f452a0ff [fixed] Missing goto 4 years ago
  KevinSmarts aee8d1593a [changed] Renamed pav library and fixed teh club file wrong name 4 years ago
  KevinSmarts 5e3a6185eb [changed] Renamed main pav hubs to use pav_ prefix and remove capitals 4 years ago
  KevinSmarts 9e38999183 [Changed] Renamed pav community center and teh hub for clubs there to more fitting names 4 years ago
  KevinSmarts 4ad0cebc9f Merge remote-tracking branch 'Philo/master' 4 years ago
  philormand 01b473e4b8 [Fixes][Text Edit] Moved Parrot story variables to an array, fixed text in a few places 4 years ago
  KevinSmarts cf054db943 Merge remote-tracking branch 'Vengence_11/master' 4 years ago
  KevinSmarts 8eb3aa1326 Merge remote-tracking branch 'Philo/master' 4 years ago
  KevinSmarts 753f7fdddb [changed] Renamed factory in Pav to pav_factory 4 years ago
  KevinSmarts c500354724 [changed] Ranamed pharmacy in pav to pav_pharmacy 4 years ago
  philormand 78f726cd48 Merge remote-tracking branch 'upstream/master' 4 years ago
  Vengeance11 639a17ef37 [text edits] Updated Albina and Bella chat options at school along with proofreading. Lots and lots of proofreading. 4 years ago
  KevinSmarts 10e2d59668 [Fixed] REmoved old reference but it included a bracket which broken the whole game, oops! 4 years ago
  philormand ed02eac289 [Text Edit] added time and location to the nerd game night reminder in the journal 4 years ago
  KevinSmarts 83a57bc595 [removed] Old Tanya apartment which was replaced by the nich named after her dad 4 years ago
  KevinSmarts c4f1785073 [Removed] Old fight files that are no longer in use 4 years ago
  KevinSmarts 57ae6dcedc Merge remote-tracking branch 'Philo/master' 4 years ago
  KevinSmarts 22502d647c Merge remote-tracking branch 'Violet_Kitten/master' 4 years ago
  philormand 109efdf8ca Added reminder of the day for the nerd game night in the journal, minor changes of you to your for social groups 4 years ago
  VioletKitten f0ffad10ac [changed] Swapped old inner thought system for new one in Niko files. I hope it works. 4 years ago
  KevinSmarts 65bbe3e5eb [chnaged] Swapped fuchsia colour out for magenta in font options 4 years ago
  richard_butte bd2286e7e8 changed fucshia to magenta, just for kitten :) 4 years ago
  richard_butte 5b9ac5fb5e unborked my borking. moved inner thought stuff to preSYS instead of stat 4 years ago
  richard_butte 80a1c9404c set default inner thought style 4 years ago
  KevinSmarts 80385237ec [fixed] reverting change I made to park name in these files in error and use of *nl for new line. 4 years ago
100 changed files with 1643 additions and 3380 deletions
  1. 26 47
      glife.qproj
  2. 2 2
      locations/AlbFatherQW.qsrc
  3. 1 1
      locations/AlbStarsEnd.qsrc
  4. 8 8
      locations/AleksandraHome.qsrc
  5. 1 1
      locations/Cheatmenu_din.qsrc
  6. 1 1
      locations/FedorEv.qsrc
  7. 18 18
      locations/FedorEv2.qsrc
  8. 1 1
      locations/FedorEv3.qsrc
  9. 4 4
      locations/FedorEv4.qsrc
  10. 3 3
      locations/FedorMisc.qsrc
  11. 43 43
      locations/Gnpc2.qsrc
  12. 1 1
      locations/JuliaMilHome.qsrc
  13. 1 1
      locations/KatjaHome.qsrc
  14. 6 6
      locations/KatjaHomeTalk.qsrc
  15. 1 1
      locations/LBZhouse.qsrc
  16. 4 4
      locations/LariskaHome.qsrc
  17. 9 9
      locations/LariskaStart.qsrc
  18. 1 1
      locations/MeynoldHome.qsrc
  19. 7 7
      locations/NikoDates.qsrc
  20. 19 19
      locations/NikoDreams.qsrc
  21. 7 7
      locations/NikoEv.qsrc
  22. 25 25
      locations/NikoEv2.qsrc
  23. 5 5
      locations/NikoMeyHome.qsrc
  24. 23 23
      locations/NikoWhore.qsrc
  25. 20 20
      locations/ParChurch.qsrc
  26. 1 1
      locations/ParkKafe.qsrc
  27. 1 1
      locations/abduction.qsrc
  28. 17 17
      locations/albinahome.qsrc
  29. 1 1
      locations/albinaporog.qsrc
  30. 2 2
      locations/arturHome.qsrc
  31. 1 1
      locations/arturend.qsrc
  32. 0 482
      locations/atak.qsrc
  33. 0 284
      locations/atakA.qsrc
  34. 0 305
      locations/atakA1.qsrc
  35. 0 137
      locations/atakB.qsrc
  36. 0 136
      locations/atakB1.qsrc
  37. 0 186
      locations/atakM.qsrc
  38. 2 2
      locations/bank.qsrc
  39. 2 2
      locations/barbershop.qsrc
  40. 1 1
      locations/bass.qsrc
  41. 37 37
      locations/bedrPar.qsrc
  42. 1 1
      locations/belpicknick.qsrc
  43. 1 1
      locations/boilerroom.qsrc
  44. 0 52
      locations/boxing.qsrc
  45. 1 1
      locations/brother_voyeur.qsrc
  46. 1 1
      locations/budgetclothes.qsrc
  47. 3 3
      locations/carF.qsrc
  48. 1 1
      locations/casino.qsrc
  49. 20 20
      locations/city_bobka.qsrc
  50. 92 92
      locations/city_clinic.qsrc
  51. 4 4
      locations/city_dima.qsrc
  52. 35 35
      locations/city_drugden.qsrc
  53. 16 16
      locations/city_irinaroom.qsrc
  54. 66 66
      locations/city_jorahouse.qsrc
  55. 71 71
      locations/city_kafe.qsrc
  56. 39 39
      locations/city_kafe2.qsrc
  57. 18 18
      locations/city_kafeend.qsrc
  58. 20 20
      locations/city_kafeevents2.qsrc
  59. 8 8
      locations/city_kafeevents3.qsrc
  60. 39 39
      locations/city_kavkazkafe.qsrc
  61. 9 9
      locations/city_pharmacy.qsrc
  62. 11 11
      locations/city_residential.qsrc
  63. 38 38
      locations/city_smalloffice.qsrc
  64. 9 9
      locations/city_trademission.qsrc
  65. 2 2
      locations/dateF.qsrc
  66. 3 3
      locations/dateM.qsrc
  67. 0 107
      locations/defence.qsrc
  68. 15 15
      locations/dimaEv.qsrc
  69. 18 18
      locations/dimaHome.qsrc
  70. 2 2
      locations/dimaRevenge.qsrc
  71. 12 12
      locations/dimalina.qsrc
  72. 1 1
      locations/din_npc.qsrc
  73. 1 1
      locations/dina.qsrc
  74. 1 1
      locations/dinnpc.qsrc
  75. 1 1
      locations/dom_gor.qsrc
  76. 1 1
      locations/ender.qsrc
  77. 3 3
      locations/etoexhib.qsrc
  78. 3 3
      locations/events.qsrc
  79. 3 3
      locations/family.qsrc
  80. 1 1
      locations/fbDormD.qsrc
  81. 1 1
      locations/fbHouse.qsrc
  82. 1 1
      locations/food_menu.qsrc
  83. 2 2
      locations/furisex.qsrc
  84. 4 4
      locations/gdkin.qsrc
  85. 7 7
      locations/gdksex.qsrc
  86. 9 9
      locations/gdksport.qsrc
  87. 3 3
      locations/gdktoilet.qsrc
  88. 1 1
      locations/gdktoilet_womens.qsrc
  89. 5 5
      locations/gevent.qsrc
  90. 1 1
      locations/glake.qsrc
  91. 2 2
      locations/gopnik_house.qsrc
  92. 3 3
      locations/gopnik_initiation.qsrc
  93. 1 1
      locations/gopskver.qsrc
  94. 4 4
      locations/gpoli.qsrc
  95. 43 43
      locations/gschool_chats.qsrc
  96. 204 228
      locations/gschool_chats1.qsrc
  97. 99 102
      locations/gschool_chats2.qsrc
  98. 212 212
      locations/gschool_chats3.qsrc
  99. 165 165
      locations/gschool_events.qsrc
  100. 4 4
      locations/gschool_grounds.qsrc

+ 26 - 47
glife.qproj

@@ -161,8 +161,8 @@
 		<Location name="lesbidomhouse"/>
 		<Location name="lesbimistress"/>
 		<Location name="lesbisubhouse"/>
-		<Location name="cafe2"/>
-		<Location name="cafe3"/>
+		<Location name="city_kafeevents2"/>
+		<Location name="city_kafeevents3"/>
 		<Location name="ParkKafe"/>
 	</Folder>
 	<Folder name="Magic Quests">
@@ -203,23 +203,12 @@
 	</Folder>
 	<Folder name="Combat">
 		<Location name="fight"/>
-		<Location name="strelba"/>
 		<Location name="before"/>
 		<Location name="init"/>
-		<Location name="boxing"/>
 		<Location name="magik"/>
-		<Location name="enemy"/>
-		<Location name="atak"/>
-		<Location name="atakA"/>
-		<Location name="atakA1"/>
-		<Location name="atakB"/>
-		<Location name="atakB1"/>
-		<Location name="atakM"/>
 		<Location name="ender"/>
 		<Location name="nill"/>
 		<Location name="test"/>
-		<Location name="priziv"/>
-		<Location name="defence"/>
 		<Location name="kikbox"/>
 		<Location name="initKik"/>
 		<Location name="Kikatak"/>
@@ -268,24 +257,24 @@
 	</Folder>
 	<Folder name="Home Street - Locations">
 		<Location name="city_residential"/>
-		<Location name="pharmacy"/>
-		<Location name="clener"/>
-		<Location name="dima"/>
+		<Location name="city_pharmacy"/>
+		<Location name="city_smalloffice"/>
+		<Location name="city_dima"/>
 		<Location name="dinsexgivi"/>
-		<Location name="IrinaRoom"/>
-		<Location name="kafe"/>
-		<Location name="kafe2"/>
-		<Location name="kafeend"/>
-		<Location name="kavkazkafe"/>
-		<Location name="klofdomhouse"/>
+		<Location name="city_irinaroom"/>
+		<Location name="city_kafe"/>
+		<Location name="city_kafe2"/>
+		<Location name="city_kafeend"/>
+		<Location name="city_kavkazkafe"/>
+		<Location name="city_jorahouse"/>
 		<Location name="city_lake"/>
 		<Location name="dort"/>
-		<Location name="narkopriton"/>
-		<Location name="bobka"/>
+		<Location name="city_drugden"/>
+		<Location name="city_bobka"/>
 		<Location name="city_park"/>
 		<Location name="parkdin"/>
 		<Location name="parkivent"/>
-		<Location name="poli"/>
+		<Location name="city_clinic"/>
 		<Location name="rinok"/>
 		<Location name="rinwork"/>
 		<Location name="sauna"/>
@@ -314,7 +303,7 @@
 		<Location name="MBathrooms"/>
 	</Folder>
 	<Folder name="Trade Representative">
-		<Location name="torgpred"/>
+		<Location name="city_trademission"/>
 		<Location name="StasQW"/>
 		<Location name="StasSex"/>
 	</Folder>
@@ -354,16 +343,6 @@
 		<Location name="WorkHosp"/>
 		<Location name="worksalon"/>
 	</Folder>
-	<Folder name="Tanya">
-		<Location name="tanapartment"/>
-		<Location name="tanhouse"/>
-		<Location name="tanroom"/>
-		<Location name="tanhozspal"/>
-		<Location name="tankitchen"/>
-		<Location name="tanspalnya"/>
-		<Location name="tanvanr"/>
-		<Location name="tanNicholas"/>
-	</Folder>
 	<Folder name="Nicholas">
 		<Location name="nichApartment"/>
 		<Location name="nichBathGuest"/>
@@ -576,16 +555,16 @@
 		<Location name="fbGar"/>
 		<Location name="zsoft_gopskverGorSlut"/>
 	</Folder>
-	<Folder name="Town">
-		<Location name="pavResidential"/>
-		<Location name="pavCommercial"/>
-		<Location name="pavCommercialOffices"/>
-		<Location name="pavIndustrial"/>
+	<Folder name="Pavlovsk">
+		<Location name="pav_residential"/>
+		<Location name="pav_commercial"/>
+		<Location name="pav_commercial_offices"/>
+		<Location name="pav_industrial"/>
 		<Location name="leonid"/>
 		<Location name="gargazel"/>
 		<Location name="garfather"/>
-		<Location name="Gshveyfab"/>
-		<Location name="gaptek"/>
+		<Location name="pav_factory"/>
+		<Location name="pav_pharmacy"/>
 		<Location name="gkafe"/>
 		<Location name="motherkafeboss"/>
 		<Location name="gpoli"/>
@@ -664,10 +643,10 @@
 		<Location name="pavShared_nd"/>
 		<Location name="pavShared_sp"/>
 	</Folder>
-	<Folder name="House of Culture">
-		<Location name="gdk"/>
-		<Location name="gdkkru"/>
-		<Location name="gdkbibl"/>
+	<Folder name="Community center">
+		<Location name="pav_commcenter"/>
+		<Location name="pav_commclubs"/>
+		<Location name="pav_library"/>
 		<Location name="gdkin"/>
 		<Location name="gdksport"/>
 		<Location name="gdktoilet"/>

+ 2 - 2
locations/AlbFatherQW.qsrc

@@ -15,7 +15,7 @@ $din_zajava_albfather = {
 			gs 'stat'
 			'You wrote and signed your statement to the captain. He then let you go without a fuss.'
 
-			act 'Leave':gt 'pavCommercial'
+			act 'Leave':gt 'pav_commercial'
 		end
 	end
 }
@@ -37,7 +37,7 @@ $din_zajava_albfather_no2 = {
 			gs 'stat'
 			'You quickly dialed Albina''s number. In a harried tone you told her of the events that had just transpired. There was a short pause and Albina thanked you and hung up.'
 
-			act 'Leave':gt 'pavCommercial'
+			act 'Leave':gt 'pav_commercial'
 		end
 	end
 }

+ 1 - 1
locations/AlbStarsEnd.qsrc

@@ -10,7 +10,7 @@ Chernov = 10
 gs 'stat'
 'You walk down the street and see Albina Barlovskuyu. Near her, a van stops; people emerge from the vehicle running towards her. They restrain her face to the ground, hands behind her back before putting her in handcuffs. Albina is furious, but her face suddenly pales when she sees the warrant for her arrest and hears the accusations of running a brothel. After a thorough search she is put on her feet, shoved into a police car and whisked away.'
 
-act 'Leave':gt 'pavResidential'
+act 'Leave':gt 'pav_residential'
 
 --- AlbStarsEnd ---------------------------------
 

+ 8 - 8
locations/AleksandraHome.qsrc

@@ -34,14 +34,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks of books with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually, <<$npc_nickname[''A231'']>> starts to get a little annoyed at you, but continues on, none the less, with her suggestions.'
 	act 'Continue looking':
@@ -93,7 +93,7 @@ if $args[0] = 'library':
 						'She replies, "Definitely. I''m going to walk home now. I''ll see you in school <<$day_temp>> <<$pcs_nickname>>."'
 						'"See you <<$day_temp>> <<$npc_nickname[''A231'']>>."'
 						killvar $day_temp
-						act 'Stay at the Commuity Center': gt 'gdk'
+						act 'Stay at the Commuity Center': gt 'pav_commcenter'
 					end
 				end
 			end
@@ -137,14 +137,14 @@ if $args[0] = 'pre_library':
 	end	
 end
 if $args[0] = 'library':
-	$loc = 'gdkbibl'
+	$loc = 'pav_library'
 	$location_type = 'public_indoors'
-	$menu_loc = 'gdkbibl'
+	$menu_loc = 'pav_library'
 	$menu_arg = ''
 	gs 'stat'
 	gs 'themes', 'indoors'
 	'<center><b><font color="maroon">Community center library</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/gdkbibl.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/library/pav_library.jpg"></center>'
 	'You arrive at the library and you can see <<$npc_firstname[''A231'']>>''s face light up. It becomes very obvious that this is her favorite place to be. You walk through the stacks with her occasionally pulling out a book that she thinks would be good for you to read.'
 	'Being rather indecisive you just can''t make up your mind and keep answering her suggestions with a maybe. Eventually <<$npc_nickname[''A231'']>> starts to get a little annoyed, but continues on none the less with her suggestions.'
 	act 'Continue looking':
@@ -196,7 +196,7 @@ if $args[0] = 'library':
 						'"Definitely. I''m going to start walking home now. I''ll see you in school <<$day_temp>> <<$pcs_nickname>>," she answers'
 						'"See you <<$day_temp>> <<$npc_nickname[''A231'']>>."'
 						killvar $day_temp
-						act 'Stay at the Commuity Center': gt 'gdk'
+						act 'Stay at the Commuity Center': gt 'pav_commcenter'
 					end
 				end
 			end

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -2430,7 +2430,7 @@ $cheatmenu = {
 	'Jump forward <a href="exec:dynamic $cheatmenu[''quicktime''], 15 & dynamic $cheatmenu">+15</a> minutes'
 	*nl
 	*nl
-	'<a href="exec:gt''pavResidential''">Teleport to Pavlovsk</a>'
+	'<a href="exec:gt''pav_residential''">Teleport to Pavlovsk</a>'
 	'<a href="exec:gt''city_residential''">Teleport to City</a>'
 	'<a href="exec:gt''gadukino''">Teleport to Gadukino</a>'
 	'<a href="exec:gt''dachi''">Teleport to Suburban Cooperative</a>'

+ 1 - 1
locations/FedorEv.qsrc

@@ -101,7 +101,7 @@ if $ARGS[0] = 'Vitek Vs Fedor':
 			'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/strela/fedor.jpg"></center>'
 
-			act 'Leave the school courtyard':gt 'pavResidential'
+			act 'Leave the school courtyard':gt 'pav_residential'
 		end
 	end
 end

+ 18 - 18
locations/FedorEv2.qsrc

@@ -104,7 +104,7 @@ if $ARGS[0] = 'Train Tracks':
 		gs 'arousal', 'end'	
 		gs 'stat'			
 
-		act 'Walk home with Fedor': gt 'pavResidential'	
+		act 'Walk home with Fedor': gt 'pav_residential'	
 	end	
 	act 'Offer him your hand':
 		*clr & cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'Train Tracks':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/nokiss.jpg"></center>'
 		'You think to yourself "This is going too fast." so you offer Fedor your hand. He is a little surprised at first but kisses your hand nonetheless. Fedor lowers your hand as he releases it and after a few moments of silence you notice a Fedor''s posture lowers as he turns away from you "It''s starting to get late, we should probally get going before your parents start to worry about you." He says, with a meek smile as he takes your hand and walks you home.'
 			
-		act 'Walk home with Fedor': gt 'pavResidential'
+		act 'Walk home with Fedor': gt 'pav_residential'
 	end	
 end	
 
@@ -703,7 +703,7 @@ if $ARGS[0] = 'Skate Kiss':
 	
 	act 'Walk home with Fedor': gt 'korrPar'
 	
-	act 'I''ll be fine on my own': gt 'pavResidential'
+	act 'I''ll be fine on my own': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Skate End':	
@@ -717,7 +717,7 @@ if $ARGS[0] = 'Skate End':
 	
 	act 'Walk home with Fedor': gt 'korrPar'
 	
-	act 'I''ll be fine on my own': gt 'pavResidential'
+	act 'I''ll be fine on my own': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Cafe':	
@@ -767,7 +767,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Take his hand':	
 				*clr & cla
@@ -784,7 +784,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end	
 		act 'Get on the swing with Fedor':	
@@ -807,7 +807,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Hug Fedor':	
 				*clr & cla
@@ -820,7 +820,7 @@ if $ARGS[0] = 'Park 2':
 				
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end			
 		end	
 	end
@@ -849,7 +849,7 @@ if $ARGS[0] = 'Park 2':
 
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end
 		end
 	end	
@@ -872,7 +872,7 @@ if $ARGS[0] = 'Park 2':
 			
 			act 'Take me home': gt 'FedorEv2', 'Park End'
 			
-			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+			act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 		end
 		act 'Relax':	
 			*clr & cla
@@ -884,7 +884,7 @@ if $ARGS[0] = 'Park 2':
 
 			act 'Take me home': gt 'FedorEv2', 'Park End'
 			
-			act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+			act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 		end
 		gs 'willpower', 'bj', 'self', 'hard'
 		if will_cost <= pcs_willpwr:
@@ -922,7 +922,7 @@ if $ARGS[0] = 'Park 2':
 						
 						act 'Take me home': gt 'FedorEv2', 'Park End'
 						
-						act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+						act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 					end
 					act 'Stop before he cums':	
 						*clr & cla
@@ -935,7 +935,7 @@ if $ARGS[0] = 'Park 2':
 						*nl
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/movies/endbye.mp4"></video></center>'
 						
-						act 'Leave':minut += 15 & gt 'pavResidential'
+						act 'Leave':minut += 15 & gt 'pav_residential'
 					end						
 				end	
 			end
@@ -970,7 +970,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Continue chatting':	
 				*clr & cla
@@ -981,7 +981,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end		
 		act 'Lay down between the tracks':	
@@ -1007,7 +1007,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end	
 			act 'Continue chatting':	
 				*clr & cla
@@ -1018,7 +1018,7 @@ if $ARGS[0] = 'Park 2':
 			
 				act 'Take me home': gt 'FedorEv2', 'Park End'
 				
-				act 'I''ll be fine here':minut += 15 & gt 'pavResidential'
+				act 'I''ll be fine here':minut += 15 & gt 'pav_residential'
 			end				
 		end					
 	end		
@@ -1053,7 +1053,7 @@ if $ARGS[0] = 'Fedor Breakup':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 	'Fedor approaches you with a serious look on his face. "Look <<$pcs_firstname>>, I''ve noticed that you and I don''t seem to be progressing at all in this relationship and I feel like I would only be holding you back if I continued this, so I think we should break this off...I''m sorry that I couldn''t be the man you needed." and before you get to say a word he turns around and leaves.'
 	
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end		
 
 --- FedorEv2 ---------------------------------

+ 1 - 1
locations/FedorEv3.qsrc

@@ -1386,7 +1386,7 @@ if $ARGS[0] = 'Movies 3':
 	*nl	
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/kiss.mp4"></video></center>'
 
-	act 'Walk away':gt 'pavResidential'
+	act 'Walk away':gt 'pav_residential'
 end		
 
 --- FedorEv3 ---------------------------------

+ 4 - 4
locations/FedorEv4.qsrc

@@ -2724,7 +2724,7 @@ if $ARGS[0] = 'Hallway':
 		else
 			FedorHomeDate = 0
 			minut += 5
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 	
@@ -3620,7 +3620,7 @@ if $ARGS[0] = 'Dimka Aftermath':
 			gt 'FedorEv4', 'Bedroom'
 		else
 			minut += 5
-			gt 'pavResidential'
+			gt 'pav_residential'
 		end
 	end
 end
@@ -3634,7 +3634,7 @@ if $ARGS[0] = 'Home Entrance':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/fedorhome/house.jpg"></left>'
 	'Fedor''s house is a bit weathered but still looks quite lovely. This house is but a short walk away from my parents apartment.'
 	
-	act 'Walk away': minut += 5 & gt 'pavResidential'
+	act 'Walk away': minut += 5 & gt 'pav_residential'
 	act 'Knock on the door':gt 'FedorEv4', 'Home Entrance 2'
 end
 
@@ -3657,7 +3657,7 @@ if $ARGS[0] = 'Home Entrance 2':
 		act 'Enter house':gt 'FedorEv4', 'Hallway'
 	else
 		'You knock on the door but no one answers.'
-		act 'Walk away': minut += 5 & gt 'pavResidential'
+		act 'Walk away': minut += 5 & gt 'pav_residential'
 	end
 end
 

+ 3 - 3
locations/FedorMisc.qsrc

@@ -1082,7 +1082,7 @@ if $ARGS[0] = 'Fedor Vs Dimka':
 
 							act 'Get dressed then leave':
 								gs 'clothing', 'wear_last_worn'
-								gt 'pavResidential'
+								gt 'pav_residential'
 							end
 						end
 					end
@@ -1106,7 +1106,7 @@ if $ARGS[0] = 'Dimka Party':
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/fedor.jpg"></center>'
 
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Dimka Party 2':
@@ -1124,7 +1124,7 @@ if $ARGS[0] = 'Dimka Party 2':
 	'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/school/events/dimka/outcast.jpg"></center>'
 
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'VKwip':

+ 43 - 43
locations/Gnpc2.qsrc

@@ -19,14 +19,14 @@ $din_gboy_end_to_disco = {
 
 			gs 'willpower', 'sex', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offers to accompany you home.'
 
-			act 'go home':gt 'pavResidential'
+			act 'go home':gt 'pav_residential'
 		end
 	elseif gnpcSex[numnpc] > 0:
 		'<<$boydesc>> invites you to his home.'
@@ -34,7 +34,7 @@ $din_gboy_end_to_disco = {
 
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Decline and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		else
 			act 'Decline and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -88,11 +88,11 @@ $din_gboy_go_to_disco = {
 
 							if tiprand <= 70:
 								'Fortunately, <<$boydesc>> manages to win the fight verbally, accusing the Gopnik of grabbing you, his girlfriend. But the evening was spoiled and finally <<$boydesc>> suggests that it would be better if you both head home.'
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							elseif tiprand <= 85:
 								otnBoyFrend[numnpc] -= 20
 								'The Gopnik quickly pounces on your guy and punches him in the face. It seems that <<$boydesc>> doesn''t stand a chance against the three Gopniks and before he gets completely beaten up he offers all his money to the angry Gopniks and apologizes repeatedly before all of them. You quickly leave the dance floor and <<$boydesc>> suggests that you both head home.'
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							else
 								'The discussion escalates quickly into a fight and soon the Gopniks charge at your <<$bfTitle[numnpc]>> in the middle of the club.'
 								*nl
@@ -113,7 +113,7 @@ $din_gboy_go_to_disco = {
 											'You try to push the Gopnik, but someone pushes you roughly away from the fight.'
 											*pl $stumble
 											*pl $bfDiscoBadEnd
-											act 'Go home':gt 'pavResidential'
+											act 'Go home':gt 'pav_residential'
 										else
 											'You push back the Gopnik with all your strength and he stumbles backwards, hitting his head on the floor. But the second Gopnik turns to you and swings his fist towards your face.'
 											if pcs_agil < 60:
@@ -123,7 +123,7 @@ $din_gboy_go_to_disco = {
 												gs 'stat'
 												*pl $looseTooth
 												*pl $bfDiscoBadEnd
-												act 'Go home':gt 'pavResidential'
+												act 'Go home':gt 'pav_residential'
 											else
 												'You react just in time and quickly move your head to the side barely avoiding his punch.'
 												*nl
@@ -144,7 +144,7 @@ $din_gboy_go_to_disco = {
 														'You swing at the Gopnik and hit him right on the nose. He staggers briefly and then yells angrily at you, "Oh, you bitch!". He charges quickly at you and then a barrage of punches comes raining down on you.'
 														$looseTooth
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													else
 														pcs_mood -= 20
 														gs 'pain', 6, 'head', 'hit'
@@ -152,7 +152,7 @@ $din_gboy_go_to_disco = {
 														'You try to hit the hooligan with a punch to the face but your blow is too slow. The Gopnik dodges your weak attempt and pushes you roughly away.'
 														$stumble
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 
@@ -170,7 +170,7 @@ $din_gboy_go_to_disco = {
 															*pl $discoScratch1
 															*pl $discoScratch2
 															*pl $discoScratch3
-															act 'Go home':gt 'pavResidential'
+															act 'Go home':gt 'pav_residential'
 														end
 													else
 														'You try to kick the hooligan in his face but he is faster than you and manages to shove you away before you even got your leg up.'
@@ -179,7 +179,7 @@ $din_gboy_go_to_disco = {
 														pcs_mood -= 20
 														gs 'pain', 6, 'head', 'hit'
 														gs 'stat'
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 
@@ -201,7 +201,7 @@ $din_gboy_go_to_disco = {
 																*pl $discoScratch1
 																*pl $discoScratch2
 																*pl $discoScratch3
-																act 'Go home':gt 'pavResidential'
+																act 'Go home':gt 'pav_residential'
 															end
 														else
 															pcs_mood -= 20
@@ -210,7 +210,7 @@ $din_gboy_go_to_disco = {
 															*pl $badKick
 															*pl $stumble
 															*pl $bfDiscoBadEnd
-															act 'Go home':gt 'pavResidential'
+															act 'Go home':gt 'pav_residential'
 														end
 													else
 														pcs_mood -= 20
@@ -219,7 +219,7 @@ $din_gboy_go_to_disco = {
 														*pl $badKick
 														*pl $stumble
 														*pl $bfDiscoBadEnd
-														act 'Go home':gt 'pavResidential'
+														act 'Go home':gt 'pav_residential'
 													end
 												end
 											end
@@ -235,7 +235,7 @@ $din_gboy_go_to_disco = {
 									gs 'stat'
 									'<<$boydesc>> can''t escape the attacks of the three Gopniks and soon falls under a barrage of punches. The Gopniks drag him into the streets where they steal all his money, take off his shoes, and throw him into the bushes.'
 									'Once they left, you help your <<$bfTitle[numnpc]>> to his feet and manage to get him back home. His face is covered in blood and bruises everywhere.'
-									act 'Go home':gt 'pavResidential'
+									act 'Go home':gt 'pav_residential'
 								end
 							end
 						end
@@ -262,7 +262,7 @@ $din_gboy_go_to_disco = {
 						act 'Leave alone':
 							cla
 							'You have already done enough damage. You tell him that you need to use the restroom, untangle yourself from his clutches and then move towards the exit.'
-							act 'Leave':gt 'gdk'
+							act 'Leave':gt 'pav_commcenter'
 						end
 					end
 				else
@@ -387,7 +387,7 @@ $din_gboy_go_to_disco = {
 												'You continue to dance with your <<$bfTitle[numnpc]>>. A few minutes pass and then you see the guys that watched your whole blowjob scene coming out of the toilet. They also see you and guffaw, noisily discussing something. <<$boydesc>> looks at them puzzled, "What''s with them?" The boys shout to him, "While you were wandering around the place, your girlfriend was in the toilet sucking on a dick!" <<$boydesc>> comes up to them, "Are you crazy?"'
 												'The Boys start to tell him how you just sucked off a guy in front of them. <<$boydesc>> rushes back over to you and slaps you across the face "Get the fuck out, slut! I don''t want to see you ever again!"'
 
-												act 'Leave':gt 'gdk'
+												act 'Leave':gt 'pav_commcenter'
 											end
 										end
 									end
@@ -808,7 +808,7 @@ $din_gboy_tits = {
 					gs 'stat'
 					'You take his hand out of your pants, and he shakes his head, not understanding.'
 
-					act 'Go home':gt 'pavResidential'
+					act 'Go home':gt 'pav_residential'
 				end
 			else
 				act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -834,7 +834,7 @@ $din_gboy_tits = {
 						'<center><img <<$set_imgh>> src="images/shared/sex/handjob/hj.jpg"></center>'
 						'You pull his hard and hot cock out of his pants and wrap your hand around it. You start kissing him while stroking his penis. Finally the guy groans and you watch as loads of his sperm erupt again and again from his cock.'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 				else
 					act 'Jerk him off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -866,7 +866,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/mouth/cum49.jpg"></center>'
 						gs 'dinsex','bj_swallow_random'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					act 'Remove it from your mouth':
@@ -879,7 +879,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial21.jpg"></center>'
 						'You remove his member from your mouth just as a stream of hot sperm hits you in the face, then another and another until he eventually finished coating your face with his cum.'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					act 'Surrender':
@@ -898,7 +898,7 @@ $din_gboy_tits = {
 						gs 'dinsex', 'boy_puts_condom'
 						gs 'dinsex','vaginal_sex',10
 						gs 'dinsex','sexcum'
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					gs 'willpower', 'anal', 'self'
@@ -919,7 +919,7 @@ $din_gboy_tits = {
 							gs 'dinSex','boy_wants_anal','','lubri' & gs 'dinsex','analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
-							act 'Leave.':gt 'pavResidential'
+							act 'Leave.':gt 'pav_residential'
 						end
 					else
 						act 'Substitute ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -948,7 +948,7 @@ $din_gboy_tits = {
 						gs 'stat'
 						'You pull his hand from your pussy, and he just looks at you, slightly confused.'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 				else
 					act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -978,7 +978,7 @@ $din_gboy_tits = {
 						gs 'dinsex', 'vaginal_sex', 15
 						gs 'dinsex', 'sexcum'
 
-						act 'Go home':gt 'pavResidential'
+						act 'Go home':gt 'pav_residential'
 					end
 
 					gs 'willpower', 'anal', 'self'
@@ -998,7 +998,7 @@ $din_gboy_tits = {
 							gs 'dinSex', 'boy_wants_anal','lubri' & gs 'dinsex', 'analsex'
 							'Finally he reaches his peak and you feel something warm filling your ass.'
 
-							act 'Leave.':gt 'pavResidential'
+							act 'Leave.':gt 'pav_residential'
 						end
 					else
 						act 'Substitute ass (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1020,7 +1020,7 @@ $din_gboy_tits = {
 			gs 'stat'
 			'You remove his hands from your exposed breasts, and he looks puzzled, not sure why.'
 
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	else
 		act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1052,7 +1052,7 @@ $din_gboy_knee = {
 			gs 'stat'
 			'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	else
 		act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1076,7 +1076,7 @@ $din_gboy_knee = {
 				gs 'stat'
 				'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-				act 'Go home':gt 'pavResidential'
+				act 'Go home':gt 'pav_residential'
 			end
 		else
 			act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1143,7 +1143,7 @@ $din_gboy_go_to_boyhome = {
 							otnBoyFrend[numnpc] -= 20
 							gs 'stat'
 							'You got up from the couch upset with the guy claiming that you are not interested in watching that type of trash. <<$boydesc>> gets embarrassed and blushing began stuttering an apology.'
-							act 'Go home':gt 'pavResidential'
+							act 'Go home':gt 'pav_residential'
 						end
 					else
 						act 'Refuse to watch (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1165,7 +1165,7 @@ $din_gboy_go_to_boyhome = {
 								gs 'stat'
 								'You remove his hand from your knee and he shakes his head, puzzled what to do next.'
 
-								act 'Go home':gt 'pavResidential'
+								act 'Go home':gt 'pav_residential'
 							end
 						else
 							act 'Remove his hand (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1187,7 +1187,7 @@ $din_gboy_go_to_boyhome = {
 								act 'Kiss him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 							end
 						end
-						act 'Go home': gt 'pavResidential'
+						act 'Go home': gt 'pav_residential'
 					end
 				end
 			end
@@ -1201,7 +1201,7 @@ $din_gboy_go_to_boyhome = {
 			dynamic $din_gboy_knee
 		end
 
-		!!act 'Go home':gt 'pavResidential'
+		!!act 'Go home':gt 'pav_residential'
 	end
 }
 
@@ -1216,7 +1216,7 @@ gs 'stat'
 if hour < 20:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$boydesc>> offered to take you home.'
-		act 'Go home':gt 'pavResidential'
+		act 'Go home':gt 'pav_residential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		gdeystboyrand = rand(0, 1)
 
@@ -1225,20 +1225,20 @@ if hour < 20:
 			dynamic $din_gboy_go_to_boyhome
 			gs 'willpower', 'sex', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse to go to his home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offered to take you home.'
-			act 'Go home':gt 'pavResidential'
+			act 'Go home':gt 'pav_residential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		'<<$boydesc>> suggested that you two go to his home.'
 		dynamic $din_gboy_go_to_boyhome
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse to go to his home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		else
 			act 'Refuse to go to his home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
@@ -1246,7 +1246,7 @@ if hour < 20:
 elseif hour >= 20 and hour < 23:
 	if otnBoyFrend[numnpc] < 80:
 		'<<$boydesc>> offered to take you home.'
-		act 'Go home':gt 'pavResidential'
+		act 'Go home':gt 'pav_residential'
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] = 0:
 		tipgbrand = rand(0, 1)
 
@@ -1255,14 +1255,14 @@ elseif hour >= 20 and hour < 23:
 			dynamic $din_gboy_go_to_disco
 			gs 'willpower', 'misc', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		elseif tipgbrand = 1:
 			'<<$boydesc>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		end
 	elseif otnBoyFrend[numnpc] >= 80 and gnpcSex[numnpc] > 0:
 		gdeystboyrand = rand(0, 1)
@@ -1270,13 +1270,13 @@ elseif hour >= 20 and hour < 23:
 		if gdeystboyrand = 0:
 			'<<$boydesc>> offered to go to his home.'
 			dynamic $din_gboy_go_to_boyhome
-			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+			act 'Refuse and go home':otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 		elseif gdeystboyrand = 1:
 			'<<$boydesc>> offered to go to the disco.'
 			dynamic $din_gboy_go_to_disco
 			gs 'willpower', 'misc', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pavResidential'
+				act 'Refuse and go home (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & otnBoyFrend[numnpc] -= 10 & gt 'pav_residential'
 			else
 				act 'Refuse and go home (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
@@ -1286,7 +1286,7 @@ elseif hour >= 20 and hour < 23:
 elseif hour >= 23:
 	'<<$boydesc>> offered to take you home.'
 
-	act 'go home':gt 'pavResidential'
+	act 'go home':gt 'pav_residential'
 end
 
 --- Gnpc2 ---------------------------------

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -1,7 +1,7 @@
 # JuliaMilHome
 
 $location_type = 'indoors'
-$menu_loc = 'pavCommercial'
+$menu_loc = 'pav_commercial'
 $menu_arg = ''
 menu_off = 0
 CLOSE ALL

+ 1 - 1
locations/KatjaHome.qsrc

@@ -15,7 +15,7 @@ else
 	if hour >= 9:'The door is opened by Katja''s mother. "Oh, hello <<$pcs_nickname>>. Katja isn''t home right now."'
 	if hour < 9:'The door is opened by Katja''s mother. "<<$pcs_nickname>>. Shouldn''t you be in bed? You shouldn''t come around before nine."'
 
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 --- KatjaHome ---------------------------------

+ 6 - 6
locations/KatjaHomeTalk.qsrc

@@ -143,7 +143,7 @@ if $ARGS[0] = '':
 	!					'- Well will continue our dispute, - asked you '
 	!					'- continue, - Katya readily agreed'
 	!
-	!					act 'Further': gt 'katja_sex','city_park'
+	!					act 'Further': gt 'katja_sex','park'
 	!				end
 	!			end
 				if flag_KissEV = 2:
@@ -165,7 +165,7 @@ if $ARGS[0] = '':
 						'"Oh yea?" Kate said with a bit of anger, "Let''s see then, let''s go to the Park and see who can kiss more boys."'
 						'"Good." You agree, let''s dispute. And what''s the bet.'
 						'"Fine, now let''s go kiss some boys." Kate said.'
-						act 'Further': gt 'katja_sex','city_park'
+						act 'Further': gt 'katja_sex','park'
 					end
 				elseif katjaPreg = 0 or knowKatjaPreg = 1:
 					if KatjaHorny < 50:'Katka talks about school lessons, cosmetics, the latest fashion trends and other very important things.'
@@ -241,7 +241,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -263,7 +263,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif KatjaPreg = 0 and knowpreg = 1 and pregchem > 0 and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -288,7 +288,7 @@ if $ARGS[0] = '':
 			if mey_vika['key'] = 1:
 				Act 'Leave the room': gt 'mey_home', 'start'
 			else
-				act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+				act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 			end
 		elseif knowKatjaPreg = 1 and knowpreg = 1 and pregchem > 0 and (KatjaConflict = 0 or katjaconflict = 2) and func('body_din','pregnancyVisibility') = 0:
 			act 'Tell her you''re pregnant':
@@ -334,7 +334,7 @@ if $ARGS[0] = '':
 	if mey_vika['key'] = 1:
 		Act 'Leave the room': gt 'mey_home', 'start'
 	else
-		act 'Say goodbye and leave':minut += 5 & gt 'pavResidential'
+		act 'Say goodbye and leave':minut += 5 & gt 'pav_residential'
 	end
 end
 

+ 1 - 1
locations/LBZhouse.qsrc

@@ -96,7 +96,7 @@ $LBZH_end={
 			act 'Leave':
 				gs 'arousal', 'end'
 				gs 'stat'
-				gt'pavResidential'
+				gt'pav_residential'
 			end
 		end
 	end

+ 4 - 4
locations/LariskaHome.qsrc

@@ -49,13 +49,13 @@ else
 		'"Yes, I''m <<$pcs_nickname>>." you reply tearing your eyes away from her nearly exposed breasts.'
 		'"Ah, <<$pcs_nickname>>, Lariska has told me all about you. I''m Anna, Lariska''s mother. My bunny has been so joyous lately. I am glad that she has such a good friend! She needed someone to get her back on her feet. <<$text_home>>"'
 		lariskaMotherKnown = 1
-		act 'Go back to town':gt'pavResidential'
+		act 'Go back to town':gt'pav_residential'
 		exit
 	end
 	if hour >= 9:'Lariska''s mother opens the door. "Hello, <<$pcs_nickname>>. I''m sorry, but Lariska isn''t home."'
 	if hour < 9:'Lariska''s mother opens the door. "Good morning , <<$pcs_nickname>>. I''m sorry but Lariska is still in bed. She doesn''t get up before nine."'
 
-	act 'Return to town':gt'pavResidential'
+	act 'Return to town':gt'pav_residential'
 end
 
 if $ARGS[0] = 'in':
@@ -90,7 +90,7 @@ if $ARGS[0] = 'in':
 		cla
 		'Lariska looks at her watch and says, "It''s time to go to the sports club."'
 		act 'Go with Lariska':lariskaTrain += 1 & minut += 20 & gt 'gdksport', 'start'
-		act 'Say goodbye and go home':gt'pavResidential'
+		act 'Say goodbye and go home':gt'pav_residential'
 		exit
 	end
 	act 'Ask for a drink':
@@ -170,7 +170,7 @@ if $ARGS[0] = 'in':
 		end
 	end
 
-	act 'Say goodbye and go home':gt'pavResidential'
+	act 'Say goodbye and go home':gt'pav_residential'
 end
 
 --- LariskaHome ---------------------------------

+ 9 - 9
locations/LariskaStart.qsrc

@@ -34,7 +34,7 @@ if $ARGS[0] = 'start':
 	'Well this is interesting, she had never shown that much interest in you before, always stuck in Christina''s stranglehold she had always been distant and you could barely get a full sentence from her.'
 	'Now that you have beaten Christina, she suddenly wants to talk. She does look more confident, happier and more active. Maybe she wants to thank you for beating up the bully?'
 	
-	act 'Leave':gt'gdk'
+	act 'Leave':gt'pav_commcenter'
 	act 'Follow Lariska':
 		cls
 		minut += 5
@@ -73,7 +73,7 @@ if $ARGS[0] = 'start':
 						'"That bitch! Do not worry, I know these bastards, Nosov takes his dope from them. Nobody is dangerous, for me anyway! Do not worry about anything!"'
 
 						KotovZverHelp = 1
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 				if IvanShowerQW >= 10 and npc_rel['A3'] >= 60:
@@ -86,7 +86,7 @@ if $ARGS[0] = 'start':
 						'"Sure, no problem <<$pcs_nickname>>."'
 
 						IvanZverHelp = 1
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 				if AlbFrend >= 1:
@@ -102,7 +102,7 @@ if $ARGS[0] = 'start':
 
 						AlbZverHelp = 1
 
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 
@@ -118,11 +118,11 @@ if $ARGS[0] = 'start':
 
 						FyodorZverHelp = 1
 
-						act 'Leave':gt'gdk'
+						act 'Leave':gt'pav_commcenter'
 					end
 				end
 
-				act 'Leave':gt'gdk'
+				act 'Leave':gt'pav_commcenter'
 			end
 		end
 		if razradKik >= 2 and pcs_stren >= 55:
@@ -152,7 +152,7 @@ if $ARGS[0] = 'start':
 					'You had stood still five minutes in perplexity and thought about that you should apologize at school tomorrow, before you finally get off and go home.'
 					lariskaHelp = -1
 
-					act 'Leave':gt'gdk'
+					act 'Leave':gt'pav_commcenter'
 				end
 			end
 		end
@@ -441,7 +441,7 @@ if $ARGS[0] = 'end':
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/lariska/sex/fight/start_end.jpg"></center>'
 												'You wake up covered in semen and with a bottle sticking out of your pussy. Your entire body is covered with obscene graffiti. Your whole body hurts, and your holes feel like glowing rods were shoved in all night.'
 
-												act 'Leave':gt'pavResidential'
+												act 'Leave':gt'pav_residential'
 											end
 										end
 									end
@@ -453,7 +453,7 @@ if $ARGS[0] = 'end':
 			end
 		end
 
-		act 'Leave':gt'pavResidential'
+		act 'Leave':gt'pav_residential'
 	end
 end
 

+ 1 - 1
locations/MeynoldHome.qsrc

@@ -521,7 +521,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	if VKNatChat = 4:
 		act 'Walk home with Natalia':NikoAftermath = 0 & gt 'NikoMeyHome', 'Natalia Walk'
 	else
-		act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
+		act 'Walk toward town':NikoAftermath = 0 & gt 'pav_residential'
 	end
 end
 

+ 7 - 7
locations/NikoDates.qsrc

@@ -308,7 +308,7 @@ if $ARGS[0] = 'Home 1':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/exit.jpg"></center>'
 	'You and Niko walk out of the amusement park then head toward the train. You both enter the train then spend the rest of the time discussing your favorite hobbies until the train reaches Pavlovsk, where you both exit the train before Niko gives you a hug. "You are an amazing girl <<$pcs_firstname>>, I will await anxiously for our next meeting. Take care m''lady." Niko gives you a kiss on the forehead before letting go of you and walking away.'
 
-	act 'Walk to town':gt 'pavResidential'
+	act 'Walk to town':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Home Sad':
@@ -318,7 +318,7 @@ if $ARGS[0] = 'Home Sad':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/dates/1/exit.jpg"></center>'
 	'You and Niko walk out of the amusement park then head toward the train. You both enter the train then spend a few minutes discussing your favorite hobbies until the train reaches Pavlovsk, where you both exit the train before Niko turns to you and says, "I hope you enjoyed yourself today. Hopefully next time we could do something more interesting." Niko gives you a kiss on the hand before letting go of you and walking away.'
 
-	act 'Walk to town':gt 'pavResidential'
+	act 'Walk to town':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'Date 2':
@@ -557,7 +557,7 @@ if $ARGS[0] = 'Date Rape':
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile1.jpg"></center>'							
 							'Niko kisses your leg, "You were a bit wild, it was a side of you that I haven''t seen before and I liked it." You reply, "Really? well I guess I could try cutting loose a bit more often." Niko pats your ass gently as he replies, "Now that''s what I like to hear! So would you like some cereal? I have plenty downstairs." You shake your head, "No I need head back home, but thanks for the offer." You give Niko a kiss on the cheek before walking out the room, where Niko guides you out of the door.'
 
-							act 'Walk to the residential district':minut += 5 & gt 'pavResidential'
+							act 'Walk to the residential district':minut += 5 & gt 'pav_residential'
 						end
 					end	
 				end	
@@ -946,7 +946,7 @@ if $ARGS[0] = 'Yurik Intro':
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 							'Niko''s eyes light up as he begins kissing your hands even faster before saying, "Thank you <<$pcs_firstname>>. I always knew that you were one of the good ones. Hey wanna watch some TV together?" You give him a smile as you reply, "I would love to but I need to head home. I''ll see you tomorrow Niko." Niko returns the smile as he responds, "I always look forward to seeing you again." Niko then walks you out of the front door then gives you a passionate kiss before closing the door.'
 
-							act 'Walk away':gt 'pavResidential'
+							act 'Walk away':gt 'pav_residential'
 						end
 
 						act 'I don''t believe you':
@@ -964,7 +964,7 @@ if $ARGS[0] = 'Yurik Intro':
 								'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
 								'Niko''s eyes light up as he grabs onto then begins kissing your hands before saying, "Thank you <<$pcs_firstname>>. I always knew that you were one of the good ones. Hey wanna watch some TV together?" You give him a smile as you reply, "I would love to but I need to head home. I''ll see you tomorrow Niko." Niko returns the smile as he responds, "I always look forward to seeing you again." Niko then walks you out of the front door then gives you a passionate kiss before closing the door.'
 
-								act 'Walk away':gt 'pavResidential'
+								act 'Walk away':gt 'pav_residential'
 							end
 
 							act 'No, I don''t believe you <font color=#FF00FF>[Break up with Niko]</font>':
@@ -1002,7 +1002,7 @@ if $ARGS[0] = 'Yurik Intro':
 											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/bruised1.jpg"></center>'
 											'Niko remains silent as he rubs his face. Yurik turns to you then says, "Get out of here girl. Niko and I have a debt to discuss." Yurik then pushes you out of the room before slamming the door closed behind you. You quickly leave the house without looking back.'
 
-											act 'Leave house':minut += 5 & gt 'pavResidential'
+											act 'Leave house':minut += 5 & gt 'pav_residential'
 										end
 									end	
 								end	
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'After School':
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss2.mp4"></video></center>'
 										'Niko kneels down in front of you then removes the collar from your neck before kissing your lips passionately for a few seconds then gently rubbing your cheek. "You will always be my perfect little princess. I have an important test to take tomorrow, so I will be very busy, but feel free to stop by the <font color=#c600ff>disco</font> and we can have a good time." Niko then stands up and walks away.'
 										
-										act 'Stand up':gt 'pavResidential'
+										act 'Stand up':gt 'pav_residential'
 									end
 								end	
 							end	

+ 19 - 19
locations/NikoDreams.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = 'Family':
 		gs'stat'
 		'<center><b><h4><font color="green"><<"Vladimir <<$pcs_lastname>>">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/vladimir/father.jpg"></center>'
-		'You enter the kitchen to see Your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair which you sit on as Anya sits down next to you. You look around in relief, <font color=#FF00FF>That whole thing was just a dream. Oh it feels so good to be back home.</font> You hear something bumping against the kitchen door.' 
+		'You enter the kitchen to see Your stepfather and Kolka laughing at a joke that you can''t quite hear. They both stop laughing as you enter. Anya offers you a chair which you sit on as Anya sits down next to you. You look around in relief, '+$OpenInnerThought+'That whole thing was just a dream. Oh it feels so good to be back home.'+$CloseInnerThought+' You hear something bumping against the kitchen door.' 
 		
 		act 'Turn to see what it is':	
 			*clr & cla
@@ -95,7 +95,7 @@ if $ARGS[0] =  'Woods':
 	VKSmiley = 3
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/1.jpg"></center>'
-	'You can feel grass on your face which you quickly brush away before looking around and noticing that you are in the middle of the woods with a mist that surrounds you. <font color=#FF00FF>What''s going on? Why am I here? How did I get here? Where am I?</font> You stand up then look around to try to get your bearings when you begin hearing music along with the sounds of laughing in the far distance. <font color=#FF00FF>Where is this music coming from? Was that a person laughing? Maybe they can help me.</font> you begin heading in that direction when you suddenly feel a cold chill down your spine. <font color=#FF00FF>Something about that laughter is...unnerving.</font>'
+	'You can feel grass on your face which you quickly brush away before looking around and noticing that you are in the middle of the woods with a mist that surrounds you. '+$OpenInnerThought+'What''s going on? Why am I here? How did I get here? Where am I?'+$CloseInnerThought+' You stand up then look around to try to get your bearings when you begin hearing music along with the sounds of laughing in the far distance. '+$OpenInnerThought+'Where is this music coming from? Was that a person laughing? Maybe they can help me.'+$CloseInnerThought+' you begin heading in that direction when you suddenly feel a cold chill down your spine. '+$OpenInnerThought+'Something about that laughter is...unnerving.'+$CloseInnerThought+''
 	*nl
 	'You can hear someone laughing, far away.'
 
@@ -108,7 +108,7 @@ if $ARGS[0] =  'Woods 2':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/2.jpg"></center>'
-	'<font color=#FF00FF>These woods are so dark. How did I get here?</font>'
+	''+$OpenInnerThought+'These woods are so dark. How did I get here?'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -135,7 +135,7 @@ if $ARGS[0] =  'Woods 3':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/3.jpg"></center>'
-	'<font color=#FF00FF>Still so dark. Am I even going the right way?</font>'
+	''+$OpenInnerThought+'Still so dark. Am I even going the right way?'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -162,7 +162,7 @@ if $ARGS[0] =  'Woods 4':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/4.jpg"></center>'
-	'<font color=#FF00FF>More woods? At least I can see some light.</font>'
+	''+$OpenInnerThought+'More woods? At least I can see some light.'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -189,7 +189,7 @@ if $ARGS[0] =  'Woods 5':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/5.jpg"></center>'
-	'<font color=#FF00FF>Must keep moving. There must be a way out of here.</font>'
+	''+$OpenInnerThought+'Must keep moving. There must be a way out of here.'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -216,7 +216,7 @@ if $ARGS[0] =  'Woods 6':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/6.jpg"></center>'
-	'<font color=#FF00FF>Will this ever end? That freak is still lurking around.</font>'
+	''+$OpenInnerThought+'Will this ever end? That freak is still lurking around.'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -244,7 +244,7 @@ if $ARGS[0] =  'Woods 7':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/7.jpg"></center>'
-	'<font color=#FF00FF>Will I be trapped here forever? Oh wait, what is that?</font> You can see a pair of train tracks ahead of you and you can hear the music getting louder as you approach the tracks.'
+	''+$OpenInnerThought+'Will I be trapped here forever? Oh wait, what is that?'+$CloseInnerThought+' You can see a pair of train tracks ahead of you and you can hear the music getting louder as you approach the tracks.'
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -273,7 +273,7 @@ if $ARGS[0] =  'Woods 8':
 	VKSmiley -= 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/woods/8.jpg"></center>'
-	'You begin walking on the train tracks toward a light at what appears to be, the end of the forest. <font color=#FF00FF>Is this it? Am I out of this forest?</font>'
+	'You begin walking on the train tracks toward a light at what appears to be, the end of the forest. '+$OpenInnerThought+'Is this it? Am I out of this forest?'+$CloseInnerThought+''
 	if VKSmiley = 1:
 		'You can hear laughing close by.'
 		PLAY 'sound/happyhome/Smiley.mp3', 100
@@ -303,7 +303,7 @@ if $ARGS[0] =  'Woods Home':
 	'<center><b><h4><font color=#E400FF><<"Happy Home">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/mansion/happyhome.jpg"></center>'
 	if VKTeeHee = 0:
-		'You finally approach the end of the forest when you see a derelict house. As you walk toward the house, you can can see; what appears to be a woman standing in the middle of the path, leading to the house while crying. <font color=#FF00FF>She must be stranded here like me. Maybe I can help her.</font> you suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
+		'You finally approach the end of the forest when you see a derelict house. As you walk toward the house, you can can see; what appears to be a woman standing in the middle of the path, leading to the house while crying. '+$OpenInnerThought+'She must be stranded here like me. Maybe I can help her.'+$CloseInnerThought+' you suddenly feel a cold chill down your spine before seeing a strange looking <a href="exec:gt ''NikoDreams'', ''TeeHee''">cat</a> on a tree stump, licking its paw.'
 	else
 		'There is an old derelict house in the distance, but the path to the house is blocked by a crying woman. <a href="exec:gt ''NikoDreams'', ''TeeHee''">TeeHee</a> continuously rubs against your leg while purring softly.'
 	end
@@ -392,7 +392,7 @@ if $ARGS[0] =  'Friends':
 		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/home/bedroom/sex/cam/Cam2.mp4"></video></center>'
-		'You quickly stand up then begin dancing. <font color=#FF00FF>I need to keep dancing because ...Umm...Why am I dancing?</font> Vicky reaches forward then shoves her fingers inside of your vagina while Katja sticks her finger in your ass. Natalia walks up to you then begins squeezing your breasts. Vicky then says, "And they thought that Sonia was a whore." Katja giggles as she responds, "That''s just silly. <<$pcs_firstname>> is the only whore here." Natalia replies, "I agree, I don''t even know why she thought that she could hide it." <font color=#FF00FF>Why are they being so mean to me? and why can''t I stop dancing?</font> Vicky gives your ass a firm smack as she says, "Alright, we kept the boys waiting long enough!"'
+		'You quickly stand up then begin dancing. '+$OpenInnerThought+'I need to keep dancing because ...Umm...Why am I dancing?'+$CloseInnerThought+' Vicky reaches forward then shoves her fingers inside of your vagina while Katja sticks her finger in your ass. Natalia walks up to you then begins squeezing your breasts. Vicky then says, "And they thought that Sonia was a whore." Katja giggles as she responds, "That''s just silly. <<$pcs_firstname>> is the only whore here." Natalia replies, "I agree, I don''t even know why she thought that she could hide it." '+$OpenInnerThought+'Why are they being so mean to me? and why can''t I stop dancing?'+$CloseInnerThought+' Vicky gives your ass a firm smack as she says, "Alright, we kept the boys waiting long enough!"'
 
 		act 'Boys?':	
 			*clr & cla
@@ -423,7 +423,7 @@ if $ARGS[0] =  'Friends':
 						*clr & cla
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/hall1.mp4"></video></center>'
-						'Lesko then pulls you up on top of him and you begin riding his dick while tears stream down your face. <font color=#FF00FF>Why is this happening? Why are they all laughing at me? Please someone make this stop!</font>'
+						'Lesko then pulls you up on top of him and you begin riding his dick while tears stream down your face. '+$OpenInnerThought+'Why is this happening? Why are they all laughing at me? Please someone make this stop!'+$CloseInnerThought+''
 
 						act 'Continue riding Lesko':	
 							*clr & cla
@@ -449,7 +449,7 @@ if $ARGS[0] =  'Friends':
 										*clr & cla
 										gs'stat'							
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/friends/darkness.jpg"></center>'
-										'You fall to the ground then stare at your stomach, watching on as an almost endless stream of cum, pours out of you. You suddenly hear someone whisper in your ear, "Hey, are you alright?" You look around to see who said that, but see nothing at all. You are surrounded by darkness. <font color=#FF00FF>Where did everyone go? Where am I? It''s so dark.</font> You hear the voice whisper again, "<<$pcs_firstname>> wake up..."'
+										'You fall to the ground then stare at your stomach, watching on as an almost endless stream of cum, pours out of you. You suddenly hear someone whisper in your ear, "Hey, are you alright?" You look around to see who said that, but see nothing at all. You are surrounded by darkness. '+$OpenInnerThought+'Where did everyone go? Where am I? It''s so dark.'+$CloseInnerThought+' You hear the voice whisper again, "<<$pcs_firstname>> wake up..."'
 										
 										act '...':minut += 120 & gt 'NikoEv2', 'Niko Wake'
 									end	
@@ -492,7 +492,7 @@ if $ARGS[0] =  'Classroom Dream':
 					*clr & cla
 					gs'stat'				
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/class/sex.jpg"></center>'
-					'He then pushes you over then rams his dick inside of you and begins thrusting. All you can think about if the humiliation of being fucked by your teacher, in front of your class. <font color=#FF00FF>Why is this happening. Why me? Will I never have a normal life again? Will I always be...</font> You suddenly hear a soft voice whispering in your ear, "Hey <<$pcs_firstname>>, are you okay? Come on, get up..."'
+					'He then pushes you over then rams his dick inside of you and begins thrusting. All you can think about if the humiliation of being fucked by your teacher, in front of your class. '+$OpenInnerThought+'Why is this happening. Why me? Will I never have a normal life again? Will I always be...'+$CloseInnerThought+' You suddenly hear a soft voice whispering in your ear, "Hey <<$pcs_firstname>>, are you okay? Come on, get up..."'
 
 					act 'Continue':	
 						*clr & cla
@@ -528,7 +528,7 @@ if $ARGS[0] =  'Puppeteer':
 		*clr & cla
 		gs'stat'
 		'<center><img src="images/shared/home/bedroom/dream/class/1.jpg"></center>'
-		'You awake then slowly lift your head, looking around the room but immediately recoil in shock, when you notice how dark the classroom is. You quickly think to yourself, <font color=#FF00CC>Whoa, how long did I sleep? Ohh shit, I must have slept through the whole day. I should probably get home before the school doors are locked up for the day.</font> You quickly shove your books into your bag then walk for the door.'	
+		'You awake then slowly lift your head, looking around the room but immediately recoil in shock, when you notice how dark the classroom is. You quickly think to yourself, '+$OpenInnerThought+'Whoa, how long did I sleep? Ohh shit, I must have slept through the whole day. I should probably get home before the school doors are locked up for the day.'+$CloseInnerThought+' You quickly shove your books into your bag then walk for the door.'	
 	
 		act 'Go to the hallway':	
 			*clr & cla
@@ -545,21 +545,21 @@ if $ARGS[0] =  'Puppeteer':
 			PLAY 'sound/happyhome/puppet.mp3', 25
 			gs'stat'
 			'<center><img src="images/shared/home/bedroom/dream/class/2.jpg"></center>'
-			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. <font color=#FF00CC>Who could that be? Maybe someone is flooding one of the bathrooms again, but that music though. Where is it coming from? Maybe outside?</font>'		
+			'As soon as you reach the hallway, you hear a strange muffled laugh in the distance, along with a strange melody which sounds very far away. '+$OpenInnerThought+'Who could that be? Maybe someone is flooding one of the bathrooms again, but that music though. Where is it coming from? Maybe outside?'+$CloseInnerThought+''		
 
 			act 'Head downstairs':	
 				*clr & cla
 				PLAY 'sound/happyhome/puppet.mp3', 50
 				gs'stat'
 				'<center><img src="images/shared/home/bedroom/dream/class/3.jpg"></center>'
-				'You reach the bottom of the stairs to hear the laughing getting louder. <font color=#FF00CC>Hmm I must be getting closer to whoever is laughing.</font> The hallway is so dark but you can see a light at the end.'
+				'You reach the bottom of the stairs to hear the laughing getting louder. '+$OpenInnerThought+'Hmm I must be getting closer to whoever is laughing.'+$CloseInnerThought+' The hallway is so dark but you can see a light at the end.'
 
 				act 'Continue down the hallway':	
 					*clr & cla
 					PLAY 'sound/happyhome/puppet.mp3',75
 					gs'stat'
 					'<center><img src="images/shared/home/bedroom/dream/class/4.jpg"></center>'
-					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. <font color=#FF00CC>What is this stuff? Did someone have a drink in their locker which spilled?</font> When you look closer, you notice that the locker is slightly open, leaking with the strange liquid.'
+					'You continue walking down the hallway until you reach a strange puddle on the floor, coming from one of the lockers. '+$OpenInnerThought+'What is this stuff? Did someone have a drink in their locker which spilled?'+$CloseInnerThought+' When you look closer, you notice that the locker is slightly open, leaking with the strange liquid.'
 					
 					act 'Open the locker':	
 						*clr & cla
@@ -567,7 +567,7 @@ if $ARGS[0] =  'Puppeteer':
 						gs'stat'
 						'<center><b><h4><font color=#FFA200><<"Puppet">></font></h4></b></center>'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/nightmares/happyhome/residents/puppet.jpg"></center>'	
-						'You slowly open the locker to find a creepy doll there, which is constantly laughing in an automated voice. <font color=#FF00CC>Who left this doll here? and why is it all wet? What is this stuff?</font> The doll is heavier than it looks and seems to be covered in a thick warm liquid. <font color=#FF00CC>What is this?</font> You look closely at the liquid as you hold up the doll to the light then notice that the liquid is dark red; almost like blood. The doll has some strings attached to both of it''s wrists and ankles. <font color=#FF00CC>Maybe it''s a puppet?</font> You look into it''s eyes and notice your own reflection next to something else...'
+						'You slowly open the locker to find a creepy doll there, which is constantly laughing in an automated voice. '+$OpenInnerThought+'Who left this doll here? and why is it all wet? What is this stuff?'+$CloseInnerThought+' The doll is heavier than it looks and seems to be covered in a thick warm liquid. '+$OpenInnerThought+'What is this?'+$CloseInnerThought+' You look closely at the liquid as you hold up the doll to the light then notice that the liquid is dark red; almost like blood. The doll has some strings attached to both of it''s wrists and ankles. '+$OpenInnerThought+'Maybe it''s a puppet?'+$CloseInnerThought+' You look into it''s eyes and notice your own reflection next to something else...'
 						
 						act 'Turn around':	
 							*clr & cla

+ 7 - 7
locations/NikoEv.qsrc

@@ -76,7 +76,7 @@ if $ARGS[0] = 'Lunch Intro':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. <font color=#FF00FF>Why was he so calm? What is it with that guy?</font> Before shaking your head and walking away.'	
+		'You give him a harsh stare as you shout, "Beat it punk! I''m not looking for a boyfriend!" He remains completely unfazed as he responds, "I''m sorry that I bothered you." Niko never loses his smile as he turns around and walks away. You can''t help but think to yourself. '+$OpenInnerThought+'Why was he so calm? What is it with that guy?'+$CloseInnerThought+' Before shaking your head and walking away.'	
 		
 		act 'Leave':gt 'gschool_lessons', 'short_break'
 	end	
@@ -95,7 +95,7 @@ if $ARGS[0] = 'Lunch Chat':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
 	end	
 	'<<$npc_notes[''A189'']>>'
-	if grupTipe[61] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#E400FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
+	if grupTipe[61] = 600:'Niko should not be available at this stage. If you are seeing this in game then please report this on the <font color=#FF00FF>Bug reports</font> thread or to <font color=#FF00FF>Violet Kitten</font> on <font color="blue">Discord</font>.'
 	if grupTipe[61] = 4:'Niko is a Gopnik and spends a lot of time doing what Gopniks usually do: be loud and drink beer.'
 	if npc_rel['A189'] < 20:'You and Niko don''t get along at all.'
 	if npc_rel['A189'] >= 20 and npc_rel['A189'] < 40:'You and Niko don''t get along very well.'
@@ -206,7 +206,7 @@ if $ARGS[0] = 'Lunch Chat':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. <font color=#FF00FF>Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
+			'You sit down next to Niko, "Hello Niko, I remember you telling me something about a special activity that you have planned." Niko grins as he replies, "I have something special for us today. Are you ready to find out what it is?" You suddenly feel a cold chill down your spine as he says that. '+$OpenInnerThought+'Why do I feel so nervous? I can''t shake the feeling that something bad is going to happen.</font>'
 			
 			act '<font color=#FF00FF>Go with Niko</font>':
 				if soniaPS = 0:
@@ -227,11 +227,11 @@ if $ARGS[0] = 'Lunch Chat':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos4.jpg"></center>'
 			VK = rand(1,3)
 			if VK = 1:
-				'You walk away without saying a word. Thinking to yourself: <font color=#FF00FF>What kind of easy lay, does he think I am?</font>'
+				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What kind of easy lay, does he think I am?</font>'
 			elseif VK = 2:
-				'You walk away without saying a word. Thinking to yourself: <font color=#FF00FF>What an annoying, little punk!</font>'
+				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'What an annoying, little punk!</font>'
 			else	
-				'You walk away without saying a word. Thinking to yourself: <font color=#FF00FF>Something about that guy, really annoys me.</font>'
+				'You walk away without saying a word. Thinking to yourself: '+$OpenInnerThought+'Something about that guy, really annoys me.</font>'
 			end
 				
 			act 'Go to class':gt 'gschool_lessons', 'short_break'
@@ -801,7 +801,7 @@ if $ARGS[0] =  'Dimka':
 		gs'stat'
 		'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: <font color=#FF00FF>Oh shit! How am I going to explain this to Niko. I''m really screwed now.</font> Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'		
+		'Dimka quickly pulls out his phone then starts up a video then shows it to Niko. You recognize the video of you sucking on Dimka''s dick, causing you to think to yourself: '+$OpenInnerThought+'Oh shit! How am I going to explain this to Niko. I''m really screwed now.'+$CloseInnerThought+' Niko watches the video then turns to you and says, "You have some talents, I see." He pulls out his phone then taps the screens of both phones for a few seconds then returns Dimka''s phone. Dimka grins as he says, "See I told you that she is a whore." Niko replies, "You are still being rude. Thanks for the vid, but you can get lost now." Dimka recoils in shock, "But this video sho... Hey what the hell? Did you delete it?" Niko smirks as he replies, "Well of course I have. I can''t just let you keep embarrassing videos of my girl, now can I?"'		
 		
 		act 'Continue':	
 			*clr & cla

+ 25 - 25
locations/NikoEv2.qsrc

@@ -38,7 +38,7 @@ if $ARGS[0] = 'Park':
 				minut += 5
 				gs'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/shady.jpg"></center>'	
-				'As you both arrive, one of the men says, "She looks good." He then reaches out to touch you, but his hand is pushed away by Niko. "You need to pay up before you start touching." The guy chuckles, "Of course, of course. Where is my head?" He then nods to the other man, who reaches into his pocket then gives Niko some ruble which Niko counts before nodding to the men then taking a step back, signaling the men to use you. The men begin fondling your breasts as they kiss your neck. <font color=#FF00FF>This feels so wrong, but Niko needs me to do this. He is counting on me. I must not let him down. I wont let you down Niko.</font>' 
+				'As you both arrive, one of the men says, "She looks good." He then reaches out to touch you, but his hand is pushed away by Niko. "You need to pay up before you start touching." The guy chuckles, "Of course, of course. Where is my head?" He then nods to the other man, who reaches into his pocket then gives Niko some ruble which Niko counts before nodding to the men then taking a step back, signaling the men to use you. The men begin fondling your breasts as they kiss your neck. '+$OpenInnerThought+'This feels so wrong, but Niko needs me to do this. He is counting on me. I must not let him down. I wont let you down Niko.'+$CloseInnerThought+'' 
 				*nl
 				'One of the men takes off your shirt then throws it to the ground. Niko immediately picks it up. One of the men begins pushing you to your knees.'		
 
@@ -67,7 +67,7 @@ if $ARGS[0] = 'Park':
 							gs 'fame'
 							gs'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/park/walk1.jpg"></center>'
-							'Niko rubs the back of your head. "Let''s get you back to my place, for your reward." You quickly feel your heart warm up. <font color=#FF00FF>My reward? He is going to reward me? What could it be? I really want to know.</font> You then reply, "Okay, Let''s go." Niko rubs your neck as he responds, "So eager, aren''t we? Good." He then chuckles as he begins walking you toward his house.'
+							'Niko rubs the back of your head. "Let''s get you back to my place, for your reward." You quickly feel your heart warm up. '+$OpenInnerThought+'My reward? He is going to reward me? What could it be? I really want to know.'+$CloseInnerThought+' You then reply, "Okay, Let''s go." Niko rubs your neck as he responds, "So eager, aren''t we? Good." He then chuckles as he begins walking you toward his house.'
 
 							act 'Follow Niko':gt 'NikoEv2', 'Home Date'
 						end
@@ -95,7 +95,7 @@ if $ARGS[0] = 'Reward':
 	gs 'fame'
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/volkovhome/rooms/niko/bedroom.jpg"></center>'
-	'As soon as you enter the bedroom, you look around, but don''t see Niko. <font color=#FF00FF>Where did Niko go...</font>' 
+	'As soon as you enter the bedroom, you look around, but don''t see Niko. '+$OpenInnerThought+'Where did Niko go...'+$CloseInnerThought+'' 
 	
 	act '...':	
 		*clr & cla
@@ -127,7 +127,7 @@ if $ARGS[0] = 'Reward':
 					minut += 5
 					gs'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/cum/throat.mp4"></video></center>'
-					'Niko continues quickly thrusting his dick further inside of you until he suddenly pulls out of you then says, "<<$pcs_firstname>> open your mouth!" You obediently open your mouth as Niko climbs on top of your chest then shoves his dick down your throat before groaning, filling you throat with his warm seed. Niko is having such a powerful orgasm that he doesn''t even notice that you are choking on his dick. <font color=#FF00FF>I''m choking. Should I pull away? No! Niko is so happy right now. I must let him finish. I just want you to be happy Niko.</font> You endure the chocking as your eyes tear up.' 
+					'Niko continues quickly thrusting his dick further inside of you until he suddenly pulls out of you then says, "<<$pcs_firstname>> open your mouth!" You obediently open your mouth as Niko climbs on top of your chest then shoves his dick down your throat before groaning, filling you throat with his warm seed. Niko is having such a powerful orgasm that he doesn''t even notice that you are choking on his dick. '+$OpenInnerThought+'I''m choking. Should I pull away? No! Niko is so happy right now. I must let him finish. I just want you to be happy Niko.'+$CloseInnerThought+' You endure the chocking as your eyes tear up.' 
 					*nl
 					'You do your best to hold back from gagging, not wanting to interrupt Niko''s orgasm. After Niko is finished, he catches his breath then says, "<<$pcs_nickname>> you are simply divine." You take a few seconds to catch you breath before leaning forward to kiss Niko.'	
 					gs 'cum_call', 'mouth', $boy
@@ -148,13 +148,13 @@ if $ARGS[0] = 'Reward':
 							gs'stat'
 							'<center><b><h4><font color="red"><<"Yurik Volkov">></font></h4></b></center>'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/intrude/yurik1.jpg"></center>'
-							'You fall to the ground then look back up at Yurik in fear. You can feel your whole body trembling. <font color=#FF00FF>What is he going to do to me. i''m not strong enough to resist him. He is so strong. What''s going to happen to me now?</font> Yurik wraps his hand around your neck, "Listen bitch, You will do whatever I say, when I say it. Do you understand?"' 
+							'You fall to the ground then look back up at Yurik in fear. You can feel your whole body trembling. '+$OpenInnerThought+'What is he going to do to me. i''m not strong enough to resist him. He is so strong. What''s going to happen to me now?'+$CloseInnerThought+' Yurik wraps his hand around your neck, "Listen bitch, You will do whatever I say, when I say it. Do you understand?"' 
 
 							act 'Nod':
 								*clr & cla
 								gs'stat'
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/deek/deek.jpg"></center>'
-								'You meekly nod and he says, "Good, you know your place." Yurik lifts you up then drops you on the bed with your head at the foot of the bed then he quickly romoves his pants causing his 19 centimeter penis to spring out. <font color=#FF00FF>Ohh wow. his dick is so big. There is no way that will fit inside me.</font> Yurik approaches your face as you lay still, in complete shock.'
+								'You meekly nod and he says, "Good, you know your place." Yurik lifts you up then drops you on the bed with your head at the foot of the bed then he quickly romoves his pants causing his 19 centimeter penis to spring out. '+$OpenInnerThought+'Ohh wow. his dick is so big. There is no way that will fit inside me.'+$CloseInnerThought+' Yurik approaches your face as you lay still, in complete shock.'
 
 								act 'See what Yurik does':	
 									*clr & cla
@@ -188,7 +188,7 @@ if $ARGS[0] = 'Reward':
 												gs'stat'
 												'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-												'You begin coughing erratically as Niko holds you in his arms, "<<$pcs_firstname>> please tell me that you are okay." Niko begins rubbing on your back gently. You continue coughing for almost a full minute as Niko wipes away your tears. "I''m so sorry <<$pcs_firstname>>. My brother is such a brutish oaf. I will find a way to protect you from him, I promise." You finally finish coughing then return Niko''s hug and begin crying in his arms, <font color=#FF00FF>He was so rough with me. I couldn''t stop him. He might do that again to me. Please no. Never again. Please.</font> Niko leads you toward the bathroom where he carefully, splashes some water on your face. He then washes your face before leading you back to his room.'
+												'You begin coughing erratically as Niko holds you in his arms, "<<$pcs_firstname>> please tell me that you are okay." Niko begins rubbing on your back gently. You continue coughing for almost a full minute as Niko wipes away your tears. "I''m so sorry <<$pcs_firstname>>. My brother is such a brutish oaf. I will find a way to protect you from him, I promise." You finally finish coughing then return Niko''s hug and begin crying in his arms, '+$OpenInnerThought+'He was so rough with me. I couldn''t stop him. He might do that again to me. Please no. Never again. Please.'+$CloseInnerThought+' Niko leads you toward the bathroom where he carefully, splashes some water on your face. He then washes your face before leading you back to his room.'
 												
 												act 'Enter Niko''s room':	
 													*clr & cla
@@ -221,7 +221,7 @@ if $ARGS[0] =  'Niko Wake':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/charmer2.jpg"></center>'
-	'You open your eyes and see Niko with a concerned look on his face, he has his hand on your shoulder, shaking you. "<<$pcs_firstname>> are you alright? You looked like you were having an intense dream." You quickly look around the room then take several deep breaths, <font color=#FF00FF>It was a dream. It was only a dream. Oh my. I can''t keep doing this. Why does this keep happening to me? Why me?</font> Niko gives you a kiss on the forehead. "I''m so worried about you. Are you alright?" You nod slowly before saying, "I''m...I''m fine. I just had a nightmare, that''s all."' 
+	'You open your eyes and see Niko with a concerned look on his face, he has his hand on your shoulder, shaking you. "<<$pcs_firstname>> are you alright? You looked like you were having an intense dream." You quickly look around the room then take several deep breaths, '+$OpenInnerThought+'It was a dream. It was only a dream. Oh my. I can''t keep doing this. Why does this keep happening to me? Why me?'+$CloseInnerThought+' Niko gives you a kiss on the forehead. "I''m so worried about you. Are you alright?" You nod slowly before saying, "I''m...I''m fine. I just had a nightmare, that''s all."' 
 	*nl
 	'Niko continues kissing your forehead before responding, "I will do everything in my power to protect you. Just stay strong. Okay <<$pcs_firstname>>?" You nod your head again before saying, "Thank you Niko. I always feel safe in your arms." Niko smiles as he wraps his arms around you.'
 
@@ -232,7 +232,7 @@ if $ARGS[0] =  'Niko Wake':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/home/bedroom/relaxing1.jpg"></center>'
 		'After relaxing for a few minutes, You get up then stretch your body before saying, "I should head home. It is getting late." Niko places his hand on your shoulder. "Will you be alright on your own?" You reply, "Of course. I''ll see you tomorrow." You lean forward and kiss Niko on the cheek before getting up, getting dressed then leaving Niko''s house.'			
 
-		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pavResidential'
+		act 'Walk onto the street':gs 'clothing', 'wear_last_worn' & gt 'pav_residential'
 	end
 end
 
@@ -280,7 +280,7 @@ if $ARGS[0] =  'Lunch Chat':
 						*clr & cla
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/petia.mp4"></video></center>'
-						'"You finally open your mouth and wrap your lips around Petia''s dick then begin licking and sucking it firmly, doing your best to pretend that you are sucking Niko''s dick. You begin focusing on the softness and warmth of his Petia''s dick in your mouth. You use your tongue to feel out the shape of his penis, brushing against your tongue, enjoying the loud moans that he lets out. <font color=#FF00FF>I must continue pleasing him. He need me to please him. He needs me.</font> You can feel yourself blushing as you continue sucking his dick more rapidly. You can tell by Petia''s constant squirming, that he is close to cumming.'
+						'"You finally open your mouth and wrap your lips around Petia''s dick then begin licking and sucking it firmly, doing your best to pretend that you are sucking Niko''s dick. You begin focusing on the softness and warmth of his Petia''s dick in your mouth. You use your tongue to feel out the shape of his penis, brushing against your tongue, enjoying the loud moans that he lets out. '+$OpenInnerThought+'I must continue pleasing him. He need me to please him. He needs me.'+$CloseInnerThought+' You can feel yourself blushing as you continue sucking his dick more rapidly. You can tell by Petia''s constant squirming, that he is close to cumming.'
 						gs 'arousal', 'bj', 5
 						gs'stat'	
 									
@@ -288,7 +288,7 @@ if $ARGS[0] =  'Lunch Chat':
 							*clr & cla
 							gs'stat'
 							'<center><video autoplay loop src="images/shared/sex/cum/mouth/cum1.11.mp4"></video></center>'
-							'<font color=#FF00FF>Now is my chance. The moment he and I have been waiting for. The time that he cums, for me... Cum for me, Petia. Cum for me!</font> You quicken your pace then feel his penis throbbing in your mouth as he begins filling your mouth with his seed. You let Petia''s cum fill your mouth as you push it around with your tongue, enjoying the warmth and texture of his cum as it slides down your chin. Petia catches his breath before looking down to you, "Wow <<$pcs_firstname>>, Niko wasn''t lying when he said that you were the best at that. We need to do this again sometime."' 
+							''+$OpenInnerThought+'Now is my chance. The moment he and I have been waiting for. The time that he cums, for me... Cum for me, Petia. Cum for me!'+$CloseInnerThought+' You quicken your pace then feel his penis throbbing in your mouth as he begins filling your mouth with his seed. You let Petia''s cum fill your mouth as you push it around with your tongue, enjoying the warmth and texture of his cum as it slides down your chin. Petia catches his breath before looking down to you, "Wow <<$pcs_firstname>>, Niko wasn''t lying when he said that you were the best at that. We need to do this again sometime."' 
 
 							act 'Turn to Niko':	
 								*clr & cla
@@ -314,7 +314,7 @@ if $ARGS[0] =  'Lunch Chat':
 										gs 'boyStat', 'A189'										
 										gs'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev2/Home/bedroom/sex/bj5.mp4"></video></center>'
-										'You can feel your heart all aflutter as you continue sucking Niko''s dick. <font color=#FF00FF>Nikolai you are the only one I want to please. The only one love. Please realize that everything I do, I do for you. Please let me be the only one to please you. I will never fail you.</font>' 
+										'You can feel your heart all aflutter as you continue sucking Niko''s dick. '+$OpenInnerThought+'Nikolai you are the only one I want to please. The only one love. Please realize that everything I do, I do for you. Please let me be the only one to please you. I will never fail you.'+$CloseInnerThought+'' 
 										gs 'arousal', 'bj', 5
 										gs'stat'
 										
@@ -427,7 +427,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss1.mp4"></video></center>'
-		'Niko leans forward and gives you a soft kiss before saying, "You''re always making me so proud of you." You give Niko a warm smile, causing him to give you another more passionate kiss. <font color=#FF00FF>His lips are so soft and his kiss, so passionate. He really does love me. Oh Niko, keep kissing me. Please.</font>' 
+		'Niko leans forward and gives you a soft kiss before saying, "You''re always making me so proud of you." You give Niko a warm smile, causing him to give you another more passionate kiss. '+$OpenInnerThought+'His lips are so soft and his kiss, so passionate. He really does love me. Oh Niko, keep kissing me. Please.'+$CloseInnerThought+'' 
 		
 		act 'Sure':	
 			*clr & cla
@@ -458,7 +458,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 						*clr & cla
 						gs'stat'
 						'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/petia2.mp4"></video></center>'
-						'You climb on top of Petia and feel is rock hard penis entering you vagina, You feel a jolt of pleasure, causing you to moan loudly, Petia moans with you, almost in perfect harmony. You start riding Petia''s cock as he breath heavily in your ear before his breath suddenly stops and he lets out a loud moan as he fills his condom, cumming almost immediately after you begin riding him. <font color=#FF00FF>Oh wow, he couldn''t hold himself back from cumming for even a minute. He must have really wanted me. He may be a smelly loser but he deserves to receive pleasure too and I gave it to him.</font>'
+						'You climb on top of Petia and feel is rock hard penis entering you vagina, You feel a jolt of pleasure, causing you to moan loudly, Petia moans with you, almost in perfect harmony. You start riding Petia''s cock as he breath heavily in your ear before his breath suddenly stops and he lets out a loud moan as he fills his condom, cumming almost immediately after you begin riding him. '+$OpenInnerThought+'Oh wow, he couldn''t hold himself back from cumming for even a minute. He must have really wanted me. He may be a smelly loser but he deserves to receive pleasure too and I gave it to him.'+$CloseInnerThought+''
 						gs 'arousal', 'vaginal', 5
 						gs'stat'	
 						
@@ -516,7 +516,7 @@ if $ARGS[0] =  'Lunch Chat 2':
 												*clr & cla
 												gs'stat'											
 												'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikomisc/payback/anal.mp4"></video></center>'
-												'Niko spends a few seconds draining his cum onto your ass before taking a few seconds to catch his breath. Niko then turns to you and says, "You were amazing <<$pcs_firstname>>. So fucking hot." You give Niko a soft kiss before replying, "I''m always happy to please you Niko." Niko gives you a very pleased smile as he responds, "I really made the right choice in choosing you. That''s for sure. I have some plans for making big money and I would like you to meet me <font color=#FF00FF>after school</font> where we can discuss it further. Alright I should really head back now." Niko begins buttoning up his pants before leaving the room.'
+												'Niko spends a few seconds draining his cum onto your ass before taking a few seconds to catch his breath. Niko then turns to you and says, "You were amazing <<$pcs_firstname>>. So fucking hot." You give Niko a soft kiss before replying, "I''m always happy to please you Niko." Niko gives you a very pleased smile as he responds, "I really made the right choice in choosing you. That''s for sure. I have some plans for making big money and I would like you to meet me '+$OpenInnerThought+'after school</font> where we can discuss it further. Alright I should really head back now." Niko begins buttoning up his pants before leaving the room.'
 												gs 'cum_call', 'butt', $boy
 												gs 'arousal', 'vaginal', 5
 												gs 'arousal', 'end'
@@ -625,7 +625,7 @@ if $ARGS[0] =  'Diner 1':
 					minut += 5
 					gs'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/1/bj1.jpg"></center>'
-					'You step in front of him before dropping to your knees then wrapping your lips around his dick. You begin licking and sucking his dick, doing your best to please him. The man begins moaning loudly. <font color=#FF00FF>This man is enjoying this so much. It must have been a long time, if ever, that this man has received a woman''s touch. I may even be his first. I must do my best to make this his best day ever. He will remember me forever.</font> You increase the pace while feeling him fidgeting. After a few more seconds, the man says, "Oh fuck girrrrrl!" The man then begins squirming as he sprays his load into your mouth and all over your face, you look up at the biker and see an adoring look on his face as he looks down at you.' 
+					'You step in front of him before dropping to your knees then wrapping your lips around his dick. You begin licking and sucking his dick, doing your best to please him. The man begins moaning loudly. '+$OpenInnerThought+'This man is enjoying this so much. It must have been a long time, if ever, that this man has received a woman''s touch. I may even be his first. I must do my best to make this his best day ever. He will remember me forever.'+$CloseInnerThought+' You increase the pace while feeling him fidgeting. After a few more seconds, the man says, "Oh fuck girrrrrl!" The man then begins squirming as he sprays his load into your mouth and all over your face, you look up at the biker and see an adoring look on his face as he looks down at you.' 
 					gs 'cum_call', 'face'
 					gs 'arousal', 'bj', 5
 					gs 'arousal', 'end'
@@ -650,7 +650,7 @@ if $ARGS[0] =  'Diner 1':
 								minut += 5
 								gs'stat'							
 								'<center><img <<$set_imgh>> src="images/pc/body/cum/cumface/blonde/15.jpg"></center>'
-								'You turn to see a nearby trucker examining your face before shouting out, "Is that what I think it is? Hey guys look at this girl. She is walking around with cum leaking off of her face!" You freeze in place. <font color=#FF00FF>Oh shit! I forgot to wash up. How did I forget that? I''m walking around with cum dripping off my chin. How could I forget?</font> the truckers and bikers in the room surround you then begin talking to each other.'
+								'You turn to see a nearby trucker examining your face before shouting out, "Is that what I think it is? Hey guys look at this girl. She is walking around with cum leaking off of her face!" You freeze in place. '+$OpenInnerThought+'Oh shit! I forgot to wash up. How did I forget that? I''m walking around with cum dripping off my chin. How could I forget?'+$CloseInnerThought+' the truckers and bikers in the room surround you then begin talking to each other.'
 								
 								act 'Listen to them':	
 									*clr & cla
@@ -668,7 +668,7 @@ if $ARGS[0] =  'Diner 1':
 										'Biker3: I wonder how much she''s chargin''?'
 									end
 									*nl
-									'Niko chuckles as he replies, "She is my girl and it will be 2000 <b>₽</b>, per customer." All of the truckers and bikers begin lining up in front of Niko giving him money, before approaching you. <font color=#FF00FF>Am I about to have sex with all these men? How can I satisfy that many men? I don''t know if I can even handle that.</font> The men begin undressing you as they roughly finger your holes. You close your eyes as one of the men pushes you down on your knees as another shoves his dick into your mouth.'
+									'Niko chuckles as he replies, "She is my girl and it will be 2000 <b>₽</b>, per customer." All of the truckers and bikers begin lining up in front of Niko giving him money, before approaching you. '+$OpenInnerThought+'Am I about to have sex with all these men? How can I satisfy that many men? I don''t know if I can even handle that.'+$CloseInnerThought+' The men begin undressing you as they roughly finger your holes. You close your eyes as one of the men pushes you down on your knees as another shoves his dick into your mouth.'
 									
 									act 'Suck their dicks':	
 										*clr & cla
@@ -728,7 +728,7 @@ if $ARGS[0] =  'Diner 1':
 														minut -= 5
 														gs'stat'
 														'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev2/diner/gang/5.jpg"></center>'
-														'<font color=#FF00FF>That man was so rough, but Niko...My Niko protected me like he said he would.</font> As the man continues fucking your ass, another man grabs your head then turns it to face a third man''s dick which you immediately wrap your lips around before licking and sucking it eagerly. The pain in your ass fades as pleasure takes it''s place. You close your eyes and submit to the pleasure when another man approaches you.'
+														''+$OpenInnerThought+'That man was so rough, but Niko...My Niko protected me like he said he would.'+$CloseInnerThought+' As the man continues fucking your ass, another man grabs your head then turns it to face a third man''s dick which you immediately wrap your lips around before licking and sucking it eagerly. The pain in your ass fades as pleasure takes it''s place. You close your eyes and submit to the pleasure when another man approaches you.'
 														gs 'arousal', 'bj', 5
 														gs 'arousal', 'anal', 5
 														gs'stat'									
@@ -876,7 +876,7 @@ if $ARGS[0] =  'Reward 2':
 		minut += 10
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/kiss3.mp4"></video></center>'
-		'As soon as you enter Niko''s house he pulls you toward him then gives you another passionate kiss as he begins undressing you. <font color=#FF00FF>Oh his kisses are so passionate. He wants me so bad. I want him too. Please take me Nikolai. Take me!</font> Niko finishes undressing you then begins removing his clothes as you help him undress. Niko pulls you to the bedroom then pushes you onto the bed.'		
+		'As soon as you enter Niko''s house he pulls you toward him then gives you another passionate kiss as he begins undressing you. '+$OpenInnerThought+'Oh his kisses are so passionate. He wants me so bad. I want him too. Please take me Nikolai. Take me!'+$CloseInnerThought+' Niko finishes undressing you then begins removing his clothes as you help him undress. Niko pulls you to the bedroom then pushes you onto the bed.'		
 
 		act 'Lay back':	
 			*clr & cla
@@ -900,7 +900,7 @@ if $ARGS[0] =  'Reward 2':
 					*clr & cla
 					gs'stat'				
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/fedor/fedorev/home/bj.mp4"></video></center>'
-					'You begin sucking on Niko''s dick. <font color=#FF00FF>Oh Niko you are so perfect. I only want to please you. To see you happy. To give you the bliss that you give me. I love you Nikolai.</font> Niko tilts his head back as he lets out a light moan before looking down to you then saying, "<<$pcs_nickname>> come here." He beckons you to come closer.'
+					'You begin sucking on Niko''s dick. '+$OpenInnerThought+'Oh Niko you are so perfect. I only want to please you. To see you happy. To give you the bliss that you give me. I love you Nikolai.'+$CloseInnerThought+' Niko tilts his head back as he lets out a light moan before looking down to you then saying, "<<$pcs_nickname>> come here." He beckons you to come closer.'
 					gs 'arousal', 'bj', 5
 					gs'stat'	
 											
@@ -955,7 +955,7 @@ if $ARGS[0] = 'Yurik BJ':
 		*clr & cla
 		gs'stat'
 		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/yurikev/sex/bj/bj1.mp4"></video></center>'
-		'You begin sucking Yurik''s massive dick, trying your best to fit as much of it in your mouth as you can. Yurik continues watching the TV as if you weren''t even there. <font color=#FF00FF>Am I not doing a good enough job. Why isn''t he enjoying this? I must try harder.</font> You begin licking his penis rapidly, trying to get a response from him. You pull his dick out of your mouth and begin licking the tip of it which causes him to grunt and look down to you.'
+		'You begin sucking Yurik''s massive dick, trying your best to fit as much of it in your mouth as you can. Yurik continues watching the TV as if you weren''t even there. '+$OpenInnerThought+'Am I not doing a good enough job. Why isn''t he enjoying this? I must try harder.'+$CloseInnerThought+' You begin licking his penis rapidly, trying to get a response from him. You pull his dick out of your mouth and begin licking the tip of it which causes him to grunt and look down to you.'
 		gs 'arousal', 'bj', 5
 		gs'stat'	
 						
@@ -1184,7 +1184,7 @@ if $ARGS[0] = 'Niko Search':
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
-	'As you are leaving the cafeteria, you walk toward the restroom to check up on Niko. When you arrive at the restroom you can see the boys chatting with each other before turning to you then whispering to each other before Dan grabs onto your arm. "Hey <<$pcs_firstname>> I know why you are here. You miss our dicks don''t you?" You recoil before saying, "No I was just looking for..." Dan grips your arm tighter as he unbuttons his pants. "Don''t worry, My dick is right here." Dan pushes you down to your knees then presses his dick against your lips while the other gopnik circle around you. <font color=#ff00cc>There is no point in resisting.</font>' 
+	'As you are leaving the cafeteria, you walk toward the restroom to check up on Niko. When you arrive at the restroom you can see the boys chatting with each other before turning to you then whispering to each other before Dan grabs onto your arm. "Hey <<$pcs_firstname>> I know why you are here. You miss our dicks don''t you?" You recoil before saying, "No I was just looking for..." Dan grips your arm tighter as he unbuttons his pants. "Don''t worry, My dick is right here." Dan pushes you down to your knees then presses his dick against your lips while the other gopnik circle around you. '+$OpenInnerThought+'There is no point in resisting.'+$CloseInnerThought+'' 
 	'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
 
@@ -1224,7 +1224,7 @@ if $ARGS[0] =  'Niko Search 2':
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'	
-	'As you are leaving the cafeteria, you carefully approach the restroom. <font color=#ff00cc>Please be there Niko.</font> When you arrive at the restroom you carefully peek through the door to see that no one is there. You can''t help but feel a bit relieved that none of the boys are there, but soon you hear some boys chatting from the hallway behind you, so you quickly run into one of the stalls while hoping that they don''t enter. To your dismay, they enter the restroom while continuing their conversation.'	
+	'As you are leaving the cafeteria, you carefully approach the restroom. '+$OpenInnerThought+'Please be there Niko.'+$CloseInnerThought+' When you arrive at the restroom you carefully peek through the door to see that no one is there. You can''t help but feel a bit relieved that none of the boys are there, but soon you hear some boys chatting from the hallway behind you, so you quickly run into one of the stalls while hoping that they don''t enter. To your dismay, they enter the restroom while continuing their conversation.'	
 	'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
 
@@ -1237,7 +1237,7 @@ if $ARGS[0] =  'Niko Search 2':
 		'Vasily: "I saw him leaving class, holding Dimka''s books like his little whipping boy. That guy has to be the biggest pussy, I have ever seen."'
 		'Vitek: "I swear that guy is a fag, if I have ever seen one."'
 		'Dan: "Hey who is in this stall? Are you taking a shit in there?"'
-		'Dan knocks on the door a few times as the others chuckle. <font color=#ff00cc>Oh no, do they know? Should I run?</font> Dan walks away from the door as the guys continue laughing and chatting.'
+		'Dan knocks on the door a few times as the others chuckle. '+$OpenInnerThought+'Oh no, do they know? Should I run?'+$CloseInnerThought+' Dan walks away from the door as the guys continue laughing and chatting.'
 		'<center><b><font color="green"><<"Denis [Dan] Ryzhov">></font></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/head/10.jpg"></center>'
 		

+ 5 - 5
locations/NikoMeyHome.qsrc

@@ -327,7 +327,7 @@ if $ARGS[0] =  'Bathroom Locked':
 	VKMeyLock = 1
 	gs'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikomisc/meynold/bathroom/locked.jpg"></center>'
-	'You try to enter the bathroom but the door is locked. <font color=#FF00FF>Hmm it''s locked. Katja or <<$VK_VikName>> must have the key. I should speak with them</font>'
+	'You try to enter the bathroom but the door is locked. '+$OpenInnerThought+'Hmm it''s locked. Katja or <<$VK_VikName>> must have the key. I should speak with them'+$CloseInnerThought+''
 
 	act 'Walk away': gt 'NikoMeyHome', 'Hallway'	
 end
@@ -502,7 +502,7 @@ if $ARGS[0] = 'Leaving':
 	gs'stat'
 	'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 	*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-	'As you approach the door, you think to yourself, <font color=#FF00FF>I haven''t spoken to all the girls yet. Should I leave without saying goodbye?</font>'
+	'As you approach the door, you think to yourself, '+$OpenInnerThought+'I haven''t spoken to all the girls yet. Should I leave without saying goodbye?'+$CloseInnerThought+''
 	
 	act '<font color=#FF00FF>Return to hallway</font>':gt 'NikoMeyHome', 'Hallway'
 	act '<font color="red">Leave Meynold home</font>':VKMeyLeft = 1 & gt 'NikoMeyHome', 'Vicky Goodbye'
@@ -521,7 +521,7 @@ if $ARGS[0] = 'Vicky Goodbye':
 	if VKNatChat = 4:
 		act 'Walk home with Natalia':NikoAftermath = 0 & gt 'NikoMeyHome', 'Natalia Walk'
 	else
-		act 'Walk toward town':NikoAftermath = 0 & gt 'pavResidential'
+		act 'Walk toward town':NikoAftermath = 0 & gt 'pav_residential'
 	end
 end
 
@@ -917,7 +917,7 @@ if $ARGS[0] = 'Kat Bath':
 							cla & *clr
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/receiving/5.mp4"></video></center>'
-							'You increase your pace before Katja suddenly slams her head back. Katja''s body begins to spasm as she experiences a powerful orgasm. Her moaning is erratic and her hands tightly clench around the shelf. You look up at her and watch her writhing in pleasure. <font color=#FF00FF>Yes Katja. Feel what you mean to me. You deserve every second of pleasure I can give you. I want you to feel pure ecstasy.</font>'
+							'You increase your pace before Katja suddenly slams her head back. Katja''s body begins to spasm as she experiences a powerful orgasm. Her moaning is erratic and her hands tightly clench around the shelf. You look up at her and watch her writhing in pleasure. '+$OpenInnerThought+'Yes Katja. Feel what you mean to me. You deserve every second of pleasure I can give you. I want you to feel pure ecstasy.'+$CloseInnerThought+''
 							
 							act 'Continue':	
 								cla & *clr
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'Katja Bath':
 							cla & *clr
 							gs'stat'
 							'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/natalia/love/bathroom/giving/5.mp4"></video></center>'
-							'Katja notices your loud moaning then begins increasing her pace, causing you to suddenly slam your head back. You feel your breath stop as waves of pleasure begin pulsing throughout your body. You lose all control as your body is filled with perfect ecstasy. You can hear yourself moaning loudly and feel your body spasming wildly while Katja remains latched onto your vagina, licking vigorously. <font color=#FF00FF>Yes Katja. Please me. Show me what I mean to you. Make me feel pure ecstasy!</font>'
+							'Katja notices your loud moaning then begins increasing her pace, causing you to suddenly slam your head back. You feel your breath stop as waves of pleasure begin pulsing throughout your body. You lose all control as your body is filled with perfect ecstasy. You can hear yourself moaning loudly and feel your body spasming wildly while Katja remains latched onto your vagina, licking vigorously. '+$OpenInnerThought+'Yes Katja. Please me. Show me what I mean to you. Make me feel pure ecstasy!'+$CloseInnerThought+''
 							
 							act 'Continue':	
 								cla & *clr

+ 23 - 23
locations/NikoWhore.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'Locker Room':
 	gs'stat'
 	'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/avatars/<<week>>.jpg"></center>'
-	'Niko wraps his arm around your neck then leads you to the locker room. When you enter the locker room, Niko closes the door then takes a quick look around to see if anyone is there. Niko walks up behind you then whispers in your ear, "<<$pcs_firstname>> take off your clothes." You obediently do as he asks, removing all your clothes. Niko collects your clothes then puts them in a bag. You can''t help but feel nervous when you see Niko packing up your clothes. <font color=#FF00FF>Is he taking my clothes away? What if someone walks in? I wont be able to get dressed. I''m sure Niko knows what he is doing. Just follow his lead <<$pcs_firstname>>, just follow his lead.</font>'
+	'Niko wraps his arm around your neck then leads you to the locker room. When you enter the locker room, Niko closes the door then takes a quick look around to see if anyone is there. Niko walks up behind you then whispers in your ear, "<<$pcs_firstname>> take off your clothes." You obediently do as he asks, removing all your clothes. Niko collects your clothes then puts them in a bag. You can''t help but feel nervous when you see Niko packing up your clothes. '+$OpenInnerThought+'Is he taking my clothes away? What if someone walks in? I wont be able to get dressed. I''m sure Niko knows what he is doing. Just follow his lead <<$pcs_firstname>>, just follow his lead.'+$CloseInnerThought+''
 
 	act 'Take a deep breath':
 		*clr & cla
@@ -30,7 +30,7 @@ if $ARGS[0] = 'Locker Room':
 				*clr & cla
 				gs'stat'			
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker2.mp4"></video></center>'
-				'You immediately understand what he wants and begin sucking his dick thoroughly, trying your best to please him. Niko looks down to you and says, "You''re doing great <<$pcs_nickname>>, keep it up." Niko''s approval gives you a warm feeling in your heart. <font color=#FF00FF>I''m doing good. Niko likes what I''m doing for him. I only want to please you Niko. Please cum for me. I want your seed inside me.</font>'
+				'You immediately understand what he wants and begin sucking his dick thoroughly, trying your best to please him. Niko looks down to you and says, "You''re doing great <<$pcs_nickname>>, keep it up." Niko''s approval gives you a warm feeling in your heart. '+$OpenInnerThought+' I''m doing good. Niko likes what I''m doing for him. I only want to please you Niko. Please cum for me. I want your seed inside me.'+$CloseInnerThought+''
 				gs 'arousal', 'bj', 5, 'sub'
 				gs 'stat'
 								
@@ -58,7 +58,7 @@ if $ARGS[0] = 'Locker Room':
 							gs'stat'
 							'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 							*pl '<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-							'You squirm for a few seconds, attempting to free yourself from the cuffs. <font color=#FF00FF>Where did Niko go? Did he forget to uncuff me? Maybe he just left to wash his hands before untying me. He wouldn''t forget about me. I just need to wait patiently, for him to return.</font> You spend the next few minutes trying to get comfortable until you hear the locker room door open. You quickly look up in excitement. <font color=#FF00FF>I knew that Niko wouldn''t forget me.</font> but as you look up...'
+							'You squirm for a few seconds, attempting to free yourself from the cuffs. '+$OpenInnerThought+'Where did Niko go? Did he forget to uncuff me? Maybe he just left to wash his hands before untying me. He wouldn''t forget about me. I just need to wait patiently, for him to return.'+$CloseInnerThought+' You spend the next few minutes trying to get comfortable until you hear the locker room door open. You quickly look up in excitement. '+$OpenInnerThought+'I knew that Niko wouldn''t forget me.'+$CloseInnerThought+' but as you look up...'
 							gs 'arousal', 'flash', 2, 'sub', 'humiliation'
 							gs 'stat'
 							
@@ -76,7 +76,7 @@ if $ARGS[0] = 'Locker Room':
 									minut += 2
 									gs'stat'							
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker4.jpg"></center>'
-									'You shout at Dan, "Let go of me, or I''ll scream!" Dan''s grin grows even wider and who would hear you? Everyone is in the cafeteria, laughing and shouting over each other. Even if someone heard you, would you like them to see you chained up naked, like this? Maybe I should just walk you into the cafeteria where you can scream all you want." <font color=#FF00FF>I''m completely naked. If he walks me into the cafeteria then I will be completely humiliated.</font>'
+									'You shout at Dan, "Let go of me, or I''ll scream!" Dan''s grin grows even wider and who would hear you? Everyone is in the cafeteria, laughing and shouting over each other. Even if someone heard you, would you like them to see you chained up naked, like this? Maybe I should just walk you into the cafeteria where you can scream all you want." '+$OpenInnerThought+'I''m completely naked. If he walks me into the cafeteria then I will be completely humiliated.'+$CloseInnerThought+''
 									gs 'arousal', 'flash', 2, 'sub', 'humiliation'
 									gs 'stat'
 									
@@ -84,9 +84,9 @@ if $ARGS[0] = 'Locker Room':
 										*clr & cla
 										gs'stat'
 										'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/locker5.mp4"></video></center>'	
-										'You lower your head in submission, "Please don''t do that. I''ll stay quiet." Dan quickly turns you around then unbuttons his pants before sliding his dick inside of your ass, causing a surge of pressure and pain to fill your ass. Dan wastes no time and begins fucking your ass, slowly at first then continues picking up the pace. <font color=#FF00FF>I can''t believe this is happening. Niko where are you? Please help me!</font> Dan continues fucking your ass when his phone begins ringing.'
+										'You lower your head in submission, "Please don''t do that. I''ll stay quiet." Dan quickly turns you around then unbuttons his pants before sliding his dick inside of your ass, causing a surge of pressure and pain to fill your ass. Dan wastes no time and begins fucking your ass, slowly at first then continues picking up the pace. '+$OpenInnerThought+'I can''t believe this is happening. Niko where are you? Please help me!'+$CloseInnerThought+' Dan continues fucking your ass when his phone begins ringing.'
 										*nl
-										'Dan doesn''t even stop fucking you as he answers his phone. The person on the other end of the phone says something to Dan, to which he responds, "I can''t right now. I''m too busy fucking <<$pcs_firstname>>''s ass." Your eyes widen as Dan continues, "Yeah, I''m in the locker room...Sure you can come." <font color=#FF00FF>Did he just tell someone about this? Who was he talking too? I can''t do anything. Please tell me I''m dreaming.</font>'
+										'Dan doesn''t even stop fucking you as he answers his phone. The person on the other end of the phone says something to Dan, to which he responds, "I can''t right now. I''m too busy fucking <<$pcs_firstname>>''s ass." Your eyes widen as Dan continues, "Yeah, I''m in the locker room...Sure you can come." '+$OpenInnerThought+'Did he just tell someone about this? Who was he talking too? I can''t do anything. Please tell me I''m dreaming.'+$CloseInnerThought+''
 										$orgasm_txt = ''
 										gs 'arousal', 'anal', 5, 'sub'
 										gs 'stat'
@@ -112,7 +112,7 @@ if $ARGS[0] = 'Locker Room':
 													kotovloveQW = -1
 													'Vitek and Vasily enter the room then Vitek begins shouting at Dan, "What the fuck do you think you''re doing Dan? <<$pcs_firstname>> is mine!" Dan suddenly rams his dick far in your ass, causing you to scream as he fills your ass with his cum. You feel his dick throbbing inside you as his warm cum fills your ass. Vitek suddenly wraps his hand around Dan''s throat, "Answer my fucking question! What are you doing, fucking my girl?" Dan chokes on his words as he tries to explain, "<<$pcs_firstname>> is a...whore and I can...Grr...prove it. Check this out," Dan reaches into his pocket then pulls out his phone and taps the screen a few times. After a few more taps, he lift the phone up to Vitek''s face. A video plays where you hear sucking sounds followed by a groan then shortly after hear yourself saying,'
 													*nl
-													'"I love you Nikolai. I love you with all my heart." You suddenly realize what that Dan must have recorded you as you sucked Niko''s dick in the hallway, after school. <font color=#FF00FF>There is no way I can talk my way out of this. What will Viktor do to me?</font> Vitek watches the video for a few more seconds before releasing Dan''s throat then turning to you with his face; seething with rage. "You fucking worthless whore!" He then lifts his hand and smacks you hard, knocking you to the ground. Vitek begins smashing a nearby garbage can in rage then Dan places his hand on Vitek''s shoulder, "It''s alright Vitek, you don''t need her, you never did." Vitek takes a few seconds to calm himself then brushes Dan''s hand off his shoulder as he unbuttons his pants then pushes his dick against your lips. "What are you waiting for, whore? Start sucking." You meekly nod before wrapping your lips around his dick.'
+													'"I love you Nikolai. I love you with all my heart." You suddenly realize what that Dan must have recorded you as you sucked Niko''s dick in the hallway, after school. '+$OpenInnerThought+'There is no way I can talk my way out of this. What will Viktor do to me?'+$CloseInnerThought+' Vitek watches the video for a few more seconds before releasing Dan''s throat then turning to you with his face; seething with rage. "You fucking worthless whore!" He then lifts his hand and smacks you hard, knocking you to the ground. Vitek begins smashing a nearby garbage can in rage then Dan places his hand on Vitek''s shoulder, "It''s alright Vitek, you don''t need her, you never did." Vitek takes a few seconds to calm himself then brushes Dan''s hand off his shoulder as he unbuttons his pants then pushes his dick against your lips. "What are you waiting for, whore? Start sucking." You meekly nod before wrapping your lips around his dick.'
 												else
 													'Vitek and Vasily enter the room then quickly begin whistling at you before Vitek says, "I thought that Dan was fucking with me when he told me about this." Dan suddenly rams his dick far in your ass, causing you to scream as he fills your ass with his cum. You feel his dick throbbing inside you as his warm cum fills your ass. "You take a second to catch your breath when you look up to see Vitek''s dick in your face. "What are you waiting for slut? Start sucking."'
 													*nl
@@ -174,7 +174,7 @@ if $ARGS[0] = 'Locker Room':
 															inhib_exp += 2
 															gs'stat'
 															'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/wos.jpg"></center>'
-															'<font color=#FF00FF>No this can''t be! Why is this happening? This will ruin my reputation forever. I will be an outcast like Sonia. The boys will abuse me. This can''t be happening.</font>"Please don''t do this. I will do anything! Please just let me go." Vitek pulls on your collar. "Less talking, more walking." Vitek walks you out of the locker room as Dan tells you, "Don''t worry <<$pcs_firstname>>, you will get used to it. Imagine it, every boy in school will be giving you a lot of attention. You will be popular among all the boys." You look back to Vasily and he whispers in your ear, "I''m sorry <<$pcs_nickname>>, but I can''t help you. It''s too late." As he follows closely behind you.'
+															''+$OpenInnerThought+'No this can''t be! Why is this happening? This will ruin my reputation forever. I will be an outcast like Sonia. The boys will abuse me. This can''t be happening.'+$CloseInnerThought+'"Please don''t do this. I will do anything! Please just let me go." Vitek pulls on your collar. "Less talking, more walking." Vitek walks you out of the locker room as Dan tells you, "Don''t worry <<$pcs_firstname>>, you will get used to it. Imagine it, every boy in school will be giving you a lot of attention. You will be popular among all the boys." You look back to Vasily and he whispers in your ear, "I''m sorry <<$pcs_nickname>>, but I can''t help you. It''s too late." As he follows closely behind you.'
 															gs 'arousal', 'flash', 2, 'sub', 'humiliation', 'exhibitionism'
 															gs 'stat'
 															
@@ -184,7 +184,7 @@ if $ARGS[0] = 'Locker Room':
 																gs'stat'
 																'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 																*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'										
-																'Your heart is pounding and you can feel tears streaming down your eyes. <font color=#FF00FF>I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!</font> You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
+																'Your heart is pounding and you can feel tears streaming down your eyes. '+$OpenInnerThought+'I''m going to lose everything. My life will never be the same again. Please let this be a bad dream. PLEEEEEEASE!'+$CloseInnerThought+' You close your eyes, trying to wake up when you hear the sounds of chatting and laughter, informing you that you are passing the cafeteria.'
 																*nl
 																if fedorkozlovQW > 1 or fedorKozlovQW < -10:
 																	'You suddenly hear Fedor Kozlov shouting, "What are you guys doing with <<$pcs_firstname>>?" Dan begins laughing as he replies, "Didn''t <<$pcs_firstname>> tell you? She wants to join Sonia as our fuck puppet." Fedor looks to you with concerning eyes, "They are lying, aren''t they?"'
@@ -502,7 +502,7 @@ if $ARGS[0] = 'Locker Room 2':
 	inhib_exp += 1
 	gs'stat'
 	'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock2.mp4"></video></center>'
-	'As soon as you reach the locker room, Dan shoves you into the crowd and Roman Yakovlev catches you then turns you around. You feel Roman''s penis entering your vagina then his pace begins increasing as he holds onto your waist, pushing you against his crotch. <font color=#FF00FF>This is it. This is my life now. How did I let this happen?</font> Roman leans forward and whispers in your ear, "How does my dick feel <<$pcs_nickname>>? Isn''t it the biggest dick you ever had?"'
+	'As soon as you reach the locker room, Dan shoves you into the crowd and Roman Yakovlev catches you then turns you around. You feel Roman''s penis entering your vagina then his pace begins increasing as he holds onto your waist, pushing you against his crotch. '+$OpenInnerThought+'This is it. This is my life now. How did I let this happen?'+$CloseInnerThought+' Roman leans forward and whispers in your ear, "How does my dick feel <<$pcs_nickname>>? Isn''t it the biggest dick you ever had?"'
 	$orgasm_txt = ''
 	gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
 	gs 'stat'
@@ -596,7 +596,7 @@ if $ARGS[0] = 'Locker Room 2':
 										minut -= 5
 										gs'stat'
 										'<center><video autoplay loop src="images/shared/sex/cum/analcreampie/cumAnal2.mp4"></video></center>'
-										'<font color=#FF00FF>Vitek is so strong and aggressive. He is always so rough. Why is he always so angry?</font> After a few more seconds, Vitek says, "This is what a whore like you deserves." Vitek then fills your ass with his warm seed. You can feel Vitek''s hot cum filling your ass and then leaking out as he pulls out of you. "You better get used to this <<$pcs_firstname>> Because this is your new life now." Vitek pulls up his pants then leaves the locker room.'
+										''+$OpenInnerThought+'Vitek is so strong and aggressive. He is always so rough. Why is he always so angry?'+$CloseInnerThought+' After a few more seconds, Vitek says, "This is what a whore like you deserves." Vitek then fills your ass with his warm seed. You can feel Vitek''s hot cum filling your ass and then leaking out as he pulls out of you. "You better get used to this <<$pcs_firstname>> Because this is your new life now." Vitek pulls up his pants then leaves the locker room.'
 										$orgasm_txt = ''
 										gs 'cum_call', 'anus', 'A9', 1
 										gs 'arousal', 'anal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang'
@@ -650,7 +650,7 @@ if $ARGS[0] = 'Locker Room 2':
 															gs'stat'
 															'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 															*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-															'You can feel all of your energy sapped, your will... Broken as you lay there in silence with the boys moving closer. You take this moment of silence to think to yourself, <font color=#FF00FF>So this is my life now. What did I do to deserve this? Why is this happening to me? This can''t be real.</font> Tears begin streaming down your cheeks as you hear footsteps. You look up to see Artem, Petka and Petia standing over you.'
+															'You can feel all of your energy sapped, your will... Broken as you lay there in silence with the boys moving closer. You take this moment of silence to think to yourself, '+$OpenInnerThought+'So this is my life now. What did I do to deserve this? Why is this happening to me? This can''t be real.'+$CloseInnerThought+' Tears begin streaming down your cheeks as you hear footsteps. You look up to see Artem, Petka and Petia standing over you.'
 															*nl
 															if artembf = 1 and artembrokenheart = 0 and artemblok = 0:
 																artembf = 0
@@ -685,7 +685,7 @@ if $ARGS[0] = 'Locker Room 2':
 																		*clr & cla
 																		gs'stat'
 																		'<center><video autoplay loop src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/lock8.mp4"></video></center>'
-																		'Petka begins fucking you, thrusting at an increased pace as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing as Petka continues using your body. <font color=#FF00FF>Wha...what''s going...feel...so hot...head...can''t think...why...</font>'
+																		'Petka begins fucking you, thrusting at an increased pace as he holds your legs open, giving himself easier access. You have no fight left, your strength is gone, your entire body is numb, you feel nothing as Petka continues using your body. '+$OpenInnerThought+'Wha...what''s going...feel...so hot...head...can''t think...why...'+$CloseInnerThought+''
 																		$orgasm_txt = ''
 																		gs 'cum_call', 'stomach', 'A6', 1
 																		gs 'arousal', 'vaginal', 5, 'sub', 'exhibitionism', 'humiliation', 'gangbang', 'prostitution'
@@ -745,7 +745,7 @@ if $ARGS[0] = 'Walk Of Shame':
 			gs'stat'
 			'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 			*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-			'<font color=#FF00FF>Maybe Roman can help me out, he is being nice to me when he doesn''t have to.</font> You meekly nod to the boy and his eyes light up as he replies, "Great! let''s get going." He then grabs your arm and guides you to the restroom.'
+			''+$OpenInnerThought+'Maybe Roman can help me out, he is being nice to me when he doesn''t have to.'+$CloseInnerThought+' You meekly nod to the boy and his eyes light up as he replies, "Great! let''s get going." He then grabs your arm and guides you to the restroom.'
 
 			act 'Follow him to the Restroom':
 				*clr & cla
@@ -779,7 +779,7 @@ if $ARGS[0] = 'Walk Of Shame':
 							*clr & cla
 							gs'stat'						
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/3.jpg"></center>'
-							'You continue sucking while enjoying the warmth of Roman''s balls and how they occasionally bounce in your mouth. Roman looks down at you and says, "That a girl, keep doing that." You continue gently sucking on his balls, feeling excited, knowing that you are pleasing him. After a few more moments, Roman grabs onto your shoulders then lifts you up before kissing you passionately. You can feel your heart warming up. <font color=#FF00FF>He is kissing me so passionately. Maybe he cares for me. Please care for me. I need someone to care for me. Please care for me.</font>'
+							'You continue sucking while enjoying the warmth of Roman''s balls and how they occasionally bounce in your mouth. Roman looks down at you and says, "That a girl, keep doing that." You continue gently sucking on his balls, feeling excited, knowing that you are pleasing him. After a few more moments, Roman grabs onto your shoulders then lifts you up before kissing you passionately. You can feel your heart warming up. '+$OpenInnerThought+'He is kissing me so passionately. Maybe he cares for me. Please care for me. I need someone to care for me. Please care for me.'+$CloseInnerThought+''
 							gs 'arousal', 'kiss', 5, 'sub'
 							gs 'arousal', 'end'
 							gs 'stat'
@@ -794,7 +794,7 @@ if $ARGS[0] = 'Walk Of Shame':
 									*clr & cla
 									gs'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/5.jpg"></center>'
-									'You suddenly feel Roman''s hard cock ram it''s way into your anus, causing a sudden jolt of pain. You scream out loud before Roman covers your mouth with his hand for a few seconds before the pain reduces to a manageable level. As Roman begin rapidly fucking your ass, you ask him "Can you...Ehh...take it slow...Ehhh...Please." Roman continues fucking you at the same pace, It seems that he is either ignoring you, or didn''t hear you speak. <font color=#FF00FF>Owww It hurts, he is fucking me so hard. Please slow down. It hurts, please stop. OOOwwwwww!</font> You close your eyes and just wait for it to be over. Roman suddenly wraps his arms around yours then drops back causing you to be on top of him with his dick still in your ass. Roman then says, "Ride me."'
+									'You suddenly feel Roman''s hard cock ram it''s way into your anus, causing a sudden jolt of pain. You scream out loud before Roman covers your mouth with his hand for a few seconds before the pain reduces to a manageable level. As Roman begin rapidly fucking your ass, you ask him "Can you...Ehh...take it slow...Ehhh...Please." Roman continues fucking you at the same pace, It seems that he is either ignoring you, or didn''t hear you speak. '+$OpenInnerThought+'Owww It hurts, he is fucking me so hard. Please slow down. It hurts, please stop. OOOwwwwww!'+$CloseInnerThought+' You close your eyes and just wait for it to be over. Roman suddenly wraps his arms around yours then drops back causing you to be on top of him with his dick still in your ass. Roman then says, "Ride me."'
 									gs 'arousal', 'anal', 5, 'sub'
 									gs 'arousal', 'end'
 									gs 'stat'
@@ -803,7 +803,7 @@ if $ARGS[0] = 'Walk Of Shame':
 										*clr & cla
 										gs'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/restroom/6.jpg"></center>'
-										'Even though the pain is quite severe, you do as he says, not wanting to disappoint him. Feeling his dry dick roughly scraping against your inner ass. You close your eyes and try to think of anything other than the pain. <font color=#FF00FF>Please cum soon. Please. I can''t take much more of this. Please just cum. PLEEEEAASE!</font> to your relief you hear Roman groan then feel his warm seed filling your ass. You focus on the warm as he continues pumping you with his cum. After Roman is spent, he pushes you off of him then says, "You were great <<$pcs_firstname>>. We should do this again sometime." You reply, "Does that mean that we can out together maybe?" Roman laughs as he replies, "Hell no! I fuck whores, not date them, but you have my permission to keep dreaming about me though." Roman chuckles and gives you a wink as he gets dressed then leaves you alone in the restroom. <font color=#FF00FF>So...He didn''t care for me. Does no one care for me? I need someone. Why wont anyone care for me anymore?</font> you suddenly hear, "Ah there you are. I''ve been looking all over for you."'
+										'Even though the pain is quite severe, you do as he says, not wanting to disappoint him. Feeling his dry dick roughly scraping against your inner ass. You close your eyes and try to think of anything other than the pain. '+$OpenInnerThought+'Please cum soon. Please. I can''t take much more of this. Please just cum. PLEEEEAASE!'+$CloseInnerThought+' to your relief you hear Roman groan then feel his warm seed filling your ass. You focus on the warm as he continues pumping you with his cum. After Roman is spent, he pushes you off of him then says, "You were great <<$pcs_firstname>>. We should do this again sometime." You reply, "Does that mean that we can out together maybe?" Roman laughs as he replies, "Hell no! I fuck whores, not date them, but you have my permission to keep dreaming about me though." Roman chuckles and gives you a wink as he gets dressed then leaves you alone in the restroom. '+$OpenInnerThought+'So...He didn''t care for me. Does no one care for me? I need someone. Why wont anyone care for me anymore?'+$CloseInnerThought+' you suddenly hear, "Ah there you are. I''ve been looking all over for you."'
 										gs 'cum_call', 'anus', 'A189', 1
 										gs 'arousal', 'anal', 5, 'sub'
 										gs 'arousal', 'end'
@@ -823,7 +823,7 @@ if $ARGS[0] = 'Walk Of Shame':
 												gs'stat'
 												'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 												'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-												'You return the hug as you think to yourself, <font color=#FF00FF>I know Katja told me that he is no good for me, but I need him. Niko takes care of me and I just want to make him happy. I know that he wouldn''t lie to me. I''m sure that he will even find a way to clear my reputation. I just need to do what he says. Ohh Nikolai, I love you so much.</font>' 
+												'You return the hug as you think to yourself, '+$OpenInnerThought+'I know Katja told me that he is no good for me, but I need him. Niko takes care of me and I just want to make him happy. I know that he wouldn''t lie to me. I''m sure that he will even find a way to clear my reputation. I just need to do what he says. Ohh Nikolai, I love you so much.'+$CloseInnerThought+'' 
 	
 												act 'Continue':
 													*clr & cla
@@ -838,7 +838,7 @@ if $ARGS[0] = 'Walk Of Shame':
 														minut += 5
 														gs'stat'
 														'<center><video autoplay loop src="images/shared/sex/blowjob/kotovbj23.mp4"></video></center>'
-														'You reply, "Of course I will Niko. You need only ask." You eagerly unbutton his pants then pull out his dick before quickly wrapping your lips around it, hearing Niko moan as you do it. <font color=#FF00FF>It feels so good to be sucking Niko''s dick again. My man. Oh How I missed you. I don''t even care if I''m a whore, but I want to be your whore Niko. I only want to please you. Only you.</font>' 
+														'You reply, "Of course I will Niko. You need only ask." You eagerly unbutton his pants then pull out his dick before quickly wrapping your lips around it, hearing Niko moan as you do it. '+$OpenInnerThought+'It feels so good to be sucking Niko''s dick again. My man. Oh How I missed you. I don''t even care if I''m a whore, but I want to be your whore Niko. I only want to please you. Only you.'+$CloseInnerThought+'' 
 
 														act 'Continue':
 															*clr & cla
@@ -871,7 +871,7 @@ if $ARGS[0] = 'Walk Of Shame':
 													gs'stat'
 													'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 													'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-													'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation. You can trust me and try to cheer up." You nod your head while giving Niko a warm smile. <font color=#FF00FF>I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.</font>' 
+													'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation. You can trust me and try to cheer up." You nod your head while giving Niko a warm smile. '+$OpenInnerThought+'I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.'+$CloseInnerThought+'' 
 													
 													act 'Kiss Niko':
 														*clr & cla
@@ -914,7 +914,7 @@ if $ARGS[0] = 'Walk Of Shame':
 		*clr & cla
 		gs'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/hallway/wos3.jpg"></center>'
-		'You keep your head lowered as you quicken your pace. One of the boys smacks your ass hard, causing you to jump up, but you try to ignore it while you feel tears streaming down your face. <font color=#FF00FF>Is this what my life will be like for now on? Will things ever go back to the way they were before? Why is this happening? What did I do wrong? Can''t they just leave me alone?</font>' 
+		'You keep your head lowered as you quicken your pace. One of the boys smacks your ass hard, causing you to jump up, but you try to ignore it while you feel tears streaming down your face. '+$OpenInnerThought+'Is this what my life will be like for now on? Will things ever go back to the way they were before? Why is this happening? What did I do wrong? Can''t they just leave me alone?'+$CloseInnerThought+'' 
 		
 		act 'Continue walking':
 			*clr & cla
@@ -944,7 +944,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 		gs'stat'
 		'<center><b><h4><font color=#FF00FF><<"<<$pcs_firstname>> [<<$pcs_nickname>>] <<$pcs_lastname>>">></font></h4></b></center>'
 		*pl '<center><img src="<<FUNC(''$face_image'')>>"></center>'
-		'You let out your tears, submitting to your own sorrow while answering your own question in your head. <font color=#FF00FF>No matter what happens, Nikolai will be here for me, He is the only one who cares for me. I need you Niko. Please don''t leave me...Please!</font>' 
+		'You let out your tears, submitting to your own sorrow while answering your own question in your head. '+$OpenInnerThought+'No matter what happens, Nikolai will be here for me, He is the only one who cares for me. I need you Niko. Please don''t leave me...Please!'+$CloseInnerThought+'' 
 
 		act 'Embrace Niko':
 			*clr & cla
@@ -971,7 +971,7 @@ if $ARGS[0] = 'Walk Of Shame 2':
 			gs'stat'
 			'<center><b><h4><font color=#E400FF><<"Nikolai [Niko] Volkov">></font></h4></b></center>'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/smile2.jpg"></center>'
-			'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation, trust me and try to cheer up." You nod your head while giving Niko a warm smile. <font color=#FF00FF>I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.</font>'
+			'You lower your posture as you reply, "Alright, what do I have to lose? I doubt anything could get any worst." Niko wraps his arms around you then brings his face to yours before responding, "Come on <<$pcs_firstname>>. That attitude wont solve anything. Meet me after school then we will work on fixing your reputation, trust me and try to cheer up." You nod your head while giving Niko a warm smile. '+$OpenInnerThought+'I don''t know how, but I know that Niko will find a way to help me. Niko loves me as much as I do him. I know in my heart that he will always protect me.'+$CloseInnerThought+''
 
 			act 'Push him away':
 				*clr & cla

+ 20 - 20
locations/ParChurch.qsrc

@@ -30,8 +30,8 @@ if $ARGS[0] = 'start':
 	'Vigil is held Saturdays at 19h.'
 	'The Divine Liturgy is on Sundays between 9h and 12h.'
 
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 
 	if week = 6 and hour >=19 and hour <= 22 and churchday ! daystart:
 		act 'Attend vigil': gt 'ParChurch', 'vigil'
@@ -41,8 +41,8 @@ if $ARGS[0] = 'start':
 		if Churchbad = 3 and Churchbadtime > daystart:
 			cla & nl
 			'The priest is probably still mad at you. You decide to avoid him for now.'
-			act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-			act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+			act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+			act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 		elseif Churchbad = 3 and Churchbadtime <= daystart:
 			Churchbad = 2
 			*nl
@@ -140,29 +140,29 @@ if $ARGS[0] = 'Excuses':
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod and say, "I''d love to stay but I... need to get back to clinic. I am doing volunteer work there." Your mother approvingly nods her head before saying. "You''re volunteering at the clinic? I''m very proud of you. Go on, I''ll see you back at home." You wave to your mother as you walk away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 1:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod then say, "I need to get back to the clinic." I just came to pick someone up." Your <<$npc_nickname[''A29'']>> nods then says with a sad tone. "Okay, I was just hoping that you could stay for a bit, but I won''t stop you from doing gods work." You return the nod before walking away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 2:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You give your <<$npc_nickname[''A29'']>> a nod then say, "I would stay bu..." you mother finishes your sentence, "You need to get back to the clinic, I understand." She then waves at you while looking away.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 3:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost1.jpg"></center>'
 		'You nod before your mother asks you, "Can you not stay for at least a little bit? God blesses his devout children." you lower your posture before replying, "I know he does but, I really need to go. I will see you at home." your <<$npc_nickname[''A29'']>> sighs as she turns away and says, "I''ll see you at home."'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 4:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -170,8 +170,8 @@ if $ARGS[0] = 'Excuses':
 		'You mother firmly guides you out the door to the side of the church then angrily says, "<<$pcs_nickname>> I went to the clinic the other day to ask if you could have time off and the receptionist told me that you haven''t been working there at all. YOU HAVE BEEN LYING TO ME IN THE LORDS HOUSE OF ALL PLACES!!! If you don''t want to stay with me or pay respect to our creator then at least be honest about it. Telling lies is what sinners do when they are too afraid to face their problems."'
 		*nl
 		'You lower your head as your mother continues, "I''m going to go back in there and do my part as a child of Christ. You can go back to whatever you were planning on doing. I won''t force you to stay." She then shakes her head at you before walking back into the church. You take a few seconds to collect yourself as you feel tears rolling down your face. You never realized that you were crying. You then walk away feeling like you really screwed up.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	elseif VKChurchNo = 5:
 		VKChurchNo += 1
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
@@ -185,8 +185,8 @@ if $ARGS[0] = 'Excuses':
 		'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost11.jpg"></center>'
 		'You turn to walk out of the church and see your mother sigh, as she turns back toward the front.'
-		act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-		act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+		act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+		act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 	end
 end
 
@@ -368,8 +368,8 @@ if $ARGS[0] = 'Leave Early':
 	'<center><b><h4><font color=#CB00A2>"Natasha [<<$npc_nickname[''A29'']>>] <<$pcs_lastname>>"</font></h4></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/mom/prost9.jpg"></center>'
 	'You approach your <<$npc_nickname[''A29'']>> and say, "I had a great time but I should be heading home now." Your <<$npc_nickname[''A29'']>> replies, "Alright thank you for stopping by and you learned something about yourself today." She then lightly rubs your arm before going back to praying.'
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 end
 
 if $ARGS[0] =  'Leave':
@@ -404,8 +404,8 @@ if $ARGS[0] =  'Leave':
 		'As the church ceremonies ends, you and your <<$npc_nickname[''A29'']>> get up and collect your things before walking out of the church. Your <<$npc_nickname[''A29'']>> says, "I had a great time today. I always enjoy spending time with my loving daughter. Hopefully I''l see you here again next week." She then kisses your cheek then hands you 300 <b>₽</b> before walking away.'
 	end
 
-	act 'Go to the residential area':minut += 5 & gt 'pavResidential'
-	act 'Go to the commercial area':minut += 10 & gt 'pavCommercial'
+	act 'Go to the residential area':minut += 5 & gt 'pav_residential'
+	act 'Go to the commercial area':minut += 10 & gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'candle':

+ 1 - 1
locations/ParkKafe.qsrc

@@ -95,7 +95,7 @@ if $ARGS[0] = 'guys':
 					'One guy lies down and roughly pulls you on top. He groans in pleasure when his hard member rubs against your tight pussy, then he starts fucking your pussy relentlessly. The other guy lines up behind you and shoves his penis up your ass. You moan, both in pain and pleasure, at the sensation of being filled in both holes.'
 					'One of them finishes deep inside you while the other pulls out and cums on your ass.'
 					gs 'arousal', 'anal', 5
-					gs 'arousal', 'vaginal', -5,
+					gs 'arousal', 'vaginal', -5
 					gs 'cum_call', '', $boy
 					gs 'cum_call', 'anus', $boy
 					gs 'arousal', 'end'

+ 1 - 1
locations/abduction.qsrc

@@ -565,7 +565,7 @@ if $ARGS[0] = 'abdEscapeWindow3':
 
 	act 'Turn and run the opposite direction':gt 'road'
 	act 'Run left':gt 'city_industrial'
-	act 'Run right':gt 'pavCommercial'
+	act 'Run right':gt 'pav_commercial'
 	act 'Run forward':gt 'city_lake', 'start'
 end
 

+ 17 - 17
locations/albinahome.qsrc

@@ -15,7 +15,7 @@ if $ARGS[0] = 'start':
 	if hour >= 20 and week >= 5 and week < 7:
 		'Albina says that she wants to go to the disco.'
 
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		if money >= 25: act 'Go to the disco':money -= 25 & minut += 15 & gt 'gdkin'
 	elseif hour < 20 and npc_sex['A23'] = 0:
 		'Albina smiles at you affably and says, "<<$pcs_firstname>> I have a bottle of fine wine here, let''s drink."'
@@ -101,7 +101,7 @@ if $ARGS[0] = 'start':
 										'"I should really get going, I''m sorry, I wish I could help." Albina nods her head in understanding. "I will see you later ok?" You tell her.'
 										'She smiles. "Of course, <<$pcs_nickname>>." Then you get up and leave her house.'
 
-										act 'Continue':gt 'pavResidential'
+										act 'Continue':gt 'pav_residential'
 									end
 								else
 									act 'Pull away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -160,7 +160,7 @@ if $ARGS[0] = 'start':
 												minut -= 30
 												gs 'stat'
 
-												act 'Say goodbye and go home':gt 'pavResidential'
+												act 'Say goodbye and go home':gt 'pav_residential'
 											end
 										end
 									end
@@ -205,7 +205,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Just chat': gt 'albinahome', 'chat'
 			act 'Talk about video games': gt 'albinahome', 'game'
 			act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'start':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You find Albina sitting on her bed when you enter her room, as you walk over you take a seat next to her and start chatting to her about the stuff you both experienced since you last spoke.'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -246,7 +246,7 @@ if $ARGS[0] = 'stripping':
 		'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 		'Albina recommends that you start with learning to dance.'
 	end
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 	act 'Rest':gt 'albinahome', 'start'
 end
 
@@ -266,7 +266,7 @@ if $ARGS[0] = 'poledancing':
 		'Albina taught you various acrobatic moves on the pole.'
 		if pcs_dancpol >= 100: 'You could not learn anything new, you already know everything she could teach you.'
 
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	elseif pcs_stren < 40 and pcs_dancero > 50:
 		'Albina grins "You''re still too weak for poledancing, we can practice developing your strength instead."'
@@ -281,7 +281,7 @@ if $ARGS[0] = 'poledancing':
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/stren.jpg"></center>'
 			'Albina shows you how to develop your strength using various exercises.'
 			act 'Rest':gt 'albinahome', 'start'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 		end
 	else
 		minut += 120
@@ -302,7 +302,7 @@ if $ARGS[0] = 'poledancing':
 			'Striptease is too complex for you, you''re not able to dance and strip at the same time.'
 			'Albina recommends that you start with learning to dance.'
 		end
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Rest':gt 'albinahome', 'start'
 	end
 end
@@ -317,7 +317,7 @@ if $ARGS[0] = 'dressing':
 		'You and Albina open her huge wardrobe and begin digging into her various dresses.'
 		'As you rummage around in her wardrobe, you are amazed by how many different clothes she can fit in there. It feels like her wardrobe is a bottomless pit filled with dresses, leggings, jeans, and all kinds of other clothes!'
 		'You end up spending an hour trying on various dresses with Albina.'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Chat some': gt 'albinahome', 'chat'
 		act 'Talk about video games': gt 'albinahome', 'game'
 	end
@@ -331,7 +331,7 @@ if $ARGS[0] = 'chat':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 	'You chat with Albina about school, love interest, family, makeup up, even the latest tv shows or movies you have watched.'
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 	act 'Keep chatting':
 		*clr & cla
 		menu_off = 1
@@ -362,7 +362,7 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 		'You shake your head no. "Not right now, thanks. I was just noticed all of them is all, maybe some other time."'
 		'She shrugs. "Sure if you ever want to, all you have to do is ask."'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
 	end
@@ -394,14 +394,14 @@ if $ARGS[0] = 'game':
 					'You shake your head no. "Not this time, maybe next time.."'
 					'You can tell she is a little disappointed, but then turns her attention to the game instead. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
 					'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
-					act 'Say goodbye and go home':gt 'pavResidential'
+					act 'Say goodbye and go home':gt 'pav_residential'
 				end
 			else
 				act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		else
 			'You and Albina lay down in front of a huge flat screen TV, after picking one of the games. The two of you play as you chat about varies things and trash talk, though neither one of you is giving your full attention to the game, instead you are just having fun together.'
-			act 'Say goodbye and go home':gt 'pavResidential'
+			act 'Say goodbye and go home':gt 'pav_residential'
 			act 'Keep playing video games': gt 'albinahome', 'playgame'
 			act 'Just chat': gt 'albinahome', 'chat'
 			act 'Talk about clothes': gt 'albinahome', 'dressing'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'playgame':
 				'You shake your head no. "Uh that''s ok. I really am not interested in that."'
 				'Albina puts the strapon away, but you can tell she is a little disappointed. Then she comes back over and lays down beside you again. "You are so going to lose this time." With that the two of you play games for awhile though things are a little awkward after you turned down her offer. After about another hour of games, Albina stops. "Well I had fun but there is some stuff I need to take care of." She says as she turns the game system off.'
 				'Getting the hint you get up as well. "Yeah I should probably get going myself." You exchange a brief hug before you leave.'
-				act 'Say goodbye and go home':gt 'pavResidential'
+				act 'Say goodbye and go home':gt 'pav_residential'
 			end
 		else
 			act 'Refuse the bet (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -454,7 +454,7 @@ if $ARGS[0] = 'playgame':
 		act 'Keep playing video games': gt 'albinahome', 'playgame'
 		act 'Just chat': gt 'albinahome', 'chat'
 		act 'Talk about clothes': gt 'albinahome', 'dressing'
-		act 'Say goodbye and go home':gt 'pavResidential'
+		act 'Say goodbye and go home':gt 'pav_residential'
 	end
 end
 
@@ -648,7 +648,7 @@ if $ARGS[0] = 'strapon_finish':
 	gs 'arousal', 'foreplay', 5, 'lesbian'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 

+ 1 - 1
locations/albinaporog.qsrc

@@ -11,7 +11,7 @@ else
 	if hour >= 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate. You say that you''re here to visit Albina. He shakes his head and says, "Albina is currently not at home."'
 	if hour < 9:'You push a button on the gates intercom and a guard walks up on the other side of the gate, saying "Come no earlier than nine."'
 
-	act 'Say goodbye and go home':gt 'pavResidential'
+	act 'Say goodbye and go home':gt 'pav_residential'
 end
 
 --- albinaporog ---------------------------------

+ 2 - 2
locations/arturHome.qsrc

@@ -36,7 +36,7 @@ act 'Go to his home':
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					
-					gt 'pavCommercial'
+					gt 'pav_commercial'
 				end
 			else
 				act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -50,7 +50,7 @@ act 'Go to his home':
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			
-			gt 'pavCommercial'
+			gt 'pav_commercial'
 		end
 	else
 		act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'

+ 1 - 1
locations/arturend.qsrc

@@ -43,7 +43,7 @@ act 'Brush up':
 		'Arthur gives you a quality handbag. You take it, feeling a mixture of joy and guilt welling up inside you. "Did I really just sleep with a stranger for a purse? Does this make me a whore, or a slut?" You think to yourself'
 	end
 
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':gt 'pav_commercial'
 end
 
 --- arturend ---------------------------------

+ 0 - 482
locations/atak.qsrc

@@ -1,482 +0,0 @@
-# atak
-
-menu_off = 1
-
-if $ARGS[0] = 'player':
-	cla
-	tip = 0
-	strenA = pcs_stren
-	speedA = speed
-	agilA = pcs_agil
-	vitalA = pcs_vital
-	!Skills
-	boxingA = boxing
-	!Parameters
-	healthA = pcs_health
-	BonusA = BonusAtak
-	strenD = strenV
-	speedD = speedV
-	agilD = agilV
-	vitalD = vitalV
-	!Skills
-	boxingD = boxingV
-	!Parameters
-	healthD = healthV
-	initBonusA = initBonus
-	initBonus = 0
-	initBonusV = 0
-	BonusD = BonusDefV
-
-	if stunV <= 0:
-		xgt'atak','popad'
-	elseif stunV > 0:
-		'<b><font color = green><<$boydesc>> Can not move a critical hit</font></b>'
-
-		xgt'atak','uronKrit'
-	end
-end
-
-if $ARGS[0] = 'enemy':
-	cla
-	tip = 1
-	strenA = strenV
-	speedA = speedV
-	agilA = agilV
-	vitalA = vitalV
-	!Skills
-	boxingA = boxingV
-	!Parameters
-	healthA = healthV
-	BonusA = BonusAtakV
-	strenD = pcs_stren
-	speedD = speed
-	agilD = pcs_agil
-	vitalD = pcs_vital
-	!Skills
-	boxingD = boxing
-	!Parameters
-	healthD = pcs_health
-	BonusD = BonusDef
-	initBonusA = initBonusV
-	initBonus = 0
-	initBonusV = 0
-
-	if stun <= 0:
-		xgt'atak','popad'
-	elseif stun > 0:
-		'<b><font color = red>YOU can not move a critical hit</font></b>'
-
-		xgt'atak','uronKritV'
-	end
-end
-
-if $ARGS[0] = 'popad':
-	cla
-	!payment hit dodge
-	poSp = speedA*20/100
-	uvAg = agilD*20/100
-	poBox = boxingA*20/100
-	uvBox = boxingD*20/100
-	popad = RAND(boxingA-poBox,boxingA+poBox) + RAND(speedA-poSp,speedA+poSp) + BonusA + initBonusA
-	uvorot = RAND(boxingD-uvBox,boxingD+uvBox) + RAND(agilD-uvAg,agilD+uvAg) + BonusD
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			if tip = 0:
-				!attack players
-				'<b><font color = green>Critical hits</font></b>'
-
-				xgt'atak','uronKrit'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = red>Critical hits</font></b>'
-
-				xgt'atak','uronKritV'
-			end
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			if tip = 0:
-				!attack players
-				'<b><font color = green>EYE</font></b>'
-
-				xgt'atak','uron'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = red>EYE</font></b>'
-
-				xgt'atak','uronV'
-			end
-		end
-	elseif popad <= uvorot:
-		if popad+popKoef <= uvorot:
-			!critical blunder
-			if tip = 0:
-				!attack players
-				'<b><font color = red>CRITICAL SLIP</font></b>'
-
-				xgt'atak','uronKritV'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = green>CRITICAL SLIP</font></b>'
-
-				xgt'atak','uronKrit'
-			end
-		elseif popad+popKoef > uvorot:
-			!bloomer
-			if tip = 0:
-				!attack players
-				'<b><font color = red>LOST</font></b>'
-
-				xgt'fight','sta'
-			elseif tip = 1:
-				!He attacks the enemy
-				'<b><font color = green>LOST</font></b>'
-
-				xgt'fight','sta'
-			end
-		end
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damage = RAND(pcs_stren,pcs_stren*2) + weapbonus + magweapbonus
-
-	if knife > 0:
-		knibon = knife+1
-		knife = 0
-		damage = damage*knibon
-		knibon = 0
-
-		'<b><font color = green>The enemy flies your throwing knife</font></b>'
-	end
-
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damage = damage - dospehDefV & dospehEnV = dospehEnV - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-		if weaponTipe = 1:bloodV = bloodV + RAND(weapon/4,weapon/2)
-		if weaponTipe = 2:stun = stun + RAND(1,2)
-		if weaponTipe = 3:bloodV = bloodV + RAND(weapon/4,weapon/2)
-
-		if stunner > 0:
-			stunner = 0
-			stunV = RAND(3,6)
-
-			'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-		end
-
-		'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	elseif defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		defenceV = defenceV - damage
-
-		'<b><font color = green>Protection of the enemy suffered damage <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone, he still had <<KlonV>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your kick flew right through the opponent''s body. <<$boydesc>> Not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			healthV = healthV - damage
-			if weaponTipe = 1:bloodV = bloodV + RAND(weapon/4,weapon/2)
-			if weaponTipe = 2:stun = stun + RAND(1,2)
-			if weaponTipe = 3:bloodV = bloodV + RAND(weapon/4,weapon/2)
-
-			if stunner > 0:
-				stunV = RAND(3,6)
-
-				'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-			end
-
-			'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-
-				'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	stKo = pcs_stren*20/100
-	damage = RAND(pcs_stren-stKo,pcs_stren+stKo) + weapbonus + magweapbonus
-
-	if knife > 0:
-		knibon = knife+1
-		knife = 0
-		damage = damage*knibon
-		knibon = 0
-
-		'<b><font color = green>The enemy flies your throwing knife</font></b>'
-	end
-
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damage = damage - dospehDefV & dospehEnV = dospehEnV - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-
-		if stunner > 0:
-			stunner = 0
-			stunV = RAND(1,3)
-
-			'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-		end
-
-		'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	elseif defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		defenceV = defenceV - damage
-
-		'<b><font color = green>Protection of the enemy suffered damage <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone, he still had <<KlonV>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your kick flew right through the opponent''s body. <<$boydesc>> Not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			healthV = healthV - damage
-
-			if stunner > 0:
-				stunV = RAND(1,3)
-
-				'<b><font color = green>You paralyzed the enemy on <<stunV>> moves.</font></b>'
-			end
-
-			'<b><font color = green>Accept damage <<damage>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-
-				'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritV':
-	cla
-	damage = RAND(strenV,strenV*2) + weapbonusV + magweapbonusV
-
-	if knifeV > 0:
-		knibonV = knifeV+1
-		knifeV = 0
-		damage = damage*knibonV
-		knibonV = 0
-
-		'<b><font color = red>As you fly throwing knife</font></b>'
-	end
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		if weaponTipeV = 1:blood = blood + RAND(weaponV/4,weaponV/2)
-		if weaponTipeV = 2:stunV = stunV + RAND(1,2)
-		if weaponTipeV = 3:blood = blood + RAND(weaponV/4,weaponV/2)
-
-		if stunnerV > 0:
-			stunnerV = 0
-			stun = RAND(3,6)
-
-			'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-		end
-
-		'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-		xgt'fight','sta'
-	elseif defence > 0 and klon <= 0 and unmaterial <= 0:
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_health = pcs_health - damage
-			if weaponTipeV = 1:blood = blood + RAND(weaponV/4,weaponV/2)
-			if weaponTipeV = 2:stunV = stunV + RAND(1,2)
-			if weaponTipeV = 3:blood = blood + RAND(weaponV/4,weaponV/2)
-
-			if stunnerV > 0:
-				stun = RAND(3,6)
-
-				'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-			end
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronV':
-	cla
-	stKo = strenV*20/100
-	damage = RAND(strenV-stKo,strenV+stKo) + weapbonusV + magweapbonusV
-
-	if knifeV > 0:
-		knibonV = knifeV+1
-		knifeV = 0
-		damage = damage*knibonV
-		knibonV = 0
-
-		'<b><font color = red>As you fly throwing knife</font></b>'
-	end
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-
-		if stunnerV > 0:
-			stunnerV = 0
-			stun = RAND(3,6)
-
-			'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-		end
-
-		'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	elseif defence > 0 and klon <= 0 and unmaterial <= 0:
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	elseif klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	elseif unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	elseif barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_health = pcs_health - damage
-
-			if stunnerV > 0:
-				stun = RAND(3,6)
-
-				'<b><font color = red><<$boydesc>> You paralyzed on <<stun>> moves.</font></b>'
-			end
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-		xgt'fight','sta'
-	end
-end
-
---- atak ---------------------------------
-

+ 0 - 284
locations/atakA.qsrc

@@ -1,284 +0,0 @@
-# atakA
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speed * 20 / 100
-	uvAg = agilV * 20 / 100
-	poBox = pcs_react * 20 / 100
-	uvBox = reactV * 20 / 100
-	popad = RAND(pcs_react - poBox,pcs_react + poBox) + RAND(speed - poSp,speed + poSp) + bonusSh
-	uvorot = RAND(reactV - uvBox,reactV + uvBox) + RAND(agilV - uvAg,agilV + uvAg)
-	uvorKoef = uvorot * 50 / 100
-	popKoef = popad * 50 / 100
-
-	if popad > uvorot:
-		if popad >= uvorot + uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = green>Critical hits</font></b>'
-
-			xgt'atakA','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = green>EYE</font></b>'
-
-			xgt'atakA','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = red>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip+damKoef,damTip+damKoef*2)
-
-	if damTipM > 0:
-		damKoefM = damTipM*20/100
-		damageM = RAND(damTipM+damKoefM,damTipM+damKoefM*2)
-	end
-
-	xgt'atakA','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip-damKoef,damTip+damKoef)
-
-	if damTipM > 0:
-		damKoefM = damTipM*20/100
-		damageM = RAND(damTipM-damKoefM,damTipM+damKoefM)
-	end
-
-	xgt'atakA','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-
-		if damTipM > 0:
-			manaV = manaV - damageM
-			pcs_mana = pcs_mana + damageM
-
-			'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
-		end
-
-		!pcs_mana = pcs_mana - damageM
-
-		if eleSh > 0:
-			stunV = RAND(eleSh,eleSh*3)
-
-			'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-		end
-
-		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defenceV = defenceV - damage
-
-		'<b><font color = green>You have caused damage <<damage>> Protection of enemy units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your blow has passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			damage = damage - barierV
-			healthV = healthV - damage
-
-			if damTipM > 0:
-				manaV = manaV - damageM
-				pcs_mana = pcs_mana + damageM
-				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
-			end
-
-			if eleSh > 0:
-				stunV = RAND(eleSh,eleSh*3)
-				'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-			end
-
-			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-				'<b><font color = red>Opponent reflected damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'atakW':
-	cla
-	!payment hit dodge
-	poSp = speed * 20 / 100
-	uvAg = agilV * 20 / 100
-	poBox = pcs_react * 20 / 100
-	uvBox = reactV * 20 / 100
-	popad = RAND(pcs_react - poBox,pcs_react + poBox) + RAND(speed - poSp,speed + poSp)
-	uvorot = RAND(reactV - uvBox,reactV + uvBox) + RAND(agilV - uvAg,agilV + uvAg)
-	uvorKoef = uvorot * 50 / 100
-	popKoef = popad * 50 / 100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakA','uronKritW'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakA','uronW'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritW':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip+damKoef,damTip+damKoef*2)
-	damKoefM = damTipM*20/100
-	damageM = RAND(damTipM+damKoefM,damTipM+damKoefM*2)
-	xgt'atakA','damageW'
-end
-
-if $ARGS[0] = 'uronW':
-	cla
-	damKoef = damTip*20/100
-	damage = RAND(damTip-damKoef,damTip+damKoef)
-	damKoefM = damTipM*20/100
-	damageM = RAND(damTipM-damKoefM,damTipM+damKoefM)
-	xgt'atakA','damageW'
-end
-
-if $ARGS[0] = 'damageW':
-	cla
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-		manaV = manaV - damageM
-
-		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		damSum = damage + damageM
-		defenceV = defenceV - damSum
-		!defenceV = defenceV - damage
-
-		'<b><font color = green>You have caused damage <<damSum>> Protection of enemy units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Your blow has passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barierV < damage:
-			manaV = manaV - damageM
-			healthV = healthV - damage
-			!healthV = healthV - damage
-
-			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				pcs_health = pcs_health - damage
-
-				'<b><font color = red>Opponent reflected damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
---- atakA ---------------------------------
-

+ 0 - 305
locations/atakA1.qsrc

@@ -1,305 +0,0 @@
-# atakA1
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp) + bonusShV
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakA1','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakA1','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV+damKoef,damTipV+damKoef*2)
-
-	if damTipMV > 0:
-		damKoefM = damTipMV*20/100
-		damageM = RAND(damTipMV+damKoefM,damTipMV+damKoefM*2)
-	end
-
-	xgt'atakA1','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV-damKoef,damTipV+damKoef)
-
-	if damTipMV > 0:
-		damKoefM = damTipMV*20/100
-		damageM = RAND(damTipMV-damKoefM,damTipMV+damKoefM)
-	end
-
-	xgt'atakA1','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-
-		if hidanAtk = 1:
-			hidanAtk = 0
-			zerkaloV = zerkaloV + 50
-			bloodV = bloodV + 50
-
-			'<b><font color = red><<$boydesc>> drink your blood.</font></b>'
-		end
-
-		if damTipMV > 0:
-			pcs_mana = pcs_mana - damageM
-			pcs_mana = pcs_mana + damageM
-
-			'<b><font color = red><<$boydesc>> swallowed <<damageM>> Units mana you.</font></b>'
-		end
-
-		if poisonAV = 1:
-			poisonV = 50
-
-			'<b><font color = red><<$boydesc>> hit the needle poisoned you.</font></b>'
-		end
-
-		!pcs_mana = pcs_mana - damageM
-
-		if eleShV > 0:
-			stun = RAND(eleShV,eleShV*3)
-
-			'<b><font color = red>You paralyzed on <<stunV>> Rounds</font></b>'
-		end
-
-		'<b><font color = red><<$boydesc>> Damage caused to you <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> got a <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy passed through you. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			pcs_health = pcs_health - damage
-
-			if damTipM > 0:
-				pcs_mana = pcs_mana - damageM
-				manaV = manaV + damageM
-
-				'<b><font color = green>You swallowed <<damageM>> mana enemy units.</font></b>'
-			end
-
-			if eleShV > 0:
-				stun = RAND(eleShV,eleShV*3)
-
-				'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-			end
-
-			if poisonAV = 1:
-				poisonV = 50
-
-				'<b><font color = red><<$boydesc>> hit the needle poisoned you.</font></b>'
-			end
-
-			'<b><font color = red>You have caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You have reflected the damage and the opponent was <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'atakW':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp)
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakA1','uronKritW'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakA1','uronW'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritW':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV+damKoef,damTipV+damKoef*2)
-	damKoefM = damTipMV*20/100
-	damageM = RAND(damTipMV+damKoefM,damTipMV+damKoefM*2)
-	xgt'atakA1','damageW'
-end
-
-if $ARGS[0] = 'uronW':
-	cla
-	damKoef = damTipV*20/100
-	damage = RAND(damTipV-damKoef,damTipV+damKoef)
-	damKoefM = damTipMV*20/100
-	damageM = RAND(damTipMV-damKoefM,damTipMV+damKoefM)
-	xgt'atakA1','damageW'
-end
-
-if $ARGS[0] = 'damageW':
-	cla
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		pcs_mana = pcs_mana - damageM
-
-		'<b><font color = green>You harmed <<damage>> units</font></b>'
-		'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red><<$boydesc>> reflected the damage and you get <<damage>> points of damage</font></b>'
-		end
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		damSum = damage + damageM
-		defence = defence - damSum
-		!defenceV = defenceV - damage
-
-		'<b><font color = green>You have caused damage <<damSum>> Protection of enemy units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = red>Your blow has passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_mana = pcs_mana - damageM
-			pcs_health = pcs_health - damage
-			!healthV = healthV - damage
-
-			'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-			'<b><font color = green>You have caused damage to the enemy mana <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = red>Opponent reflected damage and you get <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
---- atakA1 ---------------------------------
-

+ 0 - 137
locations/atakB.qsrc

@@ -1,137 +0,0 @@
-# atakB
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speed*20/100
-	uvAg = agilV*20/100
-	poBox = pcs_react*20/100
-	uvBox = reactV*20/100
-	popad = RAND(pcs_react-poBox,pcs_react+poBox) + RAND(speed-poSp,speed+poSp) + bonusSh
-	uvorot = RAND(reactV-uvBox,reactV+uvBox) + RAND(agilV-uvAg,agilV+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = green>Critical hits</font></b>'
-
-			gs'atakB','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = green>EYE</font></b>'
-
-			gs'atakB','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = red>LOST</font></b>'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damDef = defence/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef+damKoef,damDef+damKoef*2)
-	gs'atakB','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damDef = defence/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef-damKoef,damDef+damKoef)
-	gs'atakB','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defenceV <= 0 and klonV <= 0 and unmaterialV <= 0 and barierV <= 0:
-		if dospehV > 0:damageV = damageV - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		healthV = healthV - damage
-		!pcs_mana = pcs_mana - damageM
-
-		if eleSh > 0:
-			stunV = RAND(eleSh,eleSh*3)
-
-			'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-		end
-
-		'<b><font color = green>You have caused damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkaloV > 0:
-			zerkaloV = zerkaloV - 1
-			defence = defence - damage
-
-			'<b><font color = red><<$boydesc>> It reflected the damage and your defense received <<damage>> points of damage</font></b>'
-		end
-
-		!xgt'fight','sta'
-	end
-
-	if defenceV > 0 and klonV <= 0 and unmaterialV <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defenceV = defenceV - damage
-
-		'<b><font color = green>Your defense caused damage <<damage>> Protection of enemy units</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if klonV > 0 and unmaterialV <= 0:
-		klonV = klonV - 1
-
-		'<b><font color = green>Destroyed enemy clone</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if unmaterialV > 0:
-		unmaterialV = unmaterialV - 1
-
-		'<b><font color = red>Blow your protection passed through the body of the enemy. Opponents do not materials</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if barierV > 0:
-		!imeniteta barrier for damage
-		if barierV >= damage:
-			'<b><font color = red><<$boydesc>> easily weathered blow your protection</font></b>'
-
-			!xgt'fight','sta'
-		elseif barierV < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			healthV = healthV - damage
-
-			if eleSh > 0:
-				stunV = RAND(eleSh,eleSh*3)
-
-				'<b><font color = green><<$boydesc>> paralyzed <<stunV>> Rounds</font></b>'
-			end
-
-			'<b><font color = green>Your defense caused damage <<damage>> units</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkaloV > 0:
-				zerkaloV = zerkaloV - 1
-				defence = defence - damage
-
-				'<b><font color = red>Opponent reflected damage and your defense received <<damage>> points of damage</font></b>'
-			end
-		end
-
-		!xgt'fight','sta'
-	end
-end
-
---- atakB ---------------------------------
-

+ 0 - 136
locations/atakB1.qsrc

@@ -1,136 +0,0 @@
-# atakB1
-
-menu_off = 1
-
-if $ARGS[0] = 'atak':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp) + bonusShV
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = green>Critical hits</font></b>'
-
-			gs'atakB1','uronKrit'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = green>EYE</font></b>'
-
-			gs'atakB1','uron'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = red>LOST</font></b>'
-	end
-end
-
-if $ARGS[0] = 'uronKrit':
-	cla
-	damDef = defenceV/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef+damKoef,damDef+damKoef*2)
-	gs'atakB1','damage'
-end
-
-if $ARGS[0] = 'uron':
-	cla
-	damDef = defenceV/100
-	damKoef = damDef*20/100
-	damage = RAND(damDef-damKoef,damDef+damKoef)
-	gs'atakB1','damage'
-end
-
-if $ARGS[0] = 'damage':
-	cla
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDefV & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		!pcs_mana = pcs_mana - damageM
-
-		if eleShV > 0:
-			stun = RAND(eleShV,eleShV*3)
-
-			'<b><font color = red>Defense paralyzed you to <<stun>> Rounds</font></b>'
-		end
-
-		'<b><font color = red>Defense caused you damage <<damage>> units</font></b>'
-		!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			defenceV = defenceV - damage
-
-			'<b><font color = green>You have reflected the damage of the defense and the defense received <<damage>> points of damage</font></b>'
-		end
-
-		!xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		!damSum = damage + damageM
-		!defence = defence - damSum
-		defence = defence - damage
-
-		'<b><font color = red>Your protection harmed <<damage>> units of the defense</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the defense went through you. YOU are not material</font></b>'
-
-		!xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the defense</font></b>'
-
-			!xgt'fight','sta'
-		elseif barier < damage:
-			!pcs_mana = pcs_mana - damageM
-			!pcs_health = pcs_health - damage
-			pcs_health = pcs_health - damage
-
-			if eleShV > 0:
-				stun = RAND(eleShV,eleShV*3)
-
-				'<b><font color = red>Defense paralyzed you to <<stun>> Rounds</font></b>'
-			end
-
-			'<b><font color = red>You harmed <<damage>> units of the defense</font></b>'
-			!'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				defenceV = defenceV - damage
-
-				'<b><font color = green>You have reflected damage and defense received <<damage>> points of damage</font></b>'
-			end
-		end
-		!xgt'fight','sta'
-	end
-end
-
---- atakB1 ---------------------------------
-

+ 0 - 186
locations/atakM.qsrc

@@ -1,186 +0,0 @@
-# atakM
-
-menu_off = 1
-
-if $ARGS[0] = 'atakVmana':
-	cla
-	!payment hit dodge
-	poSp = speedV*20/100
-	uvAg = pcs_agil*20/100
-	poBox = reactV*20/100
-	uvBox = pcs_react*20/100
-	popad = RAND(reactV-poBox,reactV+poBox) + RAND(speedV-poSp,speedV+poSp)
-	uvorot = RAND(pcs_react-uvBox,pcs_react+uvBox) + RAND(pcs_agil-uvAg,pcs_agil+uvAg)
-	uvorKoef = uvorot*50/100
-	popKoef = popad*50/100
-
-	if popad > uvorot:
-		if popad >= uvorot+uvorKoef:
-			!Crete, very direct hit
-			'<b><font color = red>Critical hits</font></b>'
-
-			xgt'atakM','uronKritV'
-		elseif popad < uvorot+uvorKoef:
-			!Normal hit
-			!He attacks the enemy
-			'<b><font color = red>EYE</font></b>'
-
-			xgt'atakM','uronV'
-		end
-	elseif popad <= uvorot:
-		'<b><font color = green>LOST</font></b>'
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronKritV':
-	cla
-	damage = RAND(1000,2000)
-	damageM = RAND(1000,2000)
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		pcs_mana = pcs_mana - damageM
-
-		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		damSum = damage + damageM
-		defence = defence - damSum
-
-		'<b><font color = red>Your protection harmed <<damSum>> units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_mana = pcs_mana - damageM
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
-if $ARGS[0] = 'uronV':
-	cla
-	damage = RAND(500,1000)
-	damageM = RAND(500,1000)
-
-	if defence <= 0 and klon <= 0 and unmaterial <= 0 and barier <= 0:
-		if dospeh > 0:damage = damage - dospehDef & dospehEn = dospehEn - 1
-		if damage < 0:damage = 0
-		pcs_health = pcs_health - damage
-		pcs_mana = pcs_mana - damageM
-
-		'<b><font color = red>Your health harmed <<damage>> units</font></b>'
-		'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-		if zerkalo > 0:
-			zerkalo = zerkalo - 1
-			healthV = healthV - damage
-
-			'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-		end
-
-		xgt'fight','sta'
-	end
-
-	if defence > 0 and klon <= 0 and unmaterial <= 0:
-		damSum = damage + damageM
-		defence = defence - damSum
-
-		'<b><font color = red>Your protection harmed <<damSum>> units</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if klon > 0 and unmaterial <= 0:
-		klon = klon - 1
-
-		'<b><font color = red>It destroys your clone, Do you have more <<Klon>> Clones</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if unmaterial > 0:
-		unmaterial = unmaterial - 1
-
-		'<b><font color = green>Beat the enemy flew right through your body. YOU are not material</font></b>'
-
-		xgt'fight','sta'
-	end
-
-	if barier > 0:
-		!imeniteta barrier for damage
-		if barier >= damage:
-			'<b><font color = green>You can easily withstand the impact of the enemy</font></b>'
-
-			xgt'fight','sta'
-		elseif barier < damage:
-			pcs_mana = pcs_mana - damageM
-			pcs_health = pcs_health - damage
-
-			'<b><font color = red>You harmed <<damage>> units</font></b>'
-			'<b><font color = red>Your mana harmed <<damageM>> units</font></b>'
-
-			if zerkalo > 0:
-				zerkalo = zerkalo - 1
-				healthV = healthV - damage
-
-				'<b><font color = green>You are repelled and the damage <<$boydesc>> We received <<damage>> points of damage</font></b>'
-			end
-		end
-
-		xgt'fight','sta'
-	end
-end
-
---- atakM ---------------------------------
-

+ 2 - 2
locations/bank.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = 'start':
 		if bankloc = 1:
 			gt 'city_center'
 		else
-			gt 'pavCommercial'
+			gt 'pav_commercial'
 		end
 	end
 	
@@ -51,7 +51,7 @@ if $ARGS[0] = 'start':
 				if bankloc = 1:
 					gt 'city_center'
 				else
-					gt 'pavCommercial'
+					gt 'pav_commercial'
 				end
 			end
 		end

+ 2 - 2
locations/barbershop.qsrc

@@ -100,12 +100,12 @@ if $ARGS[0] = 'start':
 		*clr & cla
 		'The barber shop is closed at the moment, you should probably come back, when Mr. Syomin is in'
 
-		act 'Leave':minut += 3 & gt 'pavCommercial'
+		act 'Leave':minut += 3 & gt 'pav_commercial'
 
 		exit
 	end
 
-	act 'Leave':minut += 3 & gt 'pavCommercial'
+	act 'Leave':minut += 3 & gt 'pav_commercial'
 end
 
 if money >= 60:

+ 1 - 1
locations/bass.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/pool/bass.jpg"></center>'
 	'You must wear a swimsuit in the pool.'
 
-	if db >= 1 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'klofdomhouse', 'ev42'
+	if db >= 1 and Goraday ! daystart:act 'Search ZHoru':Goraday = daystart & gt 'city_jorahouse', 'ev42'
 
 	act 'Swim':
 		cla

+ 37 - 37
locations/bedrPar.qsrc

@@ -27,25 +27,25 @@ if momloc = 26:
 	end
 end
 
-if saveparQW = 2:
+if ParrotQW['Level'] = 2:
 	*clr & cla
 	menu_off = 1
-	'As soon as you enter the room you rush over to <<$namepopu2>>''s cage and pour the contents of the vial in to his water bowl.'
-	'You really hope this will work and keep him from spilling yours and your  sister''s bedroom secrets.'
-	saveparQW = 3
-	saveparjourQW = 3
+	'As soon as you enter the room you rush over to <<$ParrotQW[''Name'']>>''s cage and pour the contents of the vial in to his water bowl.'
+	'You really hope this will work and keep him from spilling yours and your sister''s bedroom secrets.'
+	ParrotQW['Level'] = 3
+	ParrotQW['Day'] = 3
 	act 'Continue':gt $loc, $metka
 	exit
 end
-if sisrelparday + 3 < daystart and saveparQW = 1:
+if ParrotQW['SisterReleaseParrotDay'] + 3 < daystart and ParrotQW['Level'] = 1:
 	*clr & cla
 	menu_off = 1
-	'When you enter the room you notice <<$namepopu2>>''s cage is open and he is gone.'
+	'When you enter the room you notice <<$ParrotQW[''Name'']>>''s cage is open and he is gone.'
 	'You sister must have released him since you were not able to find a solution in time.'
-	popugai2 = 0
-	saveparQW = 0
-	saveparjourQW = 2
-	saveparQWfailed = 0
+	ParrotQW['Owned2'] = 0
+	ParrotQW['Level'] = 0
+	ParrotQW['Day'] = 2
+	ParrotQW['Failed'] = 0
 	act 'Continue':gt $loc, $metka
 	exit
 end
@@ -54,21 +54,21 @@ if pcs_magik >= 6 and spellbefshild = 1 and tobiQW = 0 and sisterHere < 2:gt 'to
 
 if anyaloc = 25: gt 'sisterQW', 'sisboyQW_expel'
 
-if sisterHere = 2 and popugai2 = 1 and sispopconf = 0:
+if sisterHere = 2 and ParrotQW['Owned2'] = 1 and ParrotQW['SisKeepParrot'] = 0:
 	*clr & cla
 	menu_off = 1
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/anya/sister2.jpg"></center>'
-	'"What is that?" your sister asks while pointing at <<$namepopu2>> in his cage'
+	'"What is that?" your sister asks while pointing at <<$ParrotQW[''Name2'']>> in his cage'
 	'"I went to the shopping center and bought this bird. Isn''t he the cutest ?"'
 	if npc_rel['A33'] > 50:
 		'"Not really, but I can see this is something you really want. As long as he doesn''t make too much noise, I don''t really care"'
-		sispopconf = 1
+		ParrotQW['SisKeepParrot'] = 1
 	end
 	if npc_rel['A33']  <= 50:
 		'"No he isn''t cute, and I suggest you take it out of here, I am not sharing my room with a bird."'
 		'You feel kind of sad but you understand your sister. You should have asked her before buying it.'
 		'You go to the window, open it and release the bird'
-		popugai2 = 0
+		ParrotQW['Owned2'] = 0
 	end
 
 	act 'Leave':gt $loc, $metka
@@ -85,28 +85,28 @@ end
 *nl
 'You can access your <a href="exec: quick_dress = 1 & gt ''wardrobe'', ''default''">default clothing</a> options directly.' 
 *nl
-if popugai2 = 1:
-	'<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>"'
-	if daystart - parbuydate > 30 and daystart - parbuydate <= 35: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
-	if daystart - parbuydate > 35 and daystart - parbuydate <= 40: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
-	if daystart - parbuydate > 40 and daystart - parbuydate <= 50: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
-	if daystart - parbuydate > 50 and daystart - parbuydate <= 55: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
-	if daystart - parbuydate > 55 and saveparQW < 3: 'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
-	if saveparQW = 3:
+if ParrotQW['Owned2'] = 1:
+	'<a href="exec:gt ''popu'',''start2''"><<$ParrotQW[''Name2'']>></a> is sitting in his cage'
+	if daystart - ParrotQW['BuyDate'] <= 10: '<<$ParrotQW[''Name2'']>> starts squawking at you when you enter the room.'
+	if daystart - ParrotQW['BuyDate'] > 10 and daystart - ParrotQW['BuyDate'] <= 20: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. It sounds almost like he is saying "<b>hello  <<$pcs_nickname>></b>"'
+	if daystart - ParrotQW['BuyDate'] > 20 and daystart - ParrotQW['BuyDate'] <= 30: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is clearly saying "<b>hello  <<$pcs_nickname>></b>"'
+	if daystart - ParrotQW['BuyDate'] > 30 and daystart - ParrotQW['BuyDate'] <= 35: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> very pretty</b>"'
+	if daystart - ParrotQW['BuyDate'] > 35 and daystart - ParrotQW['BuyDate'] <= 40: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$pcs_nickname>> great body</b>"'
+	if daystart - ParrotQW['BuyDate'] > 40 and daystart - ParrotQW['BuyDate'] <= 50: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b><<$npc_firstname[''A33'']>> you''re the best</b>"'
+	if daystart - ParrotQW['BuyDate'] > 50 and daystart - ParrotQW['BuyDate'] <= 55: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>> swallow it all</b>"'
+	if daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Level'] < 3: 'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Yeah <<$npc_firstname[''A33'']>>  your pussy tastes great</b>"'
+	if ParrotQW['Level'] = 3:
 		parfixrand = rand(0,9)
-		if parfixrand = 0:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
-		if parfixrand = 1:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
-		if parfixrand = 2:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
-		if parfixrand = 3:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
-		if parfixrand = 4:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
-		if parfixrand = 5:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
-		if parfixrand = 6:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
-		if parfixrand = 7:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
-		if parfixrand = 8:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
-		if parfixrand = 9:'When <<$namepopu2>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
+		if parfixrand = 0:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Say To Me?</b>"'
+		if parfixrand = 1:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>3.1415926535897932384 ....</b>"'
+		if parfixrand = 2:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Come Closer, My Friend</b>"'
+		if parfixrand = 3:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Here Kitty, Kitty!</b>"'
+		if parfixrand = 4:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>I Just Met You and This is Crazy</b>"'
+		if parfixrand = 5:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Bow Before Me!</b>"'
+		if parfixrand = 6:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>He’s Just a Friend, Honest!</b>"'
+		if parfixrand = 7:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>What Did You Do To My Socks?</b>"'
+		if parfixrand = 8:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>That’s What She Said!</b>"'
+		if parfixrand = 9:'When <<$ParrotQW[''Name2'']>> sees you he starts ''speaking''. He is saying "<b>Help! They’ve Turned Me Into a Parrot!</b>"'
 		killvar 'parfixrand'
 	end
 
@@ -135,7 +135,7 @@ gad = 0
 if npc_QW['A33'] > 10:npc_QW['A33'] = 10
 
 act 'Exit the room':
-	if sisterHere = 2 and daystart - parbuydate > 55 and popugai2 = 1 and sisrelparday = 0 : gt 'sister_chat', 'pargone'
+	if sisterHere = 2 and daystart - ParrotQW['BuyDate'] > 55 and ParrotQW['Owned2'] = 1 and ParrotQW['SisterReleaseParrotDay'] = 0 : gt 'sister_chat', 'pargone'
 	gt'korrPar'
 end
 

+ 1 - 1
locations/belpicknick.qsrc

@@ -515,7 +515,7 @@ if $ARGS[0] = 'end':
 	if rand(1,100) <= 70:
 		minut += 60
 		'Vadim looks at you again, and sees how dirty you are, "I don''t want cum stains on my car seats. Still, we can''t just leave her here... put her in the trunk." Two of the guys push you in the trunk a bit more forcefully than is needed; it''s not like you have any energy left to resist after what happened here. After a bumpy ride the car pulls to a stop on the outskirts of Pavlovsk, and Tatar got out of the car to open the trunk. He pulls you out of the trunk, throws down your clothes next to you and gets back in before they race off, leaving you to fend for yourself. Your body feels exhausted as you slowly get dressed, and make your way to town.'
-		act'Return to Pavlovsk':gt 'pavCommercial'
+		act'Return to Pavlovsk':gt 'pav_commercial'
 	else
 		minut += 10
 		'Siple looks at your face in disgust. "That looks fucking disgusting... there''s no way you''re getting in our car. Find your own way home, slut!"'

+ 1 - 1
locations/boilerroom.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/qwest/alter/boiler/boilerroom'+ rand(1,3) +'.jpg"></center>'
 	'This event is still not completed. Please bug Ekay until he gets it done.'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 --- boilerroom ---------------------------------

+ 0 - 52
locations/boxing.qsrc

@@ -1,52 +0,0 @@
-# boxing
-!Choosing a physical attack
-
-menu_off = 1
-
-if weapon = 0 and autocombat_cheat = 0:
-	act 'Fist':
-		cla
-		!gs'atak'
-		xgt'atak','player'
-	end
-elseif weapon = 0 and autocombat_cheat = 1:
-	cla
-	!gs'atak'
-	xgt'atak','player'
-end
-
-if weapon > 0:
-	if weaponTipe = 1:$weap = 'sword'
-	if weaponTipe = 2:$weap = 'mace'
-	if weaponTipe = 3:$weap = 'ax'
-
-	act 'Hit <<$weap>>':
-		cla
-		!gs'atak'
-		xgt'atak','player'
-	end
-end
-
-if kunai > 0:
-	'You have <<kunai>> throwing knives.'
-
-	act 'Throw the knife':
-		cla
-		knife = input ("How to throw a knife?")
-		if knife > kunai:
-			knife = kunai
-			kunai = 0
-		elseif knife <= kunai:
-			kunai = kunai - knife
-		end
-
-		'<font color = green>You hurled <<knife>> knives.</font>'
-
-		xgt'atak','player'
-	end
-end
-
-if pcs_magik > 0: act 'Magic Attack':gt'magik'
-
---- boxing ---------------------------------
-

+ 1 - 1
locations/brother_voyeur.qsrc

@@ -1720,7 +1720,7 @@ if $ARGS[0] = 'brother_fuck_cum':
 		
 		act'Fuck him till he cums':gt'brother_voyeur','shower_creampie'
 			
-		act'Fill me up!':'brother_voyeur','shower_fill_me_up'
+		act'Fill me up!':gt 'brother_voyeur','shower_fill_me_up'
 		
 	elseif brothercumchoice = 3:
 		'"<<$pcs_nickname>>-! I''m almost there! Let me cum on your face!"'

+ 1 - 1
locations/budgetclothes.qsrc

@@ -21,7 +21,7 @@ if $ARGS[0] = 'start':
 			minut += 3
 			gt 'torgcentr'
 		else
-			gt 'pavIndustrial'
+			gt 'pav_industrial'
 		end
 	end
 	

+ 3 - 3
locations/carF.qsrc

@@ -16,13 +16,13 @@ $enddrive = {
 	if cardrive = 14:gt 'liam'
 	if cardrive = 18:gt 'youplace'
 	if cardrive = 19:gt 'nordtrain', 'outside'
-	if cardrive = 20:gt 'pavResidential'
+	if cardrive = 20:gt 'pav_residential'
 	if cardrive = 21:gt 'zaprF','start'
 	if cardrive = 22:gt 'road'
 	if cardrive = 23:gt 'gadukino'
-	if cardrive = 24:gt 'pavCommercial'
+	if cardrive = 24:gt 'pav_commercial'
 	if cardrive = 25:gt 'city_island'
-	if cardrive = 26:gt 'pavIndustrial'
+	if cardrive = 26:gt 'pav_industrial'
 }
 
 if $ARGS[0] = 'start':

+ 1 - 1
locations/casino.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'roulette_result':
 
 	'<right><img <<$set_imgh>> src="images/locations/city/industrial/casino/resul.jpg"></right>'
 	*nl
-	'The ball stopps at <<x_rul>> <<$color>>'
+	'The ball stops at <<x_rul>> <<$color>>'
 
 	if kh ! 0:
 		if kh = 1:

+ 20 - 20
locations/bobka.qsrc → locations/city_bobka.qsrc

@@ -1,4 +1,4 @@
-# bobka
+# city_bobka
 
 menu_off = 1
 
@@ -27,7 +27,7 @@ if ARGS[0] = 0:
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Inject yourself with the drugs': gt 'bobka', 'inject'
+	act 'Inject yourself with the drugs': gt 'city_bobka', 'inject'
 end
 
 if ARGS[0] = 1:
@@ -58,7 +58,7 @@ if ARGS[0] = 1:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Inject yourself with the drugs ': gt 'bobka', 'inject'
+		act 'Inject yourself with the drugs ': gt 'city_bobka', 'inject'
 	end
 end
 
@@ -88,7 +88,7 @@ if ARGS[0] = 2:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Inject yourself with the drugs ': gt 'bobka', 'inject'
+		act 'Inject yourself with the drugs ': gt 'city_bobka', 'inject'
 	end
 end
 
@@ -110,12 +110,12 @@ if ARGS[0] = 3:
 			gs 'willpower', 'bj', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'bobka', 'rimming2'
+			gt 'city_bobka', 'rimming2'
 		end
 	else
 		act 'Lick his ass reluctantly (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Lick his ass enthusiastically':gt 'bobka', 'rimming3'
+	act 'Lick his ass enthusiastically':gt 'city_bobka', 'rimming3'
 end
 
 if ARGS[0] = 4:
@@ -136,12 +136,12 @@ if ARGS[0] = 4:
 			gs 'willpower', 'swallow', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'bobka', 'peeface'
+			gt 'city_bobka', 'peeface'
 		end
 	else
 		act 'Let him pee on your face (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Open your mouth for him':gt 'bobka', 'peeswallow'
+	act 'Open your mouth for him':gt 'city_bobka', 'peeswallow'
 end
 
 if $ARGS[0] = 'inject':
@@ -179,7 +179,7 @@ if $ARGS[0] = 'rimming2':
 	'Bobka laughs: "That''s better. You sluts always need some encouragement!"'
 	'He forces your face onto his ass, and you do your best to please him with your tongue. The mere thought of it sickens you, but at the same time there''s nothing you can do to stop yourself now...'
 
-	act 'Moan and put your tongue to work':gt 'bobka', 'rimming4'
+	act 'Moan and put your tongue to work':gt 'city_bobka', 'rimming4'
 end
 
 if $ARGS[0] = 'rimming3':
@@ -191,7 +191,7 @@ if $ARGS[0] = 'rimming3':
 	'Bobka laughs: "That''s it, whore! I knew you were a keeper... you love this, don''t you?" as he forces your face against his ass.'
 	'"Time to really get your tongue in there, where it belongs! And put some effort into it, or else..." he smirks.'
 
-	act 'Moan and put your tongue to work':gt 'bobka', 'rimming4'
+	act 'Moan and put your tongue to work':gt 'city_bobka', 'rimming4'
 end
 
 if $ARGS[0] = 'rimming4':
@@ -208,7 +208,7 @@ if $ARGS[0] = 'rimming4':
 	'Bobka''s cock stands fully erect now, and he lazily begins to jerk off while you fuck his ass with your tongue. He grins when he sees your pleading look: "Soon, slut. Keep licking!"'
 	'"Hopefully he cums soon, at least then it will be over..." you think to yourself, not even caring that he''s probably going to cum all over your face when he does.'
 
-	act 'Continue':gt 'bobka', 'rimming5'
+	act 'Continue':gt 'city_bobka', 'rimming5'
 end
 
 if $ARGS[0] = 'rimming5':
@@ -230,7 +230,7 @@ if $ARGS[0] = 'rimming5':
 	'With a deep sigh you take his flaccid penis in your mouth, and lick it clean. After spending so much time around his anus, the taste of his semen is almost pleasant in comparison.'
 	'He scoffs when he sees the hopeful look in your eyes: "That was... disappointing, <<$pcs_nickname>>. Show some more enthusiasm next time! Heroin whores can''t afford to be squeamish, remember that."'
 	'While he looks hesitant for a while, eventually he hands you a syringe.'
-	act 'Inject yourself with the drugs ': gt 'bobka', 'inject'
+	act 'Inject yourself with the drugs ': gt 'city_bobka', 'inject'
 end
 
 if $ARGS[0] = 'peeface':
@@ -240,7 +240,7 @@ if $ARGS[0] = 'peeface':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeface.jpg"></center>'
 	'Bobka releases his flaccid penis from his trousers, and unleashes a warm stream of urine almost immediately. When you wince and close your eyes, he shouts angrily: "Don''t turn away! Open your eyes and look at me, slut! Right now!"'
 
-	act 'Look into his eyes':gt 'bobka', 'peeface2'
+	act 'Look into his eyes':gt 'city_bobka', 'peeface2'
 end
 
 if $ARGS[0] = 'peeface2':
@@ -252,7 +252,7 @@ if $ARGS[0] = 'peeface2':
 	'You open your eyes and look at him obediently, keeping your face so the urine at least won''t splash up your nose. His urine smells horribly and slowly drips down your body, forming a puddle underneath you. Your mind is going through a desperate struggle as you sit there; on the one hand you feel terrible for demeaning yourself so much, but on the other hand you''re happily anticipating your next high.'
 	'When you wipe your eyes clear with the back of your trembling hands, Bobka smiles meanly.'
 
-	act 'Ask for the dose':gt 'bobka', 'peeface3'
+	act 'Ask for the dose':gt 'city_bobka', 'peeface3'
 end
 
 if $ARGS[0] = 'peeface3':
@@ -264,7 +264,7 @@ if $ARGS[0] = 'peeface3':
 	'Bobka gets closer to you and shakes the last drops off his penis, and then wipes it on your hair.'
 	'"Did you like your shower? It seems just right, for the whore that you are..." he smiles serenely, seeing the defeated look in your eyes. He knows he''s very close to breaking you for good, and offers you the syringe without playing any games.'
 
-	act 'Grab the syringe':gt 'bobka', 'peewhore'
+	act 'Grab the syringe':gt 'city_bobka', 'peewhore'
 end
 
 if $ARGS[0] = 'peeswallow':
@@ -279,7 +279,7 @@ if $ARGS[0] = 'peeswallow':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeswallow.jpg"></center>'
 	'As soon as you open your mouth, a torrent of Bobka''s urine enters your mouth. You nearly choke and cough from the horrible taste, and grimace from the nasty smell that fills your nostrils.'
 
-	act 'Cough uncontrollably':gt 'bobka', 'peeswallow2'
+	act 'Cough uncontrollably':gt 'city_bobka', 'peeswallow2'
 end
 
 if $ARGS[0] = 'peeswallow2':
@@ -293,7 +293,7 @@ if $ARGS[0] = 'peeswallow2':
 	'"Swallow it, whore! Swallow it all, or you''re not getting anything!" Bobka barks loudly.'
 	'You throw your head back and open your mouth as far as you can, just letting the urine flow directly into your stomach without even bothering to swallow. Your stomach fills quickly, and you feel a bit bloated when the stream finally slows down.'
 
-	act 'Swallow the last drops':gt 'bobka', 'peeswallow3'
+	act 'Swallow the last drops':gt 'city_bobka', 'peeswallow3'
 end
 
 if $ARGS[0] = 'peeswallow3':
@@ -304,7 +304,7 @@ if $ARGS[0] = 'peeswallow3':
 	'<center><img <<$set_imgh>> src="images/characters/city/bobka/sex/peeswallow3.jpg"></center>'
 	'Bobka steps a bit closer to you and puts the tip of his cock directly onto your lower lip and then makes you close your mouth, making you suck the last drops out of him directly.'
 
-	act 'Lick his cock clean':gt 'bobka', 'peeswallow4'
+	act 'Lick his cock clean':gt 'city_bobka', 'peeswallow4'
 end
 
 if $ARGS[0] = 'peeswallow4':
@@ -318,7 +318,7 @@ if $ARGS[0] = 'peeswallow4':
 	'While you try not to think about what you just did to earn it, you extend your trembling hand.'
 	'Bobka laughs as he offers you a syringe and the 100 <b>₽</b> he promised you: "I think you may have found your calling! This might be a decent career for you... maybe I can make some arrangements. Anyway, here you go. I hope it was worth it."'
 
-	act 'Grab the syringe':gt 'bobka', 'peewhore'
+	act 'Grab the syringe':gt 'city_bobka', 'peewhore'
 end
 
 if $ARGS[0] = 'peewhore':
@@ -340,5 +340,5 @@ if $ARGS[0] = 'peewhore':
 	end
 end
 
---- bobka ---------------------------------
+--- city_bobka ---------------------------------
 

+ 92 - 92
locations/poli.qsrc → locations/city_clinic.qsrc

@@ -1,13 +1,13 @@
-# poli
+# city_clinic
 $location_type = 'public_indoors'
 
 if $ARGS[0] = 'start':
 	CLOSE all
-	$sexloc = 'poli'
-	$loc = 'poli'
+	$sexloc = 'city_clinic'
+	$loc = 'city_clinic'
 	$metka = 'start'
 	$location_type = 'indoors'
-	$menu_loc = 'poli'
+	$menu_loc = 'city_clinic'
 	$menu_arg = 'start'
 	menu_off = 0
 	*clr & cla
@@ -33,18 +33,18 @@ if $ARGS[0] = 'start':
 	*nl
 	if pcs_gpolimilkdonation >= 2 and lactation['active'] > 0 and lact_ev['pcs_knows_milkbank'] < 1 and lactation['pc_aware'] > 0:
 		*nl
-		'<a href="exec: minut += 5 & gt ''poli'', ''milk_reception''">Ask</a> at the reception if there is the possibilty for breast milk donation'
+		'<a href="exec: minut += 5 & gt ''city_clinic'', ''milk_reception''">Ask</a> at the reception if there is the possibilty for breast milk donation'
 	elseif pcs_gpolimilkdonation < 2 and lactation['active'] > 0 and lact_ev['pcs_knows_milkbank'] < 1 and lactation['pc_aware'] > 0:
 		*nl
-		'At the reception a small <a href="exec: minut += 5 & gt ''poli'', ''milk_advertisement''">advertisement</a> catches your eye.'
+		'At the reception a small <a href="exec: minut += 5 & gt ''city_clinic'', ''milk_advertisement''">advertisement</a> catches your eye.'
 	end
 
-	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Begin your work day':gt 'poli', 'beginwork'
+	if workhosp = 1 and hour >= 8 and hour <= 9 and week < 6:act 'Begin your work day':gt 'city_clinic', 'beginwork'
 
 	act 'Leave the clinic': minut += 5 & gt 'city_residential'
-	act 'Go see a cosmetic surgeon':gt 'poli','cosmetic1'
+	act 'Go see a cosmetic surgeon':gt 'city_clinic','cosmetic1'
 	if lact_ev['pcs_knows_milkbank'] >= 1:
-		act 'Go to the breast milk donation office': minut += 5 & gt 'poli','milk_donation_room'
+		act 'Go to the breast milk donation office': minut += 5 & gt 'city_clinic','milk_donation_room'
 	end
 
 	if pcs_health < (pcs_vital * 10 + pcs_stren * 5) or pain['total'] > 10:
@@ -55,13 +55,13 @@ if $ARGS[0] = 'start':
 			gs 'medical_din','healthTreatment'
 			gs 'stat'
 
-			if hosprand = 0:gt 'poli', '0'
-			if hosprand = 1:gt 'poli', '1'
-			if hosprand = 2:gt 'poli', '2'
+			if hosprand = 0:gt 'city_clinic', '0'
+			if hosprand = 1:gt 'city_clinic', '1'
+			if hosprand = 2:gt 'city_clinic', '2'
 			'The doctor guides you to a bed and tells you to lie down, after which he gives you a combined painkiller, steroid and vitamin shot.'
 			'You feel drowsy for a little while, but afterwards you feel a lot better. The shot sped up your aching body''s recovery by a lot, meaning the pain probably won''t come back nearly as strongly when the shot wears off, and should aid your health recovery over the coming days.'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -72,19 +72,19 @@ if $ARGS[0] = 'start':
 			minut += 60
 			pcs_mood = 100
 
-			if hosprand = 0:gt 'poli', '0'
-			if hosprand = 1:gt 'poli', '1'
-			if hosprand = 2:gt 'poli', '2'
+			if hosprand = 0:gt 'city_clinic', '0'
+			if hosprand = 1:gt 'city_clinic', '1'
+			if hosprand = 2:gt 'city_clinic', '2'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/therapy1.jpg"></center>'
 			'You lie down on the therapist''s couch and tell him all about your troubles. You immediately feel much better, but the therapist seems to be in a state of shock.'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
 	gs 'medical_din', 'birth_control'
 			
-	act 'Go to the STD clinic':gt 'poli', 'stdclinic'
+	act 'Go to the STD clinic':gt 'city_clinic', 'stdclinic'
 
 	if money >= 15000 and preg = 1 and pregchem < 1863 and knowpreg = 1:
 		act 'Get an abortion (15,000 <b>₽</b>)':
@@ -99,7 +99,7 @@ if $ARGS[0] = 'start':
 			minut += 60
 			gs 'stat'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 	
@@ -148,7 +148,7 @@ if $ARGS[0] = 'start':
 			gs 'cum_cleanup', 'reset'
 			dynamic $d_cycreport_choice
 			gs 'stat'
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -159,14 +159,14 @@ if $ARGS[0] = 'start':
 				polisickday = daystart
 				terrnd = rand(0, 1)
 
-				if terrnd = 0:gt 'poli', 'drPP'
-				if terrnd = 1:gt 'poli', 'ninel'
+				if terrnd = 0:gt 'city_clinic', 'drPP'
+				if terrnd = 1:gt 'city_clinic', 'ninel'
 			end
 		else
 			act 'See Dr. Ninel':
 				*clr & cla
 				polisickday = daystart
-				gt 'poli', 'ninel2'
+				gt 'city_clinic', 'ninel2'
 			end
 		end
 	end
@@ -179,7 +179,7 @@ if $ARGS[0] = 'start':
 
 			if ninelrand = 0:
 				'At the reception desk you are told that Dr. Ninel is in her office.'
-				act 'Go to Dr. Ninel':gt 'poli', 'ninel3'
+				act 'Go to Dr. Ninel':gt 'city_clinic', 'ninel3'
 			elseif ninelrand = 1:
 				'At the reception desk you are told that Dr. Ninel can''t see you today.'
 				act 'Leave the clinic': minut += 5 & gt 'city_residential'
@@ -193,11 +193,11 @@ if $ARGS[0] = 'start':
 	if cumcondslip > 0 and cumcondslip_aware > 0:
 		act 'See a Doctor':
 			*clr & cla
-			gt 'poli', 'drPP'
+			gt 'city_clinic', 'drPP'
 		end
 	end
 
-	if katjob > 0:act 'Visit the chief doctor': gt 'poli', 'glavdoc'
+	if katjob > 0:act 'Visit the chief doctor': gt 'city_clinic', 'glavdoc'
 
 	if pcs_teeth > -1:
 		act 'Go to the dentist':
@@ -291,7 +291,7 @@ if $ARGS[0] = 'start':
 			glassqw = 2
 			glass = 1
 			blizoruk += 1
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -304,7 +304,7 @@ if $ARGS[0] = 'start':
 
 			if glass = 1:'The doctor adds, there is also the option to buy glasses for 4,500 <b>₽</b>.'
 
-			act 'Return to the entrance':gt 'poli', 'start'
+			act 'Return to the entrance':gt 'city_clinic', 'start'
 
 			if glass = 1:
 				if money >= 4500:
@@ -316,7 +316,7 @@ if $ARGS[0] = 'start':
 						gs 'stat'
 						'You buy a new, more stylish pair of glasses.'
 
-						act 'Return to the entrance':gt 'poli', 'start'
+						act 'Return to the entrance':gt 'city_clinic', 'start'
 					end
 				else
 					*nl
@@ -334,7 +334,7 @@ if $ARGS[0] = 'start':
 						glass = 0
 						gs 'stat'
 						'You undergo laser eye surgery. Your eyesight is much better now.'
-						act 'Return to the entrance':gt 'poli', 'start'
+						act 'Return to the entrance':gt 'city_clinic', 'start'
 					end
 				else
 					*nl
@@ -361,9 +361,9 @@ if $ARGS[0] = 'stdclinic':
 	'		Complete cure for yeast infection - 15,000 <b>₽</b>.'
 	'	Treatment requires hospitalization on first Monday of each month.'
 	
-	act 'Leave':gt 'poli', 'start'
+	act 'Leave':gt 'city_clinic', 'start'
 
-	if money >= 1000: act 'Take STD test (1,000 <b>₽</b>)': gt 'poli', 'stdcheck'
+	if money >= 1000: act 'Take STD test (1,000 <b>₽</b>)': gt 'city_clinic', 'stdcheck'
 
 	if GerpesNapr > 0 and money >= 450 and GerpesUkolDay ! daystart:
 		act 'Get herpes shot (450 <b>₽</b>). You need <<GerpesNapr>> more injections to complete the treatment.':
@@ -377,7 +377,7 @@ if $ARGS[0] = 'stdclinic':
 			'You see the nurse and she gives you a painful injection in your ass.'
 			
 			if GerpesNapr = 0:Gerpes = -10 & 'You have completed the treatment.'
-			act 'Leave':gt 'poli', 'start'	
+			act 'Leave':gt 'city_clinic', 'start'	
 		end
 	end
 
@@ -394,7 +394,7 @@ if $ARGS[0] = 'stdclinic':
 
 			if TriperNapr = 0:TriperOral = 0 & TriperOralSigns = 0 & Triper = 0 & Venera -= 1 & TriperOnce = 0 & 'You have completed the treatment.'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -413,7 +413,7 @@ if $ARGS[0] = 'stdclinic':
 
 			'"That''s it, you might still feel a bit off but the infection is now cured".'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -433,7 +433,7 @@ if $ARGS[0] = 'stdclinic':
 			'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
 			'After a long recovery, you have been completely cured of your herpes.'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 
@@ -450,7 +450,7 @@ if $ARGS[0] = 'stdclinic':
 			'There''s an ambulance waiting outside. It drives you to a cutting edge medical facility, where you spend 3 days being treated and pampered.'
 			'After a long recovery, you have been completely cured of your thrush.'
 
-			act 'Leave':gt 'poli', 'start'
+			act 'Leave':gt 'city_clinic', 'start'
 		end
 	end
 end
@@ -490,16 +490,16 @@ if $ARGS[0] = 'stdcheck':
 							'The doctor, unfazed, speaks in a calm voice: "Oh, you noticed that huh? The camera is there for your safety as well as mine, miss. I''ve been accused of molestation before."'
 							'"Then it hit me: people on the internet pay good money to see my examinations! Two birds with one stone, right?" he continues. After a moment of silence he adds with a wicked grin: "Okay... since you spotted the camera, I''ll offer you a choice. If you give me 10.000 <b>₽</b> I''ll delete the footage, as if you were never here. I''d be losing a lot of income, so that''s only fair."'
 							'Before you can reply he adds: "Or if you don''t mind being watched by a few thousand people who you''ll probably never meet anyway, I can give you... 3000 <b>₽</b> to keep quiet. It''s your call."'
-							act 'Pay him to delete the footage':gt 'poli', 'ven1'
-							act 'Take the bribe':gt 'poli', 'ven2'
+							act 'Pay him to delete the footage':gt 'city_clinic', 'ven1'
+							act 'Take the bribe':gt 'city_clinic', 'ven2'
 							act 'Threaten to report him':
 								*clr & cla
 								'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/bg28qy97.jpg"></center>'
 								'The doctor brings his face very close to yours and hisses: "Look at where you are, bitch! You better shut your fucking mouth right now, I can make you disappear just like THAT and everyone would be none the wiser!" He snaps his fingers for emphasis. "I made you a very generous offer, don''t make me regret that. An unfortunate ''complication'' is easy to arrange..."'
 								'Then he becomes his calm self again and sighs: "Anyway, let''s forget what you just said and start over. Are you going to compensate me for having to delete the footage?"'
-								act 'Pay him to delete the footage':gt 'poli', 'ven1'
-								act 'Take the bribe':gt 'poli', 'ven2'
-								act 'Try to escape':gt 'poli', 'ven3'
+								act 'Pay him to delete the footage':gt 'city_clinic', 'ven1'
+								act 'Take the bribe':gt 'city_clinic', 'ven2'
+								act 'Try to escape':gt 'city_clinic', 'ven3'
 							end
 						end
 					else
@@ -544,7 +544,7 @@ if $ARGS[0] = 'stdcheck':
 							'Doctor is pleased that you do not have a sexually transmitted disease.'
 						end
 
-						act 'Leave':gt 'poli', 'stdclinic'
+						act 'Leave':gt 'city_clinic', 'stdclinic'
 					end
 				end
 			end
@@ -560,7 +560,7 @@ if $ARGS[0] = 'ven1':
     '<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
     'You lie down, almost crying, mulling over the doctor''s words again and again in your head. You know it is not fair, but you can''t allow these images to go public and decide to pay him to delete the footage.'
 	'You pull the money from your wallet and give it to him, hoping he''ll keep true to his word...'
-    act 'Return to the lobby':gt'poli','start'
+    act 'Return to the lobby':gt'city_clinic','start'
 end
 
 if $ARGS[0] = 'ven2':
@@ -571,7 +571,7 @@ if $ARGS[0] = 'ven2':
     '<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/gy93cr29.jpg"></center>'
     'You lie down, almost crying, mulling over the doctor''s words again and again in your head. After a while you decide that you want the money... you probably won''t be recognized, and even if you do: you can always pretend you didn''t know you were being filmed?'
 	'The doctor seems somewhat surprised to hear your answer, but gives you the money as promised. He grins: "Don''t worry, most of my subscribers don''t live in the city. Maybe a hundred, tops... what are the odds of you running into one of them the coming weeks?"'
-    act 'Leave his office':gt'poli','start'
+    act 'Leave his office':gt'city_clinic','start'
 end
 
 if $ARGS[0] = 'ven3':
@@ -1076,13 +1076,13 @@ if $ARGS[0] = 'glavdoc':
 			'You shake his hand and sort out the paperwork with the personnel department afterwards. Whatever Kat told them must''ve worked, none of them ask any questions about your credentials!'
 			'Five minutes later when you leave the office, you''re holding a shiny new employee pass and a booklet with relevant information.'
 
-			act 'Return to the lobby':gt 'poli', 'start'
+			act 'Return to the lobby':gt 'city_clinic', 'start'
 		end
 	end
 
-	if workhosp = 1:act 'Quit your job':gt 'poli', 'discharge'
+	if workhosp = 1:act 'Quit your job':gt 'city_clinic', 'discharge'
 
-	act 'Return to the lobby':gt 'poli', 'start'
+	act 'Return to the lobby':gt 'city_clinic', 'start'
 end
 
 if $ARGS[0] = 'beginwork':
@@ -1097,7 +1097,7 @@ if $ARGS[0] = 'beginwork':
 		gt 'WorkHosp', 'start'
 	end
 
-	act 'Quit your job':gt 'poli', 'discharge'
+	act 'Quit your job':gt 'city_clinic', 'discharge'
 
 end
 
@@ -1128,7 +1128,7 @@ if $ARGS[0] = '0':
 			gs 'willpower', 'sex', 'resist'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'poli', 'start'
+			gt 'city_clinic', 'start'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1156,7 +1156,7 @@ if $ARGS[0] = '1':
 			gs 'willpower', 'sex', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
-			gt 'poli', 'start'
+			gt 'city_clinic', 'start'
 		end
 	else
 		act 'Storm out (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1179,7 +1179,7 @@ if $ARGS[0] = '2':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/sex/hospsex3.jpg"></center>'
 	'Going to the office you catch a nurse kneeling before the doctor with his cock in her mouth.'
 
-	act 'Leave':gt 'poli', 'start'
+	act 'Leave':gt 'city_clinic', 'start'
 
 	act 'Walk in':
 		*clr & cla
@@ -1193,7 +1193,7 @@ if $ARGS[0] = '2':
 				gs 'willpower', 'cuni', 'resist'
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'poli', 'start'
+				gt 'city_clinic', 'start'
 			end
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1236,68 +1236,68 @@ if $ARGS[0] = 'cosmetic1':
 	'String implants slowly absorb your body fluids and grow larger over time. We can also drain it for you if it becomes too large.'
 	*nl
 	if money >= 80000 and lashair = 0:
-		'<a href="exec:gt ''poli'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''electrolysis''">Electrolysis</a> laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
 		else
 		'Electrolysis - laser hair removal of legs and pubic area - 80,000 <b>₽</b>'
 	end
 	if money >= 25000 and pcs_lip < 4:
-		'<a href="exec:gt ''poli'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''lipPlus''">Lip enlargement surgery</a> - 25,000 <b>₽</b>'
 		else
 		'Lip enlargement surgery - 25,000 <b>₽</b>'
 	end
 	if money >= 30000 and pcs_lip ! 0:
-		'<a href="exec:gt ''poli'', ''lipMin''">Lip reduction surgery</a> - 30,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''lipMin''">Lip reduction surgery</a> - 30,000 <b>₽</b>'
 		else
 		'Lip reduction surgery - 30,000 <b>₽</b>'
 	end
 	if money >= 90000 and pcs_eyesize < 3:
-		'<a href="exec:gt ''poli'', ''eyePlus''">Eye enlargement surgery</a> - 90,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''eyePlus''">Eye enlargement surgery</a> - 90,000 <b>₽</b>'
 		else
 		'Eye enlargement surgery - 90,000 <b>₽</b>'
 	end
 	if money >= 90000 and pcs_eyesize ! 0:
-		'<a href="exec:gt ''poli'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''eyeMin''">Eye reduction surgery</a> - 90,000 <b>₽</b>'
 		else
 		'Eye reduction surgery - 90,000 <b>₽</b>' 
 	end
 	if money >= 75000 and salo > 40:
-		'<a href="exec:gt ''poli'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
+		'<a href="exec:gt ''city_clinic'', ''lyposuction''">Liposuction</a> - 75,000 <b>₽</b>'
 		else
 		'Liposuction - 75,000 <b>₽</b>'
 	end
 	''
 	if money >= 90000 and silicone ! 0:
-		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''poli'', ''bImplantA''">Remove breast implants</a> - 90,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 0 & stringimplant = 0 & fillimplant = 0 & gt ''city_clinic'', ''bImplantA''">Remove breast implants</a> - 90,000 <b>₽</b>'
 		else
 		'Remove breast implants - 90,000 <b>₽</b>'
 	end
 	if money >= 170000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 10 & gt ''poli'', ''bImplantA''">Get small breast implants</a> - 170,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 10 & gt ''city_clinic'', ''bImplantA''">Get small breast implants</a> - 170,000 <b>₽</b>'
 		else
 		'Get small breast implants - 170,000 <b>₽</b>'
 	end
 	if money >= 180000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & gt ''poli'', ''bImplantA''">Get medium breast implants</a> - 180,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & gt ''city_clinic'', ''bImplantA''">Get medium breast implants</a> - 180,000 <b>₽</b>'
 		else
 		'Get medium breast implants - 180,000 <b>₽</b>'
 	end
 	if money >= 190000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 30 & gt ''poli'', ''bImplantA''">Get large breast implants</a> - 190,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 30 & gt ''city_clinic'', ''bImplantA''">Get large breast implants</a> - 190,000 <b>₽</b>'
 		else
 		'Get large breast implants - 190,000 <b>₽</b>'
 	end
 	if money >= 200000 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 40 & gt ''poli'', ''bImplantA''">Get XXL breast implants</a> - 200,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 40 & gt ''city_clinic'', ''bImplantA''">Get XXL breast implants</a> - 200,000 <b>₽</b>'
 		else
 		'Get XXL breast implants - 200,000 <b>₽</b>'
 	end
 	if money >= 200000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''poli'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & fillimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get fillable implants</a> - 200,000 <b>₽</b>'
 		else
 		'Get fillable implants - 200,000 <b>₽</b>'
 	end
 	if money >= 250000 and silicone = 0 and fillimplant = 0 and stringimplant = 0:
-		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''poli'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
+		'<a href="exec:brSurTemp = 20 & stringimplant = 1 & gt ''city_clinic'', ''bImplantA''">Get string implants</a> - 250,000 <b>₽</b>'
 		else
 		'Get string implants - 250,000 <b>₽</b>'
 	end
@@ -1309,7 +1309,7 @@ if $ARGS[0] = 'cosmetic1':
 		'Buy silicone bag - 500 <b>₽</b>'
 	end
 
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'electrolysis':
@@ -1323,7 +1323,7 @@ if $ARGS[0] = 'electrolysis':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/electrolysis.jpg"></center>'
 	'The surgeon has you strip completely and lie down on the table. Over next few hours you are treated by a laser over and over again. When the treatment is finished and you get up from the table, your skin feels silky smooth.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'lipPlus':
@@ -1337,7 +1337,7 @@ if $ARGS[0] = 'lipPlus':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'lipMin':
@@ -1351,7 +1351,7 @@ if $ARGS[0] = 'lipMin':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'eyePlus':
@@ -1365,7 +1365,7 @@ if $ARGS[0] = 'eyePlus':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'eyeMin':
@@ -1379,7 +1379,7 @@ if $ARGS[0] = 'eyeMin':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'lyposuction':
@@ -1394,7 +1394,7 @@ if $ARGS[0] = 'lyposuction':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'bImplantA':
@@ -1428,7 +1428,7 @@ if $ARGS[0] = 'bImplantA':
 	'The surgeon has you strip, put on a gown and lie down on the table. He gives you a mask and tells you: "Just breathe in deeply... we''ll be done before you know it."'
 	'By the time you wake up again, the procedure is complete.'
 
-	act 'Continue':gt 'poli', 'cosmetic1'
+	act 'Continue':gt 'city_clinic', 'cosmetic1'
 end
 
 if $ARGS[0] = 'milk_advertisement':
@@ -1442,7 +1442,7 @@ if $ARGS[0] = 'milk_advertisement':
 		'You are not sure why this cought your attention.'
 	end
 	if lact_ev['pcs_knows_milkbank'] < 1: lact_ev['pcs_knows_milkbank'] = 1
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_reception':
@@ -1452,7 +1452,7 @@ if $ARGS[0] = 'milk_reception':
 	'She waves into a general direction down the hallway.'
 	'Nurse at the reception: There should be a sign on the door, it is only a small room.'
 	if lact_ev['pcs_knows_milkbank'] < 1: lact_ev['pcs_knows_milkbank'] = 1
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_donation_room':
@@ -1460,7 +1460,7 @@ if $ARGS[0] = 'milk_donation_room':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/milkbank_door.jpg"></center>'
 	'There is a door with a sign on it, indicating this is the office for the milk donation.'
-	act 'Go back':gt 'poli','start'
+	act 'Go back':gt 'city_clinic','start'
 	if lactation['pc_aware'] > 0 and hour < 10 or hour > 19:
 		'The door seems to be locked, nobody is here.'
 		'There is a sign that reads "Opening hours are 10:00 to 19:00 daily.'
@@ -1538,15 +1538,15 @@ if $ARGS[0] = 'milk_donation_room':
 					lact_ev['poli_sample_vol'] = lact_ev['poli_milkedvolume']
 					lact_ev['poli_milkedvolume'] = 0
 					lact_ev['pcs_milkbank_firsttime'] = 1
-					act 'Leave':gt 'poli','start'
+					act 'Leave':gt 'city_clinic','start'
 				end
 			else
 				!!	if rand(1,100) > 98:
-				!!		gt 'poli','milk_bank_guy'
+				!!		gt 'city_clinic','milk_bank_guy'
 				!!	else
-				!!		gt 'poli','milk_bank'
+				!!		gt 'city_clinic','milk_bank'
 				!!	end
-				gt 'poli','milk_bank'
+				gt 'city_clinic','milk_bank'
 			end
 		end
 	else
@@ -1556,7 +1556,7 @@ end
 
 if $ARGS[0] = 'milk_bank_guy':
 	'content not finished yet'
-	act 'Leave':gt 'poli','start'
+	act 'Leave':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_bank':
@@ -1590,7 +1590,7 @@ if $ARGS[0] = 'milk_bank':
 			'Paid money: <<((lact_ev[''poli_totalmilkdonated'']/50)*100)>><b>₽</b>'
 			'<br>----------------------------------------'
 		end
-		act 'Leave': gt 'poli', 'milk_donation_room'
+		act 'Leave': gt 'city_clinic', 'milk_donation_room'
 	end
 	if lactation['active'] > 0:
 		act 'Donate breast milk':
@@ -1607,18 +1607,18 @@ if $ARGS[0] = 'milk_bank':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/clinic/milkbank/pumping_room.jpg"></center>'
 				'The employee leads you into one of the free rooms and invites you to sit down.'
 				'She prepares the breast pump and signales you to prepare yourself.'
-				act 'continue': gt 'poli','milk_donation'
+				act 'continue': gt 'city_clinic','milk_donation'
 			end
 			act 'Don''t follow her':
 				*clr & cla
 				menu_off = 1
 				gs 'stat'
 				'You: Ah Sorry! I forgot something and can''t donate now.'
-				act 'Leave':gt 'poli', 'milk_donation_room'
+				act 'Leave':gt 'city_clinic', 'milk_donation_room'
 			end
 		end
 	end
-	act 'Leave':gt 'poli','start'
+	act 'Leave':gt 'city_clinic','start'
 end
 
 if $ARGS[0] = 'milk_donation':
@@ -1685,9 +1685,9 @@ if $ARGS[0] = 'milk_donation':
 			if lactation['breastmv'] > lactation['breastmm']/2 and lactation['breastmv'] >= 100000:
 				'The employee looks at your breasts'
 				'Nurse: It seems there is still some milk left, do you want to donate more?'
-				act 'have your breasts pumped again': gt 'poli','milk_donation'
+				act 'have your breasts pumped again': gt 'city_clinic','milk_donation'
 			else
-				act 'ask to donate more': gt 'poli','milk_donation'
+				act 'ask to donate more': gt 'city_clinic','milk_donation'
 			end
 			act 'enough for today':
 				*clr & cla
@@ -1700,19 +1700,19 @@ if $ARGS[0] = 'milk_donation':
 				end
 				act 'leave':
 					lact_ev['poli_milkedvolume'] = 0
-					gt 'poli', 'milk_donation_room'
+					gt 'city_clinic', 'milk_donation_room'
 				end
 			end
 		end
 	elseif lact_ev['poli_donationsessioncount'] > 0:
 		'Sorry Ms. <<$pcs_lastname>>, we are closing now.'
 		'You put on your top, and the employee hands you <<lact_ev[''poli_donatemoney'']>><b>₽</b> for your donated breast milk.'
-		act 'Leave':minut += 5 & gt 'poli', 'milk_donation_room'
+		act 'Leave':minut += 5 & gt 'city_clinic', 'milk_donation_room'
 	else
 		'The milk donation service is closed. It''s open every day between 10:00 and 19:00.'
-		act 'Leave':minut += 5 & gt 'poli', 'milk_donation_room'
+		act 'Leave':minut += 5 & gt 'city_clinic', 'milk_donation_room'
 	end
 end
 
---- poli ---------------------------------
+--- city_clinic ---------------------------------
 

+ 4 - 4
locations/dima.qsrc → locations/city_dima.qsrc

@@ -1,8 +1,8 @@
-# dima
+# city_dima
 
-$loc = 'dima'
+$loc = 'city_dima'
 $metka = 'start'
-$menu_loc = 'dima'
+$menu_loc = 'city_dima'
 $menu_arg = ''
 menu_off = 0
 
@@ -21,5 +21,5 @@ if $ARGS[0] = 'start':
 	end
 end
 
---- dima ---------------------------------
+--- city_dima ---------------------------------
 

+ 35 - 35
locations/narkopriton.qsrc → locations/city_drugden.qsrc

@@ -1,4 +1,4 @@
-# narkopriton
+# city_drugden
 
 *clr & cla
 gs 'stat'
@@ -10,7 +10,7 @@ menu_off = 1
 'A skinny guy opens the door, with a paranoid look in his eyes. He says doubtfully: "Are you sure you can afford to be here? My product ain''t cheap..."'
 
 act 'Get out of here': minut += 5 & gt 'city_residential'
-act 'You roll your eyes and push the door open': gt 'narkopriton', 'start'
+act 'You roll your eyes and push the door open': gt 'city_drugden', 'start'
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -19,21 +19,21 @@ if $ARGS[0] = 'start':
 	'The skinny guy at the door looks you up and down as you enter, "So what can I get for you, honey?"'
 	if drugUser = 1:
 		act 'Leave the drug den': minut += 5 & gt 'city_residential'
-		act 'Ask for heroin': gt 'narkopriton', 'heroin'
-		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		act 'Ask for weed': gt 'narkopriton', 'joints'
-		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
+		act 'Ask for heroin': gt 'city_drugden', 'heroin'
+		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
+		act 'Ask for weed': gt 'city_drugden', 'joints'
+		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
 		if StoryLine = 1 and snarkozak = 0: act 'Ask for a drop-off point in Pavlovsk':	minut += 5 & gs 'events', 'narkozakladka'
 	elseif drugUser = 0:
 		'"Ahhh, what do you have?" you ask.'
 		'His eyes light up at a freshy and smiles wildy, "Well I have some H and amphetamine."'
 		act 'Leave the drug den': minut += 5 & gt 'city_residential'
-		act 'Ask for heroin': gt 'narkopriton', 'heroin'
-		act 'Ask for amphetamine': gt 'narkopriton', 'amphetamine'
-		act 'Ask for weed': gt 'narkopriton', 'joints'
-		act 'Ask for cocaine': gt 'narkopriton', 'cocaine'
+		act 'Ask for heroin': gt 'city_drugden', 'heroin'
+		act 'Ask for amphetamine': gt 'city_drugden', 'amphetamine'
+		act 'Ask for weed': gt 'city_drugden', 'joints'
+		act 'Ask for cocaine': gt 'city_drugden', 'cocaine'
 	elseif (StrongNarkota > 23 and amphHigh > 23) or amphHigh > 23 or StrongNarkota > 23:
-		gt 'narkopriton', 'kiteHigh'
+		gt 'city_drugden', 'kiteHigh'
 	end
 end
 
@@ -53,7 +53,7 @@ if $ARGS[0] = 'amphetamine':
 			drugUser = 1
 			amphetamine += 20
 			minut += 5
-			gt 'narkopriton', 'amphetamine'
+			gt 'city_drugden', 'amphetamine'
 		end
 	end
 	if money >= 800:
@@ -62,7 +62,7 @@ if $ARGS[0] = 'amphetamine':
 			drugUser = 1
 			amphetamine += 10
 			minut += 5
-			gt 'narkopriton', 'amphetamine'
+			gt 'city_drugden', 'amphetamine'
 		end
 	end
 	if money >= 400:
@@ -71,12 +71,12 @@ if $ARGS[0] = 'amphetamine':
 			drugUser = 1
 			amphetamine += 5
 			minut += 5
-			gt 'narkopriton', 'amphetamine'
+			gt 'city_drugden', 'amphetamine'
 		end
 	end
-	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some weed instead': gt 'narkopriton', 'joints'
-	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+	act 'Buy some heroin instead': gt 'city_drugden', 'heroin'
+	act 'Buy some weed instead': gt 'city_drugden', 'joints'
+	act 'Buy some cocaine instead': gt 'city_drugden', 'cocaine'
 end
 
 if $ARGS[0] = 'joints':
@@ -93,7 +93,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 20
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'city_drugden', 'joints'
 		end
 	end
 	if money >= 500:
@@ -102,7 +102,7 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 10
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'city_drugden', 'joints'
 		end
 	end
 	if money >= 250:
@@ -111,12 +111,12 @@ if $ARGS[0] = 'joints':
 			drugUser = 1
 			joint += 5
 			minut += 5
-			gt 'narkopriton', 'joints'
+			gt 'city_drugden', 'joints'
 		end
 	end
-	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+	act 'Buy some heroin instead': gt 'city_drugden', 'heroin'
+	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
+	act 'Buy some cocaine instead': gt 'city_drugden', 'cocaine'
 end
 
 if $ARGS[0] = 'cocaine':
@@ -133,7 +133,7 @@ if $ARGS[0] = 'cocaine':
 			drugUser = 1
 			dur += 20
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'city_drugden', 'cocaine'
 		end
 	end
 	if money >= 3600:
@@ -142,7 +142,7 @@ if $ARGS[0] = 'cocaine':
 			drugUser = 1
 			dur += 10
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'city_drugden', 'cocaine'
 		end
 	end
 	if money >= 1800:
@@ -151,12 +151,12 @@ if $ARGS[0] = 'cocaine':
 			drugUser = 1
 			dur += 5
 			minut += 5
-			gt 'narkopriton', 'cocaine'
+			gt 'city_drugden', 'cocaine'
 		end
 	end
-	act 'Buy some heroin instead': gt 'narkopriton', 'heroin'
-	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some weed instead': gt 'narkopriton', 'joints'
+	act 'Buy some heroin instead': gt 'city_drugden', 'heroin'
+	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
+	act 'Buy some weed instead': gt 'city_drugden', 'joints'
 end
 
 if $ARGS[0] = 'heroin':
@@ -220,11 +220,11 @@ if $ARGS[0] = 'heroin':
 			end
 		end
 	elseif money < 500 and SLomka > 0:
-		act 'Beg him to give you some':	gs 'narkopriton', 'drugslut'
+		act 'Beg him to give you some':	gs 'city_drugden', 'drugslut'
 	end
-	act 'Buy some amphetamine instead':	gt 'narkopriton', 'amphetamine'
-	act 'Buy some weed instead': gt 'narkopriton', 'joints'
-	act 'Buy some cocaine instead': gt 'narkopriton', 'cocaine'
+	act 'Buy some amphetamine instead':	gt 'city_drugden', 'amphetamine'
+	act 'Buy some weed instead': gt 'city_drugden', 'joints'
+	act 'Buy some cocaine instead': gt 'city_drugden', 'cocaine'
 end
 
 if $ARGS[0] = 'drugslut':
@@ -279,7 +279,7 @@ if $ARGS[0] = 'drugslut':
 				'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 				'You keep begging Bobka to give you some heroin, while you follow him to an empty room. He just laughs at you and says: <<$bobtalk>>'
 
-				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'bobka', bobrand
+				act '<<$bobtext>>':	NarkShmaraTimes += 1 & gt 'city_bobka', bobrand
 				
 				gs 'willpower', 'bj', 'resist'
 				if will_cost <= pcs_willpwr:
@@ -426,4 +426,4 @@ if $ARGS[0] = 'drugslut':
 	end
 end
 
---- narkopriton ---------------------------------
+--- city_drugden ---------------------------------

+ 16 - 16
locations/IrinaRoom.qsrc → locations/city_irinaroom.qsrc

@@ -1,9 +1,9 @@
-# IrinaRoom
+# city_irinaroom
 
 if $ARGS[0] = 'start':
 	cla
 	*clr
-	$menu_loc = 'IrinaRoom'
+	$menu_loc = 'city_irinaroom'
 	$menu_arg = 'start'
 	menu_off = 0
 	minut += 5
@@ -24,7 +24,7 @@ if $ARGS[0] = 'start':
 		if hour >= 16 and hour <= 21 and week >= 6 and IrinaQW ! 2:
 			'You ring the bell and Ira opens the door, she smiles and invites you in.'
 
-			act 'Enter apartment':gt 'IrinaRoom', 'first'
+			act 'Enter apartment':gt 'city_irinaroom', 'first'
 		else
 			'You rang the doorbell but no one answers.'
 
@@ -41,7 +41,7 @@ if $ARGS[0] = 'first':
 	cla
 	clr
 	*clr
-	$menu_loc = 'IrinaRoom'
+	$menu_loc = 'city_irinaroom'
 	$menu_arg = 'first'
 	menu_off = 0
 	gs 'stat'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'first':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/irinaroom.jpg"></center>'
 	'A small studio apartment, Ira keeps it neat and tidy'
 
-	act 'Drink in the kitchen':gt 'IrinaRoom', 'first1'
+	act 'Drink in the kitchen':gt 'city_irinaroom', 'first1'
 end
 
 if $ARGS[0] = 'first1':
@@ -73,11 +73,11 @@ if $ARGS[0] = 'first1':
 	act 'Leave':gt 'city_residential'
 
 	if IrinaQW = 1:
-		act 'Suggest drinking to sisterhood':gt 'IrinaRoom', 'first2'
+		act 'Suggest drinking to sisterhood':gt 'city_irinaroom', 'first2'
 	end
 
 	if IrinaQW >= 10:
-		act 'Kiss':gt 'IrinaRoom', 'kiss'
+		act 'Kiss':gt 'city_irinaroom', 'kiss'
 	end
 end
 
@@ -93,7 +93,7 @@ if $ARGS[0] = 'kiss':
 	gs 'arousal', 'kiss', 10, 'lesbian'
 	gs 'stat'
 
-	act 'Sex':gt 'IrinaRoom', 'sex'
+	act 'Sex':gt 'city_irinaroom', 'sex'
 end
 
 if $ARGS[0] = 'sex':
@@ -145,7 +145,7 @@ if $ARGS[0] = 'first2':
 	'<center><img <<$set_imgh>> src="images/characters/city/ira/irinaqw1.jpg"></center>'
 	'You suggest drinking to sister to Ira. Although slightly odd, this simple ritual removes tensions and brings you closer.'
 
-	act 'Kiss':gt 'IrinaRoom', 'first3'
+	act 'Kiss':gt 'city_irinaroom', 'first3'
 end
 
 if $ARGS[0] = 'first3':
@@ -160,8 +160,8 @@ if $ARGS[0] = 'first3':
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Ira undress':gt 'IrinaRoom', 'first4'
-	act 'Ira drink more':gt 'IrinaRoom', 'first5'
+	act 'Ira undress':gt 'city_irinaroom', 'first4'
+	act 'Ira drink more':gt 'city_irinaroom', 'first5'
 end
 
 if $ARGS[0] = 'first4':
@@ -197,7 +197,7 @@ if $ARGS[0] = 'first5':
 	gs 'arousal', 'foreplay', 10, 'lesbian'
 	gs 'stat'
 
-	act 'Kiss':gt 'IrinaRoom', 'first6'
+	act 'Kiss':gt 'city_irinaroom', 'first6'
 end
 
 if $ARGS[0] = 'first6':
@@ -211,7 +211,7 @@ if $ARGS[0] = 'first6':
 	gs 'arousal', 'kiss', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Fondle breasts':gt 'IrinaRoom', 'first7'
+	act 'Fondle breasts':gt 'city_irinaroom', 'first7'
 end
 
 if $ARGS[0] = 'first7':
@@ -225,7 +225,7 @@ if $ARGS[0] = 'first7':
 	gs 'arousal', 'foreplay_give', 5, 'lesbian'
 	gs 'stat'
 
-	act 'Lick pussy':gt 'IrinaRoom', 'first8'
+	act 'Lick pussy':gt 'city_irinaroom', 'first8'
 end
 
 if $ARGS[0] = 'first8':
@@ -245,7 +245,7 @@ if $ARGS[0] = 'first8':
 	minut -= 10
 	gs 'stat'
 
-	act 'Enjoy':gt 'IrinaRoom', 'first9'
+	act 'Enjoy':gt 'city_irinaroom', 'first9'
 end
 
 if $ARGS[0] = 'first9':
@@ -269,5 +269,5 @@ if $ARGS[0] = 'first9':
 	end
 end
 
---- IrinaRoom ---------------------------------
+--- city_irinaroom ---------------------------------
 

+ 66 - 66
locations/klofdomhouse.qsrc → locations/city_jorahouse.qsrc

@@ -1,4 +1,4 @@
-# klofdomhouse
+# city_jorahouse
 !Jora dick = 16, silavag = 1
 !Seymon dick = 18, silavag = 2
 if $ARGS[0] = 'start':
@@ -13,10 +13,10 @@ if $ARGS[0] = 'start':
 
 		if klofQW = 2 and hour >= 16 and klofday ! daystart:
 			klofday = daystart
-			gt 'klofdomhouse', 'ev1'
+			gt 'city_jorahouse', 'ev1'
 		elseif klofQW > 2 and hour >= 16 and klofday ! daystart:
 			klofday = daystart
-			gt 'klofdomhouse', 'start1'
+			gt 'city_jorahouse', 'start1'
 		else
 			'No one home'
 
@@ -36,7 +36,7 @@ if $ARGS[0] = 'start1':
 	gs 'stat'
 
 	if kloftimes < 10:
-		gt 'klofdomhouse', 'ev7'
+		gt 'city_jorahouse', 'ev7'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/klof.jpg"></center>'
 		'You ring the doorbell. Jora answers, scratching his belly. He yawns and says he is busy.'
@@ -60,7 +60,7 @@ if $ARGS[0] = 'ev1':
 		'"Hey," you say.'
 		'"Ahh, you." The guy standing in the doorway responds, smiling.'
 
-		act 'Stop by':gt 'klofdomhouse', 'ev2'
+		act 'Stop by':gt 'city_jorahouse', 'ev2'
 	else
 		'<center><img <<$set_imgh>> src="images/characters/city/jora/klof.jpg"></center>'
 		'You ring the doorbell. Jora answers, scratching his belly. He yawns and says he is busy.'
@@ -80,9 +80,9 @@ if $ARGS[0] = 'ev2':
 	'"I see. I don''t know your names.'
 	'"Call me Jora, and my sidekick Semyon, and now you''re introduced, hurry up and clean up this in the apartment."'
 
-	act 'Clean up':gt 'klofdomhouse', 'ev4'
+	act 'Clean up':gt 'city_jorahouse', 'ev4'
 
-	if pcs_horny < 75:act 'Leave':gt 'klofdomhouse', 'ev3'
+	if pcs_horny < 75:act 'Leave':gt 'city_jorahouse', 'ev3'
 end
 
 if $ARGS[0] = 'ev3':
@@ -108,7 +108,7 @@ if $ARGS[0] = 'ev4':
 	'"When will have gotten better acquainted, we will talk business."'
 	'"Now be a good girl and take off your clothes, you are now the entertainment."'
 
-	act 'Fuck Jora':gt 'klofdomhouse', 'ev5'
+	act 'Fuck Jora':gt 'city_jorahouse', 'ev5'
 end
 
 if $ARGS[0] = 'ev5':
@@ -122,7 +122,7 @@ if $ARGS[0] = 'ev5':
 	'Into the room comes Semyon, "Suck my cock baby, yeah."'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	act 'Suck him':gt 'klofdomhouse', 'ev6'
+	act 'Suck him':gt 'city_jorahouse', 'ev6'
 end
 
 if $ARGS[0] = 'ev6':
@@ -162,7 +162,7 @@ if $ARGS[0] = 'ev7':
 	'<center><img <<$set_imgh>> src="images/characters/city/jora/klof1.jpg"></center>'
 	'You enter the apartment'
 
-	act 'Say hello to the guys':gt 'klofdomhouse', 'ev8'
+	act 'Say hello to the guys':gt 'city_jorahouse', 'ev8'
 end
 
 if $ARGS[0] = 'ev8':
@@ -174,10 +174,10 @@ if $ARGS[0] = 'ev8':
 	'"Hello boys, did you miss me?" You say, blushing.'
 	gs 'arousal', 'foreplay', 5
 	gs 'stat'
-	act 'Entertain Jora':gt 'klofdomhouse', 'ev9'
-	act 'Entertain Semyon':gt 'klofdomhouse', 'ev10'
-	act 'Entertain both':gt 'klofdomhouse', 'ev19'
-	act 'Talk business with Jora':gt 'klofdomhouse', 'ev20'
+	act 'Entertain Jora':gt 'city_jorahouse', 'ev9'
+	act 'Entertain Semyon':gt 'city_jorahouse', 'ev10'
+	act 'Entertain both':gt 'city_jorahouse', 'ev19'
+	act 'Talk business with Jora':gt 'city_jorahouse', 'ev20'
 end
 
 if $ARGS[0] = 'ev9':
@@ -187,9 +187,9 @@ if $ARGS[0] = 'ev9':
 	silavag = 1
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Have Jora fuck your pussy':gt 'klofdomhouse', 'ev13'
-	act 'Have Jora fuck your ass':gt 'klofdomhouse', 'ev14'
-	act 'Suck Jora':gt 'klofdomhouse', 'ev19'
+	act 'Have Jora fuck your pussy':gt 'city_jorahouse', 'ev13'
+	act 'Have Jora fuck your ass':gt 'city_jorahouse', 'ev14'
+	act 'Suck Jora':gt 'city_jorahouse', 'ev19'
 end
 
 if $ARGS[0] = 'ev13':
@@ -295,9 +295,9 @@ if $ARGS[0] = 'ev10':
 	silavag = 2
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Have Semyon fuck your pussy':gt 'klofdomhouse', 'ev 16'
-	act 'Have Semyon fuck your ass':gt 'klofdomhouse', 'ev 17'
-	act 'Suck Semyon':gt 'klofdomhouse', 'ev 18'
+	act 'Have Semyon fuck your pussy':gt 'city_jorahouse', 'ev 16'
+	act 'Have Semyon fuck your ass':gt 'city_jorahouse', 'ev 17'
+	act 'Suck Semyon':gt 'city_jorahouse', 'ev 18'
 end
 
 if $ARGS[0] = 'ev 16':
@@ -457,8 +457,8 @@ if $ARGS[0] = 'ev20':
 	act 'Talk to the boss':
 		cla
 
-		if klofQW < 10:gt 'klofdomhouse', 'ev21'
-		if klofQW >= 10:gt 'klofdomhouse', 'ev22'
+		if klofQW < 10:gt 'city_jorahouse', 'ev21'
+		if klofQW >= 10:gt 'city_jorahouse', 'ev22'
 	end
 end
 
@@ -479,7 +479,7 @@ if $ARGS[0] = 'ev22':
 	'From the room comes an ugly old man.'
 	'The boss looks closely at you and says, "Come to me, looks like you''re ready to make some more money."'
 
-	act 'Go to the boss''s room':gt 'klofdomhouse', 'ev23'
+	act 'Go to the boss''s room':gt 'city_jorahouse', 'ev23'
 	
 	gs 'willpower', 'misc', 'self', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -500,7 +500,7 @@ if $ARGS[0] = 'ev23':
 	'You go into the boss''s room, it is surprisingly well renovated and furnished.'
 	'"Well, Well, take off your clothes and show yourself." Says the boss.'
 
-	act 'Show yourself':gt 'klofdomhouse', 'ev24'
+	act 'Show yourself':gt 'city_jorahouse', 'ev24'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -521,7 +521,7 @@ if $ARGS[0] = 'ev24':
 	'You sit on the bed modestly.'
 	'"Show your breasts" Orders the boss.'
 
-	act 'Show your breasts':gt 'klofdomhouse', 'ev25'
+	act 'Show your breasts':gt 'city_jorahouse', 'ev25'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -543,7 +543,7 @@ if $ARGS[0] = 'ev25':
 	'"Show me your ass!" Orders the boss'
 	gs 'arousal', 'flashlite', 5, 'sub'
 	gs 'stat'
-	act 'Show your ass':gt 'klofdomhouse', 'ev26'
+	act 'Show your ass':gt 'city_jorahouse', 'ev26'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -567,7 +567,7 @@ if $ARGS[0] = 'ev26':
 	'"Let''s get rid of that dress!" He says.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Remove your dress':gt 'klofdomhouse', 'ev27'
+	act 'Remove your dress':gt 'city_jorahouse', 'ev27'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -589,7 +589,7 @@ if $ARGS[0] = 'ev27':
 	'You take off your dress'
 	'"Spreads your legs!" You receive an order.'
 
-	act 'Spread your legs':gt 'klofdomhouse', 'ev28'
+	act 'Spread your legs':gt 'city_jorahouse', 'ev28'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -612,7 +612,7 @@ if $ARGS[0] = 'ev28':
 	'"And now seduce me" Smiles the boss.'
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
-	act 'Seduce the boss':gt 'klofdomhouse', 'ev29'
+	act 'Seduce the boss':gt 'city_jorahouse', 'ev29'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -634,7 +634,7 @@ if $ARGS[0] = 'ev29':
 	'You roll over on your side and show the boss your charms.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Give him a better view':gt 'klofdomhouse', 'ev30'
+	act 'Give him a better view':gt 'city_jorahouse', 'ev30'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -656,7 +656,7 @@ if $ARGS[0] = 'ev30':
 	'You get on all fours and show off your ass to the boss, you noticed that he is fidgeting in his chair. He undoes his pants and gives you a look that you immediately understand.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Lick the boss''s cock':gt 'klofdomhouse', 'ev31'
+	act 'Lick the boss''s cock':gt 'city_jorahouse', 'ev31'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -678,7 +678,7 @@ if $ARGS[0] = 'ev31':
 	'You gently began to lick his penis.'
 	gs 'arousal', 'foreplay', 5, 'sub'
 	gs 'stat'
-	act 'Suck it':gt 'klofdomhouse', 'ev32'
+	act 'Suck it':gt 'city_jorahouse', 'ev32'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -701,7 +701,7 @@ if $ARGS[0] = 'ev32':
 	'In a hoarse voice the boss orders, "Spreads your legs, bitch."'
 	gs 'arousal', 'bj', 5, 'sub'
 	gs 'stat'
-	act 'Spread your legs':gt 'klofdomhouse', 'ev33'
+	act 'Spread your legs':gt 'city_jorahouse', 'ev33'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -724,7 +724,7 @@ if $ARGS[0] = 'ev33':
 	'"Well, now I''ll check your pussy" States the boss.'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
-	act 'Let him fuck your pussy':gt 'klofdomhouse', 'ev34'
+	act 'Let him fuck your pussy':gt 'city_jorahouse', 'ev34'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -760,7 +760,7 @@ if $ARGS[0] = 'ev34':
 
 	'"Now I try your ass."'
 
-	act 'Let him fuck your ass':gt 'klofdomhouse', 'ev35'
+	act 'Let him fuck your ass':gt 'city_jorahouse', 'ev35'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -795,9 +795,9 @@ if $ARGS[0] = 'ev35':
 
 	'You feel that the boss is ready to cum.'
 
-	act 'Kneel in front of him':gt 'klofdomhouse', 'ev36'
-	act 'Let him end in your ass':gt 'klofdomhouse', 'ev37'
-	act 'Stick his cock in your pussy':gt 'klofdomhouse', 'ev38'
+	act 'Kneel in front of him':gt 'city_jorahouse', 'ev36'
+	act 'Let him end in your ass':gt 'city_jorahouse', 'ev37'
+	act 'Stick his cock in your pussy':gt 'city_jorahouse', 'ev38'
 end
 
 if $ARGS[0] = 'ev36':
@@ -810,7 +810,7 @@ gs 'cum_manage'
 	'You jump from his member and start wanking his cock until the boss cums on your face.'
 	gs 'arousal', 'hj', 5, 'sub'
 	gs 'stat'
-	act 'Get out of bed':gt 'klofdomhouse', 'ev39'
+	act 'Get out of bed':gt 'city_jorahouse', 'ev39'
 end
 
 if $ARGS[0] = 'ev37':
@@ -823,7 +823,7 @@ gs 'cum_manage'
 	'You start furiously thrusting your ass trying to help him quickly reach orgasm. You fill the warm feeling that tells you he has cum in your ass.'
 	gs 'arousal', 'anal', 5, 'sub'
 	gs 'stat'
-	act 'Get out of bed':gt 'klofdomhouse', 'ev39'
+	act 'Get out of bed':gt 'city_jorahouse', 'ev39'
 end
 
 if $ARGS[0] = 'ev38':
@@ -836,7 +836,7 @@ if $ARGS[0] = 'ev38':
 	'Fine, but if you have a kid it''s not mine." Says the boss.'
 	gs 'arousal', 'vaginal', 5, 'sub'
 	gs 'stat'
-	act 'Get out of bed':gt 'klofdomhouse', 'ev39'
+	act 'Get out of bed':gt 'city_jorahouse', 'ev39'
 end
 
 if $ARGS[0] = 'ev39':
@@ -847,7 +847,7 @@ if $ARGS[0] = 'ev39':
 	'"Well you pass to bed test, now to check your obedience."'
 	'"Serve both my boys only your pussy, both at the same time." Orders the boss.'
 
-	act 'Obediently serve the boys':gt 'klofdomhouse', 'ev40'
+	act 'Obediently serve the boys':gt 'city_jorahouse', 'ev40'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -882,7 +882,7 @@ if $ARGS[0] = 'ev40':
 	elseif horand > stat['vaginal']:
 		pcs_horny += 10 & 'You are not satisfied'
 	end
-	act 'Get up and get dressed':gt 'klofdomhouse', 'ev41'
+	act 'Get up and get dressed':gt 'city_jorahouse', 'ev41'
 end
 
 if $ARGS[0] = 'ev41':
@@ -907,7 +907,7 @@ if $ARGS[0] = 'ev42':
 	'You look around and notice Jora in the crowd.'
 	'He motions to you and says, "Come on baby, swim."'
 
-	act 'Go swimming':gt 'klofdomhouse', 'ev43'
+	act 'Go swimming':gt 'city_jorahouse', 'ev43'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -930,7 +930,7 @@ if $ARGS[0] = 'ev43':
 	'You dress up in a swimsuit and wait for Jora.'
 	'Jora finds you a spot by the pool and tells you, "Lie down <<$pcs_nickname>> wait until more people gather." He goes for a swim.'
 
-	act 'Lie down beside the pool':gt 'klofdomhouse', 'ev44'
+	act 'Lie down beside the pool':gt 'city_jorahouse', 'ev44'
 	
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -954,7 +954,7 @@ if $ARGS[0] = 'ev44':
 	'You lay around the pool, the pool is filling up with people.'
 	'Jora swims up to you orders, "Take off your clothes in front of the crowd."'
 
-	act 'Hesitantly remove your top':gt 'klofdomhouse', 'ev45'
+	act 'Hesitantly remove your top':gt 'city_jorahouse', 'ev45'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -984,7 +984,7 @@ if $ARGS[0] = 'ev45':
 
 	'Jora says with a grin, "Show the people those tits, they want some entertainment."'
 
-	act 'Remove hands':gt 'klofdomhouse', 'ev46'
+	act 'Remove hands':gt 'city_jorahouse', 'ev46'
 	gs 'arousal', 'flashlite', 5, 'sub'
 	gs 'exhibitionism', 1
 	gs 'stat'
@@ -1014,7 +1014,7 @@ if $ARGS[0] = 'ev46':
 	'You lift your arms behind his head and strike a pose.'
 	'Jora orders, "Remove the rest."'
 
-	act 'Go into the water and remove bikini bottoms':gt 'klofdomhouse', 'ev47'
+	act 'Go into the water and remove bikini bottoms':gt 'city_jorahouse', 'ev47'
 
 	act 'Get out of here':
 		gs 'arousal', 'end'
@@ -1032,7 +1032,7 @@ if $ARGS[0] = 'ev47':
 	'You pull off your bikini bottoms and let them drift away in water.'
 	'Jora orders, "Come out and show yourself to everyone."'
 
-	act 'Get out of the water':gt 'klofdomhouse', 'ev48'
+	act 'Get out of the water':gt 'city_jorahouse', 'ev48'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'exhibitionism', 1
 	gs 'stat'
@@ -1060,7 +1060,7 @@ if $ARGS[0] = 'ev48':
 	'You go to the edge of the pool, around you there is a crowd of excited guys.'
 	'Jora orders you, "Spread your legs."'
 
-	act 'Spread your legs':gt 'klofdomhouse', 'ev49'
+	act 'Spread your legs':gt 'city_jorahouse', 'ev49'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'exhibitionism', 3
 	gs 'stat'
@@ -1088,7 +1088,7 @@ if $ARGS[0] = 'ev49':
 	'The excitement covers you in heat so you go into the shallow water and relax.'
 	'Jora orders, "Spread your lips."'
 
-	act 'Spread your lips':gt 'klofdomhouse', 'ev50'
+	act 'Spread your lips':gt 'city_jorahouse', 'ev50'
 	gs 'arousal', 'flash', 5, 'sub'
 	gs 'stat'
 	
@@ -1114,7 +1114,7 @@ if $ARGS[0] = 'ev50':
 	'Most of the mens mouths are gaping open.'
 	'Jora orders, "play with yourself."'
 
-	act 'Caressing your pussy':gt 'klofdomhouse', 'ev51'
+	act 'Caressing your pussy':gt 'city_jorahouse', 'ev51'
 	gs 'arousal', 'vaginal_finger', 5, 'exhibitionism', 'sub'
 	gs 'stat'
 	
@@ -1139,7 +1139,7 @@ if $ARGS[0] = 'ev51':
 	'You are so excited that you pay no attention to the crowd and start to masturbate.'
 	'The gathered men are silently drooling.'
 
-	act 'Cum':gt 'klofdomhouse', 'ev52'
+	act 'Cum':gt 'city_jorahouse', 'ev52'
 	gs 'arousal', 'masturbate', 5, 'exhibitionism', 'sub'
 	gs 'stat'
 	
@@ -1167,7 +1167,7 @@ if $ARGS[0] = 'ev52':
 	'Jora hands you a dildo and says, "Insert this."'
 	gs 'arousal', 'masturbate', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Insert Dildo':gt 'klofdomhouse', 'ev53'
+	act 'Insert Dildo':gt 'city_jorahouse', 'ev53'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1191,7 +1191,7 @@ if $ARGS[0] = 'ev53':
 	'Jora hands you a second Dildo and says "Insert this in the same hole."'
 	gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Insert second Dildo':gt 'klofdomhouse', 'ev54'
+	act 'Insert second Dildo':gt 'city_jorahouse', 'ev54'
 end
 
 if $ARGS[0] = 'ev54':
@@ -1202,7 +1202,7 @@ if $ARGS[0] = 'ev54':
 	'Jora orders, "Put one in your ass."'
 	gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Put one in your ass':gt 'klofdomhouse', 'ev55'
+	act 'Put one in your ass':gt 'city_jorahouse', 'ev55'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1228,7 +1228,7 @@ if $ARGS[0] = 'ev55':
 	gs 'arousal', 'anal_dildo', 5, 'exhibitionism', 'sub'
 	minut -= 5
 	gs 'stat'
-	act 'Breathe':gt 'klofdomhouse', 'ev56'
+	act 'Breathe':gt 'city_jorahouse', 'ev56'
 end
 
 if $ARGS[0] = 'ev56':
@@ -1239,7 +1239,7 @@ if $ARGS[0] = 'ev56':
 	'He inserts a glass into you and fills it with a can of beer.'
 	gs 'arousal', 'vaginal_dildo', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Obediently hold the glass':gt 'klofdomhouse', 'ev57'
+	act 'Obediently hold the glass':gt 'city_jorahouse', 'ev57'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1262,7 +1262,7 @@ if $ARGS[0] = 'ev57':
 	'Jora leisurely drinks the beer with a straw, then smiling says, "Suck my dick, bitch."'
 	gs 'arousal', 'foreplay', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Suck Jora':gt 'klofdomhouse', 'ev58'
+	act 'Suck Jora':gt 'city_jorahouse', 'ev58'
 end
 
 if $ARGS[0] = 'ev58':
@@ -1273,7 +1273,7 @@ if $ARGS[0] = 'ev58':
 	'Once he is aroused Jora orders, "Get on my dick."'
 	gs 'arousal', 'bj', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Fuck Jora':gt 'klofdomhouse', 'ev60'
+	act 'Fuck Jora':gt 'city_jorahouse', 'ev60'
 end
 
 if $ARGS[0] = 'ev60':
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'ev60':
 	'Jora is ready to cum.'
 	gs 'arousal', 'vaginal', 5, 'exhibitionism', 'sub'
 	gs 'stat'
-	act 'Take it':gt 'klofdomhouse', 'ev61'
+	act 'Take it':gt 'city_jorahouse', 'ev61'
 end
 
 if $ARGS[0] = 'ev61':
@@ -1303,7 +1303,7 @@ if $ARGS[0] = 'ev61':
 	gs 'stat'
 	'Jora gets up and goes to the showers saying to the crowd, "This bitch is all yours."'
 
-	act 'Fuck the crowd':gt 'klofdomhouse', 'ev62'
+	act 'Fuck the crowd':gt 'city_jorahouse', 'ev62'
 
 	gs 'willpower', 'misc', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
@@ -1350,7 +1350,7 @@ if $ARGS[0] = 'ev62':
 	guy += 5
 	gang += 1
 	gs 'stat'
-	act 'Fuck the crowd':gt 'klofdomhouse', 'ev63'
+	act 'Fuck the crowd':gt 'city_jorahouse', 'ev63'
 end
 
 if $ARGS[0] = 'ev63':
@@ -1399,7 +1399,7 @@ if $ARGS[0] = 'ev63':
 	minut -= 10
 	guy += 3
 	gs 'stat'
-	act 'Fuck the crowd':gt 'klofdomhouse', 'ev64'
+	act 'Fuck the crowd':gt 'city_jorahouse', 'ev64'
 end
 
 if $ARGS[0] = 'ev64':
@@ -1427,7 +1427,7 @@ if $ARGS[0] = 'ev64':
 	minut -= 10
 	guy += 3
 	gs 'stat'
-	act 'Get up and dress in your swimsuit':gt 'klofdomhouse', 'ev65'
+	act 'Get up and dress in your swimsuit':gt 'city_jorahouse', 'ev65'
 end
 
 if $ARGS[0] = 'ev65':
@@ -1447,5 +1447,5 @@ end
 
 !!Jesus, what hueta, I cried tears of blood
 
---- klofdomhouse ---------------------------------
+--- city_jorahouse ---------------------------------
 

+ 71 - 71
locations/kafe.qsrc → locations/city_kafe.qsrc

@@ -1,9 +1,9 @@
-# kafe
+# city_kafe
 
 if $ARGS[0] = 'start':
 	$metka = 'start'
-	$loc = 'kafe'
-	$menu_loc = 'kafe'
+	$loc = 'city_kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'start'
 	menu_off = 0
 	kafe_food = (pcs_ate + pcs_drank)
@@ -15,19 +15,19 @@ if $ARGS[0] = 'start':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
 	'With its bright neon signs, pictures of flashy American muscle cars and pop-art, and a jukebox playing popular music ranging from the 50s to the 80s, The Roadhouse is something of a specialty diner, having been designed to have a retro, American feel. From the outside, the place doesn’t look very big, but in reality the diner is quite spacious, comfortably able to fit a well stocked bar, a moderately sized dinning area while also offering a handful of private booths tucked away in darker corners of the diner, and even boasting a dance floor with a small stage to play live music when available.'
-	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
+	'Sitting at one end of the bar, you see <a href="exec:gt ''city_kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
 	*nl
 	act 'Leave the diner': minut += 5 & gt 'city_residential'
 
-	act 'Sit down at a table': gt 'kafe', 'table'
+	act 'Sit down at a table': gt 'city_kafe', 'table'
 end
 
 if $ARGS[0] = 'table':
 	$metka = 'table'
-	$loc = 'kafe'
-	$menu_loc = 'kafe'
+	$loc = 'city_kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'table'
 	menu_off = 0
 	$location_type = 'public_indoors'
@@ -36,24 +36,24 @@ if $ARGS[0] = 'table':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
 	'With its bright neon signs, pictures of flashy American muscle cars and pop-art, and a jukebox playing popular music ranging from the 50s to the 80s, The Roadhouse is something of a specialty diner, having been designed to have a retro, American feel. From the outside, the place doesn’t look very big, but in reality the diner is quite spacious, comfortably able to fit a well stocked bar, a moderately sized dinning area while also offering a handful of private booths tucked away in darker corners of the diner, and even boasting a dance floor with a small stage to play live music when available.'
-	'Sitting at one end of the bar, you see <a href="exec:gt ''kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
+	'Sitting at one end of the bar, you see <a href="exec:gt ''city_kafe'', ''vlad''">the owner</a> of the diner, busy with paperwork.'
 	*nl
 	'They serve American style meals'
 
-	act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'city_kafe', 'start'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
 	if kafe_food < (pcs_ate + pcs_drank):
 		if rand(1, 10) > 5:
 			gs 'boy'
 			'A man comes over to your table <<$boybody>> <<$boybod>> <<$boyface>> introducing himself as <<$boydesc>>.'
-			xgt 'kafe', 'razvod'
+			xgt 'city_kafe', 'razvod'
 		end
 	end
 end
 
 if $ARGS[0] = 'vlad':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'vlad'
 	menu_off = 0
 	cla
@@ -99,7 +99,7 @@ if $ARGS[0] = 'vlad':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave':gt 'kafe', 'start'
+						act 'Leave':gt 'city_kafe', 'start'
 					end
 				end
 			end
@@ -137,7 +137,7 @@ if $ARGS[0] = 'vlad':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'Leave':gt 'kafe', 'start'
+						act 'Leave':gt 'city_kafe', 'start'
 					end
 				end
 			end
@@ -152,7 +152,7 @@ if $ARGS[0] = 'vlad':
 			smenaKafe = 0
 			'Givi Karapetovich sadly shakes his head, "Okay, here''s your <<pay>> <b>₽</b> and employment history. Go."'
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 	end
 
@@ -188,19 +188,19 @@ if $ARGS[0] = 'vlad':
 					smenaKafe = 0
 					'You hand over your work book, and with a smile Givi takes it. "Don''t forget: work is every Tuesday, Wednesday and Thursday, and you need to be here between 11 and 12."'
 
-					act 'Leave':gt 'kafe', 'start'
+					act 'Leave':gt 'city_kafe', 'start'
 				end
 			end
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 	end
 
-	act 'Leave':gt 'kafe', 'start'
+	act 'Leave':gt 'city_kafe', 'start'
 end
 
 if $ARGS[0] = 'work':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'work'
 	menu_off = 0
 	$location_type = 'event'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'work':
 		minut = 0
 		hour = 12
 		npc_rel['A41'] += rand(5, 10)
-		gt 'kafe', 'workPred'
+		gt 'city_kafe', 'workPred'
 	end
 
 	act 'Resign':
@@ -229,24 +229,24 @@ if $ARGS[0] = 'work':
 		smenaKafe = 0
 		'Givi Karapetovich sadly shakes his head, "Okay, here''s your <<pay>> <b>₽</b> and employment history. Go."'
 
-		act 'Leave':gt 'kafe', 'start'
+		act 'Leave':gt 'city_kafe', 'start'
 	end
 end
 
 if $ARGS[0] = 'workPred':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'workPred'
 	menu_off = 0
 	$metka = 'workPred'
-	$loc = 'kafe'
+	$loc = 'city_kafe'
 	$location_type = 'event'
 	*clr & cla
 	gs 'kit_din'
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/kafe.jpg"></center>'
-	'You''re at work in the café, the cook <a href="exec:gt ''kafe2'', ''ashot''">Ashot</a> is busy in the kitchen. Your fellow server <a href="exec:gt ''kafe2'', ''ira''">Ira</a> waits tables with customers. The owner <a href="exec:gt ''kafe2'', ''givi''">Givi K.</a> is standing behind the bar.'
-	'A small door leads to the <a href="exec:gt ''kafe2'', ''toilet''">toilets</a>.'
+	'You''re at work in the café, the cook <a href="exec:gt ''city_kafe2'', ''ashot''">Ashot</a> is busy in the kitchen. Your fellow server <a href="exec:gt ''city_kafe2'', ''ira''">Ira</a> waits tables with customers. The owner <a href="exec:gt ''city_kafe2'', ''givi''">Givi K.</a> is standing behind the bar.'
+	'A small door leads to the <a href="exec:gt ''city_kafe2'', ''toilet''">toilets</a>.'
 
 	if npc_rel['A41'] > 60:npc_rel['A41'] = 60
 	if npc_rel['A41'] > 50 and GiviSex = 0:npc_rel['A41'] = 50
@@ -380,7 +380,7 @@ if $ARGS[0] = 'workPred':
 				'You serve customers at a table and receive <<chai>> <b>₽</b> as tip.'
 			end
 
-			act 'Move away':gt 'kafe', 'workPred'
+			act 'Move away':gt 'city_kafe', 'workPred'
 
 			if znarand > pcs_apprnc or pcs_lover < 3:
 				kaferand = rand(0, 100)
@@ -391,7 +391,7 @@ if $ARGS[0] = 'workPred':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/kafe1.jpg"></center>'
 					'Serving a table at one of the private booths you see two men seducing a pretty drunk girl. Pretty soon she is on her knees sucking on both of their cocks. One of the men is looking at you with a clear invitation to join them.'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 
 					if daystart > 10 and stat['vaginal'] > 0:
 						act 'Join them':
@@ -417,7 +417,7 @@ if $ARGS[0] = 'workPred':
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/kafe2.jpg"></center>'
 					'You serve a table in the attic, with two men. Each time you come by they try to pinch or slap your butt, or run their hands under your skirt.'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 
 					if daystart > 10 and stat['vaginal'] > 0:
 						act 'Succumb':
@@ -431,11 +431,11 @@ if $ARGS[0] = 'workPred':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/waitress_client.jpg"></center>'
 					'At the table in a separate room sits a man. He looks at you appreciatively and says, "Girl, want to keep me company?" You notice the bulge in his trousers, he''s obviously aroused.'
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 					act 'Sit down next to him':
 						*clr & cla
 						'You sit down next to the client. And look at him waiting for what he would do. He takes your hand and puts it on his crotch.'
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 						if pcs_horny >= 50 or stat['bj'] > 0:
 							act 'Unbutton his pants':
 								*clr & cla
@@ -453,7 +453,7 @@ if $ARGS[0] = 'workPred':
 									gs 'arousal', 'hj', 5, 'sub', 'prostitution'
 									gs 'stat'
 
-									act 'Leave':gt 'kafe', 'workPred'
+									act 'Leave':gt 'city_kafe', 'workPred'
 								end
 								act 'Suck his dick':
 									*clr & cla
@@ -472,7 +472,7 @@ if $ARGS[0] = 'workPred':
 										money += 700
 										gs 'stat'
 
-										act 'Leave':gt 'kafe', 'workPred'
+										act 'Leave':gt 'city_kafe', 'workPred'
 									end
 								end
 							end
@@ -482,14 +482,14 @@ if $ARGS[0] = 'workPred':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/waitress_client.jpg"></center>'
 					'At the table in a separate room sits a man. He looked appreciatively at you and says, "Girl, can you help? I have prepared a great tip for you, but accidentally dropped it under the table. And I myself have eaten too much so that I can no longer bend down..." you notice he is undoing the fly on his trousers, his intention is obvious.'
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 					act 'Crawl under the table':
 						*clr & cla
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/waitress_work_3_1.jpg"></center>'
 						'"Well, now." You reply.'
 						'You could do with the tip and getting onto all fours, you climb under the table. You do find a 500 ruble note there, but when you reach for it, the mans shoe lowers onto the edge of it. He unzips his pants, pulls out his penis and points at it.'
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 						if pcs_horny >= 50 or stat['bj'] > 0:
 							act 'Suck':
 								*clr & cla
@@ -510,7 +510,7 @@ if $ARGS[0] = 'workPred':
 									money += 500
 									gs 'stat'
 
-									act 'Leave':gt 'kafe', 'workPred'
+									act 'Leave':gt 'city_kafe', 'workPred'
 								end
 							end
 						end
@@ -526,7 +526,7 @@ if $ARGS[0] = 'workPred':
 						money += 300
 						gs 'stat'
 						'You tactfully leave the booth, and after a couple of minutes they leave you a 300 <b>₽</b> tip.'
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 					end
 					act 'Break it up':
 						*clr & cla
@@ -537,16 +537,16 @@ if $ARGS[0] = 'workPred':
 						if iverand = 1:'The guy says you are a fucking whore and calls you frigid, finishes in his girlfriends mouth and leaves without leaving a tip.'
 						if iverand = 2:
 							'The guy gets out a 500 ruble bill, "For your discretion."'
-							act 'Expel them':gt 'kafe', 'workPred'
+							act 'Expel them':gt 'city_kafe', 'workPred'
 							act 'Discreetly leave':
 								*clr & cla
 								money += 500
 								gs 'stat'
 								'You take the money and leave the couple to their own devices.'
-								act 'Leave':gt 'kafe', 'workPred'
+								act 'Leave':gt 'city_kafe', 'workPred'
 							end
 						end
-						act 'Leave':gt 'kafe', 'workPred'
+						act 'Leave':gt 'city_kafe', 'workPred'
 					end
 
 					if stat['bj'] > 10 and swallow > 5 and pcs_horny >= 50:
@@ -561,7 +561,7 @@ if $ARGS[0] = 'workPred':
 								gs 'stat'
 								'You tactfully leave the booth, and after a couple of minutes they leave you a 300 <b>₽</b> tip.'
 
-								act 'Leave':gt 'kafe', 'workPred'
+								act 'Leave':gt 'city_kafe', 'workPred'
 							end
 
 							act 'Kneel before the guy':
@@ -585,7 +585,7 @@ if $ARGS[0] = 'workPred':
 									gs 'arousal', 'end'
 									gs 'stat'
 
-									act 'Leave':gt 'kafe', 'workPred'
+									act 'Leave':gt 'city_kafe', 'workPred'
 								end
 							end
 						end
@@ -597,7 +597,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 6:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand3.jpg"></center>'
@@ -605,7 +605,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 7:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand4.jpg"></center>'
@@ -613,7 +613,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 8:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand5.jpg"></center>'
@@ -621,7 +621,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 9:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand6.jpg"></center>'
@@ -629,7 +629,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 10:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand7.jpg"></center>'
@@ -637,7 +637,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 11:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand8.jpg"></center>'
@@ -645,7 +645,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 12:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand9.jpg"></center>'
@@ -653,7 +653,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 13:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand10.jpg"></center>'
@@ -661,7 +661,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 14:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand11.jpg"></center>'
@@ -669,7 +669,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 15:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand12.jpg"></center>'
@@ -677,7 +677,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 16:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand13.jpg"></center>'
@@ -685,7 +685,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 17:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand14.jpg"></center>'
@@ -693,7 +693,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 18:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand15.jpg"></center>'
@@ -701,7 +701,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 19:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand16.jpg"></center>'
@@ -709,7 +709,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 20:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand17.jpg"></center>'
@@ -717,7 +717,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 21:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand18.jpg"></center>'
@@ -725,7 +725,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 22:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand19.jpg"></center>'
@@ -733,7 +733,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 23:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand20.jpg"></center>'
@@ -741,7 +741,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand = 24:
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/shared/sex/public/ivrand21.jpg"></center>'
@@ -749,7 +749,7 @@ if $ARGS[0] = 'workPred':
 					gs 'arousal', 'voyeur_sex', 5
 					gs 'stat'
 
-					act 'Leave':gt 'kafe', 'workPred'
+					act 'Leave':gt 'city_kafe', 'workPred'
 				elseif kaferand >= 90 and (opusk > 0 or gnewQW = 5) and pirsA = 0:
 					*clr & cla
 					pirsA = 1
@@ -801,7 +801,7 @@ if $ARGS[0] = 'workPred':
 						gs 'arousal', 'end'
 						gs 'stat'
 
-						act 'return to work':gt 'kafe', 'workPred'
+						act 'return to work':gt 'city_kafe', 'workPred'
 					end
 				end
 			elseif znarand <= pcs_apprnc and pcs_lover < 3:
@@ -816,7 +816,7 @@ if $ARGS[0] = 'workPred':
 					money += 10
 					'The man is angry he leaves you a 10 <b>₽</b> tip and goes.'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				end
 
 				act 'Yes':
@@ -827,7 +827,7 @@ if $ARGS[0] = 'workPred':
 					'The man is glad that you do not mind dating him. He introduces himself as <<$boydesc>> and asks for your phone number, promising to call you back tomorrow.'
 					'Then he leaves you a hundred <b>₽</b> tip and goes.'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				end
 			end
 		end
@@ -839,35 +839,35 @@ if $ARGS[0] = 'workPred':
 				act 'Leave':
 					cla
 					minut += 5
-					gt 'kafeend'
+					gt 'city_kafeend'
 				end
 			else
-				gt 'kafe2', 'givipredlog'
+				gt 'city_kafe2', 'givipredlog'
 			end
 		end
 	end
 end
 
 if $ARGS[0] = 'razvod':
-	$menu_loc = 'kafe'
+	$menu_loc = 'city_kafe'
 	$menu_arg = 'razvod'
 	menu_off = 0
 	$location_type = 'event'
 	cla
-	act 'Get up from the table':gt 'kafe', 'start'
+	act 'Get up from the table':gt 'city_kafe', 'start'
 
 	act 'Order from the menu (0:05)':gs 'food_menu'
 
 	deyst = rand(0, 3)
 	if deyst = 0:
 		'<<$boydesc>> invites you to dance.'
-		act 'Dance with him':gt 'cafe2', 'dance'
+		act 'Dance with him':gt 'city_kafeevents2', 'dance'
 		if pcs_horny < 75:
 			act 'Leave': minut += 5 & gt 'city_residential'
 		end
 	elseif deyst = 1:
 		'<<$boydesc>> asks permission to sit down at the same table as you.'
-		act 'Drink with him':gt 'cafe2', 'booze'
+		act 'Drink with him':gt 'city_kafeevents2', 'booze'
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -882,7 +882,7 @@ if $ARGS[0] = 'razvod':
 		end	
 	elseif deyst = 2:
 		'<<$boydesc>> invites you to a nearby party which he is going to.'
-		act 'Agree to party':gt 'cafe2', 'kompashka'
+		act 'Agree to party':gt 'city_kafeevents2', 'kompashka'
 		gs 'willpower', 'drink', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Leave (<<will_cost>> Willpower)':
@@ -931,5 +931,5 @@ if $ARGS[0] = 'razvod':
 	end
 end
 
---- kafe ---------------------------------
+--- city_kafe ---------------------------------
 

+ 39 - 39
locations/kafe2.qsrc → locations/city_kafe2.qsrc

@@ -1,11 +1,11 @@
-# kafe2
+# city_kafe2
 
 if $ARGS[0] = 'toilet':
 
 	$location_type = 'bathroom'
-	$locM = 'kafe2'
+	$locM = 'city_kafe2'
 	$metkaM = 'toilet'
-	$menu_loc = 'kafe2'
+	$menu_loc = 'city_kafe2'
 	$menu_arg = 'toilet'
 	menu_off = 0
 	gs 'stat'
@@ -19,7 +19,7 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/tuarand.jpg"></center>'
 		'Going to the toilet you see in one of the booths, a drunk girl with bottle in hand riding a guys dick standing over the toilet facing away from him.'
 
-		act 'Leave':gt 'kafe', 'workPred'
+		act 'Leave':gt 'city_kafe', 'workPred'
 
 		exit
 	elseif turand = 1:
@@ -28,7 +28,7 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/tuarand1.jpg"></center>'
 		'Going to the toilet you see a skinny girl sucking dick as the guy photographs everything in the mirror.'
 
-		act 'Leave':gt 'kafe', 'workPred'
+		act 'Leave':gt 'city_kafe', 'workPred'
 
 		exit
 	elseif turand = 2:
@@ -37,12 +37,12 @@ if $ARGS[0] = 'toilet':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/tuarand2.jpg"></center>'
 		'Going to the toilet you catch a redhead sucking her boyfriends cock.'
 
-		act 'Leave':gt 'kafe', 'workPred'
+		act 'Leave':gt 'city_kafe', 'workPred'
 
 		exit
 	end
 
-	act 'Leave':gt 'kafe', 'workPred'
+	act 'Leave':gt 'city_kafe', 'workPred'
 
 	act 'Look in the mirror': gt 'mirror', 'start'
 	if pcs_hairbsh = 0: act 'Brush your hair': gt 'mirror', 'brush'
@@ -79,7 +79,7 @@ if $ARGS[0] = 'givi':
 				gs 'stat'
 				'You Givi if he will give Ira a raise. Givi grunts, "What for?" You appeal to his better nature, saying that she is your close friend and you want to help her. Givi promise to think about a wage increase.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			end
 		end
 
@@ -97,14 +97,14 @@ if $ARGS[0] = 'givi':
 
 				if npc_rel['A41'] = 90:'As you depart a hand slaps you on the ass. Turning around you see that Givi is smiling mischievously.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif GiviSex >= 1 and kavslut = 0:
 				npc_rel['A41'] = 100
 				'You talk at the bar with the cafe owner and part-time bartender Givi.'
 				'"Hey <<$pcs_nickname>>, I enjoyed it so much last time. Stay with me tonight and help."'
 				'As you depart a hand slaps you on the ass. Turning around you see that Givi is smiling mischievously.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif GiviSex >= 1 and kavslut > 0:
 				npc_rel['A41'] = 100
 				givirand = rand(0, 100)
@@ -144,7 +144,7 @@ if $ARGS[0] = 'givi':
 							gs 'arousal', 'end'
 							gs 'stat'
 
-							act 'Move away':gt 'kafe', 'workPred'
+							act 'Move away':gt 'city_kafe', 'workPred'
 						end
 					end
 
@@ -153,13 +153,13 @@ if $ARGS[0] = 'givi':
 							cla
 							'"Wow, <<$pcs_nickname>> you dirty slut, if you spend some quality time with me I could give you a pay rise, think of all the pretty dresses you could buy." Says Givi.'
 
-							act 'Move away':gt 'kafe', 'workPred'
+							act 'Move away':gt 'city_kafe', 'workPred'
 						end
 					end
 				elseif givirand >= 10 or Venera >= 4:
 					'Givi slaps you on the ass strongly and whinnied. "<<$pcs_nickname>>, that''s one fine ass!"'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				end
 			end
 		end
@@ -170,20 +170,20 @@ if $ARGS[0] = 'givi':
 			act 'Leave':
 				cla
 				minut += 5
-				gt 'kafeend'
+				gt 'city_kafeend'
 			end
 		else
-			gt 'kafe2', 'givipredlog'
+			gt 'city_kafe2', 'givipredlog'
 		end
 	end
 end
 
 if $ARGS[0] = 'ashot':
-	$loc = 'kafe2'
+	$loc = 'city_kafe2'
 	$metka = 'ashot'
 	cls
 	gs 'stat'
-	'You go into the kitchen where trainee chef Ashot is cooking. Dishwasher <a href="exec:gt ''kafe2'', ''tamdin''">Tamara</a> as always stands near the sink and washes the dishes.'
+	'You go into the kitchen where trainee chef Ashot is cooking. Dishwasher <a href="exec:gt ''city_kafe2'', ''tamdin''">Tamara</a> as always stands near the sink and washes the dishes.'
 
 	if hour < 22:
 		act 'Eat some food (0:30)':
@@ -206,11 +206,11 @@ if $ARGS[0] = 'ashot':
 				pcs_horny += 10
 				'As you walk further into the kitchen, Ashot comes up to you and squeezes your ass really tight, it makes you squeal. Ashot laughs.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif giviSex = 0 and Ashotsex = 0:
 				'You talk in the kitchen with chef Ashot.'
 
-				act 'Move away':gt 'kafe', 'workPred'
+				act 'Move away':gt 'city_kafe', 'workPred'
 			elseif giviSex > 0 and Ashotsex > 0:
 				Ashotrand = rand(0, 100)
 
@@ -220,7 +220,7 @@ if $ARGS[0] = 'ashot':
 					gs 'arousal', 'foreplay', 10, 'sub'
 					gs 'stat'
 
-					act 'Move away':gt 'kafe', 'workPred'
+					act 'Move away':gt 'city_kafe', 'workPred'
 				elseif Ashotrand <= 20:
 					*clr
 					cla
@@ -273,7 +273,7 @@ if $ARGS[0] = 'ashot':
 
 									'You feel the heat as jets of sperm hit inside your anus. Having finished in your ass, Ashot says that such a fuckable hole needs to be fucked. He pulls out his member and you feel a slow trickle of sperm dripping from your butt.'
 
-									act 'Move away':gt 'kafe', 'workPred'
+									act 'Move away':gt 'city_kafe', 'workPred'
 								end
 							end
 						else
@@ -309,7 +309,7 @@ if $ARGS[0] = 'ashot':
 
 								'You feel the heat as jets of sperm hit inside your anus. Having finished in your ass, Ashot says that such a fuckable hole needs to be fucked. He pulls out his member and you feel a slow trickle of sperm dripping from your butt.'
 
-								act 'Move away':gt 'kafe', 'workPred'
+								act 'Move away':gt 'city_kafe', 'workPred'
 							end
 						end
 					end
@@ -330,7 +330,7 @@ if $ARGS[0] = 'ashot':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Move away':gt 'kafe', 'workPred'
+	act 'Move away':gt 'city_kafe', 'workPred'
 end
 
 if $ARGS[0] = 'ira':
@@ -368,11 +368,11 @@ if $ARGS[0] = 'ira':
 				'Irina clearly looks apprehensive and tries not to look you in the eye. You approach her and try to calm her down. Irina dismissively nods and says, "I''m willing to pretend that nothing ever happened. I don''t want anybody to know about it." You agree with Ira.'
 			end
 
-			act 'Move away':gt 'kafe', 'workPred'
+			act 'Move away':gt 'city_kafe', 'workPred'
 		end
 	else
 		if IrinaSlut >= 2:
-			gt 'kafe2', 'givipredlog'
+			gt 'city_kafe2', 'givipredlog'
 		elseif IrinaSlut < 2:
 			act 'Go home with Irina':
 				cla
@@ -418,7 +418,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Ira standing by her door invites you to come in with her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				elseif npc_rel['A93'] >= 100 and IrinaQW = 2:
 					if GiviSex >= 1 and Kavslut = 0:
 						$irinatalk = 'Irina is mostly silent all the way, but finally musters up the determination to say, she did not expect you to be not only sleeping with men, but also with women. Trying to be polite, it''s not that she is against sexual minorities, but she did not want to sleep with women, they are so soft and nasty, just awful.'
@@ -436,7 +436,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Standing at the door of her house Ira invites you to come to visit her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				elseif npc_rel['A93'] >= 100 and IrinaQW >= 10 and IrinaSlut = 1:
 					if GiviSex >= 1 and Kavslut = 0:
 						$irinatalk = 'Ira, smiling, tells you that she is surprised and did not expect to find sex with a woman so much pleasure.'
@@ -448,7 +448,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Standing at the door of her house Ira invites you to come to visit her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				elseif npc_rel['A93'] >= 100 and IrinaQW >= 10 and IrinaSlut = 0:
 					if GiviSex >= 1 and Kavslut = 0:
 						$irinatalk = 'Ira smiling surprised that she did not expect to have sex with a woman so much pleasure.'
@@ -460,7 +460,7 @@ if $ARGS[0] = 'ira':
 
 					$irinaend = 'Standing at the door of her house Ira invites you to come to visit her.'
 
-					act 'Visit Ira':gt 'IrinaRoom', 'first'
+					act 'Visit Ira':gt 'city_irinaroom', 'first'
 				end
 
 				'You make your way home with Irina. <<$irinatalk>> You get to the house where she lives. <<$irinaend>>'
@@ -493,7 +493,7 @@ if $ARGS[0] = 'tamdin':
 				'Caucasian slut you, fuck off.'
 			end
 
-			act 'Move away':gt 'kafe', 'workPred'
+			act 'Move away':gt 'city_kafe', 'workPred'
 		end
 	else
 		'She already going home and offers to walk with you.'
@@ -514,12 +514,12 @@ if $ARGS[0] = 'givipredlog':
 	if IrinaSlut >= 2:
 		'Givi circles around Ira and brazenly squeezes her ass, snorting "Whoa, Ira, you''re a real slut." He turns to you, "Hey <<$pcs_nickname>> stay this evening, earn bonuses."'
 
-		act 'Stay with them':gt 'kavkazkafe', 'podgivi'
+		act 'Stay with them':gt 'city_kavkazkafe', 'podgivi'
 
 		act 'Go home':
 			cla
 			minut += 5
-			gt 'kafeend'
+			gt 'city_kafeend'
 		end
 
 		exit
@@ -537,10 +537,10 @@ if $ARGS[0] = 'givipredlog':
 				act 'I can''t tonight':
 					cla
 					minut += 5
-					gt 'kafeend'
+					gt 'city_kafeend'
 				end
 
-				act 'Help Givi':gt 'kavkazkafe', 'podgivi'
+				act 'Help Givi':gt 'city_kavkazkafe', 'podgivi'
 
 				exit
 		elseif GiviSex = 0:
@@ -550,10 +550,10 @@ if $ARGS[0] = 'givipredlog':
 				cla
 				npc_rel['A41'] = 0
 				minut += 5
-				gt 'kafeend'
+				gt 'city_kafeend'
 			end
 
-			act 'Help Givi':gt 'kavkazkafe', 'podgivi'
+			act 'Help Givi':gt 'city_kavkazkafe', 'podgivi'
 
 			exit
 		end
@@ -561,12 +561,12 @@ if $ARGS[0] = 'givipredlog':
 		act 'Go home':
 			cla
 			minut += 5
-			gt 'kafeend'
+			gt 'city_kafeend'
 		end
 	end
 
-	act 'Help Givi':gt 'kavkazkafe', 'podgivi'
+	act 'Help Givi':gt 'city_kavkazkafe', 'podgivi'
 end
 
---- kafe2 ---------------------------------
+--- city_kafe2 ---------------------------------
 

+ 18 - 18
locations/kafeend.qsrc → locations/city_kafeend.qsrc

@@ -1,4 +1,4 @@
-# kafeend
+# city_kafeend
 
 if $ARGS[0] = '':
 	kafe_rand = rand(0, 100)
@@ -8,67 +8,67 @@ if $ARGS[0] = '':
 	elseif kafe_rand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand.jpg"></center>'
 		'On leaving the cafe you see a large crowd of young people deciding where to go next. You also notice that one of the girls wasted no time and has started blowing her boyfriend completely undeterred by the crowd.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand1.jpg"></center>'
 		'Coming out of the cafe you notice a car parked in the dark, passing it you see a light in the open trunk and see a guy there hammering his chick, so much so that the shocks are creaking as the car bounces. The girl just moans and whispers, "More, more!"'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 2:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand2.jpg"></center>'
 		'On leaving the cafe you saw a large crowd of young people deciding where to go next. In the crowd you are surprised to see one of the girls licking the pussy of another oblivious to the other people there.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand3.jpg"></center>'
 		'Coming out of the cafe and on your way home, you walk past a car. You suddenly see a woman sitting on her heels give a contented guy a blowjob.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand4.jpg"></center>'
 		'Coming out of the cafe and on your way home, you notice at the side of the cafe a couple, she is squatting down and sucking his cock.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand5.jpg"></center>'
 		'Coming out of the cafe and on your way home, you walk past a car. You suddenly see a woman sitting in the front seat of the car blowing a guy as he stands by the door.'
-		gs 'kafeend', 'end_sex'
+		gs 'city_kafeend', 'end_sex'
 	elseif kafe_rand = 6:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand6.jpg"></center>'
 		'Coming out of the cafe you notice between parked cars a girl sitting with her pants down and pissing, while smiling blissfully.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 7:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand7.jpg"></center>'
 		'Coming out of the cafe you see a laughing woman, dancing badly, showing off her panties, but still managing to drink from a cup.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand8.jpg"></center>'
 		'Coming out of the cafe you noticed a girl lying on the pavement, she is wearing just a sweater and her pussy is completely exposed. The girl obviously passed out, drunk as a skunk.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand9.jpg"></center>'
 		'Coming out of the cafe you noticed on the bench asleep a drunk guy with a girl, apparently sleep caught up with them during petting, you deduce from the scene.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 10:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand10.jpg"></center>'
 		'Coming out of the cafe you notice a man and a drunk girl in the carpark, trying to drag another girl off the path.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand11.jpg"></center>'
 		'Coming out of the cafe, you have to step over drunk girl passed out that right in front of the entrance lying on the pavement.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand12.jpg"></center>'
 		'Coming out of the cafe, you see that the girl fell asleep drunk, sitting on a bin and collapsed there.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 13:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand13.jpg"></center>'
 		'Coming out of the cafe you notice one girl trying to get her friend off the road, her drunken girlfriend mumbles something drunkenly giggling.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 14:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand14.jpg"></center>'
 		'Coming out of the cafe you notice a drunk girl lying on the ground without any panties.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	elseif kafe_rand = 15:
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/arand15.jpg"></center>'
 		'Coming out of the cafe, you see a man leading his wife somewhere, clearly very drunk see has started to strip here on the street and is nearly naked.'
-		gs 'kafeend', 'end'
+		gs 'city_kafeend', 'end'
 	end
 end
 
@@ -86,5 +86,5 @@ if $ARGS[0] = 'end_sex':
 	act 'Leave':gt 'city_residential'
 end
 
---- kafeend ---------------------------------
+--- city_kafeend ---------------------------------
 

+ 20 - 20
locations/cafe2.qsrc → locations/city_kafeevents2.qsrc

@@ -1,4 +1,4 @@
-# cafe2
+# city_kafeevents2
 
 menu_off = 1
 
@@ -10,17 +10,17 @@ if $ARGS[0] = 'beginning':
 	if deyst <= 25:
 		'<<$boydesc>> asks you to dance.'
 
-		act 'Dance':gt 'Cafe2', 'dance'
+		act 'Dance':gt 'city_kafeevents2', 'dance'
 		act 'Leave':gt 'city_residential'
 	elseif deyst > 25 and deyst <= 50:
 		'<<$boydesc>> sits down at your table and orders a drink and a snack.'
 
-		act 'Drink':gt 'Cafe2', 'booze'
+		act 'Drink':gt 'city_kafeevents2', 'booze'
 		act 'Leave':gt 'city_residential'
 	elseif deyst > 50 and deyst <= 75:
 		'<<$boydesc>> invites you to join a party nearby.'
 
-		act 'Agree':gt 'Cafe2', 'kompashka'
+		act 'Agree':gt 'city_kafeevents2', 'kompashka'
 
 		if pcs_horny < 75:
 			act 'Leave':gt 'city_residential'
@@ -28,7 +28,7 @@ if $ARGS[0] = 'beginning':
 	elseif deyst > 75:
 		'<<$boydesc>> begins to flirt with you and tries to take pictures. <<$boydesc>> asks you to go with him to the toilet.'
 
-		act 'Agree':gt 'Cafe3', 'toilet'
+		act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 		if pcs_horny < 75:
 			act 'Leave':gt 'city_residential'
@@ -49,7 +49,7 @@ if $ARGS[0] = 'dance':
 	if deyst <= 25:
 		'During the dance <<$boydesc>> conducts himself confidently and correctly, his strong hands hold your waist tightly. Finally the song ends.'
 
-		act 'Finish the dance':gt 'Cafe2', 'dance2'
+		act 'Finish the dance':gt 'city_kafeevents2', 'dance2'
 	elseif deyst > 25 and deyst <= 80:
 		pcs_horny += 5
 		clr
@@ -65,7 +65,7 @@ if $ARGS[0] = 'dance':
 
 		'During the dance <<$boydesc>> gently hugs you and strokes your back down to the hips. His strong hands press your fragile body to his, pressing your soft <<$titsize>> breasts against his body. <<$didanc>>Finally, the song ends.'
 
-		act 'Finish the dance':gt 'Cafe2', 'dance2'
+		act 'Finish the dance':gt 'city_kafeevents2', 'dance2'
 	elseif deyst > 80:
 		pcs_horny += 8
 		gs 'stat'
@@ -113,7 +113,7 @@ if $ARGS[0] = 'dance':
 				if deyst <= 75:
 					'Keeping your waist held <<$boydesc>> invites you back to his home.'
 
-					act 'Agree':gt 'Cafe3', 'house'
+					act 'Agree':gt 'city_kafeevents3', 'house'
 
 					if pcs_horny < 75:
 						act 'Leave':gt 'city_residential'
@@ -121,7 +121,7 @@ if $ARGS[0] = 'dance':
 				elseif deyst > 75:
 					'Keeping your waist held <<$boydesc>> asks you to go to the toilet and continue.'
 
-					act 'Agree':gt 'Cafe3', 'toilet'
+					act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 					if pcs_horny < 75:
 						act 'Leave':gt 'city_residential'
@@ -157,7 +157,7 @@ if $ARGS[0] = 'dance':
 					if deyst <= 75:
 						'Keeping your waist held <<$boydesc>> invites you back to his home.'
 
-						act 'Agree':gt 'Cafe3', 'house'
+						act 'Agree':gt 'city_kafeevents3', 'house'
 
 						gs 'willpower', 'sex', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
@@ -173,7 +173,7 @@ if $ARGS[0] = 'dance':
 					elseif deyst > 75:
 						'Keeping your waist held <<$boydesc>> asks you to go to the toilet and continue.'
 
-						act 'Agree':gt 'Cafe3', 'toilet'
+						act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 						gs 'willpower', 'sex', 'resist', 'medium'
 						if will_cost <= pcs_willpwr:
@@ -206,11 +206,11 @@ if $ARGS[0] = 'dance2':
 	if deyst >= pcs_apprnc:
 		'The dance ends and <<$boydesc>> kisses you goodbye.'
 
-		act 'Say goodbye':gt 'kafe', 'start'
+		act 'Say goodbye':gt 'city_kafe', 'start'
 	elseif deyst < pcs_apprnc:
 		'The dance ends and <<$boydesc>> suggests going to his place.'
 
-		act 'Agree':gt 'Cafe3', 'house'
+		act 'Agree':gt 'city_kafeevents3', 'house'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -236,11 +236,11 @@ if $ARGS[0] = 'booze':
 	if deyst < 75:
 		'It seems you''ve had enough and should go home, <<$boydesc>> kisses you goodbye.'
 
-		act 'Say goodbye':gt 'kafe', 'start'
+		act 'Say goodbye':gt 'city_kafe', 'start'
 	elseif deyst >= 75 and deyst < 95:
 		'It seems you''ve had enough and should go home, <<$boydesc>> suggests you should go to him.'
 
-		act 'Agree':gt 'Cafe3', 'house'
+		act 'Agree':gt 'city_kafeevents3', 'house'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -260,7 +260,7 @@ if $ARGS[0] = 'booze':
 		gs 'arousal', 'foreplay', -5
 		gs 'stat'
 
-		act 'Agree':gt 'Cafe3', 'toilet'
+		act 'Agree':gt 'city_kafeevents3', 'toilet'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -287,11 +287,11 @@ if $ARGS[0] = 'kompashka':
 	if deyst < 60:
 		'You think you''ve had enough and should go home, <<$boydesc>> kisses you goodbye.'
 
-		act 'Say goodbye':gt 'kafe', 'start'
+		act 'Say goodbye':gt 'city_kafe', 'start'
 	elseif deyst >= 60 and deyst < 90:
 		'You think you''ve had enough and should go home, <<$boydesc>> suggests you go to his place.'
 
-		act 'Agree':gt 'Cafe3', 'house'
+		act 'Agree':gt 'city_kafeevents3', 'house'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -311,7 +311,7 @@ if $ARGS[0] = 'kompashka':
 		gs 'arousal', 'foreplay', -5
 		gs 'stat'
 		
-		act 'Agree':gt 'Cafe3', 'kompashka'
+		act 'Agree':gt 'city_kafeevents3', 'kompashka'
 
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -327,5 +327,5 @@ if $ARGS[0] = 'kompashka':
 	end
 end
 
---- cafe2 ---------------------------------
+--- city_kafeevents2 ---------------------------------
 

+ 8 - 8
locations/cafe3.qsrc → locations/city_kafeevents3.qsrc

@@ -1,4 +1,4 @@
-# cafe3
+# city_kafeevents3
 
 menu_off = 1
 
@@ -149,7 +149,7 @@ if $ARGS[0] = '0':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'cafe3', '0'
+				gt 'city_kafeevents3', '0'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -232,7 +232,7 @@ if $ARGS[0] = '0':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
-				gt 'cafe3', '0'
+				gt 'city_kafeevents3', '0'
 			end
 		else
 			act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -285,7 +285,7 @@ if $ARGS[0] = 'toilet':
 			gs 'arousal', 'end'
 			gs 'stat'
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 	else
 		act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -322,7 +322,7 @@ if $ARGS[0] = 'toilet':
 			if bjrand >= 50 or repa = 6:'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial<<picrand>>.jpg"></center>'
 
 
-			act 'Leave':gt 'kafe', 'start'
+			act 'Leave':gt 'city_kafe', 'start'
 		end
 
 		act 'Suck on':
@@ -340,7 +340,7 @@ if $ARGS[0] = 'toilet':
 				gs 'arousal', 'end'
 				gs 'stat'
 
-				act 'Leave':gt 'kafe', 'start'
+				act 'Leave':gt 'city_kafe', 'start'
 			end
 
 			act 'Spit out':
@@ -353,7 +353,7 @@ if $ARGS[0] = 'toilet':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'kafe', 'start'
+				act 'Leave':gt 'city_kafe', 'start'
 			end
 		end
 	end
@@ -432,5 +432,5 @@ if $ARGS[0] = 'coffee':
 	act 'Show him out':gt 'Korr'
 end
 
---- cafe3 ---------------------------------
+--- city_kafeevents3 ---------------------------------
 

+ 39 - 39
locations/kavkazkafe.qsrc → locations/city_kavkazkafe.qsrc

@@ -1,4 +1,4 @@
-# kavkazkafe
+# city_kavkazkafe
 if $ARGS[0] = 'podgivi':
 	gs 'bdman', 'givi'
 	minut += 30
@@ -10,10 +10,10 @@ if $ARGS[0] = 'podgivi':
 		smenaKafe += 1
 		if rand(0, 1) = 0:
 			'Givi grins as he grabs you both by your hands "Hey, come heifers, have fun."'
-			act 'Go.':gt 'kavkazkafe', 'threesome'
+			act 'Go.':gt 'city_kavkazkafe', 'threesome'
 		else
 			'Ashot entered the room and says, "Well bitches, no need to finger your holes, now you can have real horsemen in all of them."'
-			act 'Go.':gt 'kavkazkafe', 'foursome'
+			act 'Go.':gt 'city_kavkazkafe', 'foursome'
 		end
 	else
 		podrand = rand(0, 100)
@@ -25,7 +25,7 @@ if $ARGS[0] = 'podgivi':
 			'Givi says, "Hey, know what? We like you <<$pcs_nickname>>, we like filling your holes, now you two fuck horseman, never will you forget.'
 
 			act 'Leave':gt 'city_residential'
-			act 'Okay.':gt 'kavkazkafe', 'grup'
+			act 'Okay.':gt 'city_kavkazkafe', 'grup'
 		elseif podrand < 70 and kavslut = 0 and giviAnalOnce = 1:
 			gs 'bdman', 'ashot'
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/podsob.jpg"></center>'
@@ -43,7 +43,7 @@ if $ARGS[0] = 'podgivi':
 					'Givi laughes. "You are a feisty girl, yes? I know you want to ride two big digits, we will not tell anyone, do not be afraid."'
 					'Ashot comes up to you and holds his arms out to hug you.'
 
-					act 'Embrace him':gt 'kavkazkafe', 'grup'
+					act 'Embrace him':gt 'city_kavkazkafe', 'grup'
 
 					gs 'willpower', 'misc', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -64,7 +64,7 @@ if $ARGS[0] = 'podgivi':
 				act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end	
 			
-			act 'Do it':gt 'kavkazkafe', 'grup'
+			act 'Do it':gt 'city_kavkazkafe', 'grup'
 		else
 			'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/podsob.jpg"></center>'
 			'You go into the back room with Givi and begin to count wine bottles aloud to him, as he writes figures in his notebook.'
@@ -77,7 +77,7 @@ if $ARGS[0] = 'podgivi':
 					'You grin and continue pretending to count bottles as if nothing happened. Givi starts groping you with both hands.'
 					'"<<$pcs_nickname>>. I want you. Come to me sweetie."'
 					'Givis strong hands turn you around. You are now face to face with Givi.'
-					act 'Kneel':gt 'kavkazkafe', 'givibj'
+					act 'Kneel':gt 'city_kavkazkafe', 'givibj'
 					
 					gs 'willpower', 'misc', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -90,7 +90,7 @@ if $ARGS[0] = 'podgivi':
 
 							act 'Kneel':
 								money += 5000
-								gt 'kavkazkafe', 'givibj'
+								gt 'city_kavkazkafe', 'givibj'
 							end
 
 							gs 'willpower', 'misc', 'resist', 'hard'
@@ -102,7 +102,7 @@ if $ARGS[0] = 'podgivi':
 									'You blurt out, "That''s not what I meant, I''m going home!" and turn to leave.'
 									'Givi grabs you by the arm and drags you to a chair in the back.'
 
-									act 'Trying to get away':gt 'kavkazkafe', 'givirape'
+									act 'Trying to get away':gt 'city_kavkazkafe', 'givirape'
 								end
 							else
 								act 'Refuse (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -119,7 +119,7 @@ if $ARGS[0] = 'podgivi':
 					'You straighten up and look at the Givi. "That is most definitely not your notepad, Givi K."'
 					'Givi is licking his lips, his eyes burning with desire, he speaks in short bursts, "Hey <<$pcs_nickname>>, you''re so juicy, squishy bum, you want money, I''ll do bonus, you live like a queen."'
 
-					act 'Kneel':gt 'kavkazkafe', 'givibj'
+					act 'Kneel':gt 'city_kavkazkafe', 'givibj'
 
 					gs 'willpower', 'misc', 'resist', 'hard'
 					if will_cost <= pcs_willpwr:
@@ -132,7 +132,7 @@ if $ARGS[0] = 'podgivi':
 
 							act 'Kneel':
 								money += 5000
-								gt 'kavkazkafe', 'givibj'
+								gt 'city_kavkazkafe', 'givibj'
 							end
 
 							gs 'willpower', 'misc', 'resist', 'hard'
@@ -158,7 +158,7 @@ if $ARGS[0] = 'podgivi':
 				'Givi slaps your ass with relish.'
 				'"Whoa, what a fine ass. <<$pcs_nickname>> suck me, I will give you bonus.'
 
-				act 'Kneel':gt 'kavkazkafe', 'givibj'
+				act 'Kneel':gt 'city_kavkazkafe', 'givibj'
 				act 'Leave':gt 'city_residential'
 			end
 		end
@@ -188,7 +188,7 @@ if $ARGS[0] = 'grup':
 	gs 'arousal', 'bj', 5,'dick[1]','sub', 'group'
 	minut -= 5
 	gs 'stat'
-	act 'Helplessly moo':gt 'kavkazkafe', 'grup1'
+	act 'Helplessly moo':gt 'city_kavkazkafe', 'grup1'
 end
 
 if $ARGS[0] = 'grup1':
@@ -207,12 +207,12 @@ if $ARGS[0] = 'grup1':
 		gs 'arousal', 'anal_finger', 5, 'sub', 'group'
 		gs 'stat'
 
-		act 'Keep sucking':gt 'kavkazkafe', 'grup2'
+		act 'Keep sucking':gt 'city_kavkazkafe', 'grup2'
 	else
 		'Ashot suddenly pulls his cock out of you and taking you by the shoulders pushes you to your knees in front of him.'
 		gs 'stat'
 
-		act 'Kneel patiently':gt 'kavkazkafe', 'grupcum'
+		act 'Kneel patiently':gt 'city_kavkazkafe', 'grupcum'
 	end
 end
 
@@ -230,12 +230,12 @@ if $ARGS[0] = 'grup2':
 		gs 'arousal', 'anal_finger', 5, 'sub', 'group'
 		gs 'stat'
 
-		act 'Double Penetration':gt 'kavkazkafe', 'grup3'
+		act 'Double Penetration':gt 'city_kavkazkafe', 'grup3'
 	else
 		'Ashot suddenly pulls his cock out of you and taking you by the shoulders pushes you to your knees in front of him.'
 		gs 'stat'
 
-		act 'Kneel patiently':gt 'kavkazkafe', 'grupcum'
+		act 'Kneel patiently':gt 'city_kavkazkafe', 'grupcum'
 	end
 end
 
@@ -254,7 +254,7 @@ if $ARGS[0] = 'grup3':
 	'Ashot suddenly pulls his cock out of you and taking you by the shoulders pushes you to your knees in front of him.'
 	gs 'stat'
 
-	act 'Kneel patiently':gt 'kavkazkafe', 'grupcum'
+	act 'Kneel patiently':gt 'city_kavkazkafe', 'grupcum'
 end
 
 if $ARGS[0] = 'grupcum':
@@ -286,7 +286,7 @@ if $ARGS[0] = 'givirape':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/rape.jpg"></center>'
 	'Givi produces a roll of tape and begins to bind you, to stop your shouting he puts a ballgag on you.'
 	'Finally, he shakes you to remove any slack, you can not even twitch.'
-	act 'Helplessly moo':gt 'kavkazkafe', 'givirape1'
+	act 'Helplessly moo':gt 'city_kavkazkafe', 'givirape1'
 end
 
 if $ARGS[0] = 'givirape1':
@@ -294,8 +294,8 @@ if $ARGS[0] = 'givirape1':
 	'Givi takes the gag out of your mouth and fills it with his thick, unwashed member.'
 	gs 'arousal', 'bj', 5, 'sub', 'rough'
 	gs 'stat'
-	act 'Suck':gt 'kavkazkafe', 'givirapebj'
-	act 'Bite':gt 'kavkazkafe', 'givirape2'
+	act 'Suck':gt 'city_kavkazkafe', 'givirapebj'
+	act 'Bite':gt 'city_kavkazkafe', 'givirape2'
 end
 
 if $ARGS[0] = 'givirapebj':
@@ -362,8 +362,8 @@ if $ARGS[0] = 'givibj':
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/sex/before.jpg"></center>'
 	'You nod and kneel in front of big-bellied Armenians lap. He unbuttons his pants and pulls out his long and thick cock, which ends up right in your face, almost touching you.'
 
-	act 'Stroke his dick':gt 'kavkazkafe', 'givibj1'
-	act 'Suck it':gt 'kavkazkafe', 'givibj3'
+	act 'Stroke his dick':gt 'city_kavkazkafe', 'givibj1'
+	act 'Suck it':gt 'city_kavkazkafe', 'givibj3'
 end
 
 if $ARGS[0] = 'givibj1':
@@ -372,8 +372,8 @@ if $ARGS[0] = 'givibj1':
 	gs 'arousal', 'hj', 5, 'sub'
 	gs 'stat'
 
-	act 'Suck his thumb':gt 'kavkazkafe', 'givibj2'
-	act 'Suck his cock':gt 'kavkazkafe', 'givibj3'
+	act 'Suck his thumb':gt 'city_kavkazkafe', 'givibj2'
+	act 'Suck his cock':gt 'city_kavkazkafe', 'givibj3'
 end
 
 if $ARGS[0] = 'givibj2':
@@ -383,7 +383,7 @@ if $ARGS[0] = 'givibj2':
 	gs 'arousal', 'hj', 3, 'sub'
 	gs 'stat'
 
-	act 'Suck his cock':gt 'kavkazkafe', 'givibj3'
+	act 'Suck his cock':gt 'city_kavkazkafe', 'givibj3'
 end
 
 if $ARGS[0] = 'givibj3':
@@ -394,7 +394,7 @@ if $ARGS[0] = 'givibj3':
 	gs 'arousal', 'bj', 3, 'sub'
 	gs 'stat'
 
-	act 'Suck on':gt 'kavkazkafe', 'givibj4'
+	act 'Suck on':gt 'city_kavkazkafe', 'givibj4'
 end
 
 if $ARGS[0] = 'givibj4':
@@ -403,14 +403,14 @@ if $ARGS[0] = 'givibj4':
 	gs 'arousal', 'bj', 3, 'sub'
 	gs 'stat'
 
-	act 'Remove from your mouth':gt 'kavkazkafe', 'givibj5'
-	act 'Continue sucking':gt 'kavkazkafe', 'givibj6'
+	act 'Remove from your mouth':gt 'city_kavkazkafe', 'givibj5'
+	act 'Continue sucking':gt 'city_kavkazkafe', 'givibj6'
 
 	if givitime > 1:
 		if rand(0, 100) >= 75:
 			cla
 			'Givi takes his member out of your mouth, starts walking around you and says, "<<$pcs_nickname>>, take off your clothes and stay right there."'
-			act 'Doggy-Style':gt 'kavkazkafe', 'givisex'
+			act 'Doggy-Style':gt 'city_kavkazkafe', 'givisex'
 		end
 	end
 end
@@ -449,10 +449,10 @@ if $ARGS[0] = 'givisex':
 	if givitime > 5 and rand(0, 100) >= 75 and stat['anal'] > 0 and giviVagOnce = 1:
 		'<<$pcs_nickname>>, I want you in the ass.'
 
-		act 'No way':gt 'kavkazkafe', 'givisex1'
-		act 'Grin and bare it':gt 'kavkazkafe', 'givianal'
+		act 'No way':gt 'city_kavkazkafe', 'givisex1'
+		act 'Grin and bare it':gt 'city_kavkazkafe', 'givianal'
 	else
-		act 'Close your eyes':gt 'kavkazkafe', 'givisex1'
+		act 'Close your eyes':gt 'city_kavkazkafe', 'givisex1'
 	end
 end
 
@@ -474,14 +474,14 @@ if $ARGS[0] = 'givisex1':
 		'Givi suddenly takes out his member and strongly works his fingers in your ass.'
 		gs 'arousal', 'anal_finger', 3, 'sub'
 		gs 'stat'
-		act 'Close your eyes':gt 'kavkazkafe', 'givianal'
+		act 'Close your eyes':gt 'city_kavkazkafe', 'givianal'
 
 	else
 		if rand(0, 10) >= 8:
 			'Givi suddenly pulls his cock out and taking you by the shoulders puts you on your knees in front of him.'
 
-			act 'Remove from your mouth':gt 'kavkazkafe', 'givibj5'
-			act 'Continue sucking':gt 'kavkazkafe', 'givibj6'
+			act 'Remove from your mouth':gt 'city_kavkazkafe', 'givibj5'
+			act 'Continue sucking':gt 'city_kavkazkafe', 'givibj6'
 		else
 			pose = 1
 			gs 'dinSex','sexcum'
@@ -502,8 +502,8 @@ if $ARGS[0] = 'givianal':
 		'Givi suddenly pulls his cock out and taking you by the shoulders puts you on your knees in front of him.'
 		gs 'stat'
 
-		act 'Remove from your mouth':gt 'kavkazkafe', 'givibj5'
-		act 'Continue sucking':gt 'kavkazkafe', 'givibj6'
+		act 'Remove from your mouth':gt 'city_kavkazkafe', 'givibj5'
+		act 'Continue sucking':gt 'city_kavkazkafe', 'givibj6'
 	else
 		gs 'bdsex', 'ancum'
 		gs 'arousal', 'end'
@@ -602,5 +602,5 @@ if $ARGS[0] = 'foursome':
 	end
 end
 
---- kavkazkafe ---------------------------------
+--- city_kavkazkafe ---------------------------------
 

+ 9 - 9
locations/pharmacy.qsrc → locations/city_pharmacy.qsrc

@@ -1,4 +1,4 @@
-# pharmacy
+# city_pharmacy
 
 if $ARGS[0] = 'start':
 	*clr & cla
@@ -17,19 +17,19 @@ if $ARGS[0] = 'start':
 			minut += rand(1,4) * people
 			people = 0
 			gs 'stat'
-			gt 'pharmacy', 'shop'
+			gt 'city_pharmacy', 'shop'
 		end
 	else
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	end
 end
 
 if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	*clr & cla
 	$location_type = 'public_indoors'
-	$loc = 'pharmacy'
+	$loc = 'city_pharmacy'
 	$metka = 'shop'
-	$menu_loc = 'pharmacy'
+	$menu_loc = 'city_pharmacy'
 	$menu_arg = 'shop'
 	menu_off = 0
 	gs 'stat'
@@ -72,7 +72,7 @@ if $ARGS[0] = 'shop' or $ARGS[0] = '':
 	if pcs_knows_nipplecream > 0:
 		*P func ('$stock_item', 20, 'Nipplebalm', 600, 'bpnipplebalm', $curloc, $ARGS[0])
 	end
-	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''pharmacy'', ''buy_antifungal''">buy</a>','')+'')
+	if KandidNapr = 1: *P func ('$single_stock_item', 1, 'Antifungal medication', 1050, 'Kandidoz', $curloc, $ARGS[0], StoryLine, '(you have 0)',''+iif(money >= 1050,'<a href="exec:gs ''city_pharmacy'', ''buy_antifungal''">buy</a>','')+'')
 	*P '</table></center>'
 end
 
@@ -82,15 +82,15 @@ if $ARGS[0] = 'buy_antifungal':
 		Kandidoz = 0
 		gs 'stat'
 		$gardmess = '<center><font color="green">You bought 1 <b>Antifungal medication</b>.</font></center><br>You put the money on the counter and immediately open the package and swallow the tablet. A while later, you feel better.'
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	elseif Kandidoz < 30 and KandidozOnce > 0:
 		'You don''t need the medication right now. Your thrush is currently in remission, taking vitamins will ensure that it stays that way.'
 	else
 		msg '<center>You don''t need any antifungal medication right now.</center>'
 		*nl
-		gt 'pharmacy', 'shop'
+		gt 'city_pharmacy', 'shop'
 	end
 end
 
---- pharmacy ---------------------------------
+--- city_pharmacy ---------------------------------
 

+ 11 - 11
locations/city_residential.qsrc

@@ -92,15 +92,15 @@ gs 'taxi'
 if hour >= 8 and hour <= 22:'You can see the <a href="exec:$locM = ''city_residential'' & minut += 1 & gt ''kiosk'', ''start''">kiosk</a> selling cigarettes and magazines.'
 if Enable_tablemap = 0:
 	if katkey = 1:'<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment'
-	if IrinaQW >= 1:'<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.'
-	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment'
-	if klofQW >= 2:'<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment'
+	if IrinaQW >= 1:'<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.'
+	if hour >= 16 and hour < 22 and dimaQW > 0:'<a href="exec:gt ''city_dima'', ''start''">Dimas</a> apartment'
+	if klofQW >= 2:'<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment'
 else
 	st_count=0 & $show_table=''
 	if katkey = 1:gs'show_table','<a href="exec:gt ''katspalnya'', ''start''">Kats</a> apartment','3'
-	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''IrinaRoom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
+	if IrinaQW >= 1:gs'show_table','<a href="exec:gt ''city_irinaroom'', ''start''">Irenes</a> apartment is not far away from yours.','3'
 	if hour >= 16 and hour < 22 and dimaQW > 0:gs'show_table','<a href="exec:gt ''dima'', ''start''">Dimas</a> apartment','3'
-	if klofQW >= 2:gs'show_table','<a href="exec:gt ''klofdomhouse'', ''start''">Joras</a> apartment','3'
+	if klofQW >= 2:gs'show_table','<a href="exec:gt ''city_jorahouse'', ''start''">Joras</a> apartment','3'
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
 		gs'show_table','<a href="exec:gt ''lesbidomhouse'', ''start''">Natalya Petrovnas</a> apartment.'
 	elseif lesbiday ! daystart and subdom = 2:
@@ -115,18 +115,18 @@ end
 
 if hour >= 5 and hour <= 23:'The <a href="exec: minut += 5 & gt ''metro'', ''start''">Metro</a> Station is within a 5 minute walk from here.'
 if hour >= 8 and hour <= 20:'The <a href="exec: minut += 3 & gt ''shop'', ''start''">supermarket</a> is not far from here.'
-if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''poli'', ''start''">clinic</a> is also nearby.'
+if (hour >= 8 and hour <= 20) or preg = 2:'The <a href="exec:gt ''city_clinic'', ''start''">clinic</a> is also nearby.'
 if hour >= 6 and hour <= 9 and military = 1 and week = 6:'There is a <a href="exec:minut += 60 & gt ''Military'', ''start''">military bus</a> waiting on the other side of the street.'
 if hour >= 8 and hour <= 14 and week ! 1:'You could go shopping at the noisy local <a href="exec: minut += 10 & gt ''rinok'', ''start''">marketplace</a>.'
 if hour >= 8 and hour <= 15 and week < 6:'Near the market is a <a href="exec: minut += 10 & gt ''rinok'', ''tailor''">tailor shop</a> where you can get your clothes resized if needed.'
-if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door of <a href="exec: minut += 5 & gt ''kafe'', ''work''">"The Roadhouse"</a> is open, so employees can enter to begin their shift.'
-if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely styled diner <a href="exec: minut += 5 & gt ''kafe'', ''start''">"The Roadhouse"</a>, you can hear the swearing and laughing of some <a href="exec: minut += 5 & gt ''gopnew'', ''start''">gopniks</a>.'
+if hour >= 11 and hour < 12 and week > 1 and week < 5 and workKafe = 1:'The side door of <a href="exec: minut += 5 & gt ''city_kafe'', ''work''">"The Roadhouse"</a> is open, so employees can enter to begin their shift.'
+if hour >= 12 and hour <= 22 and week ! 1:'In a side alley, next to the uniquely styled diner <a href="exec: minut += 5 & gt ''city_kafe'', ''start''">"The Roadhouse"</a>, you can hear the swearing and laughing of some <a href="exec: minut += 5 & gt ''gopnew'', ''start''">gopniks</a>.'
 if hour > 22 or hour <= 3:'In one of the parking lots you can hear the swearing and laughing of some <a href="exec:gt ''gopnew'', ''start''">gopniks</a>.'
-if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''clener'', ''start''">cleaning lady</a> is needed.'
+if clener >= 1 and hour >= 7 and hour <= 22:'There''s a small office building where a <a href="exec: minut += 5 & gt ''city_smalloffice'', ''start''">cleaning lady</a> is needed.'
 
 'The city''s large <a href="exec:minut += 20 & gt ''city_park'', ''start''">central park</a> is about a 20-minute walk away.'
 'The city''s only <a href="exec:minut += 40 & gt ''city_lake'', ''start''">lake</a> is just a 40-minute walk away.'
-'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''pharmacy'', ''start''">Pharmacy</a>.'
+'24 Hour <a href="exec:$loc = ''city_residential'' & gt ''city_pharmacy'', ''start''">Pharmacy</a>.'
 
 if Enable_tablemap = 0:
 	if hour >= 10 and hour < 22 and lesbiQW = 1:
@@ -146,7 +146,7 @@ else
 	'In the courtyard of your <a href="exec: gt ''etoexhib'', ''pos51''">apartment building</a>, you see several <a href="exec: minut += 1 & gt ''trashplace''">trash bins</a>.'
 end
 
-if SNarkPriton > 0:'The <a href="exec:minut += 5 & gt ''narkopriton''">drug house</a> is clearly recognizable by the syringes and the trash that lies in front of it.'
+if SNarkPriton > 0:'The <a href="exec:minut += 5 & gt ''city_drugden''">drug house</a> is clearly recognizable by the syringes and the trash that lies in front of it.'
 if hour >= 8 and hour <= 23 or saunaWorkWhore > 0 or workDisk = 2:'<a href="exec:minut += 10 & gt ''sauna''">The Sauna</a> is a 10 minute walk away. Rumors say the sauna is just the front for a brothel.'
 
 if hour >= 20 or hour <= 4:

+ 38 - 38
locations/clener.qsrc → locations/city_smalloffice.qsrc

@@ -1,6 +1,6 @@
-# clener
+# city_smalloffice
 if $ARGS[0] = 'start':
-	$menu_loc = 'clener'
+	$menu_loc = 'city_smalloffice'
 	$menu_arg = 'start'
 	menu_off = 0
 	CLOSE ALL
@@ -14,7 +14,7 @@ if $ARGS[0] = 'start':
 
 	if svQW >= 1:
 		if hour >= 8 and hour <= 16 and week < 6:
-			'The door to the<a href="exec:gt ''torgpred''">Trade Mission</a> is open.'
+			'The door to the<a href="exec:gt ''city_trademission''">Trade Mission</a> is open.'
 		else
 			'The door of the trade mission is closed. There''s a note on the door, Open hours: Saturday and Sunday 8:00--16:00'
 		end
@@ -32,7 +32,7 @@ if $ARGS[0] = 'start':
 			gs 'stat'
 			'Still smiling he says, "<<$pcs_nickname>>, want to grab a cup of coffee?"'
 
-			act 'Decline': jouryQwNo = 1 & gt 'clener', 'start'
+			act 'Decline': jouryQwNo = 1 & gt 'city_smalloffice', 'start'
 
 			act 'Accept':
 				*clr & cla
@@ -41,7 +41,7 @@ if $ARGS[0] = 'start':
 				'You nod and the two of you head off to the café, where Yuri orders coffee. You sit down at the table and begin to sip on your coffee. Yuri is painfully quiet, he has no sense of humor and is very stiff.'
 				'It''s pretty clear that he likes you, but he does not know how to put a move on you. As you finish the coffee Yuri finally suggests if you want to follow him to his home.'
 
-				act 'No': jouryQwNo = 1 & gt 'clener', 'start'
+				act 'No': jouryQwNo = 1 & gt 'city_smalloffice', 'start'
 
 				act 'Go with Yuri': gt 'youry', 'quest'
 			end
@@ -86,9 +86,9 @@ if $ARGS[0] = 'start':
 							gs 'stat'
 							'You smile and Sasha pours more vodka, not stopping his caressing of your buttocks.'
 
-							if pcs_horny < 50: gs 'clener', 'borodachNo2'
+							if pcs_horny < 50: gs 'city_smalloffice', 'borodachNo2'
 
-							gs 'clener', 'borodachDrink'
+							gs 'city_smalloffice', 'borodachDrink'
 						end
 
 						gs 'willpower', 'hj', 'self'
@@ -111,8 +111,8 @@ if $ARGS[0] = 'start':
 								gs 'stat'
 								
 								
-								gs 'clener', 'ohrhj'
-								gs 'clener', 'ohrbj'
+								gs 'city_smalloffice', 'ohrhj'
+								gs 'city_smalloffice', 'ohrbj'
 							end
 						else
 							act 'Put your hand on his pants (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -124,7 +124,7 @@ if $ARGS[0] = 'start':
 			gs 'arousal', 'end'
 			gs 'stat'
 							
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 		end
 	end
 
@@ -138,7 +138,7 @@ if $ARGS[0] = 'start':
 			'"Fulfilment?" you reply.'
 			'The guard smiles, "You''re right, the only word that came up in my head was fucking."'
 
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 
 			act 'Laugh out loud':
 				cla
@@ -151,7 +151,7 @@ if $ARGS[0] = 'start':
 
 				gs 'willpower', 'drink', 'resist'
 				if will_cost <= pcs_willpwr:
-					act 'Sorry, I have to go (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+					act 'Sorry, I have to go (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_smalloffice', 'start'
 				else
 					act 'Sorry, I have to go (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
@@ -182,9 +182,9 @@ if $ARGS[0] = 'start':
 								'"Hey! What are you doing?" you ask.'
 								'"Relax, it was merely an accident." Sasha starts muttering as he pours another shot, "Let''s have a drink."'
 
-								if pcs_horny < 50: gs 'clener', 'borodachNo'
+								if pcs_horny < 50: gs 'city_smalloffice', 'borodachNo'
 
-								gs 'clener', 'borodachDrink'
+								gs 'city_smalloffice', 'borodachDrink'
 							end
 						else
 							act 'React (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -196,8 +196,8 @@ if $ARGS[0] = 'start':
 							pcs_horny += 15
 							gs 'stat'
 							'You continue on as usual, trying not to pay attention to it, since it was only a casual touch. Sasha pours more vodka and says, "The second shot always tastes better." as he takes another quaff.'
-							if pcs_horny < 50: gs 'clener', 'borodachNo'
-							gs 'clener', 'borodachDrink'
+							if pcs_horny < 50: gs 'city_smalloffice', 'borodachNo'
+							gs 'city_smalloffice', 'borodachDrink'
 						end
 					end
 				end
@@ -218,7 +218,7 @@ if $ARGS[0] = 'start':
 				clenerT = 1
 				'You agree to work as a cleaner.'
 
-				act 'Leave':gt 'clener', 'start'
+				act 'Leave':gt 'city_smalloffice', 'start'
 			end
 		end
 	end
@@ -236,7 +236,7 @@ if $ARGS[0] = 'start':
 				clener = 2
 				'You agree to work as a cleaner.'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		end
 	end
@@ -277,7 +277,7 @@ if $ARGS[0] = 'start':
 						'You look angrily at him, "No, I don''t mix business with pleasure..." Yuri looks dejected as he moves away from you.'
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
-						act 'Leave': gt 'clener', 'start'
+						act 'Leave': gt 'city_smalloffice', 'start'
 					end
 
 					act 'Yes':
@@ -288,7 +288,7 @@ if $ARGS[0] = 'start':
 						'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 						'As you leave, you notice Yuri awiting you. He''s pretty nervous and it seems as if he doesn''t know what to do. Not knowing what to say, he blurts out, "How about we head over to my place, watch some movies, drink champagne and talk."'
 
-						act 'No': jouryQwNo = 1 & gt 'clener', 'start'
+						act 'No': jouryQwNo = 1 & gt 'city_smalloffice', 'start'
 
 						act 'Go with Yuri': gt 'youry', 'quest'
 					end
@@ -304,7 +304,7 @@ if $ARGS[0] = 'start':
 
 			'As you''ve finished, you head over to Boris Ivanovich''s office. He gives you 65 <b>₽</b> for the work.'
 
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 		end
 	end
 
@@ -337,7 +337,7 @@ if $ARGS[0] = 'start':
 							'You''re offended by his behaviour and without any hesitation you tell Yuri to go to hell. He quickly turns and walks away.'
 							'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
-							act 'Leave':gt 'clener', 'start'
+							act 'Leave':gt 'city_smalloffice', 'start'
 						end
 					else
 						act 'Fuck you (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -349,7 +349,7 @@ if $ARGS[0] = 'start':
 						'Yuri only sees you as a simple fuck whore. But you''re willing to put up with it and agree to visit him afterwards. Yuri nods in satisfaction and leaves the toilet.'
 						'You continue on by mopping the floor and polish the toilets and urinals. You are given 65 <b>₽</b> for your work.'
 
-						act 'Leave':gt 'clener', 'start'
+						act 'Leave':gt 'city_smalloffice', 'start'
 					end
 				end
 
@@ -374,7 +374,7 @@ if $ARGS[0] = 'start':
 						'You ask him about the details. Stasik tells you, "It''s very simple. In the northern, central and residential areas there are supermarkets. You come to our office to find out what your assignment is, then you visit all the three stores and arrange our products there, making changes according to the assignment. At the checkout you take a receipt confirming that you''ve been to work."' 
 						'"Afterwards, you head back to our office and we will pay you. How does 500 <b>₽</b> sound for a few hours work? No hard labour, what do you say?"'
 
-						act 'Not interested':gt 'clener', 'start'
+						act 'Not interested':gt 'city_smalloffice', 'start'
 
 						act 'Accept':
 							*clr & cla
@@ -383,7 +383,7 @@ if $ARGS[0] = 'start':
 							'<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener2.jpg"></center>'
 							'You grin and nod acceptingly, Stas nods confirming the deal, and after that walks out of the toilet.'
 
-							act 'Leave':gt 'clener', 'start'
+							act 'Leave':gt 'city_smalloffice', 'start'
 						end
 					end
 				end
@@ -393,7 +393,7 @@ if $ARGS[0] = 'start':
 
 			'You wash the floor and polish all the booths and urinals. You are given 65 <b>₽</b> for your work.'
 
-			act 'Leave':gt 'clener', 'start'
+			act 'Leave':gt 'city_smalloffice', 'start'
 		end
 	end
 end
@@ -408,11 +408,11 @@ if $ARGS[0] = 'borodachNo':
 
 		gs 'willpower', 'drink', 'resist'
 		if will_cost <= pcs_willpwr:
-			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_smalloffice', 'start'
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'clener', 'borodachDrink'
+		gs 'city_smalloffice', 'borodachDrink'
 	end
 end
 
@@ -426,11 +426,11 @@ if $ARGS[0] = 'borodachNo2':
 
 		gs 'willpower', 'sex', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'clener', 'start'
+			act 'Leave (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'city_smalloffice', 'start'
 		else
 			act 'Leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
-		gs 'clener', 'borodachSex'
+		gs 'city_smalloffice', 'borodachSex'
 	end
 end
 
@@ -442,8 +442,8 @@ if $ARGS[0] = 'borodachDrink':
 		pcs_horny += 20
 		gs 'stat'
 		'You drink and eat some more cheese, you realize that you are happily drunk. The guard''s hand does not stop caressing your ass.'
-		gs 'clener', 'borodachNo2'
-		gs 'clener', 'borodachSex'
+		gs 'city_smalloffice', 'borodachNo2'
+		gs 'city_smalloffice', 'borodachSex'
 	end
 end
 
@@ -489,9 +489,9 @@ if $ARGS[0] = 'ohrhj':
 		gs 'arousal', 'hj', 5, 'dom'
 		gs 'stat'
 		
-		gs 'clener', 'ohrbj'
-		gs 'clener', 'ohrhjcum'
-		gs 'clener', 'ohrsex'
+		gs 'city_smalloffice', 'ohrbj'
+		gs 'city_smalloffice', 'ohrhjcum'
+		gs 'city_smalloffice', 'ohrsex'
 	end
 end
 
@@ -523,8 +523,8 @@ if $ARGS[0] = 'ohrbj':
 		gs 'arousal', 'bj', 5, 'sub'
 		gs 'stat'
 		
-		gs 'clener', 'ohrbjcum'
-		gs 'clener', 'ohrsex'
+		gs 'city_smalloffice', 'ohrbjcum'
+		gs 'city_smalloffice', 'ohrsex'
 	end
 end
 
@@ -592,5 +592,5 @@ if $ARGS[0] = 'ohrsex':
 		act 'Leave':gt 'city_residential'
 	end
 end
---- clener ---------------------------------
+--- city_smalloffice ---------------------------------
 

+ 9 - 9
locations/torgpred.qsrc → locations/city_trademission.qsrc

@@ -1,5 +1,5 @@
-# torgpred
-$menu_loc = 'torgpred'
+# city_trademission
+$menu_loc = 'city_trademission'
 $menu_arg = ''
 menu_off = 0
 gs 'stat'
@@ -7,7 +7,7 @@ gs 'stat'
 '<center><img <<$set_imgh>> src="images/locations/city/residential/office/clener.jpg"></center>'
 'You walk down the hall to the office at the end. You read Director written on the door, you knock on the door and enter. Sitting behind the desk is Stas while Vitali sits in a large comfortable chair and in the third chair you see a woman.'
 
-act 'Leave': gt 'clener', 'start'
+act 'Leave': gt 'city_smalloffice', 'start'
 
 if svQW = 2:
 	if TorgPredDay ! daystart:
@@ -21,7 +21,7 @@ if svQW = 2:
 				'<center><img <<$set_imgh>> src="images/locations/city/citycenter/office/stasoffice.jpg"></center>'
 				'You tell Stas you want the job. He smiles and hands you a paper, "Don''t forget, you need to promote all three items at all the supermarkets."'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		end
 	end
@@ -94,7 +94,7 @@ if svQW = 2:
 
 			if StVaGang > 0:'' & !!Stas and Valera believe whore Sveta
 
-			act 'Leave': gt 'clener', 'start'
+			act 'Leave': gt 'city_smalloffice', 'start'
 		end
 	end
 
@@ -129,7 +129,7 @@ if svQW = 2:
 				cla
 				gs 'stat'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		end
 
@@ -137,7 +137,7 @@ if svQW = 2:
 			cla
 			'You frown a little, "I am very flattered but I need to think about this, it''s a big step. Just give me a little time to think it over ok?" Stas frowns a bit but finally nods.'
 
-			act 'Leave': gt 'clener', 'start'
+			act 'Leave': gt 'city_smalloffice', 'start'
 		end
 
 		gs 'willpower', 'misc', 'self', 'easy'
@@ -149,7 +149,7 @@ if svQW = 2:
 				gs 'stat'
 				'You shake your head, "You''re a nice guy Stas but I just don''t feel that way towards you, I''m sorry." Stas seems a bit offended by that, "I thought, we had something, more than just a fling."'
 
-				act 'Leave': gt 'clener', 'start'
+				act 'Leave': gt 'city_smalloffice', 'start'
 			end
 		else
 			act 'Tell him no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -157,5 +157,5 @@ if svQW = 2:
 	end
 end
 
---- torgpred ---------------------------------
+--- city_trademission ---------------------------------
 

+ 2 - 2
locations/dateF.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy woman that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy, but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Thanks, I think..." you answer thinking she''s pretty cute while squirming.'
 					'"Okay, I''ll tell you but you must promise me one thing." you tease her.'
 					'Staying quiet for a moment, <<$boydesc>> is contemplating what she should answer, finally deciding, "Sure, whatever you want, I can''t say no to a girl in a hot school outfit..."'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You give her a contemptuous look. "Oh, you have me all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Well, I spotted you while I was on my way to a friend''s place and your looks caught my attention. Simply said, I want to add another trophy to my trophy wall." she impudently answers.'
 					'You snap and get up in her face, "How about I cut off your tits and add them to my collection."'
 					'She starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my tits just where they are, but if you wanted to fondle them..." She says with a grin. "But seriously, I just wanted to ask you out, so how about it?'

+ 3 - 3
locations/dateM.qsrc

@@ -46,7 +46,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'"I don''t really know if I should tell you that. For all I know you might be a creepy guy, that wants to kidnap me."'
 				'"I''m sorry I knew I would come off as creepy but I got a bit thrown off by your school outfit. I didn''t mean anything by it."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Thanks, I think..." you answer thinking he''s pretty cute while squirming.'
 					'"Okay, I''ll tell you but you must promise me one thing." you tease him.'
 					'Staying quiet for a moment, <<$boydesc>> is contemplating what he should answer, finally deciding, "Sure, whatever you want, I can''t say to a girl in a hot school outfit..."'
@@ -114,7 +114,7 @@ if $ARGS[0] = 'start':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/'+lover_picrand+'.jpg"></center>'
 				'You give him a contemptuous look. "Oh, you have us all figured out do you? My name is <<$pcs_nickname>>, not that it is any of your business."'
-				if $loc = 'pavResidential' or $loc = 'pavCommercial':
+				if $loc = 'pav_residential' or $loc = 'pav_commercial':
 					'"Well, I spotted you while I was on my way to a friends place and your looks caught my attention. Simply said, I want to add another trophy to my trophy wall." he impudently answers.'
 					'You snap and get up in his face, "How about I cut off your balls and add them to my collection."'
 					'He starts laughing clearly not feeling threatened by you, "Relax, I''m only kidding. I like my balls just where they are, but if you wanted to fondle them..." He says with a grin. "But seriously, I just wanted to ask you out, so how about it?'
@@ -271,7 +271,7 @@ if $args[0] = 'date_choice':
 		!!if good weather, day/night, go to park is an option
 		act '"Let''s go to the park."':gt 'dateM', 'datepark'
 	end
-	if $loc = 'pavResidential' or $loc = 'pavCommercial' or $loc = 'city_center':
+	if $loc = 'pav_residential' or $loc = 'pav_commercial' or $loc = 'city_center':
 		!!if in pav or city center this is an option
 		act '"Let''s go to the movie theater."':gt 'dateM', 'datecinema'
 	end

+ 0 - 107
locations/defence.qsrc

@@ -1,107 +0,0 @@
-# defence
-
-
-
-!! Old code commented out but there for reference
-!!{
-if defence <= 0:
-	defence = 0
-	defenceM = 0
-	defenceW = 0
-	defenceActPar = 0
-	defenceActParM = 0
-	defenceAct = 0
-	defenceActM = 0
-	defAtk = 0
-	defAtkM = 0
-end
-
-if defenceV <= 0:
-	defenceV = 0
-	defenceMV = 0
-	defenceWV = 0
-	defenceActParV = 0
-	defenceActParMV = 0
-	defenceActV = 0
-	defenceActMV = 0
-	defAtkV = 0
-	defAtkMV = 0
-end
-
-if defenceAct > 0:
-	defence += defenceActPar
-	defenceAct -= 1
-	defActParK = defenceActPar/100
-	pcs_mana -= defActParK
-	'<b><font color="green">Regeneration consumes <<defActParK>> units of mana.</font></b>'
-end
-
-if defenceActM > 0:
-	defenceM += defenceActParM
-	defenceActM -= 1
-	defActParKM = defenceActParM/100
-	pcs_mana -= defActParKM
-	'<b><font color="green">Regeneration consumes <<defActParKM>> units of mana.</font></b>'
-end
-
-if defenceActV > 0:
-	defenceV += defenceActParV
-	defenceActV -= 1
-	manaV -= (defenceActParV / 100)
-end
-
-if defenceActMV > 0:
-	defenceMV += defenceActParMV
-	defenceActMV -= 1
-	manaV -= (defenceActParMV / 100)
-end
-
-if defAtk > 0:
-	defAtk -= 1
-	'<b><font color="green">You protection shield counter-attack the enemy.</font></b>'
-	gs 'atakB', 'atak'
-end
-
-if defAtkV > 0:
-	defAtkV -= 1
-	'<b><font color="red">The enemy''s protection shield counter-attacks you.</font></b>'
-	gs 'atakB1', 'atak'
-end
-
-if defAtkM > 0:
-	defAtkM -= 1
-
-	if defenceMV <= 0 and unmaterialV = 0:
-		defDamM = rand(defenceActParM/2, defenceActParM)
-		manaV -= defDamM
-		defence += defDamM
-		'<b><font color="green">Your protection shield absorbed <<defDamM>> mana from an enemy, this mana converts into strengthening your defenses.</font></b>'
-	end
-
-	if defenceMV > 0:
-		defenceMV += defenceActParM
-		'<b><font color="green">Your protection shield caused <<defenceActParM>> points of damage to your enemy''s mana.</font></b>'
-	end
-	if unmaterialV > 0:'<b><font color="green">Your protection shield is trying to absorb the enemy''s attack but it does not work, the enemy is too strong.</font></b>'
-end
-
-if defAtkMV > 0:
-	defAtkMV -= 1
-
-	if defenceM <= 0 and unmaterial = 0:
-		defDamMV = rand(defenceActParMV/2, defenceActParMV)
-		pcs_mana -= defDamMV
-		defenceV += defDamMV
-		'<b><font color="red">You enemy takes <<defDamMV>> mana from you strengthening their defense.</font></b>'
-	end
-
-	if defenceM > 0:
-		defenceM += defenceActParMV
-		'<b><font color="red">The protection shield inflicts <<defenceActParMV>> points of damage.</font></b>'
-	end
-
-	if unmaterial > 0:'<b><font color="red">The enemy''s protection shield is trying to absorb your mana but it does not work.</font></b>'
-end
-}
---- defence ---------------------------------
-

+ 15 - 15
locations/dimaEv.qsrc

@@ -45,7 +45,7 @@ if $ARGS[0] = 'after_school':
 				*nl
 				'<center><b><h4><font color="blue"><<"Fyodor [Fedor] Kozlov">></font></h4></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorangry.jpg"></center>'
-				act 'Leave':gt 'pavResidential'
+				act 'Leave':gt 'pav_residential'
 			elseif dimaFilm = 0:
 				'Dimka says, "Yes, I had her in the bushes near the community center, she sucked my dick and swallowed my cum like a total pro."'
 				'Fedor scowls, rage flashing in his face. Then walks right up to Dimka. "What did you just say punk?"'
@@ -269,7 +269,7 @@ if $ARGS[0] = 'cleanup':
 	end
 	'You are shocked. Once he sees that you understand he adds: "If you don''t do as I say and come by here once a week to see to my needs, I will make sure everyone in school and your house gets this video."'
 	'At his threat, your blood runs cold and you go pale, you know what this would mean to your reputation, not counting how your mother would react.'
-	act 'Run out of his house': gt 'pavResidential'
+	act 'Run out of his house': gt 'pav_residential'
 	act 'Plead': gt 'dimaEv', 'plead'
 end
 
@@ -279,7 +279,7 @@ if $ARGS[0] = 'plead':
 	'<center><h4><font color="maroon">Dimka''s Room</font></h4></center>'
 	'<center><img src="images/pc/tears1.jpg"></center>'
 	'You start begging and pleading him not to do this and to give you the video. But laughter is all the confirmation you need that, no matter what you say he won''t give it to you. Tears begin to spill from your eyes, as you realize you''re trapped and powerless, a plaything for him, as long as that video exists. Not knowing what else to do, you gather your stuff and run out of his house, his laughter echoes in your ears.'
-	act 'Run out of his house': gt 'pavResidential'
+	act 'Run out of his house': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'blackmail':
@@ -345,7 +345,7 @@ if $ARGS[0] = 'dimkawarns':
 		gs 'pain', 2, 'vaginal', 'tear'
 		gs 'pain', 1, 'eyes', 'burn'
 		gs 'stat'
-		act 'Leave':gt 'pavResidential'
+		act 'Leave':gt 'pav_residential'
 	end
 end
 
@@ -406,7 +406,7 @@ if $ARGS[0] = 'dimkaabuse0':
 			gs 'arousal', 'end'
 			gs 'pain', 2, 'throat', 'stretch'
 			gs 'stat'
-			act 'Leave':gt 'pavResidential'
+			act 'Leave':gt 'pav_residential'
 		end
 	end
 end
@@ -424,7 +424,7 @@ if $ARGS[0] = 'dimkaabuse1':
 	gs 'arousal', 'end'
 	gs 'pain', 2, 'throat', 'stretch'
 	gs 'stat'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse2':
@@ -442,7 +442,7 @@ if $ARGS[0] = 'dimkaabuse2':
 	'Ignoring foreplay, Dimka push his <<dick>>cm <<$dick_girth>> cock through your vaginal lips. Pain from the rape, bondage, forced position and, especially, the humiliation make you cry. "Peee." That stupid sound is the only thing that you can make. Dimka seems to enjoy it, and his laughs are probably the worst. "Peee". He tries to fuck you hard, but the wheel makes you drive away. Eventually he forces you against the wall pounding himself balls deep into your pussy, instead of moaning, you make funny clown sounds."Peee."'
 	gs 'dinsex','sexcum'
 	'At last he bends over you, nailing the steering wheel with his weight on your back. Pain rises all over your body. He is cumming. Then, slowly, Dimka get up, and without a word go to take a shower. You are left crying and sore. It takes a while to slowly undo all the stupid set, all the time sobbing in a corner of the room. Once Dimka end showering he walk over to you "What the fuck are you doing here".'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse3':
@@ -456,7 +456,7 @@ if $ARGS[0] = 'dimkaabuse3':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/car.jpg"></center>'
 	'Dimka binds and ties your knees with a pair of little carts, tie you up with rope, attach a steering wheel to your back, covers your face in blue clown makeup and finally, puts a clown horn in your mouth and tapes it in place. "You know. I have been asking my father for a car. He says no. That I must wait until eighteen. So..I will comfort with you." Smilling, he put himself in position to shove his dick.'
 	gs 'dinSex','boy_wants_anal','lubri' & gs 'dinsex','analsex'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse4':
@@ -473,7 +473,7 @@ if $ARGS[0] = 'dimkaabuse4':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/nar.jpg"></center>'
 	'Dimka ties your hands tightly behind your back, then ties your legs so that they are fully folder under you. He puts a collar on you and drags you to a post where a dildo has been taped in place. Dimka makes you take the dildo in your mouth, then he ties the collar to the post so that you can not get the dildo out of your mouth. Just when you think Dimka has finished with you, he pulls the rope on your collar forcing the dildo down your throat. Dimka begins to enjoy the sight of your face reddened by suffocation, while streams of snot, saliva and tears run down your face. You choke with the dildo in your throat and you can feel that your body keeps trying to vomit. You start to fear that this is how you will die, choked with a dildo down your throat. As you start to lose consciousness, Dimka finally frees you and you are able to finally breathe freely.'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse5':
@@ -486,7 +486,7 @@ if $ARGS[0] = 'dimkaabuse5':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/dimka/sex/spank.jpg"></center>'
 	'Dimka ties you to a pole. Then he shows you a leather whip. "You know slut. I am really am understanding individual. And what I think you need, is a little of discipline. So.. Let see if I can help you." He begins to whip your ass. "One." Sharp flashes of pain burn through your drug induced euphoria and you begin screaming. "Two." You beg Dimka to stop. "Three." You sob and fight against the bonds. "Four." You understand that this is only the beginning. After several more, Dimka is satisfied and releases you.'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse6':
@@ -508,7 +508,7 @@ if $ARGS[0] = 'dimkaabuse6':
 		'When he finally gets bored, Dimka pierces your nipples with metal bars, then sets you free.'
 	end
 	gs 'stat'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse7':
@@ -527,7 +527,7 @@ if $ARGS[0] = 'dimkaabuse7':
 		'When he gets bored of watching you in pain, Dimka pulls the needles, pierces your tongue with a metal bar, then sets you free'
 		pierCount += 1
 	end
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse8':
@@ -546,7 +546,7 @@ if $ARGS[0] = 'dimkaabuse8':
 		'When he gets bored of watching you in pain, Dimka takes the pins out of your pussy, pierces your clitoris, then sets you free'
 		pierCount += 1
 	end
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse9':
@@ -565,7 +565,7 @@ if $ARGS[0] = 'dimkaabuse9':
 	gs 'arousal', 'bj', 15, 'humiliation', 'sub'
 	gs 'arousal', 'end'
 	gs 'stat'
-	act 'Leave':gt 'pavResidential'
+	act 'Leave':gt 'pav_residential'
 end
 
 if $ARGS[0] = 'dimkaabuse10':
@@ -593,7 +593,7 @@ if $ARGS[0] = 'dimkaabuse10':
 			gs 'arousal', 'bj', 5, 'sub', 'humiliation', 'deepthroat', 'rough'
 			gs 'arousal', 'end'
 			gs 'stat'
-			act 'Leave':gt 'pavResidential'
+			act 'Leave':gt 'pav_residential'
 		end
 	end
 end

+ 18 - 18
locations/dimaHome.qsrc

@@ -15,10 +15,10 @@ if $ARGS[0] = 'home':
 !!On Fridays after 19 the mother won''t answer the door.
 		elseif (hour >= 8 and hour < 14) or (week ! 5 and hour >= 19 and hour < 24):
 			'A few moments later Dimka''s mother answers the door. "I''m sorry, Dimka isn''t home right now. But I will let him know you stopped by to see him." With a smile she closes the door.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		else
 			'After knocking several times, no one answers. It seems that either no one is home, or everyone is asleep.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		end
 	else
 !!20% chance that mother answers saying he isn''t home. Just to show Dimka does other stuff.
@@ -28,10 +28,10 @@ if $ARGS[0] = 'home':
 !!On Fridays after 19 the mother won''t answer the door.
 		elseif (hour >= 8 and hour < 14) or (week ! 5 and hour >= 19 and hour < 24):
 			'A few moments later Dimka''s mother answers the door "I''m sorry, Dimka isn''t home right now. But I will let him know you stopped by to see him." With a smile she closes the door.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		else
 			'After knocking several times, no one answers. It seems that either no one is home, or everyone is asleep.'
-			act 'Leave Dimka''s home': gt 'pavResidential'
+			act 'Leave Dimka''s home': gt 'pav_residential'
 		end
 	end
 end
@@ -47,7 +47,7 @@ if $ARGS[0] = 'hallway':
 	'<center><h4><font color="maroon">Entrance hall</font></h4></center>'
 	'<center><img  src="images/locations/pavlovsk/resident/dimkahome/hallway.jpg"></center>'
 	'You walk into the entrance hall of Dimka''s house, noticing that it is tastefully decorated. There is a small closet for your coat with a set of shelves and a mirror. This room leads to all other areas of the house.'
-	act '<b>Leave Dimka''s home</b>': gt 'pavResidential'
+	act '<b>Leave Dimka''s home</b>': gt 'pav_residential'
 	act 'Living Room': gt 'dimaHome','livingroom'
 	act 'Kitchen': gt 'dimaHome','kitchen'
 	act 'Bathroom': gt 'dimaHome','bathroom'
@@ -799,7 +799,7 @@ if $ARGS[0] = 'dimka_chat':
 								'<center><img src="images/pc/no.jpg"></center>'
 								'You shake your head again. "No thanks."'
 								'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-								act 'Leave Dimka''s home': gt 'pavResidential'
+								act 'Leave Dimka''s home': gt 'pav_residential'
 							end
 						else
 							act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -820,7 +820,7 @@ if $ARGS[0] = 'dimka_chat':
 									'<center><img src="images/pc/no.jpg"></center>'
 									'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
 									'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-									act 'Leave Dimka''s home': gt 'pavResidential'
+									act 'Leave Dimka''s home': gt 'pav_residential'
 								end
 							else
 								act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -886,7 +886,7 @@ if $ARGS[0] = 'dimka_chat':
 									'<center><img src="images/pc/no.jpg"></center>'
 									'You shake your head again. "No thanks."'
 									'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-									act 'Leave Dimka''s home': gt 'pavResidential'
+									act 'Leave Dimka''s home': gt 'pav_residential'
 								end
 							else
 								act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -907,7 +907,7 @@ if $ARGS[0] = 'dimka_chat':
 										'<center><img src="images/pc/no.jpg"></center>'
 										'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
 										'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-										act 'Leave Dimka''s home': gt 'pavResidential'
+										act 'Leave Dimka''s home': gt 'pav_residential'
 									end
 								else
 									act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -965,7 +965,7 @@ if $ARGS[0] = 'dimka_chat':
 						'<center><img src="images/locations/pavlovsk/resident/dimkahome/talk.jpg"></center>'
 						'You shake your head no and push his hand away. "I doubt that, he makes me happy."'
 						'Dimka gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "You know what? I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-						act 'Leave Dimka''s home': gt 'pavResidential'
+						act 'Leave Dimka''s home': gt 'pav_residential'
 					end
 				else
 					act 'No I don''t thnk I can (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -988,7 +988,7 @@ if $ARGS[0] = 'dimka_chat':
 							'<center><img src="images/pc/no.jpg"></center>'
 							'You shake your head no. "No thanks."'
 							'He gives you a disgusted look. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave, I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-							act 'Leave Dimka''s home': gt 'pavResidential'
+							act 'Leave Dimka''s home': gt 'pav_residential'
 						end
 					else
 						act 'No (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1009,7 +1009,7 @@ if $ARGS[0] = 'dimka_chat':
 								'<center><img src="images/pc/no.jpg"></center>'
 								'Feeling uncertain, you shake your head no. "Actually, I don''t want to drink. Thanks, though."'
 								'His face suddenly twists in disgust. "Then why the fuck are you here?" Before you can even answer that, he continues. "I think you should leave. I got more important things to do." With that he gets up and ushers you out of his house quickly.'
-								act 'Leave Dimka''s home': gt 'pavResidential'
+								act 'Leave Dimka''s home': gt 'pav_residential'
 							end
 						else
 							act 'Change your mind (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'dimka_chat':
 							'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 							'You push him away with all your strength and finally force him to back up. "I said no."'
 							'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-							act 'Leave Dimka''s home': gt 'pavResidential'
+							act 'Leave Dimka''s home': gt 'pav_residential'
 						end
 					else
 						act 'Stop kissing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1102,7 +1102,7 @@ if $ARGS[0] = 'dimka_makeout':
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 					'With that he reaches back in and tries to pull your top off again, You push him away with all your strength and you barely manage to force him to back up. "I said no."'
 					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					act 'Leave Dimka''s home': gt 'pav_residential'
 				end
 			else
 				act 'I said no (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1145,7 +1145,7 @@ if $ARGS[0] = 'dimka_seduce':
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 					'You push him away with all your strength and finally manage to force him to back up. "I said no."'
 					'Dimka''s face suddenly turns into anger and confusion, obviously upset. "I thought you liked me, but whatever! I think you should leave." With that he gets up and escorts you to his bedroom door and closes it firmly behind you. Unsure what else to do you leave his house.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					act 'Leave Dimka''s home': gt 'pav_residential'
 				end
 			else
 				act 'Stop kissing (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1188,7 +1188,7 @@ if $ARGS[0] = 'dimka_makeout2':
 					'<center><img src="images/characters/pavlovsk/school/boy/dimka/sex/home/stop.jpg"></center>'
 					'With that, he reaches back in and tries to pull your top off again, You push him away with all your strength and finally manage to force him to back up. "I said no."'
 					'He suddenly gets furious. "Oh, you fucking tease! Get the hell out of my house, then!" With that he gets up and practically drags you out of his house, pushing you out the front door, before slamming it behind you.'
-					act 'Leave Dimka''s home': gt 'pavResidential'
+					act 'Leave Dimka''s home': gt 'pav_residential'
 				end
 			else
 				act 'I said no(<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -1289,7 +1289,7 @@ if $ARGS[0] = 'dimka_knees':
 								*nl
 								'An evil grin plays across his face. "I''m glad you asked." Dimka says picks up a remote before turning on the tv. As soon as the screen turns on you see webcam video of him fucking you. Your face drains to pale white as you realize he''s just recorded you having sex with him. Just as the shock is setting he makes his play, "If you don''t do everything I say and come by here at least once a week to service me, I will make sure everyone in school gets a copy of this video. Oh, and your parents as well, just for good measure, whore."'
 								'Your blood runs cold as the threat sinks in. You know what this would mean to your reputation, at school and at home with you mother.'
-								act 'Run out of his house': gt 'pavResidential'
+								act 'Run out of his house': gt 'pav_residential'
 								act 'Plead':
 									*clr & cla
 									minut += 5
@@ -1297,7 +1297,7 @@ if $ARGS[0] = 'dimka_knees':
 									'<center><img src="images/pc/tears1.jpg"></center>'
 									'"Please, you can''t do this to me! Please delete it." You beg and plead with him, hoping to undo this mistake.'
 									'Dimka laughs in your face. "I don''t think so, slut. You''re going to be my cock sock from now on, or else everyone will learn just how loose your dirty cunt really is." Tears begin to spill from your eyes as you realize you''re trapped and powerless, destined to be a plaything for this monster as long as that video exists. Not knowing what else to do you mournfully gather your stuff and run out of his house, his laughter echoing in your ears as the tears stain your face.'
-									act 'Run out of his house': gt 'pavResidential'
+									act 'Run out of his house': gt 'pav_residential'
 								end
 							end
 						end

+ 2 - 2
locations/dimaRevenge.qsrc

@@ -912,7 +912,7 @@ if dimaRevChoice = 4:
 							'As you wake up, you see a partially dressed Anushka sitting on the window sill smoking a cigarette. Alyona is still sleeping like a baby. "She looks so content," Anushaka says in a somewhat sad tone, which makes you wonder just how rough Alyona''s life is, "and so adorable when she''s like this. Are you going home?"'
 							'"Yeah," you say as you get dressed. "I''ll see you later."'
 							'You give her a kiss, then finish getting dressed and head home. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
-							act 'Continue': gt 'pavResidential'
+							act 'Continue': gt 'pav_residential'
 						end
 					end
 				else
@@ -920,7 +920,7 @@ if dimaRevChoice = 4:
 						*clr & cla
 						'<center><img src="images/locations/pavlosvk/school/oldshcool/gopnahngout/party/party.jpg"></center>'
 						'You watch the two of them make out and then they drift into another room to be alone. You rejoin the party, talking with others and drinking. You spend the whole day there, even passing out for awhile, only to wake up to several others also passed out. Seems like the party finally ran out of steam. You get up and look around a bit, stretching before heading out. You check your phone on the way and see that school is just getting out. On your way out, you spot Dimka hitting on a girl. She pushes him away and runs off, not even giving him the time of day. He looks at you with eyes full of anger, but he looks down when you glare back. It looks like you broke his spirit a bit. You smile as you leave the school grounds.'
-						act 'Continue': gt 'pavResidential'
+						act 'Continue': gt 'pav_residential'
 					end
 				end
 			end

+ 12 - 12
locations/dimalina.qsrc

@@ -246,12 +246,12 @@ if $ARGS[0] = 'watch':
 					minut += rand(30,60)
 					gs 'stat'
 					!!need to reset dimbadgirl to 0 after this so it starts over for each args scene set.
-					act 'Leave': gt 'pavResidential'
+					act 'Leave': gt 'pav_residential'
 				else
 					'After that, Dimka opens the closet and you look up at him to see him smiling down at you.'
 					'"Well, it looks like you''re not a complete dumb slut, but don''t get confused: you''re still just as worthless." He yanks the gag out and tugs you free from the chains. "Come on, get dressed and leave, I''m done with you for today. I''m only human, I can''t be bothered to fuck you now."'
 					'You groan and stand up on unstable legs. Your body hurts and you''re still in a lustful haze.'
-					act 'Leave': gt 'pavResidential'
+					act 'Leave': gt 'pav_residential'
 				end
 			end
 		end
@@ -403,7 +403,7 @@ if $ARGS[0] = 'cums1':
 		if pcs_health > 20: pcs_health -= 20
 		gs 'arousal', 'voyeur_sex', 5, 'bound'
 		gs 'stat'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 end
 
@@ -513,7 +513,7 @@ if $ARGS[0] = 'linadefiled':
 		if pcs_health > 20: pcs_health -= 20
 		npc_rel['A1'] += 1
 		gs 'stat'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 end
 
@@ -647,7 +647,7 @@ if $ARGS[0] = 'dimkalina6':
 				'You look at him with a blank expression. Why is he so excited?'
 				'"Well <<$pcs_nickname>>, time is running short and I must do something. You may go now."'
 				'Not wanting to miss your chance, you proceed to leave his room. With one last glance back at him, you see he stands in the middle of the room smiling and looking to the closet. As you close the door of his room, you swear that you hear the noise of chains.'
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 		end
 	end
@@ -866,7 +866,7 @@ if $ARGS[0] = 'hooksex':
 	if pcs_health > 20: pcs_health -= 20
 	minut += rand(20,30)
 	gs 'stat'
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'helplina':
@@ -941,7 +941,7 @@ if $ARGS[0] = 'walklina':
 		'She looks at you a moment, and shrugs.'
 		'"Do whatever you want, <<$pcs_firstname>>.'
 		'Then she begins to walk towards her home.'
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 	act 'Accompany her':
 		*clr & cla
@@ -957,7 +957,7 @@ if $ARGS[0] = 'walklina':
 			'She cries and then turns, running with all her strength and leaving you far behind.'
 			if pcs_mood > 10: pcs_mood -= 10
 			gs 'stat'
-			act 'Leave': gt 'pavResidential'
+			act 'Leave': gt 'pav_residential'
 		elseif npc_rel['A19'] < 50:
 			'Lina begins to walk towards her home. Her parent''s apartment is in the same complex as yours. As you catch up to her, she stops and gives you a questioning gaze.'
 			'"Let''s go home Lina."'
@@ -971,7 +971,7 @@ if $ARGS[0] = 'walklina':
 			npc_rel['A19'] += 3
 			minut += 5
 			gs 'stat'
-			act 'Leave': gt 'pavResidential'
+			act 'Leave': gt 'pav_residential'
 		else
 			'Lina begins to walk towards her home. Her parent''s apartment is in the same complex as yours. As you catch up with her, she stops and gives you a questioning gaze.'
 			'"Let''s go home, Lina," You say to her.'
@@ -986,7 +986,7 @@ if $ARGS[0] = 'walklina':
 				'"Ok, this is my stop."'
 				'Lina leaves your side and looks at you with a half smile.'
 				'"Thanks, <<$pcs_nickname>>... I... Well I needed that."'
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 		end
 	end
@@ -1042,7 +1042,7 @@ if $ARGS[0] = 'escape':
 	npc_rel['A1'] -= 40
 	minut += rand(10,30)
 	gs 'stat'
-	act 'leave': gt 'pavResidential'
+	act 'leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'succubusdimka':
@@ -1076,7 +1076,7 @@ if $ARGS[0] = 'succubusdimka':
 			scfeed = succublvl + rand(1,4)
 			minut += rand(20,30)
 			gs 'stat'
-			act 'Leave': gt 'pavResidential'
+			act 'Leave': gt 'pav_residential'
 		end
 	end
 end

+ 1 - 1
locations/din_npc.qsrc

@@ -7,7 +7,7 @@
 
 $go_home = {
 		if curr_home = 1:
-		gt 'pavResidential'
+		gt 'pav_residential'
 		elseif curr_home = 2:
 		gt 'gadukino'
 		elseif curr_home = 3:

+ 1 - 1
locations/dina.qsrc

@@ -13,7 +13,7 @@ $brodila = {
 
 $brodilr = {
 	if StoryLine = 1 and home_owned[2] = 1:
-		gt 'pavResidential'
+		gt 'pav_residential'
 	elseif home_owned[4] = 1:
 		gt'liames'
 	else

+ 1 - 1
locations/dinnpc.qsrc

@@ -62,7 +62,7 @@ $din_predlog_dima_bj = {
 					gs 'arousal', 'end'
 					gs 'stat'
 					
-					act 'Leave as well':gt 'gdk'
+					act 'Leave as well':gt 'pav_commcenter'
 				end
 			end
 		end

+ 1 - 1
locations/dom_gor.qsrc

@@ -179,7 +179,7 @@ act 'Go out onto the street':
 		'<b><font color="red">You feel too ill to travel through the streets.</font></b>'
 		xgt $curloc
 	else
-		xgt 'pavCommercial'
+		xgt 'pav_commercial'
 	end
 
 end

+ 1 - 1
locations/ender.qsrc

@@ -377,7 +377,7 @@ if $ARGS[0] = 'win':
 
 		act 'Go home':
 			if curr_home = 1:
-				gt 'pavResidential'
+				gt 'pav_residential'
 			elseif curr_home = 2:
 				gt 'gadukino'
 			elseif curr_home = 3:

+ 3 - 3
locations/etoexhib.qsrc

@@ -597,7 +597,7 @@ if $ARGS[0] = 'pos17':
 		act 'Enter':money -= 25 & minut += 15 & gt 'etoexhib', 'pos18'
 	end
 
-	act 'Go back to the train station':gt 'pavCommercial'
+	act 'Go back to the train station':gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'pos18':
@@ -813,7 +813,7 @@ if $ARGS[0] = 'pos20':
 
 	if teachlevel > 0 and teachlevel < 10:workPTU = 2
 
-	act 'Leave':minut += 15 & gt 'pavCommercial'
+	act 'Leave':minut += 15 & gt 'pav_commercial'
 	act 'Enter the Lyceum':gt 'etoexhib', 'pos19'
 end
 
@@ -1431,7 +1431,7 @@ if $ARGS[0] = 'pos40':
 	if gor_dorm = 2:act 'Search for the superintendant':gt 'comendant', 'pos3'
 	if gor_dorm >= 3:act 'Inspect the barn':gt 'etoexhib', 'pos43'
 
-	act 'Leave':gt 'pavCommercial'
+	act 'Leave':gt 'pav_commercial'
 end
 
 if $ARGS[0] = 'pos41':

+ 3 - 3
locations/events.qsrc

@@ -216,7 +216,7 @@ if $ARGS[0] = 'snkayf':
 	gs 'underwear', 'remove'
 	if snkz = 1:
 		minut += 120
-		gt'gdk'
+		gt'pav_commcenter'
 	end
 
 	if snkz = 2:
@@ -251,7 +251,7 @@ if $ARGS[0] = 'narkozakladka':
 	'<center><b>Shooting galleries</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 	'You decide to ask, and whether there are any dealers in Pavlovsk. To which the man replied, "Go to the train station platform, it will cost you though..."'
-	'And then he looks at you menacingly at you, "And if I hear that you''ve caused any trouble, well death will seem like a good escape."'
+	'And then he looks at you menacingly "And if I hear that you''ve caused any trouble, well death will seem like a good escape."'
 	act 'Agree':
 		*clr & cla
 		snarkozak = 1
@@ -259,7 +259,7 @@ if $ARGS[0] = 'narkozakladka':
 		'<center><img <<$set_imgh>> src="images/locations/city/residential/den/narkopriton.jpg"></center>'
 		'You gulp and stammer "I assure you there willl be no problems"'
 		'Guy nods, "Good then you can find a range of product at the end of the platform."'
-		act 'Leave':gt'narkopriton'
+		act 'Leave':gt'city_drugden'
 	end
 end
 

+ 3 - 3
locations/family.qsrc

@@ -102,14 +102,14 @@ if StoryLine = 1:
 				'Your drunken sister Anya is sound asleep in her bed.'
 			end
 		end
-		if $loc = 'gdk':
+		if $loc = 'pav_commcenter':
 			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'', ''pav_commcenter''">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'', ''pav_commcenter''">Anya</a> is sitting with a group of boys and girls, drinking beer.'
 				end
 			end
 		end

+ 1 - 1
locations/fbDormD.qsrc

@@ -236,7 +236,7 @@ $d_fbd_end = {
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Leave':gt 'pavResidential'
+		act 'Leave':gt 'pav_residential'
 	end
 }
 

+ 1 - 1
locations/fbHouse.qsrc

@@ -78,7 +78,7 @@ act 'Kiss him':
 				gs 'arousal', 'end'
 				gs 'stat'
 				
-				act 'Leave':gt 'pavResidential'
+				act 'Leave':gt 'pav_residential'
 			end
 		end
 	end

+ 1 - 1
locations/food_menu.qsrc

@@ -215,7 +215,7 @@ elseif $loc = 'cafe_parco':
 	$_drink['5,name'] = 'Milkshake'
 	$_drink['5,type'] = 'bev_mil'
 	$_drink['5,price'] = 200
-elseif $loc = 'kafe':
+elseif $loc = 'city_kafe':
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
 	*nl
 	'<center><img <<$set_imgh>> src="images/shared/menus/roadhouse.jpg"</center><br>'

+ 2 - 2
locations/furisex.qsrc

@@ -53,7 +53,7 @@ elseif furisex = 6:
 	gs 'stat'
 	
 	furisex = 0
-	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pavCommercial'
+	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pav_commercial'
 	if nroad ! 10: act 'Have him drop you off in Gadukino': gt 'gadukino'
 	if nroad ! 0: act 'Have him drop you off in St. Petersburg': gt 'nord'
 elseif furisex = 100:
@@ -136,7 +136,7 @@ elseif furisex = 101:
 	gs 'stat'
 	
 	furisex = 0
-	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pavCommercial'
+	if nroad ! 20: act 'Have him drop you off in Pavlovsk': gt 'pav_commercial'
 	if nroad ! 10: act 'Have him drop you off in Gadukino': gt 'gadukino'
 	if nroad ! 0: act 'Have him drop you off in St. Petersburg': gt 'nord'
 end

+ 4 - 4
locations/gdkin.qsrc

@@ -33,7 +33,7 @@ if $ARGS[0] = '':
 
 	if hour >= 20 and hour <= 23:
 
-		act 'Go outside': gt 'gdk'
+		act 'Go outside': gt 'pav_commcenter'
 
 		act 'Go to the toilets': gt 'gdktoilet', 'start'
 
@@ -63,7 +63,7 @@ if $ARGS[0] = '':
 				
 				'As you head out on the dance floor, A guy walks up to you and sees the cum still splattered on you. The guy points to you "Check out the cock-sucker! Hey guys, this chick has cum smeared all over her face." The ones standing near him come closer. "Did you forget to swallow, slut?" Your cheeks blush with shame and you quickly head for the exit.'
 
-				act 'Leave': gt 'gdk'
+				act 'Leave': gt 'pav_commcenter'
 			else
 				minut += 15
 				pcs_stam -= 5
@@ -153,7 +153,7 @@ if $ARGS[0] = '':
 				
 				'While standing by the wall a guy notices cum on your clothes and he points and shouts. "This chick is covered in cum, wait did you fail to swallow slut?" He says to you laughing. Your cheeks blush with shame and you head for the exit.'
 
-				act 'Leave': gt 'gdk'
+				act 'Leave': gt 'pav_commcenter'
 
 				exit
 			end
@@ -203,7 +203,7 @@ if $ARGS[0] = '':
 		if StoryLine = 1 and SchoolAtestat = 0: act 'Look for your classmates': gt 'gdkin', 'classmates'
 	elseif hour < 20:
 		'The Club closes. The main lights go on, the music fades and everyone beings to leave.'
-		act 'Go outside': gt 'gdk'
+		act 'Go outside': gt 'pav_commcenter'
 	end
 end
 

+ 7 - 7
locations/gdksex.qsrc

@@ -125,7 +125,7 @@ if $ARGS[0] = 'outside':
 									gs 'dinsex','vaginal_sex',10
 									gs 'dinsex','sexcum'
 
-									act 'Leave': gt 'gdk'
+									act 'Leave': gt 'pav_commcenter'
 								end
 							else
 								pcs_horny += 10
@@ -183,7 +183,7 @@ if $ARGS[0] = 'outside':
 					gs 'dinsex','vaginal_sex',10
 					gs 'dinsex','sexcum'
 
-					act 'Leave': gt 'gdk'
+					act 'Leave': gt 'pav_commcenter'
 				end
 			elseif alko < 6:
 				if DPtipe = 1:
@@ -502,7 +502,7 @@ if $ARGS[0] = 'kissing':
 													gs 'stat'
 													*nl
 													'Realizing he doesn''t care either way, you discreetly spit out his load and stand up again. Hopefully he won''t tell anyone about what you just did for him...'
-													act 'Leave': gt 'gdk'
+													act 'Leave': gt 'pav_commcenter'
 												end
 											else
 												act 'Spit (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -514,7 +514,7 @@ if $ARGS[0] = 'kissing':
 												gs 'stat'
 												*nl
 												'Realizing he doesn''t care either way, you gulp down his load and stand up again. Hopefully he won''t tell anyone about what you just did for him...'
-												act 'Leave': gt 'gdk'
+												act 'Leave': gt 'pav_commcenter'
 											end
 										end
 									end
@@ -541,7 +541,7 @@ if $ARGS[0] = 'kissing':
 										'You simply stare at his erection, still softly panting as you recover from your orgasm. Meanwhile, he begins to jerk off in front of you.'
 										'In no time at all, his cock erupts and a thick gob of his sperm lands on your nose. <<$boydesc>> groans loudly as he shoots several more jets of his cum onto your face. You flinch and close your eyes so you won''t get anything in them, and don''t dare opening them again until you''re sure he''s finished.'
 
-										act 'Leave': gt 'gdk'
+										act 'Leave': gt 'pav_commcenter'
 									end
 								else
 									act 'Stare at it in awe (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -721,7 +721,7 @@ if $ARGS[0] = 'blowjob':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/boybj3.jpg"></center>'
 				gs 'dinsex','bj_swallow_random'
 
-				act 'Leave': gt 'gdk'
+				act 'Leave': gt 'pav_commcenter'
 			end
 		end
 	else
@@ -754,7 +754,7 @@ if $ARGS[0] = 'blowjob':
 		gs 'dinsex','vaginal_sex',10
 		gs 'dinsex','sexcum'
 
-		act 'Leave': gt 'gdk'
+		act 'Leave': gt 'pav_commcenter'
 	end
 end
 

+ 9 - 9
locations/gdksport.qsrc

@@ -53,7 +53,7 @@ if $ARGS[0] = 'start':
 			lariskaHelp_end = 1
 			gt 'LariskaStart', 'end'
 		else
-			gt 'gdk'
+			gt 'pav_commcenter'
 		end
 	end
 
@@ -570,7 +570,7 @@ if $ARGS[0] = 'starlets':
 									gs 'stat'
 									'You got in the car along with the rest of the troupe, and shortly you returned to town.'
 
-									act 'Leave': gt 'pavResidential'
+									act 'Leave': gt 'pav_residential'
 								end
 							else
 								act 'Refuse and leave (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
@@ -606,7 +606,7 @@ if $ARGS[0] = 'starlets':
 					gs 'stat'
 					'You got in the car along with the rest of the troupe, and shortly you returned to town.'
 
-					act 'Leave': gt 'pavResidential'
+					act 'Leave': gt 'pav_residential'
 				end
 			end
 		end
@@ -626,7 +626,7 @@ if $ARGS[0] = 'cab_home':
 		'Along the way you wiped the sperm from your face.'
 	end
 
-	act 'Leave': gt 'pavResidential'
+	act 'Leave': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'racing2':
@@ -1291,7 +1291,7 @@ if $ARGS[0] = 'Fedor First Date':
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/park/walk.jpg"></center>'
 				'"Sure, I would love to go out with you." you replied. Fedor was visibly delighted "Alright I look forward to hanging out with you again. Whenever you are up for another date then meet me in the school yard, after school." Fedor says as he walks you back home. The two of you have fun discussing your favorite movies as you continue your way home.'
 
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 			act 'Refuse':
 				*clr & cla
@@ -1308,7 +1308,7 @@ if $ARGS[0] = 'Fedor First Date':
 					'You say to Fedor "You seem like a cool guy but I''m just not ready for a relationship right now." Fedor was visibly upset as he replies, "I guess it wasn''t a good time, if you ever change your mind then pay me a visit at school." he says with a forced smile as he silently walks you home.'
 				end
 
-				act 'Leave': gt 'pavResidential'
+				act 'Leave': gt 'pav_residential'
 			end
 		end
 	end
@@ -1320,7 +1320,7 @@ if $ARGS[0] = 'Fedor First Date':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/fedor/fedorev/fedorsad.jpg"></center>'
 		'You said to Fedor "I have too much that I need to do right now... maybe some other time." Fedor then lowered his head with a frown. "Okay. Maybe some other time."'
 
-		act 'Leave': gt 'pavResidential'
+		act 'Leave': gt 'pav_residential'
 	end
 end
 
@@ -1328,14 +1328,14 @@ if $ARGS[0] = 'Starletsreact':
 	cla
 	menu_off = 1
 	'As you approach the Starlets, Albina looks at you in disgust. Loudly enough for the whole team to hear, she says "<<$pcs_nickname>>, no one wants to see some pregnant whore dance. Leave. You''re done." Tears welling in your eyes, you leave, the sound of laughter and taunting following your departure.'
-	act 'Continue':npc_pregtalk['A23'] = 1 & gt 'gdk'
+	act 'Continue':npc_pregtalk['A23'] = 1 & gt 'pav_commcenter'
 end
 
 if $ARGS[0] = 'vballreact':
 	cla
 	menu_off = 1
 	'As you approach the team, your coach notices you and calls you aside. "<<$pcs_firstname>>, are you pregnant? I can''t let you play like that. Also, a pregnant teenager would definitely reflect poorly on me and the rest of the team. Sorry, but off the team." Tears welling in your eyes, you leave.'
-	act 'Continue':npc_pregtalk['A69'] = 1 & gt 'gdk'
+	act 'Continue':npc_pregtalk['A69'] = 1 & gt 'pav_commcenter'
 end
 
 

+ 3 - 3
locations/gdktoilet.qsrc

@@ -19,7 +19,7 @@ if $ARGS[0] = 'start':
 
 	'There is a <a href="exec: gt ''gdktoilet'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
 	
-	act 'Go outside': gs 'arousal', 'end' & gt 'gdk'
+	act 'Go outside': gs 'arousal', 'end' & gt 'pav_commcenter'
 	
 	if hour >= 8 and hour <= 23:
 		gs 'willpower', 'exhib', 'self'
@@ -75,8 +75,8 @@ if $ARGS[0] = 'start':
 		CLOSE ALL
 	end
 
-	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'gdkbibl'
-	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'gdkkru'
+	if hour >= 8 and hour <= 18: act 'Go to the library': gt 'pav_library'
+	if hour >= 12 and hour <= 20: act 'Go upstairs to the hobby clubs': gt 'pav_commclubs'
 	if hour >= 14 and hour <= 20: act 'Go to the gym': gt 'gdksport', 'start'
 end
 

+ 1 - 1
locations/gdktoilet_womens.qsrc

@@ -636,7 +636,7 @@ if $ARGS[0] = 'rape':
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/gorodok.jpg"></center>'
 		'You run from the community center and don''t stop until you are back in the residential area'
-		act 'Catch your breath': minut += 5 & gt 'pavResidential'
+		act 'Catch your breath': minut += 5 & gt 'pav_residential'
 	end
 end
 

+ 5 - 5
locations/gevent.qsrc

@@ -166,7 +166,7 @@ if $ARGS[0] = '3':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Continue':gt 'pavResidential'
+	act 'Continue':gt 'pav_residential'
 end
 
 if $ARGS[0] = '4':
@@ -187,7 +187,7 @@ if $ARGS[0] = '4':
 	gs 'arousal', 'end'
 	gs 'stat'
 
-	act 'Return to Pavlovsk':gt 'pavResidential'
+	act 'Return to Pavlovsk':gt 'pav_residential'
 end
 
 if $ARGS[0] = '5':
@@ -235,7 +235,7 @@ if $ARGS[0] = '5':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Straighten your clothes':gt 'pavResidential'
+	act 'Straighten your clothes':gt 'pav_residential'
 end
 
 if $ARGS[0] = '6':
@@ -292,7 +292,7 @@ if $ARGS[0] = '6':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Return to the Pavlovsk streets':gt 'pavResidential'
+	act 'Return to the Pavlovsk streets':gt 'pav_residential'
 end
 
 if $ARGS[0] = '7':
@@ -326,7 +326,7 @@ if $ARGS[0] = '7':
 	gs 'arousal', 'end'
 	gs 'stat'
 	
-	act 'Return to the Pavlovsk streets':gt 'pavResidential'
+	act 'Return to the Pavlovsk streets':gt 'pav_residential'
 end
 
 --- gevent ---------------------------------

+ 1 - 1
locations/glake.qsrc

@@ -78,7 +78,7 @@ act'Return to Pavlovsk':
 		act'Return':gt'glake'
 	elseif $clothingworntype ! 'nude':
 		minut += 5
-		gt'pavResidential'
+		gt'pav_residential'
 	else
 		'You need to wear some clothes. It''s not decent to walk the streets naked.'
 		act'Return':gt'glake'

+ 2 - 2
locations/gopnik_house.qsrc

@@ -61,7 +61,7 @@ elseif gophouse = 1:
 		gs 'arousal', 'end'
 		gs 'stat'
 		
-		act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+		act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 		
 	else
 		act 'Open your eyes':
@@ -78,7 +78,7 @@ elseif gophouse = 1:
 			gs 'arousal', 'end'
 			gs 'stat'
 		
-			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pavResidential'
+			act 'Find your way back to the main streets':podvalrape = 0 & dormrape = 0 & gt'pav_residential'
 		end  	
 	end
 end

+ 3 - 3
locations/gopnik_initiation.qsrc

@@ -81,7 +81,7 @@ if $ARGS[0] = 'walkoff':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/events/gopnikinvite/liqstoreout.jpg"></center>'
 	'You shake your head again. "Sorry I wasted your time then." With that you walk off, while Lena and Lera shout out all kind of names at you. You know you''ve made a target of yourself to the gopniks but you''re no thief. You don''t even know why you thought joining them was a good idea in the first place.'
-	act 'Leave the gang': gt 'pavResidential'
+	act 'Leave the gang': gt 'pav_residential'
 end
 
 if $ARGS[0] =  'somethingelse':
@@ -139,7 +139,7 @@ if $ARGS[0] = 'agreesteal':
 			grupvalue[4] -= 200
 			gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 			gs 'stat'
-			act 'Leave the gang': gt 'pavResidential'
+			act 'Leave the gang': gt 'pav_residential'
 		end
 		act 'Beg for another chance':
 			cla & *clr
@@ -174,7 +174,7 @@ if $ARGS[0] = 'noslut':
 	grupvalue[4] -= 200
 	gs 'gopnik_initiation', 'group_rel_change','gopniks', -10
 	gs 'stat'
-	act 'Leave the gang': gt 'pavResidential'
+	act 'Leave the gang': gt 'pav_residential'
 end
 
 if $ARGS[0] = 'gopnik party':

+ 1 - 1
locations/gopskver.qsrc

@@ -238,7 +238,7 @@ if $ARGS[0] = '':
 					'A few seconds later, he pulls out and you feel several warm drops landing on your stomach. You lose consciousness again, and a little while later you wake up to find yourself getting fucked by Dan. He''s just about finished, and shoots his load onto your stomach as well. Vitek immediately replaces him, and roughly fucks you as if you''re little more than a few fuckholes to him. Then again, maybe that''s how they really see you.'
 					'He quickly adds his load to that of his friends, and you fade out of consciousness again with a soft groan. When you finally come to your senses you find yourself alone on the sofa, and just rest for a moment. The boys are sitting at the table in the room, drinking more beers. You should probably get going soon, before they decide they''re ready for another round.'
 
-					act 'Leave':gt 'pavResidential'
+					act 'Leave':gt 'pav_residential'
 				end
 			end
 		elseif hour < 20:

+ 4 - 4
locations/gpoli.qsrc

@@ -18,7 +18,7 @@ if $ARGS[0] = '':
 
 	if pcs_ask_mward_help >= 1 and pcs_know_mward <= 0: '<br><br><a href="exec: minut += 5 & gt ''gpoli'', ''reception''">Ask</a> at the reception for help with your breasts.'
 
-	act 'Leave':minut += 5 & gt 'pavCommercial'
+	act 'Leave':minut += 5 & gt 'pav_commercial'
 
 	if preg = 2:
 		act 'Give birth':
@@ -1721,7 +1721,7 @@ if $ARGS[0] = 'maternity_ward':
 		end
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
-		act 'Leave':minut += 5 & gt 'pavCommercial'
+		act 'Leave':minut += 5 & gt 'pav_commercial'
 	end
 end
 
@@ -1823,10 +1823,10 @@ if $ARGS[0] = 'maternity_ward_donation':
 	elseif pcs_gpoli_donationsessioncount > 0:
 		'Sorry <<$pcs_firstname>>, we are closing now.'
 		'You put on your top, and the nurse hands you <<mward_donatemoney>><b>₽</b> for your donated breast milk.'
-		act 'Leave':minut += 5 & gt 'pavCommercial'
+		act 'Leave':minut += 5 & gt 'pav_commercial'
 	else
 		'The clinic is closed. It''s open every day between 06:00 and 21:00.'
-		act 'Leave':minut += 5 & gt 'pavCommercial'
+		act 'Leave':minut += 5 & gt 'pav_commercial'
 	end
 end
 

+ 43 - 43
locations/gschool_chats.qsrc

@@ -8,7 +8,7 @@ if $ARGS[0] = 'nerds':
 		menu_off = 1
 		gschool_gropeday = daystart
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/boysex_tualet.jpg"></center>'
-		'When you enter the class, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air, before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
+		'When you enter the class, you feel someone moving in behind you and quickly pulling your skirt up. Your skirt is barely in the air before you feel hands pawing at your ass. As you move to turn around, the hand quickly pulls away. By the time you can see who''s behind you, you find half the guys in your class standing there, all looking in different directions and trying to act inconspicuous, a few of them even having the gall to whistle innocently. You try to tell from their faces which one of them just touched you.'
 		act 'Ignore it': gt 'gschool_chats', 'nerds'
 		act 'Identify the perpetrator': gt 'gschool_events', 'rand_scoolboy'
 	else
@@ -20,7 +20,7 @@ if $ARGS[0] = 'nerds':
 				gs 'gschool_socialchg', 'group_rel_change', 'nerds', 1
 				gs 'npc_relationship', 'modify', 'A142', 'like'
 				if grupTipe = 3:
-					'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual. You get several warm smiles and greetings from your fellow nerds.'
+					'You go to the classroom that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual. You get several warm smiles and greetings from your fellow nerds.'
 				else
 					'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects. Some of them seem to be surprised at what you are wearing but they also seem to approve.'
 				end
@@ -31,9 +31,9 @@ if $ARGS[0] = 'nerds':
 				gs 'npc_relationship', 'modify', 'A12', 'like'
 				gs 'npc_relationship', 'modify', 'A16', 'like'
 				if grupTipe = 3:
-					'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual. Natasha notices your uniform, "Oh I like your uniform, very pretty. Don''t you think?" She nudges Julia who looks at you and blushes. Then adds, "Yes very pretty."'
+					'You go to the classroom that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual. Natasha notices your uniform. "Oh I like your uniform, it''s very pretty. Don''t you think?" She nudges Julia, who looks at you and blushes. "Yes very pretty." she says in agreement.'
 				else
-					'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects. Natasha notices your uniform, "Oh I like your uniform, very pretty. Don''t you think?" She nudges Julia who looks at you and blushes. Then adds, "Yes very pretty."'
+					'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects. Natasha notices your uniform. "Oh I like your uniform, it''s very pretty. Don''t you think?" She nudges Julia, who looks at you and blushes. "Yes very pretty." she says in agreement.'
 				end
 				'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				*nl
@@ -44,10 +44,10 @@ if $ARGS[0] = 'nerds':
 				if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 				gs 'npc_relationship', 'modify', 'A159', 'like'
 				if grupTipe = 3:
-					'You go to the classrooms that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual. Several of them look up at you as you walk in, a couple of the boys, especially Feofan, Artem and Petka look at you longer than the rest and Julia''s eyes also seem to linger on you for just a bit longer.'
+					'You go to the classroom that you and your fellow nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects, as usual. Several of them look up at you as you walk in. A couple of the boys, especially Feofan, Artem and Petka look at you longer than the rest and Julia''s eyes also seem to linger on you for just a bit longer.'
 					'Artem, Petka, Julia, Natasha, Zinaida, Evgeny, Feofan and Gerasim are sitting around some tables they''ve moved together.'
 				else
-					'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects. Several of them look up at you as you walk in, a couple of the boys, especially Feofan, Artem and Petka look at you longer than the rest and Julia''s eyes also seem to linger on you for just a bit longer.'
+					'You go to one of the classrooms that the nerds like to gather in. You find them all clustered around a table talking and engaged in a variety of pet projects. Several of them look up at you as you walk in. A couple of the boys, especially Feofan, Artem and Petka look at you longer than the rest and Julia''s eyes also seem to linger on you for just a bit longer.'
 				end
 				*nl
 				gs 'gschool_groups', 'nerds'
@@ -60,19 +60,19 @@ if $ARGS[0] = 'nerds':
 				if soniaPS > 0: gs 'npc_relationship', 'modify', 'A25', 'love'
 				gs 'npc_relationship', 'modify', 'A159', 'like'
 				if grupTipe = 3:
-					'When you walk in the room goes dead silent and everyone is staring at you. Several of the nerds blush at your scandalous display of flesh from your uniform or lack therefor of. Finally Feofan speaks up. "What are you wearing?" Only for Natasha to butt in. "A better questions is why?" As you get closer the nerds all share looks before looking at Feofan, who swallows and then says. "Maybe you should go hang out somewhere else or go change or something." Then the nerds all close ranks, making sure not to give you a space to walk up to them and talk to them. The outcasts on the other hand don''t seem to care as much.'
+					'When you walk in, the room goes dead silent and everyone is staring at you. Several of the nerds blush at the scandalous display of flesh from your uniform, or lack there of. Feofan finally speaks up. "What are you wearing?" Natasha butts in. "A better questions is why?" As you get closer, the nerds all share looks before looking at Feofan, who swallows and then says. "Maybe you should go hang out somewhere else or go change or something." Then the nerds all close ranks, making sure not to give you space to walk up and talk to them. The outcasts on the other hand don''t seem to care as much.'
 				else
-					'When you walk in the room goes dead silent and everyone is staring at you. Several of the nerds blush at your scandalous display of flesh from your uniform or lack therefor of. The nerds all close ranks, making sure not to give you a space to walk up to them and talk to them. The outcasts on the other hand don''t seem to care as much.'
+					'When you walk in, the room goes dead silent and everyone is staring at you. Several of the nerds blush at the scandalous display of flesh from your uniform, or lack there of. The nerds all close ranks, making sure not to give you space to walk up and talk to them. The outcasts on the other hand don''t seem to care as much.'
 				end
 			end
 		else
-			'You are using the school uniform cheat and not wearing uniform, therefore there are no reactions to your uniform'
+			'You are using the school uniform cheat and are not wearing a uniform, therefore there are no reactions to your uniform'
 			*nl
 			gs 'gschool_groups', 'nerds'
 		end
 		*nl
 		'The outcasts are mostly hiding away from everyone else, hoping that no one will pick on them today.'
-		'Lesco is reading a book. Meanwhile '+iif(npc_grupTipe['A5'] ! 5, '', 'Fedor is sitting at a window sill looking outside, looking lonely and depressed.')+iif(npc_grupTipe['A18'] ! 5, '', 'Christina sits at a desk in the back, looking forlorn.')+iif(npc_grupTipe['A25'] ! 5, '', 'Sonia is sitting at a desk typing on her phone.')+iif(npc_grupTipe['A5'] ! 5 and npc_grupTipe['A18'] ! 5 and npc_grupTipe['A25'] ! 5, 'And Petia is roaming around, like he is about to approach someone.', ' Petia is roaming around, like he is about to approach someone.')
+		'Lesco is reading a book. Meanwhile '+iif(npc_grupTipe['A5'] ! 5, '', 'Fedor is sitting on a window sill staring outside, looking lonely and depressed.')+iif(npc_grupTipe['A18'] ! 5, '', 'Christina sits at a desk in the back, looking forlorn.')+iif(npc_grupTipe['A25'] ! 5, '', 'Sonia is sitting at a desk typing on her phone.')+iif(npc_grupTipe['A5'] ! 5 and npc_grupTipe['A18'] ! 5 and npc_grupTipe['A25'] ! 5, 'Petia is roaming around, like he is about to approach someone.', ' Petia is roaming around, like he is about to approach someone.')
 		gs 'gschool_groups', 'outcasts'
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
@@ -92,25 +92,25 @@ if $ARGS[0] = 'gopniks':
 				gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -5
 				gs 'npc_relationship', 'modify', 'A189', 5
 				
-				'You go to the stairwell that you and your fellow gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
-				'At first a couple of them stare at you and then more and more of them do. Finally Dan laughs and Lavrenti speaks up. "What are you wearing?" They just seemed stunned at your uniform. Anushka chimes in. "Please tell you you lost some kind of bet." Several others comment all expressing displeasure at your choice of uniform. After a few minutes of ridicule they finally lose interest in you, but you can tell you lost their respect and maybe more today.'
+				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
+				'At first, a couple of them stare at you and then more and more of them do. Finally, Dan laughs and Lavrenti speaks up. "What are you wearing?" They just seem stunned at your uniform. Anushka chimes in. "Please tell me you just lost some kind of bet." Several others comment, all expressing displeasure at your choice of uniform. After a few minutes of ridicule they finally lose interest in you, but you can tell you lost their respect and maybe more today.'
 			else
 				grupvalue[4] -= 5
 				gs 'gschool_socialchg', 'group_rel_change', 'gopniks', -2
 				
-				'You go to the stairwell that the gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
-				'At first a couple of them stare at you and then more and more of them do. Finally Radomir speaks up. "Are you lost or something?" Paulina chimes in pointing back the way you came. "The nerds are back that way, loser." Several others comment all expressing displeasure at your choice of uniform. You feel very unwelcome among them, which makes you uneasy, they are well known to bully their fellow students, maybe this was a bad idea.'
+				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
+				'At first, a couple of them stare at you and then more and more of them do. Finally, Radomir speaks up. "Are you lost or something?" Paulina chimes in, pointing back the way you came. "The nerds are back that way, loser." Several others also comment, all expressing displeasure at your choice of uniform. You feel very unwelcome among them, which makes you uneasy. They are well known to bully their fellow students, maybe this was a bad idea.'
 			end
-			'Hanging around are Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko.'
+			'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are all hanging around.'
 			gs 'gschool_groups', 'gopniks'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		elseif PCloSkirt < 5 and PCloThinness < 5 and PCloBra = 0:
 			if grupTipe = 4:
-				'You go to the stairwell that you and your fellow gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
+				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual.'
 			else
-				'You go to the stairwell that the gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
+				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations.'
 			end
-			'Hanging around are Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko.'
+			'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 			gs 'gschool_groups', 'gopniks'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		elseif PCloSkirt = 5 and PCloThinness < 5 and PCloBra = 0:
@@ -120,11 +120,11 @@ if $ARGS[0] = 'gopniks':
 			gs 'npc_relationship', 'modify', 'A144', 'love'
 			gs 'npc_relationship', 'modify', 'A189', 'like'
 			if grupTipe = 4:
-				'You go to the stairwell that you and your fellow gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. A few of them take note of your slightly risky uniform and seem to approve of it.'
+				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. A few of them take note of your slightly risky uniform and seem to approve of it.'
 			else
-				'You go to the stairwell that the gopnik''s like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
+				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations. A few of them take note of your slightly risky uniform and seem to approve of it.'
 			end
-			'Hanging around are Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko.'
+			'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 			gs 'gschool_groups', 'gopniks'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		else
@@ -137,35 +137,35 @@ if $ARGS[0] = 'gopniks':
 				pcs_mood -= 10
 				gs 'stat'
 				
-				'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick." Several of the other gopniks laugh as well, a few of the guys comment their next. You feel yourself getting very nervous around them dressed the way you are, they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+				'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well, a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
 				*nl
-				'He stands up and shoves Dan up against the wall. "What did you say about my girl?"'
+				'Vitek stands up and shoves Dan up against the wall. "What did you say about my girl?"'
 				'Dan just swallows while everyone else shuts up. "Hey I was just joking, we all know she is your girl."'
-				'Vitek lets go him. "Then watch your mouth!" Then he turns towards you and walks over, grabing you by the arm and dragging you over to the side. "Just what are you wearing? You''re dressed like a slut, don''t wear this to school again. Now get out of here." With that he shoves you away, you glance back and know better than to tempt fate so you walk away.'
+				'Vitek lets go of him. "Then watch your fucking mouth!" He turns towards you and walks over, grabbing you by the arm and dragging you over to the side. "Just what are you wearing? You''re dressed like a slut! Don''t wear this to school again. Now get out of here." He then shoves you away. You glance back, but know better than to tempt fate so you walk away.'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif kotovLoveQW > 0 and kotovLoveQW['clo_comment'] = 1:
 				gs 'npc_relationship', 'modify', 'A9', 'hate'
 				pcs_mood -= 10
 				gs 'stat'
 				
-				'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, everyone notices you and when Vitek see''s you he tenses up and he angrily walks across to you and grabs you roughly by the arm and drags you out of the stair well. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut, now don''t come back to school dressed like this again." He roughly shoves you into the wall and storms back to the other gopniks.'
+				'You go to the stairwell that '+iif(grupTipe = 4,'you and your fellow','the')+' gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, everyone notices you and when Vitek sees you, he tenses up and angrily walks across to you. He grabs you roughly by the arm and drags you out of the stairwell. "What did I tell you about coming to school dressed like this? No girl of mine is going to walk around dressed like some slut. Now don''t come back to school dressed like this again!" He roughly shoves you into the wall and storms back to the other gopniks.'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			elseif grupTipe = 4:
-				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick." Several of the other gopniks laugh as well, a few of the guys comment their next. You feel yourself getting very nervous around them dressed the way you are, they might actually try something. No one comes down to this end of the school at this time of the day after all.'
-				'Hanging around are Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko.'
+				'You go to the stairwell that you and your fellow gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations, as usual. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well and a few of the guys comment about being next in line. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+				'Vitek, Dan, Vasily, Lena, Lera, Pauline, Alyona, Anushka, Ekaterina, Radomir, Lavrenti, Arkadi, Roman, Valentin and Niko are hanging around.'
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
 				grupvalue[4] -= 5
 				gs 'fame', 'pav', 'sex', 3
 				
-				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps, or even just sitting on the landing of the stairs, engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick." Several of the other gopniks laugh as well, a few of the guys comment as well. "Like she came to see you Dan, she obviously came to throw herself at me." Radomir says. You feel yourself getting very nervous around them dressed the way you are, they might actually try something. No one comes down to this end of the school at this time of the day after all.'
+				'You go to the stairwell that the gopniks like to gather in. You find them leaning against the wall, sitting on the steps or even just sitting on the landing of the stairs, engaged in a variety of conversations. As you approach, Dan stands up and whistles. "Hey there slut, why don''t you come over here and suck my dick?" Several of the other gopniks laugh as well and a few of the guys comment as well. "Like she came to see you Dan! She obviously came to throw herself at me." Radomir says. You feel yourself getting very nervous around them dressed the way you are and fear they might actually try something. No one comes down to this end of the school at this time of the day after all.'
 				gs 'gschool_groups', 'gopniks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			end
 		end
 	else
-		'You are using the school uniform cheat and not wearing uniform, therefore no one can react to your uniform.'
+		'You are using the school uniform cheat and are not wearing a uniform, therefore no one can react to your uniform.'
 		gs 'gschool_groups', 'gopniks'
 		act 'Leave': gt 'gschool_lessons', 'short_break'
 	end
@@ -203,10 +203,10 @@ if $ARGS[0] = 'cooljocks':
 			gs 'npc_relationship', 'modify', 'A149', -1
 			gs 'npc_relationship', 'modify', 'A165', -1
 			
-			'As you approach them, you notice some of them giving you a disapproving look. Then Christina starts to laugh. "What are you wearing, did mommy dress you? I mean we are all glad she did, the more clothes you wear that hides that hideous body the better." Lariska and Lina add their own snide remarks similar to Christina''s. Several other of the students laugh at her comments. Lizaveta, takes your picture and then starts text, you are sure sending the picture around. Vicky is smirking a bit and then whispering something to Vanya and her sister Katja.'
-			'Stasya glances at Bella. "My god what a little social disaster she is. Really no sense of style at all." Then she turns towards her boyfriend Andrey. "If I ever wore something like that, would you still love me?"'
-			'Andrey shakes his head. "Hell no, a man has to have his standards after all." Which just gets more and more of them to laugh.'
-			'Then Dimka steps forwards. "Maybe your lost, the nerds and outcasts are over that way." He points in the direction of the classroom the nerds and outcasts hangout in. "Perhaps you would find those who might appreciate your sense of ... style there." The rest Igor, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Marcus, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Veronika, Lazar, and Erast, either ignore what is going on or join in on mocking your clothes.'
+			'As you approach them, you notice some of them giving you a disapproving look and Christina starts to laugh. "What are you wearing? Did mommy dress you? I mean we are all glad she did, the more clothes you wear that hide that hideous body the better." Lariska and Lina add their own snide remarks similar to Christina''s and several other students laugh at her comments. Lizaveta takes your picture and then starts texting, obviously sending the picture around. Vicky is smirking a bit and then whispers something to Vanya and Katja.'
+			'Stasya glances at Bella. "My god, she is an absolute social disaster. Really no sense of style at all." Then she turns towards Andrey. "If I ever wore something like that, would you still love me?"'
+			'Andrey shakes his head. "Hell no, a man has to have his standards after all.", which just gets more and more of them to laugh.'
+			'Then Dimka steps forwards. "Maybe you''re lost? The nerds and outcasts are over that way." He points in the direction of the classroom the nerds and outcasts hang out in. "Perhaps you would find those who might appreciate your sense of ... style there." Igor, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Marcus, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Veronika, Lazar and Erast either ignore what is going on or join in on mocking your clothes.'
 			gs 'gschool_groups', 'popular'
 			gs 'gschool_groups', 'jocks'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -225,12 +225,12 @@ if $ARGS[0] = 'cooljocks':
 				gs 'npc_relationship', 'modify', 'A139', 1
 				gs 'npc_relationship', 'modify', 'A140', 1
 				
-				'As you approach them, several of them giving you approving looks. Stasya comments, "Looking good <<$pcs_nickname>>, where did you buy that uniform from?" Vicky comments as well. "Yeah I like it, it looks very nice." Several of the other girls Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, and Bella, comment on how nice your outfit looks, while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion, though you notice Igor seems to be paying attention a little, or maybe he is paying attention to you. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska,  while Veronika, is reading something and seems unaware of the whole conversation.'
+				'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah I like it, it looks very nice." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe at you in particular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
 				gs 'gschool_groups', 'popular'
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
 			else
-				'Around the lockers are Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+'Lina, Bella, Veronika, Lazar, Erast, Vanya'
+				'Dimka, Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+'Lina, Bella, Veronika, Lazar, Erast and Vanya are all gathered around the lockers.'
 				gs 'gschool_groups', 'popular'
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -243,7 +243,7 @@ if $ARGS[0] = 'cooljocks':
 				grupvalue[2] += 1
 				if soniaPS = 0: gs 'npc_relationship', 'modify', 'A25', 'like'
 				
-				'As you approach them, several of them giving you approving looks. Stasya comments, "Looking good <<$pcs_nickname>>, where did you buy that uniform from?" Vicky comments as well. "Yeah looking sexy <<$pcs_nickname>>." Several of the other girls Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta, and Bella, comment on how nice your outfit looks, while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion, though you notice Igor seems to be paying attention a little, or maybe he is paying attention to you. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska,  while Veronika, is reading something and seems unaware of the whole conversation.'
+				'As you approach them, several of them give you approving looks. Stasya comments "Looking good <<$pcs_nickname>>! Where did you buy that uniform?" Vicky comments as well. "Yeah looking sexy <<$pcs_nickname>>." Katja, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+' Lizaveta and Bella all comment on how nice your outfit looks while Dimka, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+' and Svyatoslav talk among themselves, obviously not interested in girls fashion. However, you do notice Igor seems to be somewhat paying attention, maybe to you in partucular. '+iif(npc_grupTipe['A18'] ! 5, 'Christina, ', '')+' just pretends you don''t exist while she talks to Lina and Lariska while Veronika is reading something and seems to be unaware of the whole conversation.'
 				gs 'gschool_groups', 'popular'
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -258,9 +258,9 @@ if $ARGS[0] = 'cooljocks':
 				gs 'npc_relationship', 'modify', 'A147', 'like'
 				gs 'npc_relationship', 'modify', 'A148', 'like'
 				
-				'As you approach them, several of them giving you once over, obviously noticing your uniform. Christina smirks, "Someone is trying hard to get the boys to look at her."'
-				'Bella gives you a closer look at hearing that and says. "Wouldn''t be so bad if it was a good quality."'
-				'Dimka adds in. "Now Bella you know her family can''t afford the finer things in life." If not for the tone of his voice and the smirk it would almost sound like he was defending you but it comes across more like a insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast, and Vanya just stay out of it.'
+				'As you approach them, several of them give you once over, obviously noticing your uniform. Christina smirks "Someone is trying hard to get the boys to look at her."'
+				'Hearing this, Bella gives you a closer look and says "It wouldn''t be so bad if it was a good quality."'
+				'Dimka adds in. "Now Bella, you know her family can''t afford the finer things in life." If not for the tone of his voice and the smirk, it would almost sound like he was defending you but it comes across as more of an insult. Igor, Katja, Vicky, Irina, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast and Vanya just stay out of it.'
 				gs 'gschool_groups', 'popular'
 				gs 'gschool_groups', 'jocks'
 				act 'Leave': gt 'gschool_lessons', 'short_break'
@@ -279,13 +279,13 @@ if $ARGS[0] = 'cooljocks':
 			gs 'npc_relationship', 'modify', 'A139', 'dislike'
 			gs 'npc_relationship', 'modify', 'A140', 'dislike'
 			
-			'As you approach them, several of them notice you and their looks get the rest to look and soon everyone is staring at you. Finally Bella speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the rest laugh at that and you can feel the general feeling of agreement from the rest.'
-			'Dimka smirks. "Maybe she messed up the wash and her uniform just shrunk, and was to stupid to notice." Which gets several of the others to laugh even more.'
-			'Christina steps forward. "Get out of here with your whorish clothes, no one wants you around." You hear several murmers of agreement from most of the rest, it looks like even Igor, Katja, Vicky, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast, and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling unwelcome you turn around and leave.'
+			'As you approach, everyone is staring at you. Bella speaks up. "What on earth are you wearing? Forget to change out of your whoring clothes last night?" Several of the rest laugh and you can sense the general feeling of agreement from the rest.'
+			'Dimka smirks. "Maybe she messed up the wash and her uniform just shrunk and she was too stupid to notice?" and the others laugh even more.'
+			'Christina steps forward. "Get out of here with your whorish clothes! No one wants you around." and you hear several murmers of agreement from the rest. It looks like even Igor, Katja, Vicky, Albina, '+iif(npc_grupTipe['A25'] ! 5, 'Sonia, ', '')+'Stasya, Lizaveta, Marcus, Andrey, Mefodiy, Ivan, '+iif(npc_grupTipe['A5'] ! 5, 'Fedor, ', '')+'Svyatoslav, Lariska, Lina, Veronika, Lazar, Erast and Vanya appear to agree. They either give you the cold shoulder or refuse to meet your eyes. Feeling very unwelcome, you turn around and leave.'
 			act 'Leave': gt 'gschool_lessons', 'short_break'
 		end
 	else
-		'You are using the school uniform cheat so no one reacts to your uniform, this could be good or bad.'
+		'You are using the school uniform cheat and are not wearing a uniform, therefore no one can react to your uniform.'
 		gs 'gschool_groups', 'popular'
 		gs 'gschool_groups', 'jocks'
 		act 'Leave': gt 'gschool_lessons', 'short_break'

File diff suppressed because it is too large
+ 204 - 228
locations/gschool_chats1.qsrc


+ 99 - 102
locations/gschool_chats2.qsrc

@@ -8,23 +8,23 @@ if $ARGS[0] = 'artem':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big2.jpg"></center>'
 
 	if artQW = 5 and arthakQW ! 11:
-		'You sit down and Artem pulls you close enough so only you can hear him as he speaks. "I can''t wait for our next lesson after school…" He says, his hand running down your thigh and stopping at the hem of your skirt. "I bet you can''t wait either." Slowly, he lowers his hand between your legs and gives the soft, sensitive area a light squeeze before bringing his hand back up above the desk with a confident, lecherous smile.'
+		'You sit down and Artem pulls you close enough so only you can hear him as he speaks. "I can''t wait for our next lesson after school..." he says as his hand runs down your thigh and stops at the hem of your skirt. "I bet you can''t wait either." Slowly, he lowers his hand between your legs and gives the soft, sensitive area a light squeeze before bringing his hand back up above the desk with a confident, lecherous smile.'
 	elseif artQW = 3 or artQW = 20:
 		npc_rel['A2'] += 1
-		'Artem notices you walking over and quickly grabs an empty chair and makes room for you to sit next to him. "I was worried we wouldn''t see each other today." He jokes, but you can tell there''s a part of him that was being sincere. Artem isn''t one for public affection, but he still can''t go without some kind of physical contact with you, which leaves him sitting close enough to you that your legs bump and rub against each other under the table as you talk.'
+		'Artem notices you walking over, quickly grabs an empty chair and makes room for you to sit next to him. "I was worried we wouldn''t see each other today." He jokes, but you can tell there''s a part of him that was being sincere. Artem isn''t one for public affection, but he still can''t go without some kind of physical contact with you, which leaves him sitting close enough to you that your legs bump and rub against each other under the table as you talk.'
 	elseif npc_rel['A2'] >= 50 and pav_slut < 200:
 		npc_rel['A2'] += 1
 		if grupTipe = 3:
-			'"There you are, <<$pcs_nickname>>. How''s it going?" Artem greets you as you sit down. "I figure we can get a head-start on Yenotin''s lesson while we talk," he says, moving the textbook towards you so the both of you can look at it. While you work, Artem keeps up a lively conversation, talking about a range of different topics.'
+			'"There you are <<$pcs_nickname>>. How''s it going?" Artem greets you as you sit down. "I figure we can get a head-start on Yenotin''s lesson while we talk." he says, moving the textbook towards you so the both of you can look at it. While you work, Artem keeps up a lively conversation, talking about a range of different topics.'
 		else
-			'"Hey, Artem, how''s it going?" You ask, taking a seat at a desk across from him. His desk is covered with worksheets and a stack of textbooks.'
+			'"Hey, Artem, how''s it going?" you ask, taking a seat at a desk across from him. His desk is covered with worksheets and a stack of textbooks.'
 			*nl
-			'"Oh hey, <<$pcs_nickname>>. I''m just putting together a study guide," he tells you with a smile. He hasn''t bothered to stop writing in his notebook since you started talking. As you watch him work, you realize that he''s writing quite a lot, more than needed for one person.'
+			'"Oh hey <<$pcs_nickname>>. I''m just putting together a study guide." he tells you with a smile. He hasn''t bothered to stop writing in his notebook since you started talking. As you watch him work, you realize that he''s writing quite a lot, more than is needed for one person.'
 			*nl
-			'"Who are you writing all that for?" You ask.'
+			'"Who are you writing all that for?" you ask.'
 			'"Well, I tutor a lot of the jocks, so it''s mostly for them, but I also help some of the popular kids."'
 			*nl
-			'"You mean actually tutoring them or just doing their work for them?" You ask suspiciously with a raised brow.'
+			'"You mean actually tutoring them or just doing their work for them?" you ask suspiciously with a raised brow.'
 			*nl
 			'Artem chuckles sheepishly, obviously a bit flustered by the question. "The jocks aren''t too bad and the popular kids… well, they need all the help they can get, and… and I''m happy to help if I can," he says before quickly changing the subject. You decide not to insist and keep him company while he works.'
 		end
@@ -33,13 +33,13 @@ if $ARGS[0] = 'artem':
 		if grupTipe = 3:
 			'You try to chat up Artem, but he doesn''t seem all that interested in the conversation. His answers are short and he doesn''t even bother to stop writing in his notebook as you talk.'
 		else
-			'"Sorry, <<$Pcs_nickname>>, but why are you talking to me? We''re not exactly friends, y''know…." Artem asks weakly. He''s careful not to offend you, but it''s clear he''s hesitant to talk to you.'
+			'"Sorry <<$pcs_nickname>>, but why are you talking to me? We''re not exactly friends you know…." Artem asks weakly. He''s careful not to offend you, but it''s clear he''s hesitant to talk to you.'
 		end
 	elseif pav_slut >= 200:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut." he says as he moves away from you.'
 	else
 		npc_rel['A2'] += 1
-		'You strike up a conversation with Artem, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Artem. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -64,28 +64,25 @@ if $ARGS[0] = 'petka':
 	menu_off = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big6.jpg"></center>'
-	if artQW = 5 and arthakQW ! 11:
-		npc_rel['A6'] += 1
-		'A devious smile spreads across his face as he closes his book and sets it aside. You try your best to keep the conversation lighthearted, but Petka is determined to let you know how much he''s enjoying his after school "lessons" and how he can''t wait for the next one.'
-	elseif npc_rel['A6'] >= 50 and pav_slut < 200:
+	if npc_rel['A6'] >= 50 and pav_slut < 200:
 		npc_rel['A6'] += 1
 		if grupTipe = 3:
-			'"You really have to read this book, <<$pcs_nickname>>! I''m pretty sure it''s one you''d enjoy." Petka says excitedly. He starts to tell you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you."'
+			'"You really have to read this book <<$pcs_nickname>>! I''m pretty sure it''s one you''d enjoy." Petka says excitedly. He starts to tell you about an interesting part he just read, but stops himself with a laugh. "Don''t worry, I won''t spoil it for you."'
 		else
-			'"Oh, hey, <<$Pcs_nickname>>. Did you say something? I don''t think I heard you." He smiles sheepishly as he puts his book down. "This book is crazy interesting." He tells you, and before you know it he''s going on and on about all the interesting characters, plot holes and themes in the book.'
+			'"Oh hey <<$pcs_nickname>>. Did you say something? I don''t think I heard you." He smiles sheepishly as he puts his book down. "This book is crazy interesting." He tells you, and before you know it he''s going on and on about all the interesting characters, plot holes and themes in the book.'
 		end
 	elseif npc_rel['A6'] <= 20 and pav_slut < 200:
 		npc_rel['A6'] += 1
 		if grupTipe = 3:
 			'"Can we talk later? I really want to finish this chapter before class starts." Petka says, only briefly looking up from his book to address you before burying his nose right back into it.'
 		else
-			'You try talking to Petka, bit it''s a very one-sided with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
+			'You try talking to Petka, but it''s very one-sided with you doing all of the talking until he finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 200:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut." he says as he moves away from you.'
 	else
 		npc_rel['A6'] += 1
-		'You strike up a conversation with Petka, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Petka. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -98,22 +95,22 @@ if $ARGS[0] = 'julia':
 	if npc_rel['A12'] >= 50 and pav_slut < 200:
 		npc_rel['A12'] += 1
 		if grupTipe = 3:
-			'Usually Julia is quiet and lets others do most of the talking, but with you, she participates more in the conversation.'
+			'Usually, Julia is quiet and lets others do most of the talking, but with you, she participates more in the conversation.'
 		else
-			'Julia is sitting alone, diligently working on her homework, when you sit down and start talking with her. She''s a quiet, soft spoken girl, so you end up doing most of the talking, but you can tell she''s enjoying herself.'
+			'Julia is sitting alone, diligently working on her homework when you sit down and start talking with her. She''s a quiet, soft spoken girl, so you end up doing most of the talking, but you can tell she''s enjoying herself.'
 		end
 	elseif npc_rel['A12'] <= 20 and pav_slut < 200:
 		npc_rel['A12'] += 1
 		if grupTipe = 3:
 			'You try to talk to Julia, but the conversation becomes completely one-sided, with you doing all the talking while Julia busies herself with schoolwork.'
 		else
-			'You try talking to Julia, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
+			'You try talking to Julia, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." she says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 200:
-		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
+		'When she see''s you walking over, she gives you a disgusted look. "Get away from me you disgusting slut." she says as she moves away from you.'
 	else
 		npc_rel['A12'] += 1
-		'You strike up a conversation with Julia, she seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Julia. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -124,9 +121,9 @@ if $ARGS[0] = 'julia':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big12.jpg"></center>'
 		if pav_slut >= 200:
-			'You approach Julia and explain how you''re struggling in school and could really use his help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway. As long as you don''t tell anyone.'
+			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She makes some comments about your lousy reputation in school, but at the same time doesn''t seem to care too much about it and agrees to help you anyway, so long as you don''t tell anyone.'
 		else
-			'You approach Julia and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			'You approach Julia and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 		end
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
@@ -141,22 +138,22 @@ if $ARGS[0] = 'natasha':
 	if npc_rel['A16'] >= 50 and pav_slut < 200:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
-			'"Hey, have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this, and it ends up bringing her down, but you quickly change the subject and start complimenting her on her sense of style and grades, reminding her she''s a top student in school which brings a smile to her face.'
+			'"Hey <<$pcs_nickname>>! Have you seen this new makeup line coming out? It''s expensive but I looove the colors!" Natasha says as she holds up the magazine ad for said makeup. She talks about how she can''t afford nice things like this and this ends up bringing her down. You quickly change the subject and start complimenting her on her sense of style and grades and reminding her she''s a top student in school, which brings a smile to her face.'
 		else
 			'Natasha greets you with a smile as you sit down beside her. The conversation is lighthearted as you talk about your day so far and what goes on in the apartment complex where you both live.'
 		end
 	elseif npc_rel['A16'] <= 20 and pav_slut < 200:
 		npc_rel['A16'] += 1
 		if grupTipe = 3:
-			'Natasha isn''t really interested in talking to you, but you persit trying to keep up a conversation. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" She says halfheartedly.'
+			'Natasha isn''t really interested in talking to you, but you persist in trying to keep up a conversation. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" she says halfheartedly.'
 		else
 			'"Why are you even talking to me? It''s not like we''re in the same social circle or something." Natasha says with a suspicious look. "So, if you could just…" She drags the last part out, expecting you to catch her drift and leave.'
 		end
 	elseif pav_slut >= 200:
-		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
+		'When she sees you walking over, she gives you a disgusted look. "Get away from me you disgusting slut." she says as she moves away from you.'
 	else
 		npc_rel['A16'] += 1
-		'You strike up a conversation with Natasha, she seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Natasha. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -168,7 +165,7 @@ if $ARGS[0] = 'natasha':
 			NatbelQW['QWstage'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big16.jpg"></center>'	
-			'You approach Natasha and explain how you''re struggling in school and could really use his help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
+			'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] > 0:
@@ -178,9 +175,9 @@ if $ARGS[0] = 'natasha':
 			gs 'stat'
 			'<center><b><font color="maroon">Girls Bathroom</font></b></center>'
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsbathroom.jpg"></center>'
-			'You grab Natasha by the hand and pull her along with you as you tell her. "Come to the bathroom with me."'
-			'She looks at you questioningly but doesn''t protest, as you pull her into the bathroom, past a few girls using the mirrors. You take her into a stall with you. You sit down on the toilet and pull down your panties, then spread you legs and tell her. "Down on your knees, time to pay off a little debt."'
-			'She looks a little shocked at first but then gets down on her knees and lowers her face to your crotch.'
+			'You grab Natasha by the hand and pull her along with you as you tell her "Come to the bathroom with me."'
+			'She looks at you questioningly, but doesn''t protest as you pull her into the bathroom and past a few girls using the mirrors. You take her into a stall with you. You sit down on the toilet and pull down your panties, then spread your legs and tell her "Down on your knees. Time to pay off a little debt."'
+			'She looks a little shocked at first, but then gets down on her knees and lowers her face to your crotch.'
 			act 'Continue':
 !!ToDo: Expand this content (nutluck)
 				*clr & cla
@@ -189,10 +186,10 @@ if $ARGS[0] = 'natasha':
 				NatbelQW['lesbian'] += 1
 				$orgasm_or = 'yes'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/natasha/sex/school/natschoolowe.jpg"></center>'
-				'Her tongue starts to lick your clit, you bite your lip to try and keep from moaning too loudly. You lean back and relax, as you let Natasha pleasure you with her tongue. She is getting a lot better at this and if your not mistaken she is starting to like it a lot.'
-				'She starts using her fingers on you as well and is really getting into it, you start to pant and moan. Clamping a hand over your own mouth to keep yourself from crying out, it doesn''t take her long to bring you to a climax.'
+				'Her tongue starts to lick your clit. You bite your lip to try and keep from moaning too loudly. You lean back and relax as you let Natasha pleasure you with her tongue. She is getting a lot better at this and if you''re not mistaken, she is starting to like it a lot.'
+				'She starts using her fingers on you as well and is really getting into it as you start to pant and moan. Clamping a hand over your mouth to keep yourself from crying out, it doesn''t take her long to bring you to a climax.'
 				gs 'arousal', 'cuni', 10, 'lesbian', 'dom'
-				'Your whole body shudders as the orgasm rocks your body, you grind your pussy against her face as it does. Once the sensation passes you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long slow passionate kiss, tasting your own pussy juices on her lips. A few moments later the bell rings and you both merrily hurry to class.'
+				'Your whole body shudders as the orgasm rocks your body and you grind your pussy against her face as it does. Once the sensation passes, you look down and see Natasha smiling up at you, obviously pleased with herself. You lean down and give her a long slow passionate kiss, tasting your own pussy juices on her lips. A few moments later, the bell rings and you both merrily hurry to class.'
 				gs 'stat'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
@@ -210,20 +207,20 @@ if $ARGS[0] = 'evgeny':
 		if grupTipe = 3:
 			'"In chess, you should be as cool as a cucumber." Evgeny says without you asking his opinion on the matter. You can''t help but laugh a bit, but go along with it nonetheless as you watch him play chess against himself.'
 		else
-			'"Oh, hello." Evgeny says with a curt nod towards you. He doesn''t even bother to look up from his chessboard, but you don''t take it as an insult. He''s always been socially awkward, some going as far as to say he''s autistic, so you don''t take offense, and instead sit down across from him and make small talk while he plays against himself.'
+			'"Oh, hello." Evgeny says with a curt nod towards you. He doesn''t even bother to look up from his chessboard, but you don''t take it as an insult. He''s always been socially awkward, some going as far as to say he''s autistic, so you don''t take offense and instead sit down across from him and make small talk while he plays against himself.'
 		end
 	elseif npc_rel['A151'] <= 20 and pav_slut < 200:
 		npc_rel['A151'] += 1
 		if grupTipe = 3:
-			'You try talking to Evgeny, but it''s a very one-sided with you doing all of the talking until he finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
+			'You try talking to Evgeny, but it''s very one-sided with you doing all of the talking until he finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." he says quietly. "Anyways, I''ve got to finish this game, so if you don''t mind…"'
 		else
 			'"I really don''t want to talk right now." Evgeny says abruptly. You''re a bit shocked at how straightforward he is, but he refuses to look up from his chessboard, leaving you with no other option but to walk away.'
 		end
 	elseif pav_slut >= 200:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut." he says as he moves away from you.'
 	else
 		npc_rel['A151'] += 1
-		'You strike up a conversation with Evgeny, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Evgeny. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -236,22 +233,22 @@ if $ARGS[0] = 'feofan':
 	if npc_rel['A152'] >= 50 and pav_slut < 250:
 		npc_rel['A152'] += 1
 		if grupTipe = 3:
-			'"I can''t believe this…" Feofan says as you approach. "Someone on this sci-fi forum said that Alien vs. Predator cross-over crap is the best in the series. Anyone with half a braincell knows the first two and last two movies are the only good ones!" He pauses for a second as he finishes reading what''s on his phone screen. "I can''t read anymore of this blasphemy." He finishes with a heavy sigh.'
+			'"I can''t believe this…" Feofan says as you approach. "Someone on this sci-fi forum said that Alien vs. Predator cross-over crap is the best in the series. Anyone with half a braincell knows the first two and last two movies are the only good ones!" He pauses for a second as he finishes reading what''s on his phone screen. "I can''t read anymore of this blasphemy." he finishes with a heavy sigh.'
 		else
-			'Feofan is busy on his phone when you approach, but when he sees you he flashes you a quick smile. "There''s this little Star Trek convention going on, but it''s out of town. Wish I could go." He''s clearly saddened by this, but gives a dismissive shrug of his shoulders before going on to talk about other conventions he has gone to..'
+			'Feofan is busy on his phone when you approach, but when he sees you he flashes you a quick smile. "There''s this little Star Trek convention going on, but it''s out of town. I wish I could go." He''s clearly saddened by this, but gives a dismissive shrug of his shoulders before going on to talk about other conventions he has gone to.'
 		end
 	elseif npc_rel['A152'] <= 20 and pav_slut < 250:
 		npc_rel['A152'] += 1
 		if grupTipe = 3:
-			'Feofan isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" He says halfheartedly with an awkward laugh.'
+			'Feofan isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" he says halfheartedly with an awkward laugh.'
 		else
-			'"Sorry if this sounds rude, but why are you talking to me, of all people? It''s not like we''re in the same social circle or something." Feofan says with a suspicious look. "Listen… I''m just kinda busy at the moment, so…" He remains polite and tries to stay lighthearted, but he obviously doesn''t want to talk.'
+			'"Sorry if this sounds rude, but why are you talking to me of all people? It''s not like we''re in the same social circle or something." Feofan says with a suspicious look. "Listen… I''m just kinda busy at the moment, so…" He remains polite and tries to stay lighthearted, but he obviously doesn''t want to talk.'
 		end
 	elseif pav_slut >= 250:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut." he says as he moves away from you.'
 	else
 		npc_rel['A152'] += 1
-		'You strike up a conversation with Feofan, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Feofan. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -264,22 +261,22 @@ if $ARGS[0] = 'gerasim':
 	if npc_rel['A153'] >= 50 and pav_slut < 200:
 		npc_rel['A153'] += 1
 		if grupTipe = 3:
-			'You greet Gerasim with a smile, and make a point to ask him how his day is going, subtly hinting to the fact that you know other students like to make him do their school work. With a shy smile, Gerasim shrugs his shoulders. "I''m fine." He says, his smile growing. "Thanks for worrying about me, <<$pcs_nickname>>."'
+			'You greet Gerasim with a smile and make a point to ask him how his day is going, subtly hinting to the fact that you know other students like to make him do their school work. With a shy smile, Gerasim shrugs his shoulders. "I''m fine." he says, his smile growing. "Thanks for worrying about me though <<$pcs_nickname>>."'
 		else
-			'"Oh, hello, <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously, and you realize he''s doing someone else''s homework. "Yeah, I''m a little busy, but I wouldn''t mind the company while I work." He adds with a small laugh.'
+			'"Oh hello <<$pcs_nickname>>." Gerasim says with a sheepish smile. You watch him move the papers on his desk around nervously and you realize he''s doing someone else''s homework. "Yeah, I''m a little busy, but I wouldn''t mind the company while I work." he adds with a small laugh.'
 		end
 	elseif npc_rel['A153'] <= 20 and pav_slut < 200:
 		npc_rel['A153'] += 1
 		if grupTipe = 3:
-			'Gerasim isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" He says halfheartedly with an awkward laugh.'
+			'Gerasim isn''t really interested in talking to you, but you insist and try to keep up a conversation until he finally stops you. "Hey, I''ve gotta go… do this thing. I guess I''ll see you later?" he says halfheartedly with an awkward laugh.'
 		else
-			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." He says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
+			'You try talking to Gerasim, but it''s a very one-sided conversation with you doing all of the talking until they finally speak up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." he says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 200:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut." he says as he moves away from you.'
 	else
 		npc_rel['A153'] += 1
-		'You strike up a conversation with Gerasim, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Gerasim. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -292,22 +289,22 @@ if $ARGS[0] = 'zinaida':
 	if npc_rel['A142'] >= 50 and pav_slut < 200:
 		npc_rel['A142'] += 1
 		if grupTipe = 3:
-			'"Hey, look at this, I got into the top ten with my last score." With a small smile, Zinaida shows you the screen of her phone, and sure enough she''s number five on the leader board. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it.'
+			'"Hey, look at this. I got into the top ten with my last score." With a small smile, Zinaida shows you the screen of her phone, and sure enough she''s number five on the leaderboard. You congratulate her, which causes her cheeks to flush slightly as she tries to downplay it.'
 		else
-			'"Hey, <<$pcs_nickname>>." Zinaida says with a small smile. "Come to watch me beat some noobs?" She says as she lowers her phone so you can watch her as she plays.'
+			'"Hey <<$pcs_nickname>>." Zinaida says with a small smile. "Come to watch me beat some noobs?" she says as she lowers her phone so you can watch her as she plays.'
 		end
 	elseif npc_rel['A142'] <= 20 and pav_slut < 200:
 		npc_rel['A142'] += 1
 		if grupTipe = 3:
-			'She is playing some game on her phone. "I''d like to talk… but I''m busy trying to beat this level. It''s… hard." Zinaida says quietly, looking up at you through her messy hair that hang down onto her face.'
+			'She is playing some game on her phone. "I''d like to talk… but I''m busy trying to beat this level. It''s… hard." Zinaida says quietly, looking up at you through her messy hair that hangs down onto her face.'
 		else
-			'You try talking to Zinaida, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to finish this worksheet for class, so if you don''t mind…"'
+			'You try talking to Zinaida, but it''s a very one-sided conversation with you doing all of the talking until she finally speaks up. "I don''t want to sound rude but… we''re not really friends so I''m not sure why you''d want to talk to me." She says quietly. "Anyways, I''ve got to beat this level before class, so if you don''t mind…"'
 		end
 	elseif pav_slut >= 200:
-		'When she see''s you walking over she gives you a disgusted look. "Get away from me you disgusting slut." With that she moves away from you.'
+		'When she sees you walking over she gives you a disgusted look. "Get away from me you disgusting slut." she says as she moves away from you.'
 	else
 		npc_rel['A142'] += 1
-		'You strike up a conversation with Zinaida, she seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Zinaida. She seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -322,32 +319,32 @@ if $ARGS[0] = 'natalia':
 	if VKAftermathEvent > 0 and VKNatFollowup = 0:
 		npc_rel['A240'] += 1
 		VKNatFollowup = 1
-		'You sit down next to Natalia and she quickly turns to you with a warm smile as she says, "<<$pcs_nickname>> It''s so great to see you! I hope that you are feeling better. You have been through so much." You give her a forced smile as you reply, "I''m fine Nat. Thank you for caring." Natalia smile turns to a frown as she responds, "You''re still having the nightmares aren''t you? I am looking for a way to help you with those. I plan on asking my mother for something. She used to get a lot of nightmares when she was young so she may know of some good ways to get rid of them." You place you hand on her shoulder then say, "Don''t worry about me Nat. I''ll be fine." Nat places her and on yours then nods before you get up then head back to class.'
+		'You sit down next to Natalia and she quickly turns to you with a warm smile as she says "<<$pcs_nickname>>! It''s so great to see you! I hope that you are feeling better. You have been through so much." You give her a forced smile as you reply. "I''m fine Nat. Thank you for caring." Natalia''s smile turns to a frown as she responds. "You''re still having the nightmares aren''t you? I am looking for a way to help you with those. I plan on asking my mother for something. She used to get a lot of nightmares when she was young, so she may know of some good ways to get rid of them." You place your hand on her shoulder then say "Don''t worry about me Nat. I''ll be fine." Nat places her hand on yours, then nods before you get up and head back to class.'
 	elseif NikoEv >= 17 and VKNatFollowup = 1:
 		npc_rel['A240'] += 1
 		VKNatFollowup = 2
-		'You approach Natalia and her eyes immediately light up as she says, "Hey <<$pcs_nickname>>! It''s always good to see you. I hope things have been going better with Niko." You give her an approving nod before she says, "Well if you ever need to talk about anything then please stop by. I always look forward to chatting with you." You then rub on Natalia''s shoulder as gives you a warm smile before you get up, to go to your next class.'
+		'You approach Natalia and her eyes immediately light up as she says "Hey <<$pcs_nickname>>! It''s always good to see you. I hope things have been going better with Niko." You give her an approving nod before she says "Well if you ever need to talk about anything then please stop by. I always look forward to chatting with you." You then rub on Natalia''s shoulder as she gives you a warm smile before you get up to go to your next class.'
 	elseif npc_rel['A240'] >= 50 and pav_slut < 200:
 		npc_rel['A240'] += 1
 		VK = rand(1,5)
 		if VK = 1:
-			'You see Natalia drawing something in her notebook but she quickly closes it when she sees you then says, "Hey <<$pcs_nickname>>, how are you doing today?" You reply, "I doing great today, I just stopped by to chat with you. Do you have some time to chat?" She happily nods as she says, "For you? Of course!" You and Natalia spend the next few minutes chatting about your interests.'
+			'You see Natalia drawing something in her notebook, but she quickly closes it when she sees you and says "Hey <<$pcs_nickname>>, how are you doing today?" You reply. "I doing great today. I just stopped by to chat with you. Do you have some time?" She happily nods as she says "For you? Of course!" You and Natalia spend the next few minutes chatting about your interests.'
 		elseif VK = 2:
-			'Natalia sits quietly staring at the other students chatting, looking very lonely. You approach her and wave. Natalia''s eyes immediately light up as she says, "Hey <<$pcs_nickname>> it''s so great to see you. Would you like to chat for awhile?" You nod then replay, "Of course I would." You both spend the next few minutes, swapping stories while laughing and joking.'
+			'Natalia sits quietly staring at the other students chatting, looking very lonely. You approach her and wave. Natalia''s eyes immediately light up as she says "Hey <<$pcs_nickname>> it''s so great to see you. Would you like to chat for a while?" You nod and reply."Of course I would." You both spend the next few minutes swapping stories while laughing and joking.'
 		elseif VK = 3:
-			'You see Natalia chatting with Zinaida, "Come on Natalia,  you have to download this game. It is free to play. There is no reason to not try it out." Natalia replies, "I just don''t really have time to download it. I..." Zin quickly responds, "Well you have time right now. I''m trying to get you into this game so that I can help you power level. All you need to do is..." Sensing that Nat is uncomfortable with the conversation, you approach Natalia then say, "Hey Nat the guidance counselor want to see you about something. You shouldn''t keep her waiting." Natalia gives you a approving nod then says, "Okay I better go. See you Zin and you <<$pcs_firstname>>. Bye" She leaves as Zin hollers, "But we were....Fine." She then turns around and returns to her game.'
+			'You see Natalia chatting with Zinaida. "Come on Natalia, you have to download this game. It is free to play. There is no reason to not try it out." Natalia replies. "I just don''t really have time to download it. I..." Zin quickly responds, "Well you have time right now. I''m trying to get you into this game so that I can help you power level. All you need to do is..." Sensing that Nat is uncomfortable with the conversation, you approach Natalia and say "Hey Nat, the guidance counselor wants to see you about something. You shouldn''t keep her waiting." Natalia gives you an approving nod then says "Okay I better go. See you Zin..and you too <<$pcs_firstname>>. Bye" She leaves as Zin hollers "But we were....Fine." She then turns around and returns to her game.'
 		elseif VK = 4:
-			'As you approach Natalia, she closes her notebook then waves at you. "Hey <<$pcs_nickname>>, come and have a seat." You sit down next to Natalia then discuss current events while occasionally gossiping about your classmates.'
+			'As you approach Natalia, she closes her notebook and waves at you. "Hey <<$pcs_nickname>>, come and have a seat." You sit down next to Natalia and discuss current events while occasionally gossiping about your classmates.'
 		else		
-			'You can see Natalia tidying up her back when you sit down next to her. She immediately pauses what she is doing then turns to you with an instant smile on her face as she says, "Oh hey <<$pcs_nickname>>, I didn''t notice you there. I''m sorry." You place your hand on her shoulder then reply, "Relax there is nothing to be sorry for. How have you been?" Natalia nods as you both spent the next few minute chatting about various topics.'
+			'You can see Natalia tidying up her back when you sit down next to her. She immediately pauses what she is doing then turns to you with an instant smile on her face as she says "Oh hey <<$pcs_nickname>>, I didn''t notice you there. I''m sorry." You place your hand on her shoulder and reply "Relax there is nothing to be sorry for. How have you been?" Natalia nods as you both spent the next few minute chatting about various topics.'
 		end
 	elseif npc_rel['A240'] <= 20 and pav_slut < 200:
-		'You s Natalia and as soon as she notices you, she quickly packs her stuff then begins walking away. She doesn''t seem to like you and has no intention of changing that.'
+		'You see Natalia and as soon as she notices you, she quickly packs her stuff then begins walking away. She doesn''t seem to like you and has no intention of changing that.'
 	elseif pav_slut >= 200 and VKAftermathEvent = 0:
-		'As you approach Natalia she takes one look at you then packs up her things before quickly walking away from you. She obviously does not want to be seen with you.'
+		'As you approach Natalia, she takes one look at you then packs up her things before quickly walking away. She obviously does not want to be seen with you.'
 	else
 		npc_rel['A240'] += 1
-		'You approach Natalia then sit down next to her as she quietly looks up at you. She says nothing as you begin discussing current events. Natalia listens and occasionally adds into the conversation.'
+		'You approach Natalia and sit down next to her as she quietly looks at you. She says nothing as you begin discussing current events. Natalia listens and occasionally adds into the conversation.'
 	end
 
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -360,12 +357,12 @@ if $ARGS[0] = 'petia':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
 
 	if hotcat >= 6:
-		'As you enter the classroom you are immediately swarmed by Petia. He gets really close to you, invading your personal space without a care, and a raunchy smell hits your nostrils. "Hey, <<$pcs_nickname>>, I think you''re good-looking enough to date me. So how about it? Wanna date?" he inquires.'
+		'As you enter the classroom you are immediately swarmed by Petia. He gets really close to you, invading your personal space without a care as a raunchy smell hits your nostrils. "Hey <<$pcs_nickname>>, I think you''re good-looking enough to date me. So how about it? Wanna date?" he inquires.'
 		act 'Let him down gently':
 			*clr & cla
 			npc_rel['A159'] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Taking a step back from him, you feel relieved having escaped his foul smell. "I didn''t say anything like that..." You protest, trying to sound as clear as possible without hurting his feelings. Hoping he gets the point, you stop talking and focus your attention elsewhere but to your dismay he keeps hitting on you. Letting out a sigh, you push him away. While you''re walking away, you hear him pestering another poor girl.'
+			'Taking a step back from him, you feel relieved having escaped his foul smell. "I didn''t say anything like that..." you protest, trying to sound as clear as possible without hurting his feelings. Hoping he gets the point, you stop talking and focus your attention elsewhere but to your dismay he keeps hitting on you. Letting out a sigh, you push him away. While you''re walking away, you hear him pestering another poor girl.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him off':
@@ -375,22 +372,22 @@ if $ARGS[0] = 'petia':
 			grupvalue[2] += 1
 			grupvalue[4] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Taking a step back from him, you feel relieved having escaped his foul smell. "Like I would ever be caught dating with someone like you. Even if we were the last living people on earth I still wouldn''t even consider it! Don''t ever ask me something like that again, got it?!" After you''re done telling him off you''re sure that he''s going to leave you alone but to your disappointment he only smiles and starts hitting on you again. By now you''re tired of him and shove him away. As you''re walking away you hear him pestering another girl.'
+			'Taking a step back from him, you feel relieved having escaped his foul smell. "Like I would ever be caught dating someone like you! If we were the last living people on Earth, I would rather let us go extinct than be near you! Don''t ever ask me something like that again, got it?!" After you''re done telling him off you''re sure that he''s going to leave you alone, but to your disappointment he only smiles and starts hitting on you again. By now you''re tired of him and shove him away. As you''re walking away, you hear him pestering another girl.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A159'] >= 50 and pav_slut < 250:
 		if grupTipe = 5:
-			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "The others are being rude towards me. They don''t want to help me out and I''m getting really hungry."'
+			'You notice Petia desperately walking up and down the classroom trying to mooch some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "The others are being rude. They don''t want to help me out and I''m getting really hungry."'
 		else
-			'Walking into the classroom you notice the class mooch, Petia, pestering Feofan to give him some money so he can buy some food in the cafeteria. When Petia sees you, he turns toward you and begins to tell you that he had this great plan on how he would buy something from the cafeteria then turn around and sell it for a profit but he''s missing the funds to do it.'
+			'Walking into the classroom you notice the class mooch, Petia, pestering Feofan to give him some money so he can buy some food in the cafeteria. When Petia sees you, he turns toward you and begins to tell you that he had this great plan on how he would buy something from the cafeteria then turn around and sell it for a profit, but he''s missing the funds to do it.'
 			*nl
-			'Taking pity on him you attentively listen but you''re staying out of it as you don''t want to get involved. Taking your silence as encouragement he turns engages you in a lengthy discussion about all the things he would like to have.'
+			'Taking pity on him, you attentively listen but you''re staying out of it as you don''t want to get involved. Taking your silence as encouragement, he engages you in a lengthy discussion about all the things he would like to have.'
 		end
 		act 'Give him advice':
 			*clr & cla
 			npc_rel['A159'] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Feeling sorry for him you listen and give him some advice on how to approach the others. He listens carefully, gives you a nod and then quickly turns around and starts talking to the other students once again.'
+			'Feeling sorry for him, you listen and give him some advice on how to approach the others. He listens carefully, gives you a nod and then quickly turns around and starts talking to the other students once again.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Give him money (50 <b>₽</b>)':
@@ -398,8 +395,8 @@ if $ARGS[0] = 'petia':
 			npc_rel['A159'] += 2
 			money -= 50
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Feeling sorry and you do have the spare money. "Here Petia, go get yourself some lunch."'
-			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours to long for comfort. "Thank you <<$pcs_nickname>>, you are the best!" He says with a grin and, is that love in his eyes? After another awkward moment he leaves to go buy some food.'
+			'You do have spare money and feel sorry for him. "Here Petia, go get yourself some lunch."'
+			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours way too long for comfort. "Thank you <<$pcs_nickname>>, you are the best!" he says with a grin and, is that love in his eyes? After another awkward moment, he leaves to go buy some food.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him to stop being such a mooch':
@@ -409,22 +406,22 @@ if $ARGS[0] = 'petia':
 			grupvalue[2] += 1
 			grupvalue[4] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Getting tired of him always trying to mooch off you and everyone else you tell him. "Stop being such a mooch all the time and try taking care of yourself for once."'
-			'His eyes water up a little. "I thought we were friends... I''m...." then he walks off with his head hung low.'
+			'Getting tired of him always trying to mooch off you and everyone else, you tell him "Stop being such a mooch all the time and try taking care of yourself for once."'
+			'His eyes water up a little. "I thought we were friends... I''m...." He walks off with his head hung low.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A159'] <= 20 and pav_slut < 250:
 		npc_rel['A159'] += 1
 		if grupTipe = 5:
-			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<$pcs_nickname>>, do you have any money? I''m getting really hungry. The rest just bully me when I ask them." He says in a pleading voice.'
+			'You notice Petia desperately walking up and down the classroom, trying to mooch some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<$pcs_nickname>>, do you have any money? I''m getting really hungry. The rest just bully me when I ask them." he says in a pleading voice.'
 		else
-			'You notice Petia desperately walking up and down the classroom trying to mooch off some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<$pcs_nickname>>, do you have any money? I''m getting really hungry."'
+			'You notice Petia desperately walking up and down the classroom, trying to mooch some stuff from the other students in the classroom. When he sees you, he breaks out into a smile and quickly starts walking towards you. "Hey <<$pcs_nickname>>, do you have any money? I''m getting really hungry."'
 		end
 		act 'Tell him you don''t':
 			*clr & cla
 			npc_rel['A159'] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'You shake your head no and tell him you don''t and ask him why he doesn''t bring a lunch. Which causes him to launch into a lengthy discussion about the benefits of a hot lunch, which leads to having a not so horrible conversation with him.'
+			'You shake your head, tell him you don''t and ask him why he doesn''t bring a lunch. This causes him to launch into a lengthy discussion about the benefits of a hot lunch, which leads to having a not so horrible conversation with him.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Give him money (50 <b>₽</b>)':
@@ -432,8 +429,8 @@ if $ARGS[0] = 'petia':
 			npc_rel['A159'] += 2
 			money -= 50
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Feeling sorry and you do have the spare money. "Here Petia, go get yourself some lunch."'
-			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours to long for comfort. "Thank you <<$pcs_nickname>>, you''re the best!" He says with a grin and, is that love in his eyes? After another awkward moment he leaves to go buy lunch.'
+			'You have the spare money and feel sorry for him. "Here Petia, go get yourself some lunch."'
+			'His eyes get huge and he takes the money from your hand, letting his hand linger against yours way too long for comfort. "Thank you <<$pcs_nickname>>, you''re the best!" he says with a grin and, is that love in his eyes? After another awkward moment, he leaves to go buy lunch.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'Tell him to stop being such a mooch':
@@ -443,16 +440,16 @@ if $ARGS[0] = 'petia':
 			grupvalue[2] += 1
 			grupvalue[4] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big159.jpg"></center>'
-			'Getting tired of him always trying to mooch off you and everyone else you tell him. "Stop being such a mooch all the time and take care of yourself for once."'
-			'His eyes water up a little. "I thought we were friends... I''m...." then he walks off with his head hung low.'
+			'Getting tired of him always trying to mooch off you and everyone else, you tell him "Stop being such a mooch all the time and take care of yourself for once."'
+			'His eyes water up a little. "I thought we were friends... I''m...." He walks off with his head hung low.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif pav_slut >= 250:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut." With that he moves away from you. But stops a moment later, then turns back looking around a bit. Then he steps back and says. "Unless you want to give me a blowjob that is." He asks hopeful, but even you have standards and walk off instead.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut." He moves away from you, but stops, turns around and walks back. "Unless you want to give me a blowjob that is?" he asks hopefully, but even you have standards and walk off instead.'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	else
 		npc_rel['A159'] += 1
-		'You strike up a conversation with Petia, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Petia. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 		act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	end
 end
@@ -463,36 +460,36 @@ if $ARGS[0] = 'lesco':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big7.jpg"></center>'
 	if rand(0,5) = 0:
-		'You see Lesco talking to Lera and unsurprisingly things look tense. Knowing how volatile the gopnik can be, you approach them carefully. They greet you back and Lesco is the first to speak up, "Lera and I were talking about her needing to take care some of her chores at home, but she doesn''t want to listen..."'
-		'An annoyed Lera is quick to snap back. "Why are you telling your little girlfriend my business? Trying to show off? Try that shit again and I''ll tell her all your dirty little secrets."'
-		'Hearing this you start to wonder what kind of secrets someone like Lesco is hiding but decide to keep quiet as you don''t really want to get involved. They continue on bickering for a while before you decide that it''s time to leave them alone.'
+		'You see Lesco talking to Lera and, unsurprisingly, things look tense. Knowing how volatile the gopnik can be, you approach them carefully. They greet you and Lesco is the first to speak up. "Lera and I were talking about her needing to take care some of her chores at home, but she doesn''t want to listen..."'
+		'An annoyed Lera is quick to snap back. "Why are you telling your little girlfriend my business? Trying to show off? Try that shit again and I''ll tell her all your dirty..little..secrets." she says while prodding him on the chest.'
+		'Hearing this, you start to wonder what kind of secrets someone like Lesco is hiding but decide to keep quiet as you don''t really want to get involved. They continue bickering for a while before you decide that it''s time to leave them alone.'
 	elseif npc_rel['A7'] >= 50 and pav_slut < 200:
 		npc_rel['A7'] += 1
 		if grupTipe = 5:
-			'You see Lesco sitting by himself just like usual, except when you sit with him. As you approach him with a friendly smile, he looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?"'
+			'You see Lesco sitting by himself as usual, except when you sit with him. As you approach him with a friendly smile, he looks up and gives you a friendly smile in return. "How''s it going <<$pcs_nickname>>?"'
 			*nl
-			'You tell him well enough and ask if he wants to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncle''s family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You tell him well enough and ask if he wants to hang out for a bit. You end up talking with him about living at the Tsarev residence and, as you suspected, how Lera makes his life a living hell at home. He still has a few funny stories to tell you about her, like how when they were younger and things weere better. He tells you how Lera found a dead bird and started poking it, but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		else
-			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he stiffens and shyly looks up towards you, "C-Can I help you with something?"'
+			'You see Lesco sitting by himself as usual. Feeling sad about him sitting alone all the time, you approach him with a friendly smile. When he sees you, he stiffens and shyly looks up towards you. "C-Can I help you with something?"'
 			*nl
-			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You shrug your shoulders, saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and, as you suspected, how Lera makes his life a living hell at home. He still has a few funny stories to tell you about her, like how when they were younger and things were better. He tells you how Lera found a dead bird and started poking it, but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
 	elseif npc_rel['A7'] <= 20 and pav_slut < 200:
 		npc_rel['A7'] += 1
 		if grupTipe = 5:
-			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he relaxes slightly and shyly looks up towards you, "What do you want?"'
+			'You see Lesco sitting by himself as usual. Feeling sad about him sitting alone all the time, you approach him with a friendly smile. When he sees you, he relaxes slightly and shyly looks up towards you. "What do you want?"'
 			*nl
-			'You shrug your shoulders saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You shrug your shoulders, saying you just wanted to hang out for a bit. You end up talking with him about living at the Tsarev residence and, as you suspected, how Lera makes his life a living hell at home. He still has a few funny stories to tell you about her, like how when they were younger and things were better. He tells you how Lera found a dead bird and started poking it, but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		else
-			'You see Lesco sitting by himself just like usual. Feeling sad about him sitting alone all the time you approach him with a friendly smile. When he sees you, he stiffens and looks up towards you with a apprehensive expression. "Please leave me alone."'
+			'You see Lesco sitting by himself as usual. Feeling sad about him sitting alone all the time, you approach him with a friendly smile. When he sees you, he stiffens and looks up towards you with a apprehensive expression. "Please leave me alone."'
 			*nl
-			'You shrug your shoulders saying you just wanted to hang out for a bit. He seems unsure a bit but as you talk, he relaxes a little and you end up talking with him about living at the Tsarev residence and as you suspected he makes his life a living hell at home, since he moved in with his uncles family. He still has a few funny stories to tell you about her, like how when they were younger and things where better for both families. He tells you how Lena found a dead bird and started poking it but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
+			'You shrug your shoulders, saying you just wanted to hang out for a bit. He seems unsure, but as you talk, he relaxes a little and you end up talking with him about living at the Tsarev residence and, as you suspected, how Lera makes his life a living hell at home. He still has a few funny stories to tell you about her, like how when they were younger and things were better. He tells you how Lera found a dead bird and started poking it, but it turned out to still be alive and ended up attacking her. Even after the bird had flew away, she continued to run and scream all the way back home.'
 		end
 	elseif pav_slut >= 200:
-		'When he see''s you walking over he gives you a disgusted look. "Get away from me you disgusting slut, I have enough problems with out being seen with the likes of you." With that he moves away from you.'
+		'When he sees you walking over, he gives you a disgusted look. "Get away from me you disgusting slut! I have enough problems without being seen with the likes of you." he says as he moves away from you.'
 	else
 		npc_rel['A7'] += 1
-		'You strike up a conversation with Lesco, he seems a bit hesitant at first but quickly engages you in some idle chatter about school.'
+		'You strike up a conversation with Lesco. He seems a bit hesitant at first, but quickly engages you in some idle chatter about school.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end

+ 212 - 212
locations/gschool_chats3.qsrc

@@ -8,13 +8,13 @@ if $ARGS[0] = 'vitek':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big9.jpg"></center>'
 	
 	if kotovLoveQW > 0 and pav_slut >= 200:
-		'Vitek scowled and tells you "Well <<$pcs_nickname>>, whats this garbage I hear about what you and <<$gnikname>> did? The whole town already knows, the guys have been telling me all about it. You fucking bitch! "'
+		'Vitek scowls and tells you "Well <<$pcs_nickname>>, what''s this garbage I hear about what you and <<$gnikname>> did? The whole town already knows, the guys have been telling me all about it. You fucking bitch!"'
 		act 'Accuse him of sleeping around':
 			*clr & cla
 			npc_rel[$static_num] = 0
 			kotovLoveQW = -1
 			gs 'stat'
-			'You started yelling at Vitek that he has fucked other girls. Vitek started yelling at you and suddenly, there is a ringing in your head, your vision is blurry. You find you''re on the floor, with Vitek standing over you. Your cheek burns with pain, it takes you a few moments to understand what happened, it seems he slapped you, so hard it knocked you off your feet. "Stay away from me you fucking whore, it''s over between us!"'
+			'You start yelling at Vitek that he has fucked other girls. Vitek starts yelling at you and suddenly, there is a ringing in your head and your vision goes blurry. You find you''re on the floor with Vitek standing over you. Your cheek burns with pain and it takes you a few moments to understand what happened. It seems he slapped you so hard it knocked you off your feet. "Stay away from me you fucking whore! It''s over between us!"'
 
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
@@ -27,7 +27,7 @@ if $ARGS[0] = 'vitek':
 				if pav_sex > 75: pav_sex = 75
 				if pav_prostitute > 75: pav_prostitute = 75
 				gs 'stat'
-				'It takes a bit but you convince Vitek that all this was just gossip and none of it was true. Vitek frowned, "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry, baby I will shut their yapping mouths."'
+				'It takes a bit, but you convince him that all this was just gossip and none of it was true. He frowns. "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry baby. I will shut their yapping mouths."'
 
 				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end
@@ -36,38 +36,38 @@ if $ARGS[0] = 'vitek':
 		end
 	elseif grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A9'] += 1
-		'You go over and sit on the stairs near Vitek. After you sit down, he turns to you, "What''s up, slut?" You grimance slightly, but what can you say, you pretty much are the gopnik''s party slut by choice.'
-		'"I just wanted to say hi and talk is all," you tell him.'
-		'He laughs. "Who knew your mouth was good for anything other than sucking cock." You put up with the comments and end up talking to him about a variety of things the group is up to. He only insults you ever so often but in an almost friendly way, atleast way friendlier than he treats anyone who isn''t a gopnik.'
+		'You go over and sit on the stairs near Vitek. After you sit down, he turns to you. "What''s up, slut?" You grimance slightly, but what can you say, you pretty much are the gopnik''s party slut by choice.'
+		'"I just wanted to say hi and talk is all." you tell him.'
+		'He laughs. "Who knew your mouth was good for anything other than sucking cock?" You put up with the comments and end up talking to him about a variety of things the group is up to. He only insults you every so often but in an almost friendly way, at least way friendlier than he treats anyone who isn''t a gopnik.'
 	elseif npc_rel['A9'] >= 50 and pav_slut < 300:
 		npc_rel['A9'] += 1
 		if grupTipe = 4:
-			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. After a few questions he starts telling you about some of his more exciting adventures, soon you are both laughing about them and swapping stories.'
+			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. After a few questions, he starts telling you about some of his more exciting adventures and soon you are both laughing about them and swapping stories.'
 		else
-			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want <<$pcs_nickname>>?"'
-			'"I just wanted to say hi and talk, is all," you tell him.'
-			'He shrugs, "Whatever." He goes back to telling stories and after a few questions, starts telling you about some of his more exciting adventures. Soon you are both laughing about them.'
+			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks "What do you want <<$pcs_nickname>>?"'
+			'"I just wanted to say hi and talk is all." you tell him.'
+			'He shrugs. "Whatever." He goes back to telling stories and after a few questions, starts telling you about some of his more exciting adventures. Soon you are both laughing about them.'
 		end
 	elseif npc_rel['A9'] <= 20 and pav_slut < 300:
 		npc_rel['A9'] += 1
 		if grupTipe = 4:
-			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want, you stupid cow?"'
-			'"I just wanted to say hi and talk, is all," You tell him.'
-			'He shrugs, "Whatever." He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He answers a few of your questions, but doesn''t completely ignore you at least.'
+			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you Vitek asks "What do you want, you stupid cow?"'
+			'"I just wanted to say hi and talk is all." you tell him.'
+			'He shrugs. "Whatever." He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He answers a few, but doesn''t completely ignore you at least.'
 		else
-			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want, you stupid fucking cow?"'
-			'"I just wanted to say hi and talk, is all," you tell him.'
-			'He glares at you, "Fuck off bitch!" He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He ignore''s your questions, but at least he doesn''t chase you off either.'
+			'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks "What do you want, you stupid fucking cow?"'
+			'"I just wanted to say hi and talk is all." you tell him.'
+			'He glares at you. "Fuck off bitch!" He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He ignores your questions, but at least he doesn''t chase you off either.'
 		end
 	elseif pav_slut >= 300:
-		'You go over and sit on the stairs near Vitek, he glances at you and gives you a look of disgust. "Get the fuck away from me, slut!"'
-		'Then Dan chimes in, "Maybe she is looking for a fuck." He gives you a dark look.'
-		'Seeing the mood turning dark and ugly you beat a hasty retreat, hearing the laughter behind you.'
+		'You go over and sit on the stairs near Vitek. He glances at you and gives you a look of disgust. "Get the fuck away from me, slut!"'
+		'Then Dan chimes in, "Maybe she is looking for a fuck?" he says as he gives you a dark look.'
+		'Seeing the mood turning dark and ugly, you beat a hasty retreat, hearing the laughter behind you.'
 	else 
 		npc_rel['A9'] += 1
-		'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you, Vitek asks, "What do you want <<$pcs_nickname>>?"'
-		'"I just wanted to say hi and talk, is all," you tell him.'
-		'He shrugs, "Whatever." He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He answers a few of your questions, but doesn''t completely ignore you at least.'
+		'You go over and sit on the stairs near Vitek and listen to him, Dan and Vasily tell stories. When they notice you Vitek asks "What do you want <<$pcs_nickname>>?"'
+		'"I just wanted to say hi and talk is all." you tell him.'
+		'He shrugs. "Whatever." He goes back to telling stories and you ask him a few questions about some of his more exciting adventures. He answers a few, but doesn''t completely ignore you at least.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 	if kotovloveqw > 0 and NikoPayback = 2:act 'Tell him what Niko did to you':gt 'NikoPayback', 'Vitek Help'
@@ -80,27 +80,27 @@ if $ARGS[0] = 'radomir':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big154.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A154'] += 1
-		'As you walk up, Radomir says, "Well well well, if it isn''t my favorite groupie slut."'
-		'You smile and put up with the comments, knowing this is now your place among the gopniks. He tells you, you should stop by practice some time. Saying the boys could use some stress release during the practice, which leads to him talking about the band and where they will be playing.'
+		'As you walk up, Radomir says "Well well well, if it isn''t my favorite groupie slut."'
+		'You smile and put up with the comments, knowing this is now your place among the gopniks. He tells you that you should stop by practice some time, saying the boys could use some stress release during the practice, which leads to him talking about the band and where they will be playing.'
 	elseif npc_rel['A154'] >= 50 and pav_slut < 300:
 		npc_rel['A154'] += 1
 		if grupTipe = 4:
-			'Radomir is talking about the bands latest gig as you walk up. Seeing you, he gives you a wink and starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where he says the band''s going and the success it will have.'
+			'Radomir is talking about the band''s latest gig as you walk up. Seeing you, he gives you a wink and starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where he says the band''s going and the success it will have.'
 		else
 			'Radomir is talking about the bands latest gig as you walk up. Seeing you, he gives you a wink. "So what can I do for one of my fans?" You ask him about how things are going for the band and he starts telling you about all the girls throwing their panties on stage. Asking him a few questions leads to the two of you talking about where he says the band''s going and the success it will have.'
 		end
 	elseif npc_rel['A154'] <= 20 and pav_slut < 300:
 		npc_rel['A154'] += 1
 		if grupTipe = 4:
-			'Radomir is talking about the bands latest gig as you walk up. Seeing you, he barely acknowledges you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He mostly ignores you, but does reply to a few of your comments.'
+			'Radomir is talking about the band''s latest gig as you walk up. Seeing you, he barely acknowledges you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He mostly ignores you, but does reply to a few of your comments.'
 		else
-			'Radomir is talking about the bands latest gig as you walk up. You are not sure if he''s even seen you, as he completely ignores you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He ignores your comments, like you are not even there.'
+			'Radomir is talking about the band''s latest gig as you walk up. You are not sure if he''s even seen you as he completely ignores you. Instead, he tells the others about all the girls throwing their panties on stage at him at their last gig. He ignores your comments, like you are not even there.'
 		end
 	elseif pav_slut >= 300:
-		'As you start to say something to him, he interrupts you, "Get lost slut, I can''t be seen with the likes of you, I have a reputation to uphold."'
+		'As you start to say something to him, he interrupts you. "Get lost slut! I can''t be seen with the likes of you, I have a reputation to uphold."'
 	else 
 		npc_rel['A154'] += 1
-		'Radomir is talking about the bands latest gig as you walk up. Seeing you, he barely acknowledges you. Instead he tells the others about all the girls throwing their panties on stage at him at their last gig. He mostly ignores you, but does reply to a few of your comments.'
+		'Radomir is talking about the band''s latest gig as you walk up. Seeing you, he barely acknowledges you. Instead he tells the others about all the girls throwing their panties on stage at him at their last gig. He mostly ignores you, but does reply to a few of your comments.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -112,37 +112,37 @@ if $ARGS[0] = 'roman':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big157.jpg"></center>'
 	if npc_rel['A157'] >= 50 and gopnik_slut = 1:
 		npc_rel['A157'] += 1
-		'As you walk up, Roman says, "Well well well, if it isn''t our little fuck bunny, you looking for a cock to hop on?"'
-		'"I just wanted to say hi and talk, is all," you tell him.'
-		'"Tell me how much you love cock then." You banter with him for a bit, he rips on you a lot, but at least he does talk to you.'
+		'As you walk up, Roman says "Well well well, if it isn''t our little fuck bunny. You looking for a cock to hop on?"'
+		'"I just wanted to say hi and talk is all." you tell him.'
+		'"Tell me how much you love cock then." You banter with him for a bit. He rips on you a lot, but at least he does talk to you.'
 	elseif npc_rel['A157'] >= 50 and pav_slut < 300:
 		npc_rel['A157'] += 1
 		if grupTipe = 4:
 			'"So listen to this, I was arguing with this old hag yesterday. She wouldn''t let go that I was swearing." Roman is again telling one of his crazy stories to the group.'
 			'You join in, listening and asking him a few questions. Soon the two of you are chatting about a variety of topics.'	
 		else
-			'As you walk up, Roman says, "Well, what do you want?"'
-			'"I just wanted to say hi and talk, is all," you tell him.'
-			'"Yeah, what about?" You banter with him for a bit, about a variety of things, he seems friendly enough considering his rep.'
+			'As you walk up, Roman says "Well, what do you want?"'
+			'"I just wanted to say hi and talk is all." you tell him.'
+			'"Yeah, what about?" You banter with him for a bit about a variety of things. He seems friendly enough, considering his reputation.'
 		end
 	elseif npc_rel['A157'] <= 20 and pav_slut < 300:
 		npc_rel['A157'] += 1
 		if grupTipe = 4:
 			'You take a seat near Roman. "Hey what''s up Roman?"'
-			'"Fuck off bitch," he snarls at you.'
-			'"Calm down, I just want to talk." He mostly ignores you or when he does respond he insults you, but at least he doesn''t run you off.'
+			'"Fuck off bitch!" he snarls at you.'
+			'"Calm down, I just want to talk." He mostly ignores you and when he does respond, he insults you, but at least he doesn''t run you off.'
 		else
 			'You take a seat near Roman. "Hey what''s up Roman?"'
-			'"Get lost cunt," he snarls at you.'
-			'"Calm down, I just want to talk." He mostly ignores you or when he does respond he insults you, but at least he doesn''t run you off.'
+			'"Get lost cunt!" he snarls at you.'
+			'"Calm down, I just want to talk." He mostly ignores you and when he does respond, he insults you, but at least he doesn''t run you off.'
 		end
 	elseif pav_slut >= 300:
-		'As you start to approach Roman, he snarls at you, "If you so much as open your cum breath mouth at me, I will get you down these stairs." Not wishing to push your luck, you walk away.'
+		'As you start to approach Roman, he snarls at you. "If you so much as open your cum breath mouth at me, I will toss you down these stairs." Not wishing to push your luck, you walk away.'
 	else 
 		npc_rel['A157'] += 1
-		'As you walk up, Roman says, "Well, what do you want?"'
-		'"I just wanted to say hi and talk, is all," you tell him.'
-		'"Yeah, what about?" You banter with him for a bit, about a variety of things. He is rude and often insulting, but at least he doesn''t threaten you.'
+		'As you walk up, Roman says "Well, what do you want?"'
+		'"I just wanted to say hi and talk is all." you tell him.'
+		'"Yeah, what about?" You banter with him for a bit about a variety of things. He is rude and often insulting, but at least he doesn''t threaten you.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -154,39 +154,39 @@ if $ARGS[0] = 'dan':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big10.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A10'] += 1
-		'As you walk up, Dan says, "You lost or just looking for a cock to suck?"'
-		'"I just wanted to say hi and talk, is all," you tell him.'
-		'"I bet that is rare, not having your mouth full long enough to talk." You banter with him for a bit, he rips on you a lot, but at least he does talk to you.'
+		'As you walk up, Dan says "You lost or just looking for a cock to suck?"'
+		'"I just wanted to say hi and talk is all." you tell him.'
+		'"I bet that is rare, not having your mouth full long enough to talk." You banter with him for a bit. He rips on you a lot, but at least he does talk to you.'
 	elseif npc_rel['A10'] >= 50 and pav_slut < 300:
 		npc_rel['A10'] += 1
 		if grupTipe = 4:
 			'"Hey, Dan!" you greet him.'
-			'"What''s up <<$pcs_nickname>>?," he asks you, soon the two of you are engaged in a friendly conversation.'
+			'"What''s up <<$pcs_nickname>>?" he asks you and soon the two of you are engaged in a friendly conversation.'
 		else
-			'"Hey, Dan!" you greet him. As usual, Dan is his arrogant self and barely pays you any attention.'
-			'"Oh, come on now Dan!" you tell him, "Don''t act that way, I know you like it when I talk to you."'
+			'"Hey Dan!" you greet him. As usual, Dan is his arrogant self and barely pays you any attention.'
+			'"Oh, come on now Dan!" you tell him. "Don''t act that way. I know you like it when I talk to you."'
 			'"Is that so?" he asks. You laugh a bit and the two of you strike up a friendly conversation.'
 		end
 	elseif npc_rel['A10'] <= 20 and pav_slut < 300:
 		npc_rel['A10'] += 1
 		if grupTipe = 4:
-			'"Hey, Dan!" you greet him.'
+			'"Hey Dan!" you greet him.'
 			'He narrows his eyes at you. "What do you want?"'
-			'"I just wanted to talk, is all," you tell him.'
+			'"I just wanted to talk is all." you tell him.'
 			'"Well, I''m busy so get lost." You persist and he relents. He talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 		else
-			'"Hey, Dan!" you greet him.'
+			'"Hey Dan!" you greet him.'
 			'He narrows his eyes at you. "What the fuck do you want?"'
-			'"I just wanted to talk, is all," you tell him.'
+			'"I just wanted to talk is all." you tell him.'
 			'"Yeah well, I don''t want to talk to you." You persist and he relents. He talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 		end
 	elseif pav_slut >= 300:
 		'You try and talk to him, but he just completely ignores you, like you aren''t even there. Eventually, you give up and walk off.'
 	else 
 		npc_rel['A10'] += 1
-		'"Hey, Dan!" you greet him.'
-		'He glances at you, "What do you want?"'
-		'"I just wanted to talk is all," You tell him.'
+		'"Hey Dan!" you greet him.'
+		'He glances at you. "What do you want?"'
+		'"I just wanted to talk is all." you tell him.'
 		'"I''m not in the mood." You persist and he relents. He talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -204,24 +204,24 @@ if $ARGS[0] = 'valentin':
 		npc_rel['A158'] += 1
 		'He smiles as you walk up. "What''s up <<$pcs_nickname>>?"'
 		'You smile back. "Nothing much, just wanted to hang out and talk."'
-		'The two of you talk about a few things, though he gets a little hands on with you at times, but you are used to it. As you start to leave, he adds, "Stop by the garage some time, I can always use a break and a quick fuck."'
+		'The two of you talk about a few things. He gets a little hands on with you at times, but you are used to it. As you start to leave, he adds "Stop by the garage some time, I can always use a break and a quick fuck."'
 	elseif npc_rel['A158'] >= 50 and pav_slut < 300:
 		npc_rel['A158'] += 1
 		if grupTipe = 4:
-			'As you walk up, Valentin calls out, "Hey, <<$pcs_nickname>>, good seeing you again."'
-			'You smile as you reply, "You know, I''ve been busy lately so I haven''t really been around here."'
-			'Valentin in his most charming way, "Well I hope I will see you more frequently in the future."'
+			'As you walk up, Valentin calls out "Hey <<$pcs_nickname>>, good seeing you again."'
+			'You smile as you reply. "You know, I''ve been busy lately so I haven''t really been around here."'
+			'Valentin, in his most charming way, replies "Well I hope I will see you more frequently in the future."'
 			'Your cheeks turn red as you hear him comment and soon the two of you are engaged in a friendly conversation, mostly about the band or his bike.'
 			act 'Ask for a ride on his bike':
 				cla & *nl
-				'Listening to him, you tease him a little, "Hey Valentin! As soon as you''ve fixed your bike, I want you to take me on a ride! And I won''t take no for an answer."'
-				'Valentin gives you a big smile, "Sure thing, <<$pcs_nickname>>. I''ll send you a text as soon as I have finished repairing her and I''ll take you on a ride."'
+				'Listening to him, you tease him a little. "Hey Valentin! As soon as you''ve fixed your bike, I want you to take me on a ride! And I won''t take no for an answer."'
+				'Valentin gives you a big smile. "Sure thing, <<$pcs_nickname>>. I''ll send you a text as soon as I have finished repairing her and I''ll take you on a ride."'
 				act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 			end
 		else
-			'"Hey <<$pcs_nickname>>, what are you up to," Valentin says.'
-			'You smile as you reply, "You know, I''ve been busy lately so I haven''t really been around here."'
-			'Valentin in his most charming way, "Well I hope I will see you more frequently in the future."'
+			'"Hey <<$pcs_nickname>>, what are you up to?" Valentin asks.'
+			'You smile as you reply. "You know, I''ve been busy lately so I haven''t really been around here."'
+			'Valentin, in his most charming way, replies "Well I hope I will see you more frequently in the future."'
 			'Your cheeks turn red as you hear him comment and soon the two of you are chatting and flirting back and forth.'
 		end
 	elseif npc_rel['A158'] <= 20 and pav_slut < 300:
@@ -229,22 +229,22 @@ if $ARGS[0] = 'valentin':
 		if grupTipe = 4:
 			'"Hey, Valentin!" you greet him as you walk up.'
 			'He sighs. "What do you want?"'
-			'"I just wanted to talk, is all," you tell him.'
+			'"I just wanted to talk is all." you tell him.'
 			'"Yeah? Well I''m busy, I don''t have time for you." You persist and he relents, he talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 		else
 			'"Hey, Valentin!" you greet him as you walk up.'
 			'He frowns as you approach. "We have nothing to talk about so go bother someone else!"'
-			'"I just wanted to talk, is all," you tell him.'
+			'"I just wanted to talk is all." you tell him.'
 			'"Yeah well, I don''t want to talk to you." You persist and he relents, he talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 		end
 	elseif pav_slut >= 300:
-		'You try and talk to him, but he just completely ignores you, like you aren''t even there. Eventually you give up and walk off.'
+		'You try and talk to him, but he just completely ignores you, like you aren''t even there. Eventually, you give up and walk off.'
 	else 
 		npc_rel['A158'] += 1
 		'"Hey, Valentin!" you greet him as you walk up.'
-		'He gives you a slight no in greeting.'
+		'He gives you a slight nod in greeting.'
 		'"What have you been up to?" you ask him.'
-		'"Working on my bike and practicing with the band," he half heartedly answers you, but he warms up a bit the more you talk to him. Mostly you ask him about his music and his bike which seems to do the trick.'
+		'"Working on my bike and practicing with the band." he half heartedly answers you, but he warms up a bit the more you talk to him. You mostly ask him about his music and his bike, which seems to do the trick.'
 	end
 end
 
@@ -255,39 +255,39 @@ if $ARGS[0] = 'vasily':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big11.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A11'] += 1
-		'"I am surprised you don''t walk bow legged after the number of times you have been fucked <<$pcs_nickname>>," Vasily says with a laugh.'
-		'You flip him the bird as you sit down by him. After a bit the two of you talk about a variety of things, though he keeps asking about who all you have fucked or who''s dick you just got through sucking.'
+		'"I am surprised you don''t walk bow legged after the number of times you have been fucked <<$pcs_nickname>>." Vasily says with a laugh.'
+		'You flip him the bird as you sit down by him. After a bit, the two of you talk about a variety of things, although he keeps asking about who you have fucked or who''s dick you just got through sucking.'
 	elseif npc_rel['A11'] >= 50 and pav_slut < 300:
 		npc_rel['A11'] += 1
 		if grupTipe = 4:
-			'As you walk up he calls out, "Hey, <<$pcs_nickname>>, what''s up?" Vasily speaks softly to you.'
-			'You smile as you reply, "Not much, thought I would just come by and hang out with you for a bit."'
+			'As you walk up he calls out. "Hey <<$pcs_nickname>>, what''s up?" Vasily speaks softly to you.'
+			'You smile as you reply "Not much, thought I would just come by and hang out with you for a bit."'
 			'Soon the two of you are engaged in a friendly conversation about what''s been going on.'
 		else
-			'As you walk up he calls out, "Hey, <<$pcs_nickname>>, what''s up?" Vasily speaks softly to you.'
-			'You smile as you reply, "Not much, thought I would just come by and hang out with you for a bit."'
-			'Soon the two of you are engaged in a friendly conversation about when you were both kids mostly.'
+			'As you walk up he calls out. "Hey <<$pcs_nickname>>, what''s up?" Vasily speaks softly to you.'
+			'You smile as you reply "Not much, thought I would just come by and hang out with you for a bit."'
+			'Soon the two of you are engaged in a friendly conversation, mostly about when you were both kids.'
 		end
 	elseif npc_rel['A11'] <= 20 and pav_slut < 300:
 		npc_rel['A11'] += 1
 		if grupTipe = 4:
 			'"Hey, Vasily!" you greet him as you walk up.'
 			'He frowns as you approach. "What do you want <<$pcs_nickname>>?"'
-			'"I just wanted to talk, is all." you tell him.'
+			'"I just wanted to talk is all." you tell him.'
 			'"Can''t you find someone else to bother?" You persist and he relents, he talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 		else
 			'"Hey, Vasily!" you greet him as you walk up.'
 			'He frowns as you approach. "Stop bothering me <<$pcs_nickname>>."'
-			'"I just wanted to talk, is all." you tell him.'
+			'"I just wanted to talk is all." you tell him.'
 			'"Go bother someone else!" You persist and he relents, he talks to you for a short bit before making it clear he is done talking, so you leave him in peace.'
 		end
 	elseif pav_slut >= 300:
-		'"Get lost, you fucking slut!" he says with a sneer and more than loud enough for everyone to hear, so you turn and walk away.'
+		'"Get lost you fucking slut!" he says with a sneer, more than loud enough for everyone to hear, so you turn and walk away.'
 	else 
 		npc_rel['A11'] += 1
-		'As you walk up he says, "Hey," with a nod of greeting'
-		'You smile as you reply, "I thought I would just come by and hang out with you for a bit."'
-		'Soon the two of you are engaged in a friendly conversation, about when you were both kids mostly.'
+		'As you walk up, he says "Hey" with a nod of greeting'
+		'You smile as you reply "I thought I would just come by and hang out with you for a bit."'
+		'Soon the two of you are engaged in a friendly conversation, mostly about when you were both kids.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -300,37 +300,37 @@ if $ARGS[0] = 'arkadi':
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A156'] += 1
 		'As you walk up, he cups his crotch and bounces it a bit. "Yeah you want this, don''t you. Well I don''t got time to give it to you right now."'
-		'"I just wanted to talk, is all." you tell him.'
+		'"I just wanted to talk is all." you tell him.'
 		'He snorts a bit, but doesn''t refute what you say as you talk to him. He starts to talk back a bit.'
 	elseif npc_rel['A156'] >= 50 and pav_slut < 300:
 		npc_rel['A156'] += 1
 		if grupTipe = 4:
-			'As you walk up to him, you say, "I thought I would just come by and hang out with you for a bit."'
-			'He scoots over and makes room for you on the set he is sitting on. "Sure, what do you want to talk about?"'
-			'You know he loves the city so you ask him questions about it and soon you are chatting away.'
+			'As you walk up to him, you say "I thought I would just come by and hang out with you for a bit."'
+			'He scoots over and makes room for you on the step he is sitting on. "Sure, what do you want to talk about?"'
+			'You know he loves the city, so you ask him questions about it and soon you are chatting away.'
 		else
-			'As you walk up to him, you say, "I thought I would just come by and hang out with you for a bit."'
-			'He scoots over and makes room for you on the set he is sitting on. "Oh yeah? What about?"'
-			'You know he loves the city so you ask him questions about it and soon are chatting away.'
+			'As you walk up to him, you say "I thought I would just come by and hang out with you for a bit."'
+			'He scoots over and makes room for you on the step he is sitting on. "Oh yeah? What about?"'
+			'You know he loves the city, so you ask him questions about it and soon you are chatting away.'
 		end
 	elseif npc_rel['A156'] <= 20 and pav_slut < 300:
 		npc_rel['A156'] += 1
 		if grupTipe = 4:
-			'As you walk up to him, you say, "I thought I would just come by and hang out with you for a bit."'
-			'He snorts and grabs his crotch. "Why don''t you suck my dick instead."'
-			'You ignore the comment and ask him about the city, after a bit he finally starts to respond back, telling you about his time in the city.'
+			'As you walk up to him, you say "I thought I would just come by and hang out with you for a bit."'
+			'He snorts and grabs his crotch. "Why don''t you suck my dick instead?"'
+			'You ignore the comment and ask him about the city and after a bit, he finally starts to respond back, telling you about his time in the city.'
 		else
-			'As you walk up to him, you say, "I thought I would just come by and hang out with you for a bit."'
-			'He snorts and grabs his crotch. "Why don''t you do something useful with that mouth of yours and suck my dick instead."'
-			'You ignore the comment and ask him about the city, after a bit he finally starts to respond back, telling you about his time in the city.'
+			'As you walk up to him, you say "I thought I would just come by and hang out with you for a bit."'
+			'He snorts and grabs his crotch. "Why don''t you do something useful with that mouth of yours and suck my dick instead?"'
+			'You ignore the comment and ask him about the city and after a bit, he finally starts to respond back, telling you about his time in the city.'
 		end
 	elseif pav_slut >= 300:
-		'"Get lost you disgusting whore!" he says, before you even make it to him.'
+		'"Get lost you disgusting whore!" he says before you even make it to him.'
 	else 
 		npc_rel['A156'] += 1
-		'As you walk up to him, you say, "I thought I would just come by and hang out with you for a bit."'
+		'As you walk up to him, you say "I thought I would just come by and hang out with you for a bit."'
 		'He looks up at you from where he is sitting on the stairs. "Oh yeah? What about?"'
-		'You know he loves the city so you ask him questions about it and soon you are chatting away.'
+		'You know he loves the city, so you ask him questions about it and soon you are chatting away.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -342,10 +342,10 @@ if $ARGS[0] = 'lavrenti':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big155.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A155'] += 1
-		'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
-		'Lavrenti smiles to you, "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
+		'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
+		'Lavrenti smiles at you. "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
 		'"Sounds great, can I come?" you ask him, wondering if you''ll get an invite.'
-		'He laughs a bit and then nods. "Yeah, you can come if you want, I mean what''s a party without a party favor to pass around. I will text you when the party is." Soon the two of you are talking about his party and then he starts telling you about some of the funny things that happened at some of the other gopnik parties.'
+		'He laughs a bit and then nods. "Yeah, you can come if you want. I mean what''s a party without a party favor to pass around? I will text you when the party is." Soon the two of you are talking about his party and then he starts telling you about some of the funny things that happened at some of the other gopnik parties.'
 	elseif npc_rel['A155'] >= 50 and pav_slut < 300:
 		npc_rel['A155'] += 1
 		if grupTipe = 4:
@@ -353,35 +353,35 @@ if $ARGS[0] = 'lavrenti':
 			'You nod to him. "Sounds great, just text me the time and day of the party."'
 			'Soon the two of you are talking about his party and then funny things that happened at other parties.'
 		else
-			'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
-			'Lavrenti smiles to you, "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
-			'"Sounds great," you tell him, wondering if you will get an invite.'
+			'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
+			'Lavrenti smiles at you. "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
+			'"Sounds great." you tell him, wondering if you will get an invite.'
 			'He laughs a bit and then nods. "Yeah, you can come if you want, I will text you when it is." Soon the two of you are talking about his party and then he starts telling you about some of the funny things that happened at some of the other gopnik parties.'
 		end
 	elseif npc_rel['A155'] <= 20 and pav_slut < 300:
 		npc_rel['A155'] += 1
 		if grupTipe = 4:
-			'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
-			'Lavrenti looks a bit questioning at you, "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
-			'"Sounds great, I am looking forward to it." you tell him, wondering if you will get an invite.'
-			'He frowns at you, "Why the fuck should I invite you?"'
-			'"Come on, don''t be like that. It will be fun," you tell him.'
-			'He snorts. "Let me think about it." You keep talking to him, hoping to warm him up for an invite, asking about his party which slowly gets him talking.'
+			'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
+			'Lavrenti just looks at you. "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
+			'"Sounds great, I look forward to it." you tell him, wondering if you will get an invite.'
+			'He frowns at you. "Why the fuck would I invite you?"'
+			'"Come on, don''t be like that. It will be fun." you tell him.'
+			'He snorts. "Let me think about it." You keep talking to him, hoping to warm him up for an invite. You ask about his party, which slowly gets him talking.'
 		else
-			'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
-			'Lavrenti gives you a fuck off look, "My parents will be out of town next week and I was thinking of throwing a party."'
+			'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
+			'Lavrenti gives you a "fuck off" look. "My parents will be out of town next week and I was thinking of throwing a party."'
 			'"Sounds great, parties are always fun." you tell him, wondering if you will get an invite.'
-			'He frowns at you, "Fuck off, you''re not invited."'
-			'"Come on, don''t be like that. It will be fun," you tell him.'
-			'He snorts. "You are about the last person I would invite." You keep talking to him hoping to warm him up for an invite, asking about his party which slowly gets him talking a little.'
+			'He frowns at you. "Fuck off! You''re not invited."'
+			'"Come on, don''t be like that. It will be fun." you tell him.'
+			'He snorts. "You are about the last person I would invite." You keep talking to him, hoping to warm him up for an invite. You ask about his party, which slowly gets him talking a little.'
 		end
 	elseif pav_slut >= 300:
-		'"Get the fuck away from me you fucking slut," he tells you.'
+		'"Get the fuck away from me you fucking slut!" he tells you.'
 	else 
 		npc_rel['A155'] += 1
-		'You approach Lavrenti, "So, what''s up with you Lavrenti?"'
-		'Lavrenti nods to you, "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
-		'"Sounds great," you tell him, wondering if you will get an invite. Soon the two of you are talking about his party and then he starts telling you about some of the funny things that happened at some of the other gopnik parties, as you try and wrangle an invite.'
+		'You approach Lavrenti. "So, what''s up with you Lavrenti?"'
+		'He nods at you. "Not a lot, my parents will be out of town next week and I was thinking of throwing a party."'
+		'"Sounds great." you tell him, wondering if you will get an invite. Soon the two of you are talking about his party and then he starts telling you about some of the funny things that happened at some of the other gopnik parties as you try and wrangle an invite.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -408,39 +408,39 @@ if $ARGS[0] = 'ekaterina':
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A145'] += 1
 		'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
-		'She gives you a look of disgust. "Not really, me and some of the girls got together last night for fight night. Something you wouldn''t understand"'
+		'She gives you a look of disgust. "Not really. Some of the girls and I got together last night for fight night. Something you wouldn''t understand"'
 		'You ask her a few questions about it and she answers you in as few words as possible, before finally just getting up and walking away from you. She obviously isn''t a fan of how you got to be a gopnik.'
 	elseif npc_rel['A145'] >= 50 and pav_slut < 300:
 		npc_rel['A145'] += 1
 		if grupTipe = 4:
 			'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
-			'She shakes her head no. "Not really, me and some of the girls got together last night for fight night."'
-			'She then goes on to tell you about how some of the gopnik girls get together and fight each other to practice and just to kick the shit out of each other for fun. "You should come by sometime and go a few rounds."'
+			'She shakes her head. "Not really. Some of the girls and I got together last night for fight night."'
+			'She then goes on to tell you about how some of the gopnik girls get together and fight each other to practice or just to kick the shit out of each other for fun. "You should come by sometime and go a few rounds."'
 		else
 			'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
-			'She shakes her head no. "Not really, me and some of the girls got together last night for fight night."'
-			'She then goes on to tell you about how some of the gopnik girls get together and fight each other to practice and just to kick the shit out of each other for fun. Then she stops and looks you over for a moment, as if judging you. "You should come by sometime and go a few rounds, to see what you are made of."'
+			'She shakes her head. "Not really. Some of the girls and I got together last night for fight night."'
+			'She then goes on to tell you about how some of the gopnik girls get together and fight each other to practice or just to kick the shit out of each other for fun. Then she stops and looks you over for a moment, as if judging you. "You should come by sometime and go a few rounds. See what you are made of."'
 		end
 	elseif npc_rel['A145'] <= 20 and pav_slut < 300:
 		npc_rel['A145'] += 1
 		if grupTipe = 4:
 			'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
 			'She glares at you. "What fucking business is it of yours?"'
-			'You raise your palms towards her, to show you didn''t mean anything by it. "I was just asking, is all."'
-			'She starts to say something and then stops, gives you a look over and then gets a dark smile on her face. "You should come by sometime and go a few rounds, to see what you are made of." By the way she is looking at you, you think she just wants an excuse to beat your ass.'
+			'You raise your palms towards her to show you didn''t mean anything by it. "I was just asking, is all."'
+			'She starts to say something and then stops, gives you a look over and then gets a dark smile on her face. "You should come by sometime and go a few rounds. See what you are made of." By the way she is looking at you, you think she just wants an excuse to beat your ass.'
 		else
 			'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
 			'She snarls at you. "What fucking business is it of yours?"'
-			'You raise your palms towards her, to show you didn''t mean anything by it. "I was just asking, is all."'
-			'"Well fuck off!" she snarls at you, you try to talk a bit more, but she mostly ignores you or snarls at you, before driving you off.'
+			'You raise your palms towards her to show you didn''t mean anything by it. "I was just asking, is all."'
+			'"Well fuck off!" she snarls at you. You try to talk a bit more, but she mostly ignores you or snarls at you, driving you off.'
 		end
 	elseif pav_slut >= 300:
-		'"Get the fuck away from me, before I kick your teeth in!" You are certain she means it, so you beat a hasty retreat.'
+		'"Get the fuck away from me before I kick your teeth in!" You are certain she means it, so you beat a hasty retreat.'
 	else 
 		npc_rel['A145'] += 1
 		'As you walk over to her, you see her nursing some bruised knuckles. "Get in a fight?" you ask.'
-		'She shakes her head no. "Mind your own business!"'
-		'You raise your palms towards her, to show you didn''t mean anything by it. "I was just asking, is all."'
+		'She shakes her head. "Mind your own business!"'
+		'You raise your palms towards her to show you didn''t mean anything by it. "I was just asking, is all."'
 		'"Yeah well, don''t." You change the subject to school and she pays half attention to you, obviously not that interested in talking.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -451,39 +451,39 @@ if $ARGS[0] = 'lera':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big21.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A21'] += 1
-		'As usual, you find Lera and Lena smoking on the stairs, "So, hopped on any cocks today, bunny?" Lera inquires.'
-		'You sigh slightly, "No, have you licked any pussy?" you reply.'
-		'"No, but you just might, if you don''t watch your mouth." Lera says as she spreads her legs.'
-		'After that you both engage in a bit of banter, back and forth.'
+		'As usual, you find Lera and Lena smoking on the stairs. "So, hopped on any cocks today bunny?" Lera inquires.'
+		'You sigh slightly "No, have you licked any pussy?" you reply.'
+		'"No, but you just might if you don''t watch your mouth." Lera says as she spreads her legs.'
+		'You then both engage in a bit of back and forth banter.'
 	elseif npc_rel['A21'] >= 50:
 		npc_rel['A21'] += 1
 		if grupTipe = 4:
-			'As usual, you find Lera and Lena smoking on the stairs, "What''s up <<$pcs_nickname>>?" Lera inquires.'
-			'You shrug your shoulders, "Nothing much you?" you reply.'
-			'"Nah," Lera says as she shakes her head.'
-			'After that you both engage in a bit of banter back and forth, about how the school day has been.'
+			'As usual, you find Lera and Lena smoking on the stairs. "What''s up <<$pcs_nickname>>?" Lera inquires.'
+			'You shrug your shoulders. "Nothing much you?" you reply.'
+			'"Nah." Lera says as she shakes her head.'
+			'You then both engage in a bit of banter back and forth about how the school day has been.'
 		else
-			'Seeing Lera sitting on the steps without Lena, you walk up to her, "Hi Lera! What are you up to?"'
-			'She looks back at you and shrugs her shoulders, "Hi <<$pcs_nickname>>, nothing much, waiting for Lena."'
+			'Seeing Lera sitting on the steps without Lena, you walk up to her. "Hi Lera! What are you up to?"'
+			'She looks back at you and shrugs her shoulders. "Hi <<$pcs_nickname>>, nothing much. Just waiting for Lena."'
 			'The two of you continue talking for a while until Lena shows up and calls Lera over, ending your conversation.'
 		end
 	elseif npc_rel['A21'] <= 20 and pav_slut < 300:
 		npc_rel['A21'] += 1
 		if grupTipe = 4:
-			'As usual, you find Lera and Lena smoking on the stairs, "Hi Lera! What are you up to?"'
-			'She looks back at you and frowns, "None of your fucking business <<$pcs_nickname>>."'
-			'You talk to her some more but it is mostly one sided, as she alternates between ignoring you and making snide remarks.'
+			'As usual, you find Lera and Lena smoking on the stairs. "Hi Lera! What are you up to?"'
+			'She looks back at you and frowns. "None of your fucking business <<$pcs_nickname>>."'
+			'You talk to her some more, but it is mostly one sided as she alternates between ignoring you and making snide remarks.'
 		else
-			'As usual, you find Lera and Lena smoking on the stairs, "Hi Lera! What are you up to?"'
-			'She looks back at you and frowns, "None of your fucking business, bitch!"'
-			'You talk to her some more but it is mostly one sided, as she alternates between ignoring you and making snide remarks.'
+			'As usual, you find Lera and Lena smoking on the stairs. "Hi Lera! What are you up to?"'
+			'She looks back at you and frowns. "None of your fucking business, bitch!"'
+			'You talk to her some more, but it is mostly one sided as she alternates between ignoring you and making snide remarks.'
 		end
 	elseif pav_slut >= 300:
 		'"Don''t even come near me with that disgusting cum breath of yours."'
 	else 
 		npc_rel['A21'] += 1
-		'Seeing Lera sitting on the steps without Lena, you walk up to her, "Hi Lera! What are you up to?"'
-		'She looks back at you and shrugs her shoulders, "Nothing much, waiting for Lena."'
+		'Seeing Lera sitting on the steps without Lena, you walk up to her. "Hi Lera! What are you up to?"'
+		'She looks back at you and shrugs her shoulders. "Nothing much. Just waiting for Lena."'
 		'The two of you continue talking for a while until Lena shows up and calls Lera over, ending your conversation.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
@@ -497,40 +497,40 @@ if $ARGS[0] = 'alyona':
 	
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A143'] += 1
-		'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening to?"'
+		'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask "What are you listening to?"'
 		'She pulls out one of the ear buds. "This new band I heard about."'
 		'"Cool, are they any good?" you ask her. She nods and you press on and get her talking about her favorite kind of music.'
 	elseif npc_rel['A143'] >= 50:
 		npc_rel['A143'] += 1
 		if grupTipe = 4:
-			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening to?"'
+			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask "What are you listening to?"'
 			'She pulls out one of the ear buds. "This new band I heard about, want to listen?"'
-			'You nod and she offers one of the earbuds, the two of you listen to the music for a bit and talk about your favorite bands.'
+			'You nod and she offers one of the earbuds. The two of you listen to the music for a bit and talk about your favorite bands.'
 		else
-			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening to?"'
+			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask "What are you listening to?"'
 			'She pulls out one of the ear buds. "This new band I heard about, want to listen?"'
-			'You nod and she offers one of the earbuds, the two of you listen to the music for a bit and talk about your favorite bands.'
+			'You nod and she offers one of the earbuds. The two of you listen to the music for a bit and talk about your favorite bands.'
 		end
 	elseif npc_rel['A143'] <= 20:
 		npc_rel['A143'] += 1
 		if grupTipe = 4 and pav_slut < 300:
 			npc_rel['A143'] += 1
-			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening to?"'
+			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask "What are you listening to?"'
 			'She ignores you and pulls out a small bottle of booze from her jacket pocket and takes a swig from it.'
 			'You press on and get her talking a little about her favorite kind of music, before she goes back to ignoring you.'
 		elseif grupTipe ! 4 and pav_slut < 300:
 			npc_rel['A143'] += 1
-			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening too?"'
+			'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask "What are you listening to?"'
 			'She gives you a dirty look and pulls out a small bottle of booze from her jacket pocket and takes a swig from it.'
-			'You press on and get her talking a little about her favorite kind of music, before she threatens to cut you, if you don''t leave her alone.'
+			'You press on and get her talking a little about her favorite kind of music, before she threatens to cut you if you don''t leave her alone.'
 		else
-			'She doesn''t say a word to you, only glares at you and starts playing with the knife she always carries. Getting the message, you leave.'
+			'She doesn''t say a word to you. She only glares at you and starts playing with the knife she always carries. Getting the message, you leave.'
 		end
 	else 
 		npc_rel['A143'] += 1
-		'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask, "What are you listening too?"'
+		'Alyona is sitting a little bit away from the rest, with earbuds attached to her phone, listening to some music by the sounds of it. You take a seat next to her and ask "What are you listening to?"'
 		'She pulls out one of the earbuds. "This new band I heard about, why?"'
-		'"I was just curious is all, they any good?" you ask her. She nods and you press on and get her talking about her favorite kind of music.'
+		'"I was just curious is all. Are they any good?" you ask her. She nods and you press on and get her talking about her favorite kind of music.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -546,8 +546,8 @@ if $ARGS[0] = 'anushka':
 			*clr & cla
 			npc_rel['A144'] -= 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
-			'"Sorry I can''t, maybe some other time?" You tell her.'
-			'She frowns a little then shurgs. "Sure what ev, some other time then."'
+			'"Sorry I can''t, maybe some other time?" you tell her.'
+			'She frowns a little, then shurgs. "Sure what ev. Some other time then."'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 		act 'I would like that':
@@ -555,30 +555,30 @@ if $ARGS[0] = 'anushka':
 			meet_after_school = 1
 			npc_rel['A144'] += 1
 			'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
-			'"Yes I would like that." You tell her.'
-			'"Sweet, I''ll wait for you at the doors after school." She tells you.'
+			'"Yes I would like that." you tell her.'
+			'"Sweet, I''ll wait for you at the doors after school." she tells you.'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
 	elseif npc_rel['A144'] >= 50 and anushkaFirstvisit ! 0:
 		npc_rel['A144'] += 1
 		if grupTipe = 4:
-			'As you walk up the steps, Anushka is sitting on the top step with her knee''s pulled up to almost her chin. Which gives a nice shot up her skirt to anyone with eyes. She is using her knee''s to support a notebook computer that she is typing on. Taking a seat next to her, you glance over and see they are lyrics to a song. "New song?"'
-			'She glances to you with a smile. "Yeah, if I can get it finished, what do you think <<$pcs_nickname>>?"'
+			'As you walk up the steps, Anushka is sitting on the top step with her knees pulled up to almost her chin, which gives a nice shot up her skirt to anyone with eyes. She is using her knees to support a notebook computer that she is typing on. Taking a seat next to her, you glance over and see they are lyrics to a song. "New song?"'
+			'She glances to you with a smile. "Yeah, if I can get it finished. What do you think <<$pcs_nickname>>?"'
 			'You look over it and soon the two of you are talking about her music, which leads to a variety of other subjects. The two of you talk and laugh until the bell rings.'
 		else
-			'As you walk up the steps, Anushka is sitting on the top step cross legged. Which gives a nice shot up her skirt to anyone with eyes. She is using her knee''s to support a notebook computer that she is typing on. Taking a seat next to her, you glance over and see they are lyrics to a song. "New song?"'
+			'As you walk up the steps, Anushka is sitting on the top step cross legged, which gives a nice shot up her skirt to anyone with eyes. She is using her knees to support a notebook computer that she is typing on. Taking a seat next to her, you glance over and see they are lyrics to a song. "New song?"'
 			'She glances to you with a smile. "Hey <<$pcs_nickname>>, just finishing it up."'
 			'Soon the two of you are talking about her music, which leads to a variety of other subjects. The two of you talk and laugh until the bell rings.'
 		end
 	elseif npc_rel['A144'] <= 20:
 		if grupTipe = 4 and pav_slut < 300:
 			npc_rel['A144'] += 1
-			'Anushka is leaning against the wall snickering about something she is looking at on her phone. Walking up, you stand next to her and try and peak, but before you can see anything, she puts her phone away and frowns at you. "What do you want?"'
+			'Anushka is leaning against the wall, snickering about something she is looking at on her phone. Walking up, you stand next to her and try and peek. Before you can see anything, she puts her phone away and frowns at you. "What do you want?"'
 			'You sigh, not getting to see whatever it is she found so amusing. "I thought we could just hang out." you tell her.'
 			'She rolls her eyes. "Whatever." You try to talk to her, but she mostly just ignores you.'
 		elseif grupTipe ! 4 and pav_slut < 300:
 			npc_rel['A144'] += 1
-			'Anushka is leaning against the wall snickering about something she is looking at on her phone. Walking up, you stand next to her and try and peak, but before you can see anything, she puts her phone away and frowns at you. "Get lost freak, I''m busy."'
+			'Anushka is leaning against the wall, snickering about something she is looking at on her phone. Walking up, you stand next to her and try and peak, but before you can see anything, she puts her phone away and frowns at you. "Get lost freak, I''m busy."'
 			'You sigh, not getting to see whatever it is she found so amusing. "I thought we could just hang out." you tell her.'
 			'She rolls her eyes. "Like I would want to talk to you." You try to talk to her, but she mostly just ignores you.'
 		else
@@ -586,7 +586,7 @@ if $ARGS[0] = 'anushka':
 		end		
 	else 
 		npc_rel['A144'] += 1
-		'As you walk up the steps, Anushka is sitting on the top step, cross legged. Which gives a nice shot up her skirt to anyone with eyes. She is using her knee''s to support a notebook computer that she is typing on. Taking a seat next to her, you glance over and see they are lyrics to a song. "New song?"'
+		'As you walk up the steps, Anushka is sitting on the top step cross legged, which gives a nice shot up her skirt to anyone with eyes. She is using her knees to support a notebook computer that she is typing on. Taking a seat next to her, you glance over and see they are lyrics to a song. "New song?"'
 		'She glances to you with a slight smile. "No, it is something Rad wrote and I am, well, fixing it."'
 		'Soon the two of you are talking about her music, which leads to a variety of other subjects. The two of you talk and laugh until the bell rings.'
 	end
@@ -599,14 +599,14 @@ if $ARGS[0] = 'anushka':
 			if Anush_lunch = 0:
 				pcs_horny += 10
 				'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big144.jpg"></center>'
-				'"Hey Anush, you feeling ok? You kinda look flushed, is something wrong? Would you like to talk about it?"'
-				'She leans in close and tries to kiss you, while one hand reaches down and squeezes your butt. You turn your head and pull away. "What are you doing? I was only seeing if you were ok."'
-				'She crowds you a bit and leans in close. "You talk too much, I can think of better things you can do with that tongue of yours."'
+				'"Hey Nush, you feeling OK? You kinda look flushed, is something wrong? Would you like to talk about it?"'
+				'She leans in close and tries to kiss you while one hand reaches down and squeezes your ass. You turn your head and pull away. "What are you doing? I was only seeing if you were OK."'
+				'She crowds you a bit and leans in close. "You talk too much. I can think of better things you can do with that tongue of yours."'
 				act 'Um, that''s not what I meant':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nomake.jpg"></center>'
-					'You place your hand on her shoulders and gentle push her away. "No, I don''t want to."'
-					'She rolls her eyes. "Fine whatever, if you don''t want to have a little fun, I will find someone that does." With that she turns and walks off, leaving you unsure what just happened.'
+					'You place your hand on her shoulders and gently push her away. "No, I don''t want to."'
+					'She rolls her eyes. "Fine whatever. If you don''t want to have a little fun, I will find someone that does." She turns and walks off, leaving you unsure of what just happened.'
 					act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 				end
 				act 'Go with it':
@@ -616,13 +616,13 @@ if $ARGS[0] = 'anushka':
 					gs 'stat'
 					'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
 					'You breath heavily, feeling yourself turned on. "Ok, where?"'
-					'You barely even have time to get the words out, when she leans in and kisses you. You kiss her back. Your hands are roaming each others bodies, several of the other gopniks are checking the two of you out, especially the guys. After a couple of minutes, she grabs you by the hands and pulls you along with her.'
+					'You barely even have time to get the words out when she leans in and kisses you and you kiss her back. Your hands are roaming each other''s bodies and several of the other gopniks are checking the two of you out, especially the guys. After a couple of minutes, she grabs you by the hands and pulls you along with her.'
 					act 'Go somewhere private':  gt 'gschool_sex', 'Anush_private'
 				end
 			else
 				'<center><video autoplay loop src="images/characters/pavlovsk/school/girl/anushka/makeout.mp4"></video></center>'
-				'"You are looking pretty flushed again today, would you like me to help you out with that?"'
-				'You barely even have time to get the words out, when she leans in and kisses you. You kiss her back. Your hands are roaming each others bodies, several of the other gopniks are checking the two of you out, especially the guys. After a couple of minutes, she grabs you by the hands and pulls you along with her.'
+				'"You are looking pretty flushed again today. Would you like me to help you out with that?"'
+				'You barely even have time to get the words out when she leans in and kisses you and you kiss her back. Your hands are roaming each other''s bodies and several of the other gopniks are checking the two of you out, especially the guys. After a couple of minutes, she grabs you by the hands and pulls you along with her.'
 				act 'Go somewhere private':  gt 'gschool_sex', 'Anush_private'
 			end
 		end
@@ -636,43 +636,43 @@ if $ARGS[0] = 'lena':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big20.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A20'] += 1
-		'As usual, you find Lena smoking on the stairs, "Shouldn''t you be in the bathroom getting gangbanged?" Lena inquires with a note of disgust.'
-		'You sigh slightly, "No, I just wanted to see what you were up to." you reply.'
-		'"Go bother someone else," Lena says.'
+		'As usual, you find Lena smoking on the stairs. "Shouldn''t you be in the bathroom getting gangbanged?" Lena inquires with a note of disgust.'
+		'You sigh slightly. "No, I just wanted to see what you were up to." you reply.'
+		'"Go bother someone else." she says.'
 		'You talk to her for a bit and while she doesn''t ignore you, she also makes it clear she doesn''t approve of how you got in the gopniks.'
 	elseif npc_rel['A20'] >= 50 and pav_slut < 300:
 		npc_rel['A20'] += 1
 		if grupTipe = 4:
-			'Seeing Lena sitting on the steps, you approach her, "Hi Lena! What are you up to?"'
-			'She looks back at you and shrugs her shoulders, "Hey <<$pcs_nickname>>, nothing much, just waiting for this day to end."'
-			'The two of you continue talking for a while, about how much school sucks and all the better things you could be doing with your time.'
+			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'She looks back at you and shrugs her shoulders. "Hey <<$pcs_nickname>>, nothing much. Just waiting for this day to end."'
+			'The two of you continue talking for a while about how much school sucks and all the better things you could be doing with your time.'
 		else
-			'Seeing Lena sitting on the steps, you approach her, "Hi Lena! What are you up to?"'
-			'She looks back at you and arches a brow, "Nothing much, you lost <<$pcs_nickname>>?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'She looks back at you and arches a brow. "Nothing much. You lost <<$pcs_nickname>>?"'
 			'You shake your head. "No, I just came over to see how you were and hang out."'
-			'The two of you continue talking for a while, about how much school sucks and all the better things you could be doing with your time.'
+			'The two of you continue talking for a while about how much school sucks and all the better things you could be doing with your time.'
 		end
 	elseif npc_rel['A20'] <= 20 and pav_slut < 300:
 		npc_rel['A20'] += 1
 		if grupTipe = 4:
-			'Seeing Lena sitting on the steps, you approach her, "Hi Lena! What are you up to?"'
-			'She looks back at you with a frown, "What do you want <<$pcs_nickname>>?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'She looks back at you with a frown. "What do you want <<$pcs_nickname>>?"'
 			'"I just wanted to say hi and see what you were up to." you reply'
 			'"Yeah well, I don''t want to talk to you." You continue talking to her for a while, but it is obvious she has no interest in talking to you.'
 		else
-			'Seeing Lena sitting on the steps, you approach her, "Hi Lena! What are you up to?"'
-			'She looks back at you with a frown, "What do you want freak?"'
+			'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+			'She looks back at you with a frown. "What do you want freak?"'
 			'"I just wanted to say hi and see what you were up to." you reply'
 			'"Yeah well, I don''t want to talk to you." You continue talking to her for a while, but it is obvious she has no interest in talking to you.'
 		end
 	elseif pav_slut >= 300:
-		'"What do you want cunt? Shouldn''t you be sucking some cocks somewhere?" With that she ignores you.'
+		'"What do you want cunt? Shouldn''t you be sucking some cocks somewhere?" She turns away and ignores you.'
 	else 
 		npc_rel['A20'] += 1
-		'Seeing Lena sitting on the steps, you approach her, "Hi Lena! What are you up to?"'
-		'She looks back at you and arches a brow, "You lost, shouldn''t you be hanging out with your own friends?"'
+		'Seeing Lena sitting on the steps, you approach her. "Hi Lena! What are you up to?"'
+		'She looks back at you and arches a brow. "You lost? Shouldn''t you be hanging out with your own friends?"'
 		'You shake your head. "I have a lot of friends. I just wanted to come over to see how you were and hang out."'
-		'The two of you continue talking for a while, about how much school sucks and all the better things you could be doing with your time.'
+		'The two of you continue talking for a while about how much school sucks and all the better things you could be doing with your time.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 end
@@ -684,42 +684,42 @@ if $ARGS[0] = 'pauline':
 	'<center><img <<$set_imgh>> src="images/pc/npc_headshots/big24.jpg"></center>'
 	if grupTipe = 4 and gopnik_slut = 1:
 		npc_rel['A24'] += 1
-		'As usual you find Pauline on the stairs, "What do you want?" Pauline asks in a non too friendly tone, as you approach.'
-		'You sigh slightly, "I just wanted to talk is all." you reply.'
+		'As usual you find Pauline on the stairs. "What do you want?" Pauline asks in a non too friendly tone as you approach.'
+		'You sigh slightly. "I just wanted to talk is all." you reply.'
 		'"Go talk to someone that cares then." she says.'
 		'You talk to her for a bit and while she doesn''t ignore you, she also makes it clear she doesn''t approve too much of how you got into the gopniks.'
 	elseif npc_rel['A24'] >= 50 and pav_slut < 300:
 		npc_rel['A24'] += 1
 		if grupTipe = 4:
-			'Seeing Pauline sitting on the steps, you approach her, "Hi Pauline! What are you up to?"'
-			'She looks back at you and shrugs her shoulders, "Hey <<$pcs_nickname>>, nothing much, just waiting for this day to end."'
-			'The two of you continue talking for a while, about how much school sucks and all the better things you could be doing with your time.'
+			'Seeing Pauline sitting on the steps, you approach her. "Hi Pauline! What are you up to?"'
+			'She looks back at you and shrugs her shoulders. "Hey <<$pcs_nickname>>, nothing much. Just waiting for this day to end."'
+			'The two of you continue talking for a while about how much school sucks and all the better things you could be doing with your time.'
 		else
 			'Seeing Pauline sitting on the steps you approach her, "Hi Pauline! What are you up to?"'
-			'She looks back at you and asks, "You lost <<$pcs_nickname>>, shouldn''t you be with your own kind?"'
-			'You shake your head. "Don''t be like that, I just came over to see how you were doing."'
+			'She looks back at you and asks "You lost <<$pcs_nickname>>? Shouldn''t you be with your own kind?"'
+			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 			'The two of you continue talking for a while, mostly about how, if you want to hang with the gopniks, you should join them.'
 		end
 	elseif npc_rel['A24'] <= 20 and pav_slut < 300:
 		npc_rel['A24'] += 1
 		if grupTipe = 4:
-			'Seeing Pauline sitting on the steps, you approach her, "Hi Pauline! What are you up to?"'
-			'She glances at you and then looks around a moment before replying, "I should just kick your ass, right now."'
-			'You shake your head. "Don''t be like that, I just came over to see how you were doing."'
+			'Seeing Pauline sitting on the steps, you approach her. "Hi Pauline! What are you up to?"'
+			'She glances at you and then looks around for a moment before replying "I should just kick your ass, right now."'
+			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 			'You try and talk to her, but she doesn''t really have much to say to you other than offer a few threats.'
 		else
-			'Seeing Pauline sitting on the steps, you approach her, "Hi Pauline! What are you up to?"'
-			'She glances at you and then looks around a moment before replying, "If there weren''t teachers around, I would kick your ass right now."'
-			'You shake your head. "Don''t be like that, I just came over to see how you were doing."'
+			'Seeing Pauline sitting on the steps, you approach her. "Hi Pauline! What are you up to?"'
+			'She glances at you and then looks around for a moment before replying. "If there weren''t teachers around, I would kick your ass right now."'
+			'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 			'You try and talk to her, but she doesn''t really have much to say to you other than offer a few threats.'
 		end
 	elseif pav_slut >= 300:
 		'"Don''t even think about trying to talk to me, slut."'
 	else 
 		npc_rel['A24'] += 1
-		'Seeing Pauline sitting on the steps, you approach her, "Hi Pauline! What are you up to?"'
-		'She glances at you and then looks around a moment before replying, "You lost, shouldn''t you be with your own kind?"'
-		'You shake your head. "Don''t be like that, I just came over to see how you were doing."'
+		'Seeing Pauline sitting on the steps, you approach her. "Hi Pauline! What are you up to?"'
+		'She glances at you and then looks around for a moment before replying. "You lost? Shouldn''t you be with your own kind?"'
+		'You shake your head. "Don''t be like that. I just came over to see how you were doing."'
 		'The two of you continue talking for a while, mostly about how, if you want to hang with the gopniks, you should join them.'
 	end
 	act 'Time for the next class': gt 'gschool_lessons', 'short_break'

File diff suppressed because it is too large
+ 165 - 165
locations/gschool_events.qsrc


+ 4 - 4
locations/gschool_grounds.qsrc

@@ -98,7 +98,7 @@ if $ARGS[0] = 'main':
 				'You go up to the podium. The Principal shakes your hand and gives you your diploma and you return to your place.'
 			end
 
-			act 'Return to town': minut += 2 & gt 'pavResidential'
+			act 'Return to town': minut += 2 & gt 'pav_residential'
 
 			act 'Go to the prom party':
 				*clr & cla
@@ -131,7 +131,7 @@ if $ARGS[0] = 'main':
 				'The Principal hands you your diploma. "Good luck in your future!" she says as she shakes your hand.'
 			end
 
-			act 'Return to town': minut += 2 & gt 'pavResidential'
+			act 'Return to town': minut += 2 & gt 'pav_residential'
 		end
 	end
 
@@ -181,7 +181,7 @@ if $ARGS[0] = 'main':
 		end
 	end
 
-	act 'Return to town': minut += 2 & gt 'pavResidential'
+	act 'Return to town': minut += 2 & gt 'pav_residential'
 
 	act 'Go to the sports field': minut += 1 & gt 'gschool_grounds', 'sports'
 
@@ -428,7 +428,7 @@ if $ARGS[0] = 'bulding':
 			end
 		end
 	end
-	act 'Return to town': minut += 2 & gt 'pavResidential'
+	act 'Return to town': minut += 2 & gt 'pav_residential'
 	if dimaRevenge = 1:
 		menu_off = 1
 		'You''re in a good mood today as you enter the school. That changes when Dimka stops you in the hall on the way to class.

Some files were not shown because too many files changed in this diff