Browse Source

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

hdb 1 year ago
parent
commit
24ed92c76c
59 changed files with 2931 additions and 1209 deletions
  1. 1 1
      locations/Cheatmenu_din.qsrc
  2. 1 1
      locations/HotelRoom.qsrc
  3. 44 20
      locations/MagEncounterFairy.qsrc
  4. 76 60
      locations/Voltrener.qsrc
  5. 1 1
      locations/Zvereva_house_events.qsrc
  6. 82 104
      locations/_attributes_school.qsrc
  7. 13 7
      locations/albina_starlets.qsrc
  8. 9 9
      locations/albina_wine_event.qsrc
  9. 11 2
      locations/city_coffee_hole.qsrc
  10. 17 17
      locations/city_redlight.qsrc
  11. 20 0
      locations/clothing_attributes.qsrc
  12. 1 0
      locations/dimaHome.qsrc
  13. 1 1
      locations/fame.qsrc
  14. 1 1
      locations/gdksport.qsrc
  15. 1 0
      locations/gschool_grounds.qsrc
  16. 1 1
      locations/gschool_jock_chats.qsrc
  17. 21 20
      locations/home_activity.qsrc
  18. 1 1
      locations/hookup_talk.qsrc
  19. 119 14
      locations/journal.qsrc
  20. 47 46
      locations/journal_school.qsrc
  21. 4 1
      locations/journal_work.qsrc
  22. 4 4
      locations/kathouse0.qsrc
  23. 492 38
      locations/katja_chat.qsrc
  24. 145 102
      locations/katja_city.qsrc
  25. 84 37
      locations/katja_dorm.qsrc
  26. 0 2
      locations/katja_lake.qsrc
  27. 77 16
      locations/katja_meynold_schedule.qsrc
  28. 39 0
      locations/katja_uni.qsrc
  29. 379 33
      locations/katja_uni_sex.qsrc
  30. 1 1
      locations/korr.qsrc
  31. 45 46
      locations/metro_events.qsrc
  32. 11 4
      locations/music_actions.qsrc
  33. 1 0
      locations/music_guitarlesson.qsrc
  34. 6 5
      locations/npcstatic3.qsrc
  35. 1 1
      locations/npcstatic5.qsrc
  36. 6 6
      locations/olutaxi.qsrc
  37. 5 5
      locations/pav_clinic.qsrc
  38. 26 40
      locations/pav_disco_coolkids.qsrc
  39. 32 46
      locations/pav_disco_gopniks.qsrc
  40. 9 18
      locations/pav_disco_jocks.qsrc
  41. 2 2
      locations/pav_discoev1.qsrc
  42. 3 3
      locations/pav_hotel.qsrc
  43. 51 4
      locations/pav_park.qsrc
  44. 2 2
      locations/pav_parkev.qsrc
  45. 229 0
      locations/pavlov_home.qsrc
  46. 2 2
      locations/pet_dog.qsrc
  47. 2 0
      locations/placer_house.qsrc
  48. 21 4
      locations/salon.qsrc
  49. 16 1
      locations/shop.qsrc
  50. 6 1
      locations/sleep.qsrc
  51. 3 0
      locations/sportShop.qsrc
  52. 14 7
      locations/stat.qsrc
  53. 99 2
      locations/street_event.qsrc
  54. 442 191
      locations/stripclub.qsrc
  55. 41 41
      locations/stwork.qsrc
  56. 158 230
      locations/stwork2.qsrc
  57. 2 5
      locations/tatiana_missions.qsrc
  58. 1 1
      locations/vasilyhome.qsrc
  59. 2 2
      locations/zaprFWash.qsrc

+ 1 - 1
locations/Cheatmenu_din.qsrc

@@ -1100,7 +1100,7 @@ $cheatmenu['tatoo'] = {
 	if tatlip >= 1:'<a href="exec:tattCount-=1 & tatlip = 0 & dynamic $cheatmenu[''tatoo'']">Remove your lip tattoo</a>'
 	if tatneck = 0:'You do not have a tattoo on your neck</a>'
 	if tatneck >= 1:'<a href="exec:tattCount-=1 & tatneck = 0 & dynamic $cheatmenu[''tatoo'']">Remove your neck tattoo</a>'
-	if tatvag = 0:'You do not have a public tattoo</a>'
+	if tatvag = 0:'You do not have a pubic tattoo</a>'
 	if tatvag >= 1:'<a href="exec:tattCount-=1 & tatvag = 0 & dynamic $cheatmenu[''tatoo'']">Remove your pubic tattoo</a>'
 	if tatlech = 0:'You do not have a tattoo on your shoulder</a>'
 	if tatlech >= 1:'<a href="exec:tattCount-=1 & tatlech = 0 & dynamic $cheatmenu[''tatoo'']">Remove your shoulder tattoo</a>'

+ 1 - 1
locations/HotelRoom.qsrc

@@ -181,7 +181,7 @@ if $ARGS[0] = 'shower1':
 		end
 	end
 	
-	gs 'din_van', 'private', 'hotelroom', iif(hotelroom = 1, '', 'bath')
+	gs 'din_van', 'private', 'hotelroom', iif(hotelRoom[$hotel] = 1, '', 'bath')
 end
 
 if $ARGS[0] = 'tv':

+ 44 - 20
locations/MagEncounterFairy.qsrc

@@ -138,32 +138,50 @@ if $ARGS[0] = 'fairy_chat':
 					pcs_nips += 5
 					pcs_horny += 10
 					gs 'stat'
-					if pcs_nips < 20:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
-					if pcs_nips >= 20 and pcs_nips < 40:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
-					if pcs_nips >= 40 and pcs_nips < 60:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
-					if pcs_nips >= 60 and pcs_nips < 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
-					if pcs_nips >= 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
+					if pcs_nips < 20:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
+					elseif pcs_nips < 40:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
+					elseif pcs_nips < 60:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
+					elseif pcs_nips < 80:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
+					end
 					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, and seem to be a bit larger now.'
 					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
 				elseif fairy_surprise = 3:
 					pcs_nips -= 5
 					gs 'stat'
-					if pcs_nips < 20:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
-					if pcs_nips >= 20 and pcs_nips < 40:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
-					if pcs_nips >= 40 and pcs_nips < 60:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
-					if pcs_nips >= 60 and pcs_nips < 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
-					if pcs_nips >= 80:'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
+					if pcs_nips < 20:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples1.jpg"></center>'
+					elseif pcs_nips < 40:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples2.jpg"></center>'
+					elseif pcs_nips < 60:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples3.jpg"></center>'
+					elseif pcs_nips < 80:
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples4.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/pc/body/nipples/nipples5.jpg"></center>'
+					end
 					'You hear a giggle.  Suddenly, your nipples get really firm and pointed, yet seem to be smaller then before.'
 					'You can''t help but rub both breasts, feeling the warm tingling in them, and in your pussy.'
 				elseif fairy_surprise <= 4:
 					clit_size += 5
 					pcs_horny += 10
 					gs 'stat'
-					if clit_size < 20:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
-					if clit_size >= 20 and clit_size < 40:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
-					if clit_size >= 40 and clit_size < 60:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
-					if clit_size >= 60 and clit_size < 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
-					if clit_size >= 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
+					if clit_size < 20:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
+					elseif clit_size < 40:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
+					elseif clit_size < 60:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
+					elseif clit_size < 80:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
+					end
 					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
 					'Your clitoris has swollen, and seems to stand out even more than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
 					'The fairy admires the changes she''s made, and smiles at you, looking again at your puffy pussy and licking her lips.'
@@ -171,11 +189,17 @@ if $ARGS[0] = 'fairy_chat':
 				elseif fairy_surprise = 5:
 					clit_size -= 5
 					gs 'stat'
-					if clit_size < 20:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
-					if clit_size >= 20 and clit_size < 40:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
-					if clit_size >= 40 and clit_size < 60:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
-					if clit_size >= 60 and clit_size < 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
-					if clit_size >= 80:'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
+					if clit_size < 20:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit1.jpg"></center>'
+					elseif clit_size < 40:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit2.jpg"></center>'
+					elseif clit_size < 60:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit3.jpg"></center>'
+					elseif clit_size < 80:
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit4.jpg"></center>'
+					else
+						'<center><img <<$set_imgh>> src="images/pc/body/clit/clit5.jpg"></center>'
+					end
 					'You hear a giggle and you feel a warm tingle at the top of your slit, you reach down and part your pussy lips with your fingers.'
 					'Your clitoris has shunk, and seems to more demure than before! You can''t help but rub all around it, feeling the warm tingling and the moisture build at the entrance.'
 				elseif fairy_surprise <= 6:

+ 76 - 60
locations/Voltrener.qsrc

@@ -157,85 +157,101 @@ if $ARGS[0] = 'talk':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
 				gs 'stat'
-				if fame['pav_slut'] <= 125:
-					if trenerSex = 1:
-						volleysostav = 1
-						'You ask the coach about joining the team. He smiles and says, "<<$pcs_nickname>>, honey, I can do that, but you''ll have to start as a sub or people might be suspicious."'
-					elseif pcs_vball < 60:
-						'You ask the coach about joining the team, but he just shakes his head. "<<$pcs_lastname>>, it''s not personal, you have good amateur skills. Just not enough to make the team."'
-					else
-						'You ask the coach about joining the team. He thinks for a minute, then says "You have good skills for an amateur, but you''re still not good enough to start on the team. However, I have room for a substitute, and we can put you there. How does that sound?"'
+				if pcs_vball > 75:
+					'You ask the coach about joining the team and Mikhail smiles and nods his head then giving you the thumbs up he says, "<<$pcs_lastname>>, you have very good skills. Umm... Okay, just about enough to make the team. I want to congratulate you as I''ve decided to make you a first string regular. From now on, you''ll be starting."'
+					'"But," he adds, shaking his finger at you admonishingly. "You still need to keep practicing, and less drinking!"'
+					act 'Accept the starter position':
+						*clr & cla
+						gs 'stat'
+						grupvalue[2] += 5
+						volleysostav = 2
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+						'You happily accept, "Oh Mikhail! Thank you so much, I won''t let you down." The coach grins at you and nods his head in confirmation.'
+						'"Okay, welcome to the team <<$pcs_lastname>>. Remember, tournament matches are on Saturdays. Don''t forget to show up!"'
+						act 'Leave':gt 'gdksport', 'start'
+					end
+				else
+					if fame['pav_slut'] <= 125:
+						if trenerSex = 1:
+							volleysostav = 1
+							'You ask the coach about joining the team. He smiles and says, "<<$pcs_nickname>>, honey, I can do that, but you''ll have to start as a sub or people might be suspicious."'
+						elseif pcs_vball < 60:
+							'You ask the coach about joining the team, but he just shakes his head. "<<$pcs_lastname>>, it''s not personal, you have good amateur skills. Just not enough to make the team."'
+						else
+							'You ask the coach about joining the team. He thinks for a minute, then says "You have good skills for an amateur, but you''re still not good enough to start on the team. However, I have room for a substitute, and we can put you there. How does that sound?"'
 
-						act 'Accept the substitute position':
+							act 'Accept the substitute position':
+								*clr & cla
+								gs 'stat'
+								grupvalue[2] += 3
+								volleysostav = 1
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+								'You accept the substitute position and the coach nods his head in confirmation.'
+								'"Okay, welcome to the team <<$pcs_lastname>>. Remember, tournament matches are on Saturdays. Don''t forget to show up!"'
+								act 'Leave':gt 'gdksport', 'start'
+							end
+						end
+					elseif fame['pav_slut'] > 200:
+						'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
+						act 'It''s all lies':
 							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+							'You tell him it''s not true and that some of the kids have been spreading false rumours about you.'
+							'He doesn''t appear to be convinced, the only options are to go aggressive or drop it, for now.'
+							act 'Drop it': gt 'gdksport', 'start'
+							gs 'willpower', 'misc', 'self', 'hard'
 							gs 'stat'
-							grupvalue[2] += 3
-							volleysostav = 1
-							'You accept the substitute position and the coach nods his head in confirmation.'
-							'"Okay, welcome to the team <<$pcs_lastname>>. Remember, tournament matches are on Saturdays. Don''t forget to show up!"'
-							act 'Leave':gt 'gdksport', 'start'
+							if will_cost <= pcs_willpwr:
+								act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
+									*clr & cla
+									gs 'willpower', 'pay', 'self'
+									gs 'stat'
+									!!if volleysostav > 0:npc_rel['A69'] -= 1
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
+									if npc_rel['A69'] > 20:
+										npc_rel['A69'] = 20
+										volleysostav = 1
+										'You try to prove to the coach that he should put you on the team, the coach tries to protest, and you get into an argument. Eventually you shout him down and he gives up. "Fine <<$pcs_lastname>>, I''ll put you in the team, but you''re on the bench and any more stunts like this and you''re out."'
+									else
+										'You try to prove to the coach that he should put you on the team, but you are not forceful enough and the coach countered all your arguments, denying you a place on the team.'
+									end
+									act 'Leave':gt 'gdksport', 'start'
+								end
+							else
+								act 'Persuade him to let you join the team (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
+							end
 						end
-					end
-				elseif fame['pav_slut'] > 200:
-					'You ask the coach about joining the team. The coach thinks for a minute, "Hey <<$pcs_lastname>>, I hear loads of rumours about you. Such as you being a <<$gnikname>>. Is this true?"'
-					act 'It''s all lies':
-						*clr & cla
-						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/teacher/mikhail/volleytrener6.jpg"></center>'
-						'You tell him it''s not true and that some of the kids have been spreading false rumours about you.'
-						'He doesn''t appear to be convinced, the only options are to go aggressive or drop it, for now.'
-						act 'Drop it': gt 'gdksport', 'start'
-						gs 'willpower', 'misc', 'self', 'hard'
-						gs 'stat'
+						act 'Okay, it''s true. I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
+					else
+						'You ask the coach about joining the team. After thinking for a minute, he says "I have a spot for a substitute, but I don''t know if you have what it takes."'
+						gs 'willpower', 'misc', 'self'
 						if will_cost <= pcs_willpwr:
-							act 'Persuade him to let you join the team (<<will_cost>> Willpower)':
+							act 'Persuade him (<<will_cost>> Willpower)':
 								*clr & cla
+								minut += rand(20,30)
 								gs 'willpower', 'pay', 'self'
 								gs 'stat'
-									!!if volleysostav > 0:npc_rel['A69'] -= 1
-								if npc_rel['A69'] > 20:
-									npc_rel['A69'] = 20
+
+								if npc_rel['A69'] >= 60:
 									volleysostav = 1
-									'You try to prove to the coach that he should put you on the team, the coach tries to protest, and you get into an argument. Eventually you shout him down and he gives up. "Fine <<$pcs_lastname>>, I''ll put you in the team, but you''re on the bench and any more stunts like this and you''re out."'
+									grupvalue[2] += 3
+									'You appeal to the coach and ask him to at least give you a chance to prove yourself. Since he likes you, he decides to give you a break. "Okay, <<$pcs_nickname>>, I do have an opening for a sub. You''re on the team as a substitute player.'
+									act 'Leave':gt 'gdksport', 'start'
 								else
-									'You try to prove to the coach that he should put you on the team, but you are not forceful enough and the coach countered all your arguments, denying you a place on the team.'
+									'You try to prove to the coach that he should let you on the team, but he counters all your arguments, denying you a place on the team.'
+									act 'Leave':gt 'gdksport', 'start'
 								end
-								act 'Leave':gt 'gdksport', 'start'
 							end
 						else
-							act 'Persuade him to let you join the team (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
-						end
-					end
-					act 'Okay, it''s true. I am a <<$gnikname>>': gt'Voltrener', 'gorslut'
-				else
-					'You ask the coach about joining the team. After thinking for a minute, he says "I have a spot for a substitute, but I don''t know if you have what it takes."'
-					gs 'willpower', 'misc', 'self'
-					if will_cost <= pcs_willpwr:
-						act 'Persuade him (<<will_cost>> Willpower)':
-							*clr & cla
-							minut += rand(20,30)
-							gs 'willpower', 'pay', 'self'
-							gs 'stat'
-
-							if npc_rel['A69'] >= 60:
-								volleysostav = 1
-								grupvalue[2] += 3
-								'You appeal to the coach and ask him to at least give you a chance to prove yourself. Since he likes you, he decides to give you a break. "Okay, <<$pcs_nickname>>, I do have an opening for a sub. You''re on the team as a substitute player.'
-								act 'Leave':gt 'gdksport', 'start'
-							else
-								'You try to prove to the coach that he should let you on the team, but he counters all your arguments, denying you a place on the team.'
-								act 'Leave':gt 'gdksport', 'start'
-							end
+							act 'Persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 						end
-					else
-						act 'Persuade him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to persuade him to join the team.'
 					end
+					act 'Leave':gt 'gdksport', 'start'
 				end
+	
 				act 'Leave':gt 'gdksport', 'start'
 			end
-
-			act 'Leave':gt 'gdksport', 'start'
 		end
-
 		act 'Leave':gt 'gdksport', 'start'
 	else
 		if trenerSex = 0:

+ 1 - 1
locations/Zvereva_house_events.qsrc

@@ -214,7 +214,7 @@ if $ARGS[0] = 'bed_chat':
 			'Giving you an appraising look, she says "Silvestr is the youngest of my older brothers and the only one of them I actually like. He taught me how to fight, and where I learned to push my body to achieve the perfection you see today."'
 			'"When will I meet him?"'
 			'"Why haven''t you already? It''s why I brought you home. What, did you think I wanted to fuck you? Get out there and say hello. He will take it from there. Remember, do what he says or else."'
-			if stat['think_virgin'] = 0:
+			if stat['think_virgin'] = 1:
 				'"But I''m a virgin. My mother makes me do regular check ups at the gynaecologist!"'
 				'Christina starts laughing. "Yeah right!"'
 				'"Really, Mistress. I don''t have a choice. If she finds out I''ve lost my virginity to your brother there will be a lot of trouble." You let the unspoken threat hang in the air.'

+ 82 - 104
locations/_attributes_school.qsrc

@@ -73,9 +73,9 @@ elseif ARGS[1] = 10:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 11:
-	CloQuality = 4
-	CloThinness = 5
-	CloTopCut = 3
+	CloQuality = 3
+	CloThinness = 4
+	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
@@ -217,13 +217,13 @@ elseif ARGS[1] = 31:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 32:
 	CloQuality = 5
-	CloThinness = 4
-	CloTopCut = 2
+	CloThinness = 3
+	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
 	
@@ -235,51 +235,44 @@ elseif ARGS[1] = 33:
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 34:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 3
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 1
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
 	
 elseif ARGS[1] = 35:
 	CloQuality = 3
 	CloThinness = 4
 	CloTopCut = 3
-	CloSkirtShortness = 6
+	CloSkirtShortness = 5
 	CloStyle2 = 4
 	CloBimbo = 1
 	
 elseif ARGS[1] = 36:
 	CloQuality = 4
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 6
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 37:
-	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloQuality = 4
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 
 elseif ARGS[1] = 38:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 4
+	CloThinness = 4
+	CloTopCut = 2
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 39:
 	CloQuality = 3
-	CloThinness = 5
+	CloThinness = 4
 	CloTopCut = 4
 	CloSkirtShortness = 6
 	CloStyle2 = 4
@@ -287,80 +280,67 @@ elseif ARGS[1] = 39:
 	
 elseif ARGS[1] = 40:
 	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloStyle = 4
 
 elseif ARGS[1] = 41:
 	CloQuality = 3
-	CloThinness = 6
+	CloThinness = 4
 	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloBimbo = 1
-	CloStyle = 4
 
 elseif ARGS[1] = 42:
 	CloQuality = 3
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 
 elseif ARGS[1] = 43:
 	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloStyle = 4
 	
 elseif ARGS[1] = 44:
 	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 4
-	CloSkirtShortness = 6
+	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloStyle = 4
 
 elseif ARGS[1] = 45:
 	CloQuality = 4
-	CloThinness = 6
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloThinness = 2
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 46:
 	CloQuality = 4
 	CloThinness = 6
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 
 elseif ARGS[1] = 47:
 	CloQuality = 3
 	CloThinness = 5
 	CloTopCut = 4
-	CloSkirtShortness = 6
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloStyle = 4
 	
 elseif ARGS[1] = 48:
 	CloQuality = 3
 	CloThinness = 6
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 49:
 	CloQuality = 3
@@ -368,103 +348,101 @@ elseif ARGS[1] = 49:
 	CloTopCut = 4
 	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
 	
 elseif ARGS[1] = 50:
 	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 51:
 	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 3
 	CloStyle2 = 4
-	CloStyle = 4
 	
 elseif ARGS[1] = 52:
 	CloQuality = 3
 	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
+	CloStyle = 2
 	
 elseif ARGS[1] = 53:
 	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 54:
 	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 55:
 	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
-	CloSkirtShortness = 6
+	CloTopCut = 2
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 56:
 	CloQuality = 4
 	CloThinness = 4
-	CloBra = 1
-	CloSkirtShortness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 57:
 	CloQuality = 5
-	CloThinness = 5
-	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloThinness = 3
+	CloTopCut = 1
+	CloSkirtShortness = 4
 	CloStyle2 = 4
-	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 58:
 	CloQuality = 3
-	CloThinness = 4
+	CloThinness = 3
 	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloBimbo = 1
 	
 elseif ARGS[1] = 59:
 	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloThinness = 2
+	CloTopCut = 1
+	CloSkirtShortness = 4
 	CloStyle2 = 4
 	
 elseif ARGS[1] = 60:
 	CloQuality = 4
-	CloThinness = 6
-	CloTopCut = 4
-	CloSkirtShortness = 6
+	CloThinness = 4
+	CloTopCut = 1
+	CloSkirtShortness = 5
 	CloStyle2 = 4
-	CloStyle = 4
 	
-
+elseif ARGS[1] = 61:
+	CloQuality = 4
+	CloThinness = 1
+	CloTopCut = 1
+	CloSkirtShortness = 4
+	CloStyle2 = 4
+	
+elseif ARGS[1] = 62:
+	CloQuality = 4
+	CloThinness = 6
+	CloTopCut = 1
+	CloSkirtShortness = 5
+	CloStyle2 = 4
+	CloCoverTop = 3
 end
 
 --- $attributes_school ---------------------------------

+ 13 - 7
locations/albina_starlets.qsrc

@@ -1,7 +1,7 @@
 # albina_starlets
 !2021/05/06
 
-!! If Sveta is not a cool kid or jock
+!! If Sveta is not a cool kid or jock, or Albina simply doesn''t like her
 if $ARGS[0] = 'albina1':
 	menu_off = 1
 	*clr & cla
@@ -10,7 +10,7 @@ if $ARGS[0] = 'albina1':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know nothing about her outside of her reputation as a cold-hearted bitch.'
+	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know nothing about her outside of her reputation as a stuck up bitch.'
 
 	act 'Greet Albina':
 		*clr & cla
@@ -49,7 +49,13 @@ if $ARGS[0] = 'albina1':
 			   '<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 			   'The music starts playing and you instantly realise your mistake in trying to compare yourself to Albina. She flawlessly performs a number of dance moves you could never hope to do, all with a smug smile on her face directed at you.'
 			   'She finishes her performance as the music ends and you sheepishly avoid eye contact with her as she walks up to you, breathless.'
-			   '"Not so loud mouthed now are you?" she gleefully remarks with a laugh. "Now why don''t you fuck off and take your bow-legged humble ass back to the amateur corner where you belong? Someone of <i>your</i> social standing will <i>never</i> make it onto the Starlets." The other girls laugh at you as you retreat from the mocking insults being directed at you.'
+			   '"Not so loud mouthed now are you?" she gleefully remarks with a laugh. "Now why don''t you fuck off and take your bow-legged humble ass back to the amateur corner where you belong?"' 
+			   if grupTipe = 4:
+					'"A junkie like you will never dance with <i>us</i>!"'
+				else
+					'"If I liked you better, then I <i>might</i> have taken an interest in improving your horrible dancing."'
+				end
+			   'The other girls laugh at you as you retreat from the mocking insults being directed at you.'
 			   
 			   act 'Leave': gt 'gdksport', 'start'
 			end
@@ -66,7 +72,7 @@ if $ARGS[0] = 'albina2':
 	gs 'stat'
 	'<center><b><font color="maroon"><<$npc_firstname[''A23'']>> <<$npc_lastname[''A23'']>></font></b></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
-	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know Albina from school and you have a pretty good relationship.'
+	'At the end of the class, a few girls enter the dance studio, including Albina Barlovskaya. You know Albina from school and you have a pretty good relationship with each other.'
 
 	act 'Greet Albina':
 		*clr & cla
@@ -132,7 +138,7 @@ if $ARGS[0] = 'albina3':
 		'You approach and greet Albina, who turns to you and smiles, but stops short of hugging you.'
 		'"<<$pcs_nickname>>!! Please tell me you don''t practice with those bow-legged cows who call themselves dancers?" she asks with a smirk.'
 		'"I''m pretty good, but I don''t know if I''m quite on your level just yet," you reply.'
-		'"Hey, don''t sell yourself short <<$pcs_nickname>>," Albina responds with a smile. "Have you seen the people that take lessons here? Please. No amount of teaching will help them reach your skill level. You''ve got talent, which brings me to my next question."'
+		'"Hey, don''t sell yourself short <<$pcs_nickname>>," she responds with a smile. "Have you seen the people that take lessons here? <i>Please</i>. No amount of teaching will help them reach your skill level. You''ve got talent, which brings me to my next question."'
 
 		act 'Ask what she means':
 			*clr & cla
@@ -175,7 +181,7 @@ if $ARGS[0] = 'albina4':
 				gs 'stat'
 				if hotcat < 6:
 					'"Well, am I good enough to join?" you ask.'
-					'Albina just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, you don''t have the prettiest of faces <<$pcs_nickname>>. Appearance is everything to the Starlets, so try improving your looks first and then get back to us."' 
+					'Albina just laughs at you dismissively. "While I <i>could</i> train you properly so you''re not a floundering embarrassment, appearance is everything to the Starlets, so try improving your looks first and then get back to us."' 
 					'She turns and leaves with the rest of the troupe, her comments leaving you feeling slightly insulted.'
 				elseif hotcat >= 6 and stat['think_virgin'] = 1 and stat['vaginal'] = 0:
 					'"Well, am I good enough to join?" you ask.'
@@ -400,7 +406,7 @@ if $ARGS[0] = 'starlets':
 										AlbinaQW['StarletsWhore'] += 1
 										gs 'stat'
 										'You agree to be "nice" and Albina reluctantly hands over the money.'
-										'As you are led away, Albina looks like she is about to say something, but instead just looks at the floor, disheartened. You hear her muttering to herself about how the men can be "way too rough sometimes" while cursing her father.'
+										'As you are led away, Albina looks like she is about to say something, but instead just looks at the floor, disheartened. You hear her muttering to herself while cursing her father.'
 										if AlbinaQW['StarletCustomer'] = 1:
 											act 'Go with the Armenian': gt 'albina_starlets', 'whore1'
 										elseif AlbinaQW['StarletCustomer'] = 2:

+ 9 - 9
locations/albina_wine_event.qsrc

@@ -148,7 +148,7 @@ if $ARGS[0] = 'wine_chat1':
 				end
 			end
 			
-			if npc_sex['A23'] = 1:
+			if npc_sex['A23'] >= 1:
 				act 'I like your taste too':
 					cla & *nl
 					'"I like the taste of your pussy too," you slur back and give her a filthy grin.'
@@ -499,7 +499,7 @@ if $ARGS[0] = 'wine_chat1':
 					'You let yourself drift off in a momentary fantasy before you look down and see Albina''s face frozen in a tight expression.'
 					'"What?" you ask. "Is that weird?"'
 					'Albina stays quiet for a minute, chewing on her lip, appearing to mull over whether she should say something or not. Finally, she speaks.'
-					act'Continue':
+					act 'Continue':
 						cla & *clr
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 						'"The first time I refused to... <i>give</i>... one of the Starlets to my dad, he punished me. He invited a bunch of his friends over and ripped off my clothes. He told me that unless I apologized, he was going to hand me over to them. I was feeling stubborn, so I refused. And then..."'
@@ -511,7 +511,7 @@ if $ARGS[0] = 'wine_chat1':
 						'"Finally after hours of it, I... I broke... I begged him to make it stop. I apologized, told him I was sorry for being a delinquent daughter, that I would never do it again. And he... he just let them keep going. They raped me all weekend long."'
 						*nl
 						'Albina lets her hair fall over her face, but you can see her shoulder shaking with silent sobs.'
-						act'Continue':
+						act 'Continue':
 							cla & *clr
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/event/wine_talk.jpg"></center>'
 							'"The fucker didn''t even whore me out," she whispers. "He let them have me for free. Even gave them some blow to make sure they''d keep fucking for days. He <i>lost</i> money to do this to me. And he made it clear: this was just because I was disobedient."'
@@ -715,7 +715,7 @@ if $ARGS[0] = 'wine_chat1':
 				'"Yeah, too bitchy."'
 				'"What the fuck is that supposed to mean?"'
 				'"You''d rip the balls off the first guy who called you a slut," you say matter of factly. "You couldn''t put up with enough bullshit to be a stripper."'
-				'"... fuck."'
+				'"... Fuck."'
 				'"See? Bitchy," you smile, smugly sipping your wine.'
 				'"Oh fuck off," she grumbles back, taking a much bigger gulp.'
 				gs 'albina_wine_event','wine_chat2'
@@ -1179,8 +1179,8 @@ if $ARGS[0] = 'medium_tits':
 	
 	act 'Me too':
 		cla & *nl
-		'"Me too," you sigh in return. "I get so jealous of the girls in our class who have big boobs."'
-		'"It''s not fair!" she moans. "I want big tits! I want them! I want them! I want them!"'
+		'"Me too," you sigh in return. "I get so jealous of the girls in our class who have big tits."'
+		'"It''s not fair!" she moans. "I want big tits too!"'
 		gs 'albina_wine_event','mom_boobs'
 	end
 	
@@ -1300,13 +1300,13 @@ if $ARGS[0] = 'caught':
 	minut += rand(30,60)
 	cla & *clr
 	albina['wine_count'] = 0
-	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 	'"<i>ALBINA BARLOVSKAYA!</i>"'
 	*nl
 	'A deafening blare splits your ears and you sit up, bewildered as to what''s going on. Looking around, you see Albina just as confused as you are and her mother fuming as she stalks across the room.'
 	act 'Oh shit':
 		cla & *clr
-		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/kitchen.jpg"></center>'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/albinahome/livingroom.jpg"></center>'
 		'"What the hell do you think you''re doing young lady?!" Zoya says before grabbing Albina by the ear and yanking her to her feet. "Drunk in the middle of the day? And naked!"'
 		'"Ow! Ow ow ow ow ow!" Albina whines in pain while standing on her tip toes trying to escape her mother''s grasp. "We''re just having some fun! Lay off Mama!"'
 		'"What is this indecency?!" Zoya goes on, ignoring her pleas. "I thought even you had better sense than this!"'
@@ -1322,7 +1322,7 @@ if $ARGS[0] = 'caught':
 				minut += 15
 				cla & *clr
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/etaj2.jpg"></center>'
-				'The mansion door slams behind you and suddenly you find yourself outside the door of your family''s apartment.'
+				'The mansion door slams behind you before you suddenly find yourself outside the door of your family''s apartment.'
 				'"Huh? How did I-?" you try to turn around but a pair of hands give you a gentle push on your back.'
 				'"Now get inside," Zoya''s voice sounds from behind you. "I won''t tell your mother about this as I expect Albina probably... ''seduced'' you into it, but you need to get to bed and sleep off all that alcohol. Drink a full bottle of water before you do. You''ll thank me in the morning."'
 				'After managing to fumble your key into the door, you stumble inside and Zoya gently closes it behind you.'

+ 11 - 2
locations/city_coffee_hole.qsrc

@@ -22,6 +22,7 @@ if $args[0]= 'inner':
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'inner'
 	menu_off = 0
+	gs 'katja_meynold_schedule'
 	gs 'stat'
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/inside.jpg"></center>'
@@ -29,6 +30,9 @@ if $args[0]= 'inner':
 	if mid($start_type,1,2) = 'sg' and yearstart = 2 and (day = 2 or day = 4 or day = 7) and hour >= 18:
 		'You see a familiar face working behind the counter, your classmate <a href="exec:gt ''city_coffee_hole'', ''anushka_work''">Anushka.</a>'
 	end
+	if locat['katja'] = 30 and (katjaQW['know_going_to_teaching_degree'] = 1 or mid($start_type,1,2) = 'sg'):
+		'You see your classmate <a href="exec:gt ''katja_chat'', ''coffee_hole''">Katja</a> sitting at a table with a pile of books, a cup of coffee and a plate of food.'
+	end
 	if week < 6 and hour >= 17:
 		temprand = rand(1,10)
 		if mid($start_type,1,2) = 'sg' and yearstart = 2:
@@ -75,6 +79,11 @@ if $ARGS[0] = 'eat':
 	$loc_arg = 'post_komp'
 	$menu_loc = 'city_coffee_hole'
 	$menu_arg = 'eat'
+	!! Sending the player to Katja''s table if she is sitting with Katja.
+	if katjaQW['brunch_bought'] = 1:
+		katjaQW['brunch_bought'] = 0
+		gt 'katja_chat', 'city_coffee_hole_event'
+	end
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
 	if coffe_hole_ordered = 1:
@@ -145,7 +154,7 @@ if $args[0]= 'counter':
 			'As you approach, the girl behind the counter looks up at you. She appears to be in her late teens or early twenties. She has short blond hair with one side shaved, her arms are covered in tattoos, and she has a large tattoo on her chest. "Welcome to the Coffee Hole. What can I get you?" she asks in a bored and monotone voice.'
 			act 'Exit the cafe': gt 'city_island'
 			act 'Leave counter': gt 'city_coffee_hole', 'inner'
-			act 'Order from the menu (0:05)':gs 'food_menu'
+			act 'Order from the menu (0:05)': gs 'food_menu'
 		end
 	end
 end
@@ -206,7 +215,7 @@ if $args[0]= 'anushka_work':
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave counter': gt 'city_coffee_hole', 'inner'
-	act 'Order from the menu (0:05)':gs 'food_menu'
+	act 'Order from the menu (0:05)': gs 'food_menu'
 end
 
 if $ARGS[0] = 'photo_shoot':

+ 17 - 17
locations/city_redlight.qsrc

@@ -11,7 +11,7 @@ if $ARGS[0] = 'start':
 	menu_off = 0
 	CLOSE ALL
 	if sound = 0:
-		if month >=11 and month <= 12 or month >=1 and month <=3:
+		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
 			if hour >= 8 and hour <= 23: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
 			if hour >= 0 and hour <= 7: PLAY 'sound/street_night.mp3',30 & PLAY 'sound/zima.mp3',30
 		else
@@ -25,21 +25,21 @@ if $ARGS[0] = 'start':
 	'<center><b>Red Light District</b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/redlight.jpg"></center>'
 	
-	'This small area inside the Industrial District has lots of strip clubs and sex shops. The Porn studio also operates out of this district.'
-	if hour >= 18 or hour < 2:
-		'The <a href="exec:gt ''stripclub'', ''start''">Strip Clubs</a> red lights, attracting men from all over the city.'
+	'This small area inside the Industrial District is home to a number of strip clubs and sex shops. The porn studio also operates out of this district.'
+	if hour >= 18 or hour < 3:
+		'The bright lights and booming music of the <a href="exec:gt ''stripclub'', ''start''">Fuzzy Dice</a> strip club attract men from all over the city.'
 	else
-		'The <a href="exec:msg ''The Strip Club is closed for the day and will reopen at 18:00''">Strip Clubs</a> red lights, attracting men from all over the city.'
+		'The strip club is closed for the day and will reopen at 18:00.'
 	end
 	if pornstudio >= 1 and hour >= 10 and hour < 22:
-		'At the <a href="exec:gt ''pornstudio'', ''start''">Porn Studio</a>, where a variety of adult movies are created.'
+		'A <a href="exec:gt ''pornstudio'', ''start''">porn studio</a> is housed within one of the few warehouses that hasn''t been abandoned.'
 	elseif pornstudio >= 1 and (hour < 10 or hour >= 22):
-		'At the <a href="exec:msg ''The Porn Studio is closed for the day and will reopen at 10:00''">Porn Studio</a>, where a variety of adult movies are created.'
+		'The porn studio is closed and will reopen at 10:00.'
 	end
 	if hour < 3 or hour >= 11: 
-		'A shop for <a href="exec:minut += 1 & gt ''sexshop'', ''start''">Sex Toys</a> is open for perverts from all around the city to browse its stock.'
+		'A <a href="exec:minut += 1 & gt ''sexshop'', ''start''">seedy looking shop</a> that sells sex toys and other erotic merchandise is open for perverts from all around the city to browse its stock.'
 	else
-		'A shop that sells sex toys. It is currently closed and will open at 11:00.'
+		'A seedy looking shop that sells sex toys and other erotic merchandise. It is currently closed and will reopen at 11:00.'
 	end
 	if bordel > 0 and func('bordel', 'is_open'):'Inside the courtyard is the entrance to the <a href="exec:gt ''bordel''">brothel</a>.'
 	if hour >= 10: 
@@ -48,9 +48,9 @@ if $ARGS[0] = 'start':
 		'You see a small printing shop tucked away between two larger buildings. It is currently closed and will open at 10:00.'
 	end
 		if hour >= 19 or hour < 2:
-		'A <a href="exec:gt ''hookahlounge'', ''start''">Hookah Lounge</a> is on a corner, with Indian music streaming from an open door, with a scent of exotic spices.'
+		'A <a href="exec:gt ''hookahlounge'', ''start''">Hookah Lounge</a> sits on a corner, with Indian music and the scent of exotic spices streaming from an open door.'
 	else 
-		'A <a href="exec:msg ''The Hookah Lounge is closed for now and will reopen at 19:00''">Hookah Lounge</a> is on a corner, but it''s currently closed.'
+		'The Hookah Lounge is currently closed and will reopen at 19:00.'
 	end
 	
 	act 'Walk to the Industrial Region (0:05)': minut += 5 & gt 'city_industrial'
@@ -65,13 +65,13 @@ if $ARGS[0] = 'start':
 			cardrive = 3
 		end
 		if cardrive = 3 or cardrive = 6 or (cardrive = 7 and func('autoservisF', 'is_open')) or (cardrive = 9 and func('autotraidF', 'is_open')) or cardrive = 27:
-			'In the parking stands your <a href="exec:' + iif(cardrive = 27, '', 'minut += 1 & ') + 'gs ''carF'', ''start''"><<$car>></a>.'
+			'Your <a href="exec:' + iif(cardrive = 27, '', 'minut += 1 & ') + 'gs ''carF'', ''start''"><<$car>></a> sits in the parking lot.'
 		end
 	end
 
 	if hour >= 20 or hour <= 4:
 		*nl
-		'There are prostitutes working in places near here.'
+		'There are prostitutes working near here.'
 		if pcs_makeup > 2 and PCloStyle = 4 and pcs_inhib >= 40:
 			act 'Prostitute yourself': prst_loc = 1 & gt 'street_walker', 'work'
 		elseif pcs_inhib >= 40:  
@@ -94,12 +94,12 @@ if $ARGS[0] = 'city_copy_shop':
 	if fakepassport = 2:
 		!!only notify player 1 time after events triggered
 		fakepassport = 0
-		'He looks at you hard before saying in a quiet voice, "A passport with a fake age will cost you 30,000 <b>₽</b>"'
+		'He gives you a hard stare. "A fake passport will cost you 30,000 <b>₽</b>," he says quietly.'
 	end
 	if university['fakediplom'] = 2:
 		!!only notify player 1 time after events triggered
 		university['fakediplom'] = 0
-		'He tells you "A diploma for a bachelor''s degree will cost you 100,000 <b>₽</b>"'
+		'"A diploma for a bachelor''s degree will cost you 100,000 <b>₽</b>," he says quietly.'
 	end
 	act 'Leave': gt 'city_redlight', 'start'
 	if age < 18 and fakepassport ! 1:
@@ -110,7 +110,7 @@ if $ARGS[0] = 'city_copy_shop':
 				money -= 30000
 				fakepassport = 1
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/bm_seller.jpg"></center>'
-				'He tells you to come in the back and takes a quick photo of your face, then tells you to wait out out front until he''s done. About an hour goes by before he steps back out and hands you the passport, which shows your face but has an older age printed out on it.'
+				'He tells you to come in the back and takes a quick photo of your face, then tells you to wait out front until he''s done. About an hour goes by before he steps back out and hands you the passport, which shows your face but has an older age printed on it.'
 				act 'Leave': gt 'city_redlight', 'start'
 			end
 		else
@@ -125,7 +125,7 @@ if $ARGS[0] = 'city_copy_shop':
 				money -= 100000
 				university['fakediplom'] = 1
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/bm_seller.jpg"></center>'
-				'You bought a fake diploma.'
+				'You buy a fake diploma.'
 				act 'Leave': gt 'city_redlight', 'start'
 			end
 		else

+ 20 - 0
locations/clothing_attributes.qsrc

@@ -60,6 +60,26 @@
 !! CloBimbo = 1
 !!		Notes:	 Flag for bimboification gain. All exceptionally slutty clothing (the kind almost never seen outside of porn, strip clubs, or on street hookers) should have this flag.
 !!
+!! The following are only applied if required, if the outfit covers these areas fully there is no need to add them
+!!
+!! CloCoverFront:1-4 scale not required to be set must expose the vagina at least partially
+!!		Ex: 	4 Pussy not covered at all 
+!!				3 Pussy is covered but the material is completely transparent, or wide fishnet
+!!				2 Pussy covered but still visible, inc. wide mesh
+!!				1 Pussy can barely be seen through material if you look hard enough, inc. fine mesh
+!!
+!! CloCoverBack:1-4 scale not required to be set exposure of the butt, the presence of a g-string or thong does not mean the butt is covered
+!!		Ex: 	4 Butt not covered at all 
+!!				3 Butt is covered but the material is completely transparent, or wide fishnet
+!!				2 Butt covered but still visible, inc. wide mesh
+!!				1 Butt can barely be seen through material if you look hard enough, inc. fine mesh
+!!
+!! CloCoverTop:	1-4 scale not required to be set. Breast exposure, must be some nipple or the whole of the rest of the breast for it to count. Deep cleavage without nipple does not count.
+!!		Ex: 	4 Breasts not covered at all 
+!!				3 Breasts is covered but the material is completely transparent, or wide fishnet
+!!				2 Breasts covered but still visible, inc. wide mesh
+!!				1 Breasts can barely be seen through material if you look hard enough, inc. fine mesh
+!!
 !!	Figures for CloInhibit values, these are the maximums for each range. Currently all set to lowest figure in range but to add random element when time permits
 !!0:	dress:1					pants:1		top:2			thickness:2
 !!5:	dress:2					pants:3		top:2			thickness:3

+ 1 - 0
locations/dimaHome.qsrc

@@ -403,6 +403,7 @@ if $ARGS[0] = 'kitchen1':
 	*clr & cla
 	menu_off = 1
 	minut += 1
+	met_DimkaMother = 1
 	gs 'stat'
 	'<center><b><font color = maroon>Kitchen</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/dimkahome/olya.jpg"></center>'

+ 1 - 1
locations/fame.qsrc

@@ -755,7 +755,7 @@ if $ARGS[0] = 'calculateSlut':
     elseif fame['pav_slut'] < 125:
         $gnikname = 'vixen'
     elseif fame['pav_slut'] < 150:
-        $gnikname = 'tempress'
+        $gnikname = 'temptress'
     elseif fame['pav_slut'] < 175:
         $gnikname = 'cocklover'
     elseif fame['pav_slut'] < 200:

+ 1 - 1
locations/gdksport.qsrc

@@ -259,7 +259,7 @@ if $ARGS[0] = 'dance2':
 			if AlbinaQW['StarletsJoined'] = 0 and AlbinaQW['StarletsShutDown'] = 0 and mid($start_type,1,2) = 'sg' and ( month < 10 or ( month = 10 and day < 18 )):
 				if alterstrtimg = 13:
 					gt 'albina_starlets', 'albina3'
-				elseif grupTipe = 1 or grupTipe = 2:
+				elseif (grupTipe = 1 or grupTipe = 2) and npc_rel['A23'] >= 60:
 					gt 'albina_starlets', 'albina2'
 				else
 					gt 'albina_starlets', 'albina1'

+ 1 - 0
locations/gschool_grounds.qsrc

@@ -899,6 +899,7 @@ if $ARGS[0] = 'Family extension':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/sveta_mum_restaurant.jpg"></center>'
 						if npc_QW['A29'] > 0:
+							if npc_QW['A29'] = 1: npc_QW['A29'] = 2
 							'At the station cafe, your mother selects a corner spot away from the main area so you can keep your chat private.'
 							'You both initially have some general small talk during which she again congratulates you on your win and explains that she wants the best for you and will help in any way she can, but you need to meet her half way.'
 							'You''re initially unsure how to respond, but after a while in a very low shaky voice, you reply. "I''d love that, but why do you give me such a hard time just because I had sex?"'

+ 1 - 1
locations/gschool_jock_chats.qsrc

@@ -841,7 +841,7 @@ if $ARGS[0] = 'lina':
 		end
 	elseif grupTipe = 4:
 		if npc_rel['A19'] >= 60:
-			if tatarm = 0 or tatass = 0 or tatback = 0 or tatblly = 0 or tatbrst = 0 or tatchst = 0 or tatfce = 0 or tatankle = 0 or tathand = 0 or tatleg = 0 or tatlip = 0 or tatneck = 0 or tatvag = 0 or tatlech = 0 or tatside = 0 or tatupb = 0 or tatunder = 0 or tatwrist = 0:
+			if tattCount = 0:
 				'"Why don''t you have any tattoos, <<$pcs_nickname>>?"'
 				'"I don''t know," you say with a shrug.'
 				'"I''m surprised the other gopniks let you hang around without at least one. Like an initiation or something."'

+ 21 - 20
locations/home_activity.qsrc

@@ -6,13 +6,13 @@
 
 if $ARGS[0] = 'vomiting_check':
 	!! if not one of these locations, event will not fire
-	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $home['current'] = 5 or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
+	if at_home = 1 or at_home = 2 or at_home = 3 or at_home = 4 or $loc = 'bedrPar' or at_home = 6 or at_home = 13 or at_home = 15 or $loc = 'mey_home':
 		gs 'home_activity', 'vomiting_images'
 		gt 'home_activity', 'morning_vomit'
-!!	else
-!!		vomit['morning_sick'] = 0
-!!		vomit['hangover'] = 0
-!!		vomit['unlucky'] = 0
+    else
+		vomit['morning_sick'] = 0
+		vomit['hangover'] = 0
+		vomit['unlucky'] = 0
 	end
 end
 
@@ -115,7 +115,7 @@ if $ARGS[0] = 'vomiting_images':
 end
 
 if $ARGS[0] = 'morning_vomit':
-	cla & *clr
+    cla & *clr
 	$home_activity['vomit_bedroom']
 	'Before you even open your eyes, your stomach churns. Nausea courses through you, acid burns at the back of your throat, and you know without a doubt:'
 	*nl
@@ -163,7 +163,7 @@ if $ARGS[0] = 'morning_vomit':
 				if $loc = 'mey_home':
 					act'Continue':gt 'mey_home', 'mey_morning_vomit'
 				else
-					act'Continue':gt'home_activity','vomiting_exit'
+					act'Continue':gt'sleep','end'
 				end
 			end
 		end
@@ -231,7 +231,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You don''t like the frequency with which this is happening. More and more, the evidence is pointing towards you being pregnant.'
 		*nl
 		'<i>What am I going to do?</i> you think to yourself.'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'I better not be pregnant':
@@ -240,7 +240,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Disgust and irritation fill you as you reach out to flush the toilet.'
 		*nl
 		'<i>Oh God,</i> you groan internally. <i>I swear, this better be a stomach bug and not pregnancy. I am not ready for motherhood.</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'I can''t wait for this baby':
@@ -249,7 +249,7 @@ if $ARGS[0] = 'think_preg_react':
 		'Even through the pain and the horrid taste on your lips, you can''t help but smile.'
 		*nl
 		'<i>I''m so ready for this baby!</i> you think excitedly.'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'Baby good, morning sickness bad':
@@ -258,7 +258,7 @@ if $ARGS[0] = 'think_preg_react':
 		'You clutch your head, wincing at the sharp pain that lances through it.'
 		*nl
 		'<i>This baby can not come sooner,</i> you think to yourself. <i>Really looking forward to watching it grow, but <b>really</b> hate this pregnancy stuff.</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 end
 
@@ -267,14 +267,14 @@ if $ARGS[0] = 'preg_scare_react':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>I need to take a pregnancy test right now!</i> you think urgently. <i>I need to figure out what is going on!</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'This is really bad':
 		cla & *clr
 		$home_activity['vomit_bathroom']
 		'<i>This is really really bad!</i> you think, the blood draining from your face. <i>I don''t want to be a mom! Not now!</i>'
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	act'This is wonderful!':
@@ -285,7 +285,7 @@ if $ARGS[0] = 'preg_scare_react':
 		else
 			'<i>I''m going to have another baby!</i> you think, smiling to yourself. <i>This is wonderful!</i>'
 		end
-		act'Continue':gt'home_activity','vomiting_exit'
+		act'Continue':gt'sleep','end'
 	end
 	
 	if stat['think_virgin'] = 1:
@@ -293,22 +293,23 @@ if $ARGS[0] = 'preg_scare_react':
 			cla & *clr
 			$home_activity['vomit_bathroom']
 			'<i>This doesn''t make any sense,</i> you think to yourself, putting your hand on your head, feeling woozy again.'
-			act'Continue':gt'home_activity','vomiting_exit'
+			act'Continue':gt'sleep', 'end'
 		end
 	end
 end
 
 
 if $ARGS[0] = 'vomiting_exit':
-	vomit['morning_sick'] = 0
+    vomit['morning_sick'] = 0
 	vomit['hangover'] = 0
 	vomit['unlucky'] = 0
-	if at_home = 1:
+
+    if at_home = 1:
 		!! location = 'City residential apartment'
 		gt 'vanr'
-	elseif at_home = 2:
+	elseif $loc = 'bedrPar':
 		!! location = 'Parent''s home in Pavlovsk'
-		gt 'vanrPar'
+        gt 'vanrPar'
 	elseif at_home = 3:
 		!! location = 'My cottage in the cooperative farm'
 		gt 'dachain', 'dachabath'
@@ -343,4 +344,4 @@ if $ARGS[0] = 'vomiting_exit':
 end
 
 !! --------------- end vomiting ----------------------------
---- home_activity ---------------------------------
+--- home_activity ---------------------------------

+ 1 - 1
locations/hookup_talk.qsrc

@@ -1698,4 +1698,4 @@ if $ARGS[0] = 'what_do_you_do':
 	
 end
 
---- hookup_talk ---------------------------------
+--- hookup_talk ---------------------------------

+ 119 - 14
locations/journal.qsrc

@@ -198,23 +198,88 @@ if $ARGS[0] = 'relationstab':
 
 		'Gopnik'
 		gs 'indik', '4', grupvalue[4]/10, grupvalue[4], 4 & '<<$ind>>'
+			
+		'<center><h2>Popular Kids Relations</h2></center>'
 		
-		'<h2>Other Relations</h2>'
+		if npc_rel['A1'] > 0: 'Friendship with Dimka:' & gs 'journal', 'relindex', 'A1' 
+		if npc_rel['A4'] > 0: 'Friendship with Igor:' & gs 'journal', 'relindex', 'A4' 
+		if npc_rel['A14'] > 0: 'Friendship with Katja:' & gs 'journal', 'relindex', 'A14' 
+		if npc_rel['A15'] > 0: 'Friendship with Vicky:' & gs 'journal', 'relindex', 'A15' 
+		if npc_rel['A17'] > 0: 'Friendship with Irina:' & gs 'journal', 'relindex', 'A17'
+		if npc_rel['A22'] > 0: 'Friendship with Bella:' & gs 'journal', 'relindex', 'A22' 
+		if npc_rel['A146'] > 0: 'Friendship with Marcus:' & gs 'journal', 'relindex', 'A146' 
+		if npc_rel['A147'] > 0: 'Friendship with Andrey:' & gs 'journal', 'relindex', 'A147' 
+		if npc_rel['A148'] > 0: 'Friendship with Mefodiy:' & gs 'journal', 'relindex', 'A148' 
+		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
+		if npc_rel['A139'] > 0: 'Friendship with Stasya:' & gs 'journal', 'relindex', 'A139' 
+		if npc_rel['A140'] > 0: 'Friendship with Lizaveta:' & gs 'journal', 'relindex', 'A140' 
 		
-		if npc_QW['A192'] > 0: 'Friendship with Nastya:' & gs 'journal', 'relindex', 'A192' 
-		if npc_rel['A218'] > 0: 'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'  
-		if npc_rel['A219'] > 0: 'Friendship with Kat:' & gs 'journal', 'relindex', 'A219' 
-		if npc_rel['A220'] > 0: 'Friendship with Vika:' & gs 'journal', 'relindex', 'A220' 
-		if npc_rel['A93'] > 0: 'Friendship with Ira:'  & gs 'journal', 'relindex', 'A93' 
-		if npc_rel['A43'] > 0: 'Friendship with Tamara:' & gs 'journal', 'relindex', 'A43' 
-		if npc_rel['A169']> 0: 'Friendship with Dima:'  & gs 'journal', 'relindex', 'A169' 
-		if npc_rel['A69'] > 0:'Friendship with Mikhail Nikolaevich (Volleyball Coach):' & gs 'journal', 'relindex', 'A69' 
+		'<center><h2>Jocks Relations</h2></center>'
 		
-		! Uncomment if re-introduced into the game ensure you use NPC ID to update them
-		! if alla > 0: 'Friendship with Alla <<alla>>'
-		! if masha > 0: 'Friendship with Masha <<masha>>'
-		! if npc_rel['A41'] > 0: 'Friendship with Givi K. <<npc_rel[''A41'']>>'
-		! if npc_rel['A42'] > 0: 'Friendship with Ashot <<npc_rel[''A42'']>>'
+		if npc_rel['A3'] > 0: 'Friendship with Ivan:' & gs 'journal', 'relindex', 'A3' 
+		if fedormasha = 0 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
+		if npc_rel['A8'] > 0: 'Friendship with Svyatoslav:' & gs 'journal', 'relindex', 'A8' 
+		if npc_rel['A13'] > 0: 'Friendship with Lariska:' & gs 'journal', 'relindex', 'A13' 
+		if npc_rel['A18'] > 0: 'Friendship with Christina:' & gs 'journal', 'relindex', 'A18'
+		if npc_rel['A19'] > 0: 'Friendship with Lina:' & gs 'journal', 'relindex', 'A19'
+		if npc_rel['A23'] > 0: 'Friendship with Albina:' & gs 'journal', 'relindex', 'A23' 
+		if npc_rel['A149'] > 0: 'Friendship with Lazat:' & gs 'journal', 'relindex', 'A149' 
+		if npc_rel['A150'] > 0: 'Friendship with Erast:' & gs 'journal', 'relindex', 'A150' 
+		if npc_rel['A141'] > 0: 'Friendship with Veronika:' & gs 'journal', 'relindex', 'A141' 
+		if npc_rel['A165'] > 0: 'Friendship with Vanya:' & gs 'journal', 'relindex', 'A165' 
+		
+		'<center><h2>Nerds Relations</h2></center>'
+		
+		if npc_rel['A2'] > 0: 'Friendship with Artem:' & gs 'journal', 'relindex', 'A2' 
+		if npc_rel['A6'] > 0: 'Friendship with Petka:' & gs 'journal', 'relindex', 'A6' 
+		if npc_rel['A12'] > 0: 'Friendship with Julia:' & gs 'journal', 'relindex', 'A12' 
+		if npc_rel['A16'] > 0: 'Friendship with Natasha:' & gs 'journal', 'relindex', 'A16' 
+		if npc_rel['A151'] > 0: 'Friendship with Evgeny:' & gs 'journal', 'relindex', 'A151'
+		if npc_rel['A152'] > 0: 'Friendship with Feofan:' & gs 'journal', 'relindex', 'A152'
+		if npc_rel['A153'] > 0: 'Friendship with Gerasim:' & gs 'journal', 'relindex', 'A153' 
+		if npc_rel['A142'] > 0: 'Friendship with Zinaida:' & gs 'journal', 'relindex', 'A142' 
+		if npc_rel['A240'] > 0: 'Friendship with Natalia:' & gs 'journal', 'relindex', 'A240' 
+		
+		'<center><h2>Gopnik Relations</h2></center>'
+		
+		if npc_rel['A9'] > 0: 'Friendship with Vitek:' & gs 'journal', 'relindex', 'A9' 
+		if npc_rel['A10'] > 0: 'Friendship with Dan:' & gs 'journal', 'relindex', 'A10' 
+		if npc_rel['A11'] > 0: 'Friendship with Vasily:' & gs 'journal', 'relindex', 'A11' 
+		if npc_rel['A20'] > 0: 'Friendship with Lena:' & gs 'journal', 'relindex', 'A20' 
+		if npc_rel['A21'] > 0: 'Friendship with Lera:' & gs 'journal', 'relindex', 'A21'
+		if npc_rel['A24'] > 0: 'Friendship with Pauline:' & gs 'journal', 'relindex', 'A24' 
+		if npc_rel['A154'] > 0: 'Friendship with Radomir:' & gs 'journal', 'relindex', 'A154' 
+		if npc_rel['A155'] > 0: 'Friendship with Lavrenti:' & gs 'journal', 'relindex', 'A155' 
+		if npc_rel['A156'] > 0: 'Friendship with Arkadi:' & gs 'journal', 'relindex', 'A156' 
+		if npc_rel['A157'] > 0: 'Friendship with Roman:' & gs 'journal', 'relindex', 'A157' 
+		if npc_rel['A158'] > 0: 'Friendship with Valentin:' & gs 'journal', 'relindex', 'A158' 
+		if npc_rel['A143'] > 0: 'Friendship with Alyona:' & gs 'journal', 'relindex', 'A143' 
+		if npc_rel['A144'] > 0: 'Friendship with Anushka:' & gs 'journal', 'relindex', 'A144' 
+		if npc_rel['A145'] > 0: 'Friendship with Ekaterina:' & gs 'journal', 'relindex', 'A145' 
+		if npc_rel['A189'] > 0: 'Friendship with Niko:' & gs 'journal', 'relindex', 'A189' 
+		
+		'<center><h2>Outcast/Loner Relations</h2></center>'
+		
+		if npc_rel['A7'] > 0: 'Friendship with Lesco:' & gs 'journal', 'relindex', 'A7' 
+		if npc_rel['A159'] > 0: 'Friendship with Petia:' & gs 'journal', 'relindex', 'A159' 
+		if soniaPS = 0 and npc_rel['A25'] > 0: 'Friendship with Sonia:' & gs 'journal', 'relindex', 'A25' 
+		if fedormasha = 1 and npc_rel['A5'] > 0: 'Friendship with Fedor:' & gs 'journal', 'relindex', 'A5' 
+		
+		'<center><h2>Teachers/Coaches/School Staff Relations</h2></center>'
+		
+		if npc_rel['A26'] > 0: 'Friendship with Anatoly Tsarev (Math Teacher):' & gs 'journal', 'relindex', 'A26' 
+		if npc_rel['A69'] > 0: 'Friendship with Mikhail Nikolaevich (Volleyball Coach):' & gs 'journal', 'relindex', 'A69' 
+		if npc_rel['A128'] > 0: 'Friendship with Makar Vasilyev (Art Teacher):' & gs 'journal', 'relindex', 'A128' 
+		if npc_rel['A129'] > 0: 'Friendship with Serafim Ivanov (Computer Science Teacher):' & gs 'journal', 'relindex', 'A129'
+		if npc_rel['A130'] > 0: 'Friendship with Ilya Yenotin (Literature Teacher):' & gs 'journal', 'relindex', 'A130' 
+		if npc_rel['A131'] > 0: 'Friendship with Viktor Pavlovich (P.E. Teacher):' & gs 'journal', 'relindex', 'A131'
+		if npc_rel['A132'] > 0: 'Friendship with Ruslan Kuznetsov (Shop Teacher):' & gs 'journal', 'relindex', 'A132' 
+		if npc_rel['A133'] > 0: 'Friendship with Rolan Metveev (Janitor):' & gs 'journal', 'relindex', 'A133' 
+		if npc_rel['A134'] > 0: 'Friendship with Aleksandrina Volkov (Headmistress):' & gs 'journal', 'relindex', 'A134' 
+		if npc_rel['A135'] > 0: 'Friendship with Yeva Sokoloff (Geography Teacher):' & gs 'journal', 'relindex', 'A135'
+		if npc_rel['A136'] > 0: 'Friendship with Olga Aleksandrov (School Nurse):' & gs 'journal', 'relindex', 'A136' 
+		if npc_rel['A137'] > 0: 'Friendship with Raven Braakman (English Teacher):' & gs 'journal', 'relindex', 'A137' 
+		if npc_rel['A138'] > 0: 'Friendship with Arina Orlov (Biology Teacher):' & gs 'journal', 'relindex', 'A138'
 		
 
 		!!!WD: Formatting
@@ -222,6 +287,46 @@ if $ARGS[0] = 'relationstab':
 		*nl
 		
 	end
+			
+	'<center><h2>Pavlovsk Relations</h2></center>'
+	if npc_rel['A54'] > 0: 'Friendship with Uncle Misha:' & gs 'journal', 'relindex', 'A54' 	 
+	if npc_rel['A57'] > 0: 'Friendship with Rex:' & gs 'journal', 'relindex', 'A57' 
+	if npc_rel['A217'] > 0: 'Friendship with Pavlin:' & gs 'journal', 'relindex', 'A217'  	 
+	if npc_rel['A112'] > 0: 'Friendship with Sergey Shulgin:' & gs 'journal', 'relindex', 'A112'   	 
+	if npc_rel['A119'] > 0: 'Friendship with Borislav:' & gs 'journal', 'relindex', 'A119' 
+		
+	'<center><h2>Gadukino Relations</h2></center>'
+	if npc_rel['A31'] > 0: 'Friendship with Elena (your great-grandmother):' & gs 'journal', 'relindex', 'A31' 
+	if npc_rel['A32'] > 0: 'Friendship with Zlatek (your great-grandfather):' & gs 'journal', 'relindex', 'A32' 
+	if npc_rel['A60'] > 0: 'Friendship with Mira:' & gs 'journal', 'relindex', 'A60' 
+	if npc_rel['A61'] > 0: 'Friendship with Kolyamba:' & gs 'journal', 'relindex', 'A61' 
+	if npc_rel['A62'] > 0: 'Friendship with Vasyan:' & gs 'journal', 'relindex', 'A62' 
+	if npc_rel['A63'] > 0: 'Friendship with Mitka:' & gs 'journal', 'relindex', 'A63' 
+	if npc_rel['A64'] > 0: 'Friendship with Afanasiy:' & gs 'journal', 'relindex', 'A64' 
+	if npc_rel['A65'] > 0: 'Friendship with Vtialiy:' & gs 'journal', 'relindex', 'A65' 
+	if npc_rel['A221'] > 0: 'Friendship with Grigory:' & gs 'journal', 'relindex', 'A221' 		 	
+	if npc_rel['A172'] > 0: 'Friendship with Andrei (hunter):' & gs 'journal', 'relindex', 'A172' 	 	
+	if npc_rel['A173'] > 0: 'Friendship with Igor (hunter):' & gs 'journal', 'relindex', 'A173'  	
+	if npc_rel['A174'] > 0: 'Friendship with Sergei (hunter):' & gs 'journal', 'relindex', 'A174' 
+	
+	'<center><h2>Saint Petersburg Relations</h2></center>'
+	if npc_QW['A192'] > 0: 'Friendship with Nastya:' & gs 'journal', 'relindex', 'A192' 
+	if npc_rel['A218'] > 0: 'Friendship with Tanya:' & gs 'journal', 'relindex', 'A218'  
+	if npc_rel['A219'] > 0: 'Friendship with Kat:' & gs 'journal', 'relindex', 'A219' 
+	if npc_rel['A220'] > 0: 'Friendship with Vika:' & gs 'journal', 'relindex', 'A220' 
+	if npc_rel['A93'] > 0: 'Friendship with Ira:'  & gs 'journal', 'relindex', 'A93' 
+	if npc_rel['A43'] > 0: 'Friendship with Tamara:' & gs 'journal', 'relindex', 'A43' 
+	if npc_rel['A35'] > 0: 'Friendship with Mikhail Kuznetsov (your biological father):' & gs 'journal', 'relindex', 'A35' 
+	if npc_rel['A169']> 0: 'Friendship with Dima:'  & gs 'journal', 'relindex', 'A169' 		 		
+	if npc_rel['A89']> 0: 'Friendship with Eugene:'  & gs 'journal', 'relindex', 'A89' 			 		
+	if npc_rel['A216']> 0: 'Friendship with Martin:'  & gs 'journal', 'relindex', 'A216'  	 		
+	
+	! '<center><h2>Other Relations</h2></center>'
+	! Uncomment if re-introduced into the game ensure you use NPC ID to update them
+	! if alla > 0: 'Friendship with Alla <<alla>>'
+	! if masha > 0: 'Friendship with Masha <<masha>>'
+	! if npc_rel['A41'] > 0: 'Friendship with Givi K. <<npc_rel[''A41'']>>'
+	! if npc_rel['A42'] > 0: 'Friendship with Ashot <<npc_rel[''A42'']>>'
 
 	if husband > 0:'You have been married for <<husbanday>> days. Your husband <<$husName>> <<$husBody>> <<$husFat>> <<$husHair>>. Member <<husDick>> Relationship <<husband>>.'
 	if kid > 0:

+ 47 - 46
locations/journal_school.qsrc

@@ -134,9 +134,9 @@ if $ARGS[0] = 'popular':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/1.jpg"></center>'
 	'<center>Dimka Nosov</center>'
 	if grupTipe = 1:
-		'Dimka Nosov is a cute guy and all the girls adore him. He is considered the coolest kid in school. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. He even throws some epic parties that everyone that is anyone tries to get invited too, even kids from Pushkin sometimes attend. Then his New Years party is the one party he invites everyone. He is the king of the school and everyone wants to either be his friend or hang out with him.'
+		'Dimka Nosov is a cute guy and all the girls adore him. Considered the coolest kid in school, he comes from a fairly wealthy family and is always dressed in expensive stylish clothes. He throws some epic parties that everyone that is anyone tries to get invited to, with even kids from Pushkin sometimes attending. He is the king of the school and everyone wants to either be his friend or hang out with him.'
 	else
-		'Dimka Nosov is a cute guy and all the girls adore him. He is considered the coolest kid in school. The guys tend to either befriend him or loath him. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. Since Lavrenti started hanging out with the gopniks, Dimka is now even king of the parties. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants. He seems to love verbally tormenting the nerds and outcasts when given the chance.'
+		'Dimka Nosov is a cute guy and all the girls adore him. Considered the coolest kid in school, the guys tend to either befriend him or loath him. He comes from a fairly wealthy family and is always dressed in expensive stylish clothes. Since Lavrenti started hanging out with the gopniks, Dimka is now even king of the parties. Despite his pleasant smile and friendly demeanor, there are rumors saying he is a sadist bastard that always gets what he wants. He seems to love verbally tormenting the nerds and outcasts when given the chance.'
 	end
 	if npc_rel['A1'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -168,9 +168,9 @@ if $ARGS[0] = 'popular':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/17.jpg"></center>'
 	'<center>Irina Devyatova</center>'
 	if grupTipe = 1:
-		'Irina Devyatova is a tall and pretty girl. She knows it and takes full advantage of it, using her looks to sweet talk the boys and teachers alike, to get her way. She has a very arrogant and haughty personality hidden behind her sweet smile. She is the queen of what is in fashion and often berates those she deems with out a sense of style, more than once driving other girls to tears. She is often the center of attention when the popular kids hangout. When needed she often sweet talks the jocks and gopnik boys do her dirty work, making them think they have a chance with her and then laughing at them behind their back.'
+		'Irina Devyatova is a tall and pretty girl. She knows it and takes full advantage of it, using her looks to sweet talk boys and teachers alike to get her way. She has a very arrogant and haughty personality hidden behind her sweet smile. She is the queen of what is in fashion and often berates those she deems to have no sense of style, more than once driving other girls to tears. She is often the center of attention when the popular kids hang out. When needed, she often sweet talks the jocks and gopniks into doing her dirty work, making them think they have a chance with her and then laughing at them behind their back.'
 	else
-		'Irina Devyatova is a tall and pretty girl. She knows it and takes full advantage of it, using her looks to sweet talk the boys and teachers alike, to get her way. She has a very arrogant and haughty personality hidden behind her sweet smile. She is the queen of what is in fashion and often berates those she deems with out a sense of style, more than once driving other girls to tears. When needed she often sweet talks the jocks and gopnik boys do her dirty work.'
+		'Irina Devyatova is a tall and pretty girl. She knows it and takes full advantage of it, using her looks to sweet talk boys and teachers alike to get her way. She has a very arrogant and haughty personality hidden behind her sweet smile. She is the queen of what is in fashion and often berates those she deems to have no sense of style, more than once driving other girls to tears. When needed, she often sweet talks the jocks and gopniks into doing her dirty work.'
 	end
 	if npc_rel['A17'] >= 80:
 		'She really likes you and considers you one of her best friends.'
@@ -185,9 +185,9 @@ if $ARGS[0] = 'popular':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/15.jpg"></center>'
 	'<center>Viktoriya "Vicky" Meynold</center>'
 	if grupTipe = 1:
-		'Vicky Meynold is the opposite of her sister. On one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and boyfriend Vanya. A good humored girl, she loves bright and crazy colored clothing. As a child, she took gymnastic lessons and as a result has excellent flexibility and tries out for many of the sports, especially cheerleading. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head. Despite her flighty and unpredictable nature, her liveliness and spontaneity make her fun to hang out with.'
+		'Vicky Meynold is the opposite of her sister. On one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and boyfriend Vanya. A good humored girl, she loves bright and crazy colored clothing. As a child, she took gymnastic lessons and as a result has excellent flexibility and tries out for many of the sports, especially cheerleading. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head. Despite her unpredictable nature, her liveliness and spontaneity make her fun to hang out with.'
 	else
-		'Vicky Meynold is the opposite of her sister. On one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya. A good humored girl, she loves bright and crazy colored clothing. She is a member of the cheerleaders and sometimes tries out for other sports. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head. Despite her flighty and unpredictable nature, her liveliness and spontaneity make her fun to hang out with.'
+		'Vicky Meynold is the opposite of her sister. On one side a smart ass and on the other a cheerful girl. She is very sociable, being friends with many of the students in school and is considered to be one of the most popular girls in school. With a passionate love for dancing, Vicky can often be found at the disco with her sister and good friend Vanya. A good humored girl, she loves bright and crazy colored clothing. She is a member of the cheerleaders and sometimes tries out for other sports. A bit flighty and unpredictable, you never know what thoughts she will come up with next. Logic and reason were never her strong suit as she lives by her emotions and feelings, making decisions from her heart rather than her head. Despite her unpredictable nature, her liveliness and spontaneity make her fun to hang out with.'
 	end
 	if npc_rel['A15'] >= 80:
 		'She really likes you and considers you one of her best friends.'
@@ -202,9 +202,9 @@ if $ARGS[0] = 'popular':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/139.jpg"></center>'
 	'<center>Stanislava "Stasya" Pavlov</center>'
 	if grupTipe = 1:
-		'Stasya Pavlov is a complete bitch to those she considers beneath her, which is the nerds, outcasts, gopniks and even some of the cool kids and jocks. Now that her boyfriend Andrey hangs around with Marcus more than her, she has become jealous of all the time Andrey and Marcus spend together without her, but never says anything around Marcus or Andrey. Instead, she seems to take out her anger on everyone around her, especially the nerds and the outcasts, or complain to her friends Irina and Lizaveta.'
+		'Stasya Pavlov is a complete bitch to those she considers beneath her, which is the nerds, outcasts, gopniks and even some of the cool kids and jocks. Now that her boyfriend Andrey hangs around with Marcus more than her, she has become jealous of all the time Andrey and Marcus spend together without her, but never says anything about it around them. Instead, she seems to take out her anger on everyone around her, especially the nerds and the outcasts, or complains to her friends Irina and Lizaveta.'
 	else
-		'Stasya Pavlov is a complete bitch, and always has been one, but now that her boyfriend Andrey hangs around with Marcus more than her, she has become a lot worse. She doesn''t care for Marcus at all, but never says anything around Marcus or Andrey. Instead, she seems to take out her anger on everyone around her, especially the nerds and the outcasts.'
+		'Stasya Pavlov is a complete bitch, and always has been one, but now that her boyfriend Andrey hangs around with Marcus more than her, she has become a lot worse. She doesn''t care for Marcus at all, but never says anything around him or Andrey. Instead, she seems to take out her anger on everyone around her, especially the nerds and the outcasts.'
 	end
 	if npc_rel['A139'] >= 80:
 		'She really likes you and considers you one of her best friends.'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'popular':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/140.jpg"></center>'
 	'<center>Yelizaveta "Lizaveta" Petrov</center>'
 	if grupTipe = 1:
-		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and willing to use her looks to sweet talk boys into sharing any juicy gossip. If you want to know anything about anyone, she is the one to ask. Luckily, she seems more interested in collecting and sharing gossip than using it for her own gain. Though mostly everyone has respect for what she knows, the few times she has really gone after someone, she has destroyed their status and reputation among their peers. She is often found with Irina and Stasya'
+		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and willing to use her looks to sweet talk boys into sharing any juicy gossip. If you want to know anything about anyone, she is the one to ask. Luckily, she seems more interested in collecting and sharing gossip than using it for her own gain. Though pretty much everyone has respect for what she knows, the few times she has really gone after someone, she has destroyed their status and reputation among their peers. She is often found with Irina and Stasya.'
 	else
 		'Lizaveta Petrov wants to know everyone''s secrets, but is completely incapable of keeping them. Extremely nosy, she is the first to arrive at the scene of any commotion, eager to pry into the details. She is pretty and most boys seem torn. They are attracted to her, but are afraid she will tell everyone everything about them and their whole life becomes public knowledge.'
 	end
@@ -270,7 +270,7 @@ if $ARGS[0] = 'popular':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/14.jpg"></center>'
 	'<center>Ekaterina "Katja" Meynold</center>'
 	if grupTipe = 1:
-		'Katja Meynold is an attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but can also be impulsive at times. She is an avid reader and can be found sometimes discussing books with the nerds, but more often than not, she can be found at the disco with her sister.'
+		'Katja Meynold is an attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but can also be impulsive at times. She is an avid reader and can sometimes be found discussing books with the nerds, but is more often than not found at the disco with her sister.'
 	else
 		'Katja Meynold is an attractive and petite girl, a redhead with a keen interest in fashion and cosmetics. She and her twin sister, Vicky, are like two sides of the same coin. As a quiet and sensible girl, Katja is shy and intelligent, but is an avid reader and can sometimes be found discussing books with the nerds. She can often be found at the disco with her sister.'
 	end
@@ -288,10 +288,10 @@ if $ARGS[0] = 'popular':
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/25.jpg"></center>'
 		'<center>Sonia Ivanko</center>'
 		if grupTipe = 1:
-			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, able to pull off many great looks and earning the envy of many other girls at school. Pretty, smart, cheerful, and sociable, Sonia loves to party and is rarely in a bad mood. She even has grades nearly as good as most of the nerds.'
+			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, able to pull off many great looks and earning the envy of many other girls at school. Pretty, smart, cheerful and sociable, Sonia loves to party and is rarely in a bad mood. She even has grades nearly as good as most of the nerds.'
 			'She lives with her mother in a small apartment after her father left some time ago. Her mother is a nervous, hysterical and scandalous woman who, when not at work in the garment factory, is often out drinking and flirting with men. She often dreams of having a better life away from her mother, one filled with luxury and sophistication.'
 		else
-			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, able to pull off many great looks and earning the envy of many other girls at school. Pretty, smart, cheerful, and sociable, Sonia loves to party and is rarely in a bad mood. She even has grades nearly as good as most of the nerds.'
+			'Sonia Ivanko is an ordinary girl and doesn''t stand out much, other than her sense of fashion. Despite her lack of money or variety of clothing, she has an amazing sense of style, able to pull off many great looks and earning the envy of many other girls at school. Pretty, smart, cheerful and sociable, Sonia loves to party and is rarely in a bad mood. She even has grades nearly as good as most of the nerds.'
 			'She lives with her mother in a small apartment after her father left some time ago. There are rumors about her mother being a hysterical and scandalous woman who, when not at work in the garment factory, is often out drinking and flirting with men.'
 		end
 		if npc_rel['A25'] >= 80:
@@ -353,9 +353,9 @@ if $ARGS[0] = 'jocks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/149.jpg"></center>'
 	'<center>Lazar Pajari</center>'
 	if grupTipe = 2:
-		'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the football team captain. He excels in several sports, but his passion is football, at least when he is not chasing after girls or, more often than not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different ones. He has even been seen hanging out with Albina, who mostly ignores the boys in school. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
+		'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the football team captain. He excels in several sports, but his passion is football, at least when he''s not chasing after girls or, more often than not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different ones. He has even been seen hanging out with Albina, who mostly ignores the boys in school. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
 	else
-		'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the football team captain. He excels in several sports, but his passion is football, at least when he is not chasing after girls or, more often than not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different ones. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
+		'Lazar Pajari is the school football star and the best athlete in school. He is a central midfielder and the football team captain. He excels in several sports, but his passion is football, at least when he''s not chasing after girls or, more often than not, being chased by them, whom he happily lets catch him. His status and good looks make him desirable among the girls and he is often seen with several different ones. Ivan is his biggest competition in sports. While Lazar is the over all better athlete, Ivan is far more focused on boxing than other sports.'
 	end
 	if npc_rel['A149'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -371,6 +371,8 @@ if $ARGS[0] = 'jocks':
 	'<center>Albina Barlovskaya</center>'
 	if grupTipe = 2:
 		'Albina Barlovskaya comes from a wealthy background and is considered to be one of the most attractive girls in school. A gifted dancer and leader of the cheerleaders at school, she is trying to conduct herself properly as her father is trying to become the town mayor, but she is well known for her short temper and is intimidating if angered, despite her rather petite size. She leads a dance troupe that only the prettiest and best dancers are allowed to join, which comes before all other sports or even hanging out with her fellow jocks. There are several rumors about her going around school, but nobody dares mention them in front of her out of fear of incurring her wrath.'
+	elseif grupTipe = 4:
+		'Albina Barlovskaya comes from a wealthy background and is considered to be one of the most attractive girls in school. She is a gifted dancer and cheerleader who is trying to conduct herself properly as her father is trying to become the town mayor, but she is well known for her short temper and is intimidating if angered, despite her rather petite size. She leads a dance troupe that only the prettiest and best dancers are allowed to join. There are several rumors about her going around school, but nobody dares mention them in front of her out of fear of incurring her wrath. She seems to have a particular hatred towards you and your fellow gopniks.'
 	else
 		'Albina Barlovskaya comes from a wealthy background and is considered to be one of the most attractive girls in school. She is a gifted dancer and cheerleader who is trying to conduct herself properly as her father is trying to become the town mayor, but she is well known for her short temper and is intimidating if angered, despite her rather petite size. She leads a dance troupe that only the prettiest and best dancers are allowed to join. There are several rumors about her going around school, but nobody dares mention them in front of her out of fear of incurring her wrath.'
 	end
@@ -387,9 +389,9 @@ if $ARGS[0] = 'jocks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/3.jpg"></center>'
 	'<center>Ivan Prokhorov</center>'
 	if grupTipe = 2:
-		'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and is considered to be very good looking by the girls in school. He spends a lot of time training and is regularly away competing. He isn''t very sociable and, other than when he is training, he tends to be home taking care of his little brother and sister while his mother works two jobs. He occasionally hangs out with Fedor and on rare occasions shows up at the disco or some of the jock parties. He is calm and collected by nature, some might even say apathetic.'
+		'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and spends a lot of training and is regularly away competing. Despite being considered very good looking by the girls in school, he isn''t very sociable and, other than when he is training, tends to be at home taking care of his siblings while his mother works two jobs. He occasionally hangs out with Fedor and on rare occasions shows up at the disco or some of the jock parties. He is calm and collected by nature, some might even say apathetic.'
 	else
-		'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and is considered to be very good looking by the girls in school. He spends a lot of time training and is regularly away competing. He isn''t very sociable and, other than when he is training, tends to keep to himself, although he occasionally hangs out with Fedor. He is calm and collected by nature, some might even say apathetic.'
+		'Ivan Prokhorov is a talented athlete who is able to succeed in any sport he takes part in. He is mostly into boxing and running and spends a lot of training and is regularly away competing. Despite being considered very good looking by the girls in school, he isn''t very sociable and, other than when he is training, tends to keep to himself, although he occasionally hangs out with Fedor. He is calm and collected by nature, some might even say apathetic.'
 	end
 	if npc_rel['A3'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -404,9 +406,9 @@ if $ARGS[0] = 'jocks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/18.jpg"></center>'
 	'<center>Christina Zvereva</center>'
 	if grupTipe = 2:
-		'Christina is one of the school''s best athletes and is the most athletic girl you know. She is very muscular and is a surprisingly skilled fighter, not afraid to start a fight with any of the other girls in school and even some of the boys. She has leadership abilities that, together with her tenacity and intelligence, make her a dominant presence wherever she goes. She is, however, a bully to most of the non-jock girls in school, verbally, emotionally, and physically tormenting them while she tends to dominate most of the other girl jocks. She seems to utterly hate you in particular and goes out of her way to torment you when she can.'
+		'Christina is one of the school''s best athletes and is the most athletic girl you know. She is very muscular and is a surprisingly skilled fighter, not afraid to start a fight with any of the other girls in school and even some of the boys. She has leadership abilities that, together with her tenacity and intelligence, make her a dominant presence wherever she goes. She is, however, a bully to most of the non-jock girls in school, and enjoys verbally, emotionally and physically tormenting them. She seems to utterly hate you in particular and goes out of her way to torment you when she can.'
 	else
-		'Christina is one of the school''s best athletes and is the most athletic girl you know, she is very muscular as well and rumored to be a good fighter, not afraid to start a fight with any of the other girls in school or even some of the boys. She has leadership abilities that, together with her tenacity and intelligence, make her a dominant presence wherever she goes. She is, however, a bully to most of the non-jock girls in school, verbally, emotionally, and physically bullying the other girls. She seems to utterly hate you in particular and goes out of her way to torment you when she can.'
+		'Christina is one of the school''s best athletes and is the most athletic girl you know. She is very muscular and rumored to be a good fighter, not afraid to start a fight with any of the other girls in school or even some of the boys. She has leadership abilities that, together with her tenacity and intelligence, make her a dominant presence wherever she goes. She is, however, a bully to most of the non-jock girls in school, and enjoys verbally, emotionally and physically bullying them. She seems to utterly hate you in particular and goes out of her way to torment you when she can.'
 	end
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/8.jpg"></center>'
@@ -414,7 +416,7 @@ if $ARGS[0] = 'jocks':
 	if grupTipe = 2:
 		'Svyatoslav Voinov is an athletic guy with a very competitive spirit, perhaps the most competitive of the boys. Unfortunately for him, he is not as good of an athlete as Lazar or Ivan and almost always comes in third. He is on every one of the school''s sports teams and runs track, often competing with Ivan to be the fastest. His other focus is football, where he competes with Lazar to be the best player on the team. He''s always trying to one up Ivan or Lazar, but rarely manages to beat either of them at anything.'
 	else
-		'Svyatoslav Voinov is an athletic guy with a very competitive spirit. He is always engaged in sports one way or another. He runs track and often competes with Ivan to be the fastest. His other focus is football, as well as many other sports the school offers. He''s always trying to one up Ivan or Lazar, but rarely manages to beat either of them at anything.'
+		'Svyatoslav Voinov is an athletic guy with a very competitive spirit, always engaged in sports one way or another. He''s always trying to one up Ivan or Lazar, but rarely manages to beat either of them at anything.'
 	end
 	if npc_rel['A8'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -448,7 +450,7 @@ if $ARGS[0] = 'jocks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/165.jpg"></center>'
 	'<center>Vanya Yanka</center>'
 	if grupTipe = 2:
-		'Vanya Yanka is a goofy little jock, playing jokes on his teammates and annoying the coaches. He never goes too far with his jokes and is a good morale booster, so everyone likes him. Despite his easy going attitude, he is a better athlete than most would suspect. When he''s not training or competing, he spends most of his free time hanging out with Vicky and Katja. He is popular with the girls at school, but only seems to have eyes for Vicky, whom he is dating.'
+		'Vanya Yanka is a goofy little jock who often plays jokes on his teammates and annoys the coaches. He never goes too far with his jokes and is a good morale booster, so everyone likes him. Despite his easy going attitude, he is a better athlete than most would suspect. When he''s not training or competing, he spends most of his free time hanging out with Vicky and Katja. He is popular with the girls at school, but only seems to have eyes for Vicky, whom he is dating.'
 	else
 		'Vanya Yanka is a goofy little jock who often plays jokes at school, even during class. He never goes too far with his jokes, so everyone except the nerds, who tend to be the butt of his jokes, like him. When he''s not training or competing, he spends most of his free time hanging out with Vicky and Katja. He is popular with the girls at school, but only seems to have eyes for Vicky, whom he is dating.'
 	end
@@ -516,7 +518,7 @@ if $ARGS[0] = 'jocks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/141.jpg"></center>'
 	'<center>Veronika "Ronnie" Sokolov</center>'
 	if grupTipe = 2:
-		'Veronika Sokolov is sometimes called the "Ice Queen" behind her back for two reasons. One is that she is a very talented ice skater; there is even talk about how she might compete in the next winter Olympics. The other is because she often comes across as cold and indifferent and never lets anyone get close to her. You know that isn''t true; she can be nice or even sweet at times, she is just hyper focused on her skating and rarely has any free time between school and training. She comes from one of the wealthier families in Pavlovsk.'
+		'Veronika Sokolov is sometimes called the "Ice Queen" behind her back for two reasons. One is that she is a very talented ice skater; there is even talk about how she might compete in the next winter Olympics. The other is because she often comes across as cold and indifferent and never lets anyone get close to her. You know that isn''t true; she can be nice or even sweet at times, she''s just hyper focused on her skating and rarely has any free time between school and training. She comes from one of the wealthier families in Pavlovsk.'
 	else
 		'Veronika Sokolov is called the "Ice Queen" by her fellow students behind her back for two reasons. One is that she is a very talented ice skater; there is even talk about how she might compete in the next winter Olympics. The other is because she is cold and indifferent and never lets anyone get close to her. She comes from one of the wealthier families in Pavlovsk.'
 	end
@@ -533,7 +535,7 @@ if $ARGS[0] = 'jocks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/19.jpg"></center>'
 	'<center>Avelina "Lina" Starov</center>'
 	if grupTipe = 2:
-		'Lina Starov is a mediocre athlete. While she looks like Christina''s friend, the right term would be lapdog. She usually does anything Christina wants her to do, as if she doesn''t have a mind of her own. She is a very pretty girl and if she would think for herself, she would be a lot more popular as most of the jocks find her doormat personality off putting.'
+		'Lina Starov is a mediocre athlete. While she looks like Christina''s friend, the right term would be lapdog. She usually does anything Christina wants her to do, as if she doesn''t have a mind of her own. She is a very pretty girl and if she would think for herself, she would be a lot more popular as most of the other students find her doormat personality off putting.'
 	else
 		'Lina Starov is a mediocre athlete. While she looks like Christina''s friend, the right term would be lapdog. She usually does anything Christina wants her to do, often helping her bully others or following her around telling her how great she is. She is a very pretty girl and if she would think for herself, she would be a lot more popular.'
 	end
@@ -564,7 +566,7 @@ if $ARGS[0] = 'nerds':
 	if grupTipe = 3:
 		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. He is the Game Master for the weekly game night and often invites others over to play games at his house.'
 	else
-		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is a nerd''s nerd, but isn''t bad looking for one. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. Rumor is that he runs some silly game night for the other nerds, which has earned him the nickname "King of the Nerds."'
+		'Feofan Krupin is heavily into science fiction, fantasy and the like. He has a serious love for superheroes and loves talking about them, their movies and comic books all the time. He also has a collection of cosplay outfits of all the most famous superheroes. He does well in school, but not as well as most would expect. He is a nerd''s nerd, but isn''t bad looking for one. He is the most outgoing of the nerds and is not afraid to talk to the other students, even flirting with girls that are way out of his league. Rumor is that he runs some silly game night for the other nerds, which has earned him the nickname "King of the Nerds".'
 	end
 	if npc_rel['A152'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -664,7 +666,7 @@ if $ARGS[0] = 'nerds':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/16.jpg"></center>'
 	'<center>Natasha Belova</center>'
 	if grupTipe = 3:
-		'Natasha is an excellent student and one of the smartest people in your school. Even though you both live in the same building, her parents are very poor and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends as most of the other girls shun her or mock her poor clothing. She and Julia used to be best friends, but they recently had a falling out. She rarely attends gaming night or other such events. All of you know she dreams of being one of the popular girls and she has been seen attending the disco trying to befriend them.'
+		'Natasha is an excellent student and one of the smartest people in your school. Even though you both live in the same building, her parents are very poor and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends as most of the other girls shun her or mock her poor clothing. She and Julia used to be best friends, but they recently had a falling out. She rarely attends gaming night or other such events. All of you know is that she dreams of being one of the popular girls and has been seen attending the disco trying to befriend them.'
 	else
 		'Natasha is an excellent student and one of the smartest people in your school. Even though you both live in the same building, her parents are very poor and it shows as Natasha is always dressed in second-hand clothes and can never afford to do anything fun. As a result, she doesn''t have many friends as most of the other girls shun her or mock her poor clothing. She doesn''t even seem to get along with her fellow nerds that much.'
 	end
@@ -697,7 +699,7 @@ if $ARGS[0] = 'nerds':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/240.jpg"></center>'
 	'<center><<"Natalia [Nat] Pavlova">></center>'
-	'Natalia is a very smart, but weak willed girl. She constantly struggles to maintain friendships, but her good looks and eagerness to help others prevents her from being an outcast. Despite this, she is rarely seen hanging out with anyone. She fiercely guards a notebook she likes to keep private, never letting anyone read or even touch it.'
+	'Natalia is a very smart, but weak willed girl. She constantly struggles to maintain friendships, but her friendly attitude and eagerness to help others prevents her from being an outcast, despite her not being overly attractive. She is rarely seen hanging out with anyone and fiercely guards a notebook she likes to keep private, never letting anyone read or even touch it.'
 	if npc_rel['A240'] >= 80:
 		'She really likes you and considers you one of her best friends.'
 	elseif npc_rel['A240'] >= 50:
@@ -718,7 +720,7 @@ end
 if $ARGS[0] = 'gopniks':
 	*clr & cla
 	'<center><h2>Gopniks</h2></center>'
-	'All the gopniks listed by popularity within their own clique, which is mostly how tough they are, their attitude, and how scared the rest are of them. The girls don''t have the respect of the boys, and most are seen as beneath the guys.'
+	'All the gopniks listed by popularity within their own clique, which is mostly how tough they are, their attitude and how scared the rest are of them. The girls don''t have the respect of the boys, and most are seen as beneath the guys.'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/9.jpg"></center>'
 	'<center>Vitek Kotov</center>'
 	if grupTipe = 4:
@@ -739,9 +741,9 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/157.jpg"></center>'
 	'<center>Roman Yakovlev</center>'
 	if grupTipe = 4:
-		'Roman Yakovlev is an absolute psychopath and everyone but Vitek seems to be afraid of him. Despite his small size, he is muscular. He''ll start fights out of boredom and has no problems fighting dirty. He enjoys being especially cruel or sadistic to his victims. He once smashed a bottle over a guy''s head and then stabbed him in the face with it, simply because he said the guy looked at him funny. He always has a snide remark and is not afraid to speak back to the teachers or other adults. He''s not doing great at school because he doesn''t care, but the other gopniks find his attitude amusing and seem to like that he''s always getting them into fights.'
+		'Roman Yakovlev is an absolute psychopath and everyone but Vitek seems to be afraid of him. Despite his small size, he is muscular. He''ll start fights out of boredom and has no problems fighting dirty. He enjoys being especially cruel or sadistic to his victims, once smashing a bottle over a guy''s head and stabbing him in the face with it, simply because he said the guy looked at him funny. He always has a snide remark and is not afraid to speak back to the teachers or other adults. He''s not doing great at school because he doesn''t care, but the other gopniks find his attitude amusing and seem to like that he''s always getting them into fights.'
 	else
-		'Roman Yakovlev is an absolute psychopath and just about everyone is afraid of him. He''s one of the smaller students, but he is always causing trouble. He''ll start fights out of boredom, knowing that the other gopniks will have his back. He enjoys being especially cruel or sadistic to his victims. He once smashed a bottle over a guy''s head and then stabbed him in the face with it, simply because he said the guy looked at him funny. He always has a snide remark and is not afraid to speak back to the teachers or other adults. He''s not doing great at school because he doesn''t care, but the other gopniks find his attitude amusing and seem to like that he''s always getting them into funny situations.'
+		'Roman Yakovlev is an absolute psychopath and just about everyone is afraid of him. He''s one of the smaller students, but he is always causing trouble. He''ll start fights out of boredom, knowing that the other gopniks will have his back. He enjoys being especially cruel or sadistic to his victims, once smashing a bottle over a guy''s head and stabbing him in the face with it, simply because he said the guy looked at him funny. He always has a snide remark and is not afraid to speak back to the teachers or other adults. He''s not doing great at school because he doesn''t care, but the other gopniks find his attitude amusing and seem to like that he''s always getting them into funny situations.'
 	end
 	if npc_rel['A157'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -807,9 +809,9 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/154.jpg"></center>'
 	'<center>Radomir Popov</center>'
 	if grupTipe = 4:
-		'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Reydery (Pussy Raiders). He has a great deal of raw talent and is convinced the band is going to become mega stars. In fact he already acts like they are more famous then they are and can thus be arrogant to almost everybody. Some girls adore him because they think he is cool or are just groupies that latch onto his limited fame, but he is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
+		'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Reydery (Pussy Raiders). He has a great deal of raw talent and is convinced the band is going to become mega stars. In fact, he already acts like they''re more famous then they are and can thus be arrogant to almost everybody. Some girls adore him because they think he''s cool or are just groupies that latch onto his limited fame, but he is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
 	else
-		'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Reydery (Pussy Raiders). They are considered fairly talented, but he is more or less an asshole who thinks he should already be a star and thus can be arrogant to almost everybody. Some girls adore him because they think he is cool or are just groupies that latch onto his limited fame, but he is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
+		'Radomir Popov is the lead singer, backup guitarist and leader of a local underground rock/punk band named Pizdá Reydery (Pussy Raiders). They are considered fairly talented, but he is more or less an asshole who thinks he should already be a star and thus can be arrogant to almost everybody. Some girls adore him because they think he''s cool or are just groupies that latch onto his limited fame, but he is more than happy to use his small amount of fame to let him use as many girls as he can, as often as he can. He seems to think girls only exist to provide him with sexual gratification.'
 	end
 	if npc_rel['A154'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -824,11 +826,10 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/145.jpg"></center>'
 	'<center>Katyusha Maksimov</center>'
 	if grupTipe = 4:
-		'Katyusha Maksimov is the least attractive girl in school. Her face and body is too masculine and she tends to dress like a boy and never shaves her arm pits or legs. She only seems to care about two things; booze and fighting. She gets her booze by either stealing it or hanging out with the boys. When she "plays" with the boys, it only goes as far as she wants it. While the boys are afraid of Lena''s brother, she prefers fighting the boys herself, which has left them with a healthy respect for her.'
-		*nl
+		'Katyusha Maksimov is the least attractive girl in school. Her face and body are too masculine, she tends to dress like a boy and never shaves her arm pits or legs. She only seems to care about two things; booze and fighting. She gets her booze by either stealing it or hanging out with the boys. When she "plays" with the boys, it only goes as far as she wants it. While the boys are afraid of Lena''s brother, she prefers fighting the boys herself, which has left them with a healthy respect for her.'
 		'Regardless of the weather, she practices Sambo in the park every day before school. She often taunts or makes fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She doesn''t see herself as a gopnik, but other people consider her one. This doesn''t bother her because she only cares about the opinion of the people whom earn her respect, which is really hard to do. She mostly hangs out with Arkadi, Roman and Pauline since she has no respect at all for the other gopnik girls, often wondering why they are even allowed to hang out with them.'
 	else
-		'Katyusha Maksimov is the least attractive girl in school. Her face and body is too masculine and she tends to dress like a boy and never shaves her arm pits or legs. She only seems to care about two things; booze and fighting. Regardless of the weather, she practices Sambo in the park every day before school. She often taunts or makes fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She doesn''t see herself as a gopnik, but other people consider her one.'
+		'Katyusha Maksimov is the least attractive girl in school. Her face and body are too masculine, she tends to dress like a boy and never shaves her arm pits or legs. She only seems to care about two things; booze and fighting. Regardless of the weather, she practices Sambo in the park every day before school. She often taunts or makes fun of the boxers by claiming "boxing is for pussies" and that real fighters fight without rules. She doesn''t see herself as a gopnik, but other people consider her one.'
 	end
 	if npc_rel['A145'] >= 80:
 		'She really likes you and considers you one of her best friends.'
@@ -877,9 +878,9 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/189.jpg"></center>'
 	'<center>Nikolai Volkov</center>'
 	if grupTipe = 4:
-		'Niko Volkov is clever, confident and well spoken, but is also short tempered. When he is not drinking and partying, he is hanging out with Lavrenti, with many saying that he only spends time with Lavrenti for his money. His family used to be fairly wealthy but fell on hard times, their once grand house falling into disrepair.'
+		'Niko Volkov is clever, confident and well spoken, but is also short tempered. When he''s not drinking and partying, he is hanging out with Lavrenti, with many saying that he only spends time with Lavrenti for his money. His family used to be fairly wealthy but fell on hard times, their once grand house falling into disrepair.'
 	else
-		'Niko Volkov is clever, but short tempered. When he is not drinking and partying, he is hanging out with Lavrenti, with many saying that he only spends time with Lavrenti for his money. He always seems confident and well spoken, but can sometimes come off as paranoid and unstable.'
+		'Niko Volkov is clever, but short tempered. When he''s not drinking and partying, he is hanging out with Lavrenti, with many saying that he only spends time with Lavrenti for his money. He always seems confident and well spoken, but can sometimes come off as paranoid and unstable.'
 	end
 	if npc_rel['A189'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -928,7 +929,7 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/21.jpg"></center>'
 	'<center>Valeria "Lera" Tsarev</center>'
 	if grupTipe = 4:
-		'Lera Tsarev comes from a poor family. Her father is one of the teachers at school and her cousin Lesco recently moved in with them and attends the same school. She often picks on him and the other outcasts at school, where she hangs out with the gopniks in your class and is liked by most of them. She''s best friends with Lena and they can often be found together, smoking in the school''s restrooms or hanging out after school. She is protective of Lena and always follows her lead. Just about all the gopniks are convinced she is a lesbian. It is well known that she and Lena hook up fairly regularly and she has been seen making eyes at some of the other pretty gopnik girls. Katyusha seems disgusted by Lera and dislikes her, almost as much as she dislikes Anushka.'
+		'Lera Tsarev comes from a poor family. Her father is one of the teachers at school and her cousin Lesco recently moved in with them and attends the same school. She often picks on him and the other outcasts at school, where she hangs out with the gopniks in your class and is liked by most of them. She''s best friends with Lena and they can often be found together, smoking in the school''s restrooms or hanging out after school. She is protective of Lena and always follows her lead. Just about all the gopniks are convinced she is a lesbian since it''s well known that she and Lena hook up fairly regularly and she has been seen making eyes at some of the other pretty gopnik girls. Katyusha seems disgusted by Lera and dislikes her, almost as much as she dislikes Anushka.'
 	else
 		'Lera Tsarev comes from a poor family. Her father works at the school as a teacher and her cousin Lesco recently moved in with them and attends the same school. She often picks on him and the other outcasts at school, where she hangs out with the gopniks in your class and is liked by them. She''s best friends with Lena and they can often be found together, smoking in the school''s restrooms or hanging out after school. She is protective of Lena and always takes her lead. It is rumored that she is a lesbian and is in love with Lena.'
 	end
@@ -945,9 +946,9 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/144.jpg"></center>'
 	'<center>Anushka "Nush" Konstantinov</center>'
 	if grupTipe = 4:
-		'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band. She and the band often use her good looks to their advantage. She is very adventurous and is very open about her bisexuality. She often teases the boys and even some of the girls at school and is a bit of an exhibitionist. Her main goal in life seems to just be having fun, but she does surprisingly well in school. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally, with the exception of Gerasim, whom she has been seen protecting from being bullied, even from the other gopniks. While she has a bit of a reputation as a slut, the reality is most of the guys try to get in her panties, but few succeed. She loves making them all think they have a chance.'
+		'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band. She and the band often use her good looks to their advantage. She is very adventurous and is very open about her bisexuality. She often teases the boys and even some of the girls at school and is a bit of an exhibitionist. Her main goal in life seems to just be having fun, but she does surprisingly well in school. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally, with the exception of Gerasim, whom she has been seen protecting from being bullied, even from the other gopniks. While she has a bit of a reputation as a slut, the reality is that while most of the guys try to get in her panties, few succeed, though she loves making them all think they have a chance.'
 	else
-		'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band. She and the band often use her good looks to their advantage. She is very adventurous and is not shy about her bisexuality. She often teases the boys and even some of the girls at school and is a bit of an exhibitionist. Her main goal in life seems to just be having fun and she likes getting into and causing trouble. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally, with the exception of Gerasim, whom she has been seen protecting from being bullied, even from the other gopniks. She has a reputation for being a slut and most wonder why she isn''t an outcast. A popular rumor is that she is the gopniks personal slut and lets all the guys fuck her.'
+		'Anushka Konstantinov is the lead guitarist and backup vocalist in Radomir''s band. She and the band often use her good looks to their advantage. She is very adventurous and is not shy about her bisexuality. She often teases the boys and even some of the girls at school and is a bit of an exhibitionist. Her main goal in life seems to just be having fun and she likes getting into and causing trouble. She doesn''t seem to be hung up on social standing and seems willing to hang out with or pick on everyone equally, with the exception of Gerasim, whom she has been seen protecting from being bullied, even from the other gopniks. She has a reputation for being a slut and most wonder why she isn''t an outcast. A popular rumor is that she is the gopniks'' personal slut and lets all the guys fuck her.'
 	end
 	if npc_rel['A144'] >= 80:
 		'She really likes you and considers you one of her best friends.'
@@ -962,9 +963,9 @@ if $ARGS[0] = 'gopniks':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/155.jpg"></center>'
 	'<center>Lavrenti Romanov</center>'
 	if grupTipe = 4:
-		'Lavrenti Romanov comes from a wealthy family. He is an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed when Dimka fucked his girlfriend at the time and they had it out in school where Lavrenti beat Dimka badly, which earned him the respect of the gopniks. Since the fight, he has been hanging with the gopniks and starting to become mean and violent. However, he is more of a follower; the other gopniks tolerate him while he uses his money to supply them with alcohol and drugs, sometimes throwing parties at his house when his parents are away.'
+		'Lavrenti Romanov comes from a wealthy family, an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed when Dimka fucked his girlfriend at the time and they had it out in school where Lavrenti beat Dimka badly, which earned him the respect of the gopniks. Since the fight, he has been hanging with the gopniks and starting to become mean and violent. However, he is more of a follower; the other gopniks tolerate him while he uses his money to supply them with alcohol and drugs, sometimes throwing parties at his house when his parents are away.'
 	else
-		'Lavrenti Romanov comes from a wealthy family. He is an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed last year. He became mean and violent, which resulted in him and Dimika having a major falling out. Since the fight, he has been hanging with the gopniks. However, he is more of a follower; the gopniks seem to tolerate him while using him for his money.'
+		'Lavrenti Romanov comes from a wealthy family, an only child with parents that are rarely around. He used to be one of the cool kids, but his attitude abruptly changed last year. He became mean and violent, which resulted in him and Dimika having a major falling out. Since the fight, he has been hanging with the gopniks. However, he is more of a follower; the gopniks seem to tolerate him while using him for his money.'
 	end
 	if npc_rel['A155'] >= 80:
 		'He really likes you and considers you one of his best friends.'
@@ -1088,7 +1089,7 @@ if $ARGS[0] = 'teachers':
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/137.jpg"></center>'
 	'<center>Raven Braakman</center>'
-	'Raven Braakman is the school''s social sciences and English teacher. She is from South Africa, but married a Russian man and moved to Pavlovsk. Her husband died in a car accident a few years ago. She has a strict teaching style and accepts only the best out of her students. It is rumored that she is a bit of a party goer in her free time.'
+	'Raven Braakman is the school''s social sciences and English teacher. Originally from South Africa, she married a Russian man and moved to Pavlovsk, though her husband later died in a car accident. She has a strict teaching style and accepts only the best out of her students, though it''s rumored that she is a bit of a party goer in her free time.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/130.jpg"></center>'
 	'<center>Ilya Yenotin</center>'
@@ -1105,16 +1106,16 @@ if $ARGS[0] = 'teachers':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/69.jpg"></center>'
 	'<center>Mikhail Nikolaevich</center>'
 	if grupTipe = 3:
-		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He is almost as bad as Mr. Pavlovich with how he treats the students, except he almost worships the best of the jocks by always talking and laughing with them.'
+		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of both the Pavlovsk girls volleyball team and the football team. He is almost as bad as Mr. Pavlovich with how he treats the students, except he almost worships the best of the jocks by always talking and laughing with them.'
 	elseif grupTipe = 2:
-		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. He was heading towards the big leagues as a footballer and almost became a pro himself, but an injury shattered those dreams. He knows how to push you to get the most of yourself, because he''s enormously competitive. He always wants to win no matter what. If you want to be a part of the squad, you''ll have to put in work one way or another.'
+		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of both the Pavlovsk girls volleyball team and the football team. He was heading towards the big leagues as a footballer and almost became a pro himself, but an injury shattered those dreams. He knows how to push you to get the most of yourself, because he''s enormously competitive. He always wants to win no matter what. If you want to be a part of the squad, you''ll have to put in work one way or another.'
 	else
-		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of the Pavlovsk girls volleyball team and the football team. Some say he almost went pro in some sport, but hurt himself or something like that and now he tries to live through the glory of his students.'
+		'Mikhail Nikolaevich is the school''s assistant P.E. teacher and the coach of both the Pavlovsk girls volleyball team and the football team. Some say he almost went pro in some sport, but hurt himself or something and now he tries to live through the glory of his students.'
 	end
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/138.jpg"></center>'
 	'<center>Arina Orlov</center>'
-	'Arina Orlov is the school''s biology and health teacher. She is the youngest teacher at school, having just finished college and this is her first job. She is a bit shy and mousey, which causes many of the students to ignore her during class. This leads to her having a bit of a problem controlling her classes. She''s not much older than her students and is very cute. This causes the boys to sometimes pay extra special attention to her during class.'
+	'Arina Orlov is the school''s biology and health teacher. She is the youngest teacher at school, having just finished college and this is her first job. She is a bit shy and mousey, which causes many of the students to ignore her during class. She''s not much older than her students and is very cute, which causes the boys to sometimes pay extra special attention to her during class.'
 
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/136.jpg"></center>'
 	'<center>Olga Aleksandrov</center>'
@@ -1123,7 +1124,7 @@ if $ARGS[0] = 'teachers':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/133.jpg"></center>'
 	'<center>Rolan Matveev</center>'
 	if grupTipe = 1:
-		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught rummaging through the girls lockers stealing their panties, while other people say he stalks the girls and photographs them. Regardless if the rumors are true or not, you and the other girls have caught him staring at you when he doesn''t think you are watching and will quickly look away.'
+		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught rummaging through the girls lockers stealing their panties, while other people say he stalks the girls and photographs them. Regardless if the rumors are true or not, you and the other girls have caught him staring at you when he doesn''t think you''re watching and will quickly look away.'
 	else
 		'Rolan Matveev is the school''s janitor and handyman. He is quiet and rarely interacts with the students. There is a rumor going around that he got caught rummaging through the girls lockers stealing their panties, while other people say he stalks the girls and photographs them. Regardless if the rumors are true or not, everyone agrees he looks and acts creepy.'
 	end

+ 4 - 1
locations/journal_work.qsrc

@@ -41,7 +41,10 @@ if $ARGS[0] = 'start':
 	end
 	if postjobQW = 2 or postjobQW = 4:'You deliver mail for the postmaster. The work day starts each Saturday between 11:00 and 12:00. Salary is 450 <b>₽</b> .'
 	if (work = 1 or cheatWork = 1) and gpoliuborka > 1:'You work part-time as a cleaner in the Pavlovsk clinic. Your schedule is from 14:00 to 21:00.'
-	if stripwork >= 1:'You work as a stripper in the city''s red light district and can work every day from 18:00-00:00. No salary as you earn tips.'
+	if stripwork >= 1:'You work as a stripper at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. No salary as you earn tips.'
+	if stripwork1 >= 1:'You work as a stripper at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. No salary as you earn tips.'
+	!!if stripbarwork >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Wednesday and Thursday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
+	!!if stripbarwork1 >= 1: 'You work as a bargirl at the Fuzzy Dice strip club every Friday and Saturday from 18:00 to 03:00. Salary is automatically transferred on the 25th of each month.'
 	if film > 0:'You are working as a pornographic actress under the name <<$pfname>>.'
 	if bumtolik = 4:'You have been asked to help the homeless at the Mercy Clinic in the city industrial region.'
 	if bumtolik >= 5:'You volunteer at the Mercy Clinic in the city industrial region and work with the homeless. Working hours are from 09:00 to 17:00 on Saturday and Sunday.'

+ 4 - 4
locations/kathouse0.qsrc

@@ -4,10 +4,10 @@ pcs_sleep = 100
 gs 'stat'
 '<center><img <<$set_imgh>> src="images/characters/city/katja/slip.jpg"></center>'
 'Katja walks you to her house, supporting you by wrapping an arm around you as you walk... you still feel a bit woozy from the sunstroke.'
-'She doesn''t live too far from the lake, and guides you to an apartment and into her bed. She lies down next to you and softly strokes your hair as she says: "You''re fine... just sleep. I will see you in the morning."'
-'You fall asleep next to her, and wake up early in the morning. Katja wrestled free from your bear grip on her, and smiles benevolently as she says: "Go back to sleep... I have to go to work now. I''ll leave you a key, so you can close up behind you."'
+'She doesn''t live far from the lake and guides you to an apartment and into her bed. She lies down next to you and softly strokes your hair as she says: "You''re fine... just sleep. I will see you in the morning."'
+'You fall asleep next to her and wake up early in the morning. Katja wrestles free from your bear grip and smiles benevolently as she says: "Go back to sleep... I have to go to work now. I''ll leave you a key, so you can close up behind you."'
 'She gives you a kiss on the mouth and leaves you, and you promptly fall asleep again.'
-'A few hours later you wake up again, and a man you''ve never seen before is watching you curiously from the couch. He must be one of Kat''s many friends-with-benefits she told you about.'
+'A few hours later, you wake up again, and a man you''ve never seen before is watching you curiously from the couch. He must be one of Kat''s many friends-with-benefits she told you about.'
 
 act 'Leave Kat''s house':gt 'city_residential'
 
@@ -16,7 +16,7 @@ act 'Seduce the guy':
 	*clr
 	'<center><img <<$set_imgh>> src="images/characters/city/katja/kathouse1.jpg"></center>'
 	'He''s rather cute! You wouldn''t mind him joining you in bed...'
-	'You give him a weak smile and slowly pull down your panties, rubbing a finger over your engorged pussy lips. When you notice how wet you are, you slip in two fingers slowly and let out a soft moan while you look him straight in the eye.'
+	'You give him a weak smile and slowly pull down your panties, rubbing a finger over your engorged pussy lips. Then, when you notice how wet you are, you slip in two fingers slowly and let out a soft moan while you look him straight in the eye.'
 	'The guy shifts his position a few times, watching you intently. You can tell he''s enjoying your little show a lot.'
 
 	act 'Invite him over':

+ 492 - 38
locations/katja_chat.qsrc

@@ -22,7 +22,7 @@
 !!							 So if you want to check if Katja is not wearing panties at school, use katjaQW['pantiesQWstage'] >= 5. (katjaTanga, katja_tanga_end)
 
 !! katjaQW['school_kiss'] Increases the first two times you kiss at school, used to trigger the kissing competition in the park. (flag_start_parc)
-									
+
 !! katjaQW['slut'] a number that increases as Katja becomes more and more sexualy liberated, and allows her to be villing to do more sexual stuff. (katjaSlut)
 !! katjaQW['horny'] a measure of Katja''s arousal. Grows until she has an orgasmn and will determine how willing she is at the moment to have sex.
 !! katjaQW['dom'] a number that tells if Katja is dominant or submissive. 0 is neutral, negative means she is submissive and positive means that she is dominant. In general the absolute value needs to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
@@ -45,9 +45,11 @@
 !! katjaQW['ivan_anal'] = 1 Katja has taken Ivan''s cock in her ass.
 !! katjaQW['marcus_pussy'] = 1 Katja has taken Marcus''s cock in her pussy.
 !! katjaQW['marcus_anal'] = 1 Katja has taken Marcus''s cock in her ass.
+!! katjaQW['lazar_pussy'] = 1 Katja has taken Lazar''s cock in her pussy.
+!! katjaQW['lazar_anal'] = 1 Katja has taken Lazar''s cock in her ass.
 !! katjaQW['marcus_disco'] = 1 Katja and the player character have had a threesome with Marcus at the community center disco.
 
-!! katjaQW['Marcus_day'] is set to daystart if Katja has asked to have a threesome with Marcus. Such that the question will only be asked once per day.
+!! katjaQW['Marcus_day'] is set to daystart if Katja has asked to have a threesome with Marcus so that the question will only be asked once per day.
 
 !! katjaQW['birth_control_start_day'] This is set to the daystart value from the day Katja''s birth control will be effective, if the player tells her to use it. Should be used to check if Katja can become pregnant by a if katjaQW['birth_control_start_day'] ! 0 and katjaQW['birth_control_start_day'] < daystart to make sure she is protected.
 
@@ -63,14 +65,14 @@
 !! katjaQW['knows_sex'] = 1 You have told Katja that you have had vaginal sex with a guy (KatjaKnowSex =1)
 !! katjaQW['knows_anal'] = 1 You have told Katja that you have had anal sex with a guy (KatjaKnowAnal =1)
 !! katjaQW['knows_cuni'] = 1 You have told Katja that have gone down on another girl (KatjaKnowKuni =1)
-!! katjaQW['know_Pirced_tongue'] = 1 katja has noticed your tongue piercing (KatjaKnowPirsA =1)
+!! katjaQW['know_Pirced_tongue'] = 1 Katja has noticed your tongue piercing (KatjaKnowPirsA =1)
 
 !! katja['school_sex'] = 1 Katja has taken you to a storage room at school to have sex. (katschoolsex)
-!! katjaQW['disco_Foto'] = 1 somebody has taken a picture of Katja''s exposed breast at the disco. Right now the only use of this variable is so that another photo won''t be taken. (katja_disco_Foto)
+!! katjaQW['disco_Foto'] = 1 Somebody has taken a picture of Katja''s exposed breast at the disco. Right now the only use of this variable is so that another photo won''t be taken. (katja_disco_Foto)
 
 !! katjaQW['drunk_help'] is set to 1 when Katja walks you home from the disco because you are too drunk. Will be reset to 0 after you talk to her about it at school. (meynoldQW = 3)
 !! katjaQW['no_panties_at_disco'] is set if Katja shows you at the disco that she is not wearing panties. Will be reset to 0 at night. (katja_disco_end)
-!! KatjaQW['sex_in_the_park_comment'] temporary variable which is set during sex with guys in the park to make sure she gives the right comment before she says goodbye. Will be reset to 0 when going home after sex. (KatjaOhrenet)
+!! KatjaQW['sex_in_the_park_comment'] Temporary variable which is set during sex with guys in the park to make sure she gives the right comment before she says goodbye. Will be reset to 0 when going home after sex. (KatjaOhrenet)
 
 !! katjaQW['know_katja_uni'] = 1 Katja has told you she is going to uni to study teaching.
 !! katjaQW['know_going_to_teaching_degree'] = 1 you have told Katja that you are going to the university to study in the teaching program.
@@ -81,7 +83,7 @@ if $ARGS[0] = 'start':
 	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'chat'
 	if locat['katja'] = 25:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/campus_grounds.jpg"></center>'
-		'You approach Katja, who''s sitting and talking on the phone. She finishes her call just before you reach her.'
+		'You approach Katja while she''s talking on the phone. She finishes her call just before you reach her.'
 	elseif locat['katja'] = 24:
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 		'Katja is in her room getting her things ready for class. She looks out the window to check if the weather has improved.'
@@ -110,9 +112,9 @@ if $ARGS[0] = 'start':
 		act 'Say you can''t stay to chat': gt $loc, $loc_arg
 	else
 		if fame['city_slut'] > 200:
-			'"This is not the place to attract boys," Katja says mockingly. "Take your antics somewhere else!"'
-			'"Maybe I am not hunting for boys but redheaded girls this time," you reply in jest.'
-			'"Stop it! I''m not interested," she says, in a tone less harsh than you expected.'
+			'"This is not the place to attract boys," she says mockingly. "Take your antics somewhere else!"'
+			'"Maybe I''m not hunting for boys this time," you reply in jest.'
+			'"Stop it! I''m not interested," she says in a tone less harsh than you expected.'
 			'"Maybe you should be," you say with a smirk. "I could definitely teach you a thing or two about how to have fun."'
 			'Katja''s face grows red and her breath hitches, defying the stern look on her face.'
 			if npc_rel['A14'] > 40:
@@ -122,18 +124,18 @@ if $ARGS[0] = 'start':
 				act 'Leave': gt $loc, $loc_arg			
 			end
 		elseif npc_rel['A14'] > 60:
-			'"Hi, <<$pcs_nickname>>. Great to see you. How is it going?" Katja asks.'
+			'"Hi, <<$pcs_nickname>>. Great to see you. How is it going?" she asks.'
 			'"It''s going good," you reply. "How about you?"'
-			'"I''m good," Katja says.'
+			'"I''m good," she says.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 			act 'Say you don''t have time to chat': gt $loc, $loc_arg
 		elseif npc_rel['A14'] < 25:
-			'"What are you doing here?" Katja asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
+			'"What are you doing here?" she asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt $loc, $loc_arg
 		else
-			'"Hi, <<$pcs_nickname>>," Katja says, looking awkwardly at you like she is trying to determine why you approached her.'
-			'"Hi, Katja," you say. "How are you?"'
-			'"I''m good," she says, and her composure loosens a little.'
+			'"Hi <<$pcs_nickname>>," she says while looking at you awkwardly, as if she''s trying to determine why you approached her.'
+			'"Hi Katja," you say. "How are you?"'
+			'"I''m good," she replies, and her composure loosens a little.'
 			act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 			act 'Say you don''t have time to chat': gt $loc, $loc_arg
 		end
@@ -144,7 +146,7 @@ if $ARGS[0] = 'uni_cafe':
 	menu_off = 1
 	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'chat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'Katja looks up from her lunch as you are trying to sit down opposite her.'
+	'Katja looks up from her lunch as you try to sit down opposite her.'
 
 	if npc_sex['A14'] > 0:
 		if katjaQW['slut'] >= 100:
@@ -165,14 +167,14 @@ if $ARGS[0] = 'uni_cafe':
 		end
 	else
 		if fame['city_slut'] > 200:
-			'"This is not the place to attract boys," Katja says mockingly. "Take your antics somewhere else!"'
-			'"Maybe I am not hunting for boys but redheaded girls this time," you reply in jest.'
-			'"Stop it! I''m not interested," she says, in a tone less harsh than you expected.'
+			'"This isn''t the place to attract boys," she says mockingly. "Take your antics somewhere else!"'
+			'"Maybe I''m not hunting for boys this time," you reply in jest.'
+			'"Stop it! I''m not interested," she says in a tone less harsh than you expected.'
 			'"Maybe you should be," you say with a smirk. "I could definitely teach you a thing or two about how to have fun."'
 			'Katja''s face grows red and her breath hitches, defying the stern look on her face.'
 			if npc_rel['A14'] > 40:
 				if uni_lunch_bought = 1:
-					'You sit down and start eating your lunch with Katja while you are talking.'
+					'You sit down and start eating your lunch while chatting with Katja.'
 					act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 				else
 					act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -182,25 +184,25 @@ if $ARGS[0] = 'uni_cafe':
 				act 'Leave': gt 'uni_cafe'		
 			end
 		elseif npc_rel['A14'] > 60:
-			'"Hi, <<$pcs_nickname>>.Great to see you. How is it going?" Katja asks.'
+			'"Hi <<$pcs_nickname>>, great to see you. How''s it going?" she asks.'
 			'"It''s going good," you reply. "How about you?"'
-			'"I''m good," Katja says.'
+			'"I''m good," she says.'
 			if uni_lunch_bought = 1:
-				'You sit down and start eating your lunch with Katja while you are talking.'
+				'You sit down and start eating your lunch while chatting with Katja.'
 				act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 			else
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
 				act 'Say you can''t stay to chat': gt 'uni_cafe'
 			end
 		elseif npc_rel['A14'] < 25:
-			'"What are you doing here?" Katja asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
+			'"What are you doing here?" she asks. "I don''t have time for bullies like you." She then turns around and ignores you.'
 			act 'Leave': gt 'uni_cafe'
 		else
-			'"Hi <<$pcs_nickname>>," Katja says, looking awkwardly at you, like she is trying to determine why you approached her.'
+			'"Hi <<$pcs_nickname>>," she says while looking at you awkwardly, as if she''s trying to determine why you approached her.'
 			'"Hi Katja," you say. "How are you?"'
 			'"I''m good," she says, and her composure loosens a little.'
 			if uni_lunch_bought = 1:
-				'You sit down and start eating your lunch with Katja while you are talking.'
+				'You sit down and start eating your lunch while chatting with Katja.'
 				act 'Chat with Katja while you are eating': uni_lunch_bought = 0 & gt 'katja_chat', 'chat'
 			else
 				act 'Continue chatting with Katja': gt 'katja_chat', 'chat'
@@ -216,24 +218,24 @@ if $ARGS[0] = 'chat':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if locat['katja'] = 26:
 		if $university['enrolled_in'] = 'teaching_studies':
-			'Katja says you need to leave for class now, so you aren''t late.'
+			'Katja says you need to leave for class now so you aren''t late.'
 			hour -= 1
 			if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 			act 'Say you aren''t going to class and leave': hour += 1 & gt $loc, $loc_arg
 		else
-			'Katja says she needs to leave now, so she isn''t late for class.'
+			'"I have to go before I''m late for class," she says before leaving.'
 			hour -= 1
 			if university['semester_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'schedule'
 			act 'Say goodbye': hour +=1 & gt $loc, $loc_arg
 		end
 	elseif locat['katja'] = 50:
 		if $university['enrolled_in'] = 'teaching_studies':
-			'Katja says that you need to leave for class now, so you aren''t late for the exam.'
+			'Katja says that you need to leave for class now so you aren''t late for the exam.'
 			hour -= 1
 			if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 			act 'Say you aren''t going to the exam and leave': hour += 1 & gt $loc, $loc_arg
 		else
-			'Katja says she needs to leave for class now, so she isn''t late for her exam.'
+			'"I have to go before I''m late for my exam," she says before leaving.'
 			hour -= 1
 			if university['exam_week'] > 0 and university['enrolled_in_semester'] > university['semester_passed']: gs 'uni_lessons', 'exam_schedule'
 			act 'Say goodbye': hour +=1 & gt $loc, $loc_arg
@@ -315,8 +317,8 @@ if $ARGS[0] = 'first_meet':
 	if $university['enrolled_in'] = 'teaching_studies': katjaQW['know_going_to_teaching_degree'] = 1
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"Are you studying at uni?" you ask.'
-	'"Yes, I''m '+iif(year = 2017 and month < 10, 'going to study', 'studying')+' to become a teacher," Katja says. "What about you. Are you also studying here?"'
-	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university,')+',')+'" you tell Katja.'
+	'"Yes, I''m '+iif(year = 2017 and month < 10, 'going to study', 'studying')+' to become a teacher," she says. "What about you. Are you also studying here?"'
+	'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university,')+',')+'" you reply.'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
 end	
 
@@ -326,17 +328,469 @@ if $ARGS[0] = 'sofia1':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	'"So, what do you think about my roommate?" Katja asks with a curious look on her face.'
 	'"She seems nice," you answer. "But she sure does talk a lot."'
-	'"She talks constantly; she never shuts up! Like she has nobody else to talk to except me," Katja complains.'
+	'"She never shuts up! It''s like she has nobody else to talk to except me!" Katja complains.'
 	'"Is that true?" you ask.'
-	'"Maybe. I don''t think she''s made any friends since she moved here. So she probably only has her boyfriend and me," Katja says. "If she just had something interesting to say, it might be a bit more bearable," Katja continues.'
+	'"Maybe. I don''t think she''s made any friends since she moved here. So she probably only has her boyfriend and me," Katja says. "If she just had something interesting to say, it might be a bit more bearable."'
 	'"She never says anything interesting?" you ask.'
-	'"Well, sometimes she talks about her classes, which isn''t too boring, or she''ll tell me about something she saw or experienced that day," Katja says. "But mostly, she just tells the same stories from her stupid hometown in the fucking middle of nowhere, or even worse, just fawns over her boyfriend." The redhead looks at you and smiles slightly, "At least she knows you now, so maybe she''ll start bothering you instead so I can get a little bit of peace."'
-	'"Hopefully, she can make some more friends soon," you laughingly.'
-	'"I doubt it," Katja says. "She is constantly hanging out with her boyfriend, and I don''t think he wants her to meet other girls. She also returns to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
+	'"Well, sometimes she talks about her classes, which isn''t too boring, or she''ll tell me about something she saw or experienced that day," Katja says. "But she mostly just tells me the same stories from her stupid hometown in the fucking middle of nowhere, or even worse, just fawns over her boyfriend." She looks at you and smiles slightly. "At least she knows you now, so maybe she''ll start bothering you instead so I can get a little bit of peace."'
+	'"Hopefully she can make some more friends soon," you laughingly.'
+	'"I doubt it," Katja says. "She''s constantly hanging out with her boyfriend, and I don''t think he wants him to meet other girls. She also returns to her hometown on Thursday nights and stays until Sunday, so she doesn''t have much time to meet anyone."'
 	'"You''re not too fond of her boyfriend?" you ask.'
-	'"I don''t know," she says. "There''s something about him that feels a little bit off, but I shouldn''t speak ill of people you don''t even know. So let''s wait until after you meet him."'
+	'"I don''t know," she says. "There''s something about him that feels a little bit off, but I shouldn''t speak ill of people you don''t even know, so let''s wait until after you meet him."'
 	act 'Talk about something else': gt 'katja_chat', 'chat1'
 end
 
+if ARGS[0] = 'coffee_hole':
+	menu_off = 1
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'coffe_hole1'
+	if npc_rel['A14'] < 20:
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		'You approach Katja, who seems to be studying while drinking coffee and having brunch.'
+		'"What are you doing here?" she says when she notices you. "Go bother somebody else!"'
+		'You understand that staying won''t achieve anything, so you leave her in peace.'
+		act 'Leave': gt 'city_coffee_hole', 'inner'
+	else
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		if katjaQW['know_going_to_teaching_degree'] = 0:
+			katjaQW['know_going_to_teaching_degree'] = 1
+			'You approach Katja, who seems to be studying while drinking coffee and having brunch.'
+			'"Hey <<$pcs_nickname>>," she waves when she notices you. "So you''ve also discovered this breathing hole. Have a seat," she says and starts making space for you by removing her backpack from the chair and packing away some papers from the table.'
+			'"Are you studying at the university?" you ask.'
+			'"Yes, I''m '+iif(year = 2017 and month < 10, 'going to study', 'studying')+' to become a teacher," Katja says. "What about you?"'
+			'"I''m '+iif( $university['enrolled_in'] = 'teaching_studies', ' also going to study to become a teacher,', ' '+iif(university[student] = 1, 'in the '+func('uni_programs', 'program_name')+' program', 'not studying at the university')+',')+'" you reply.'
+			'"That''s cool'+iif( $university['enrolled_in'] = 'teaching_studies', ' that we are going to study together,', ',')+'" Katja says.'
+			act 'Sit down': gt 'katja_chat', 'brunch'
+			act 'Say goodbye and leave': gt 'city_coffee_hole', 'inner'
+		else
+			'You approach Katja, who seems to be studying while drinking coffee and having brunch.'
+			'"Hey <<$pcs_nickname>>," she waves when she notices you. "Have a seat," she says and starts making space for you by removing her backpack from the chair and packing away some papers from the table.'
+			act 'Sit down': gt 'katja_chat', 'brunch'
+			act 'Say goodbye and leave': gt 'city_coffee_hole', 'inner'
+		end
+	end
+end
+
+if ARGS[0] = 'brunch':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole2.jpg"></center>'
+	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
+	minut += 10
+	gs 'stat'
+	if katjaQW['QWstage'] >= 2 and pcs_makeup < 2:
+		!!Katja offers to do your makeup.
+		gs 'katja_procedural', 'makeup', 'katja_chat', 'brunch'
+	end
+	'You sit down and start chatting with Katja.'+iif(npc_rel['A14'] < 40 and katjaQW['QWstage'] = 0, ' Your talk is a little awkward since you don''t know each other that well, but it is a nice conversation', ' You have so much fun talking that Katja seems to forget that she was studying')+'.'
+	'After a while, '+iif(mid($start_type,1,2) = 'sg' and yearstart = 2 and (day = 2 or day = 4 or day = 7) and hour >= 18, 'Anushka', 'the waitress')+' comes over and asks if you want to order something.'
+	act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+	act 'Say you don''t need anything': gt 'katja_chat', 'coffee_hole_event'
+end
+
+if $ARGS[0] = 'coffee_hole_event':
+	!! This is to have random events when you are sitting with Katja
+	katjaQW['brunch_bought'] = 0
+	gt 'katja_chat', 'coffee_hole_hangout'
+end
+
+if ARGS[0] = 'coffee_hole_hangout':
+	gs 'npc_relationship', 'modify', 'A14', 'like', 3, 'coffe_hole2'
+	gs 'katja_meynold_schedule'
+	gs 'katja_procedural', 'face_color'
+	minut += 15
+	func('npc_reactions', 'general', 'A14')
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole1.jpg"></center>'
+	'You and Katja spend some time chatting about school, what you''ve both been up to and gossiping about your old school mates while drinking coffee.'
+	if locat['katja'] ! 30:
+		if locat['katja'] = 29:
+			'"I need to go study. '+iif($university['enrolled_in'] = 'teaching_studies' or katjaQW['QWstage']> 0, 'Wanna join me?', 'See you later!')+'" she says as she packs her things and gets ready to leave.'
+			act 'Say goodbye and leave': gt 'city_coffee_hole', 'inner'
+			if $university['enrolled_in'] = 'teaching_studies' or katjaQW['QWstage']> 0:
+				act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2' 
+			end
+			if katjaQW['QWstage'] >= 2:
+				act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
+			end
+		elseif locat['katja'] = 44:
+			'"I''m done here. I want to go to the city mall to look at clothes," Katja says as she packs her things and gets ready to leave.'
+			act 'Say goodbye and Leave': gt 'city_coffee_hole', 'inner'
+			if katjaQW['QWstage']> 0:
+				act 'Go with Katja to the city mall': minut += 15 & gt 'katja_city', 'metro' 
+			end
+			if katjaQW['QWstage'] >= 2:
+				act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
+			end
+
+
+		end
+	else
+		act 'Order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+		act 'Continue talking': gt 'katja_chat', 'coffee_hole_event'
+		act 'Try to convince her to do something else': gt 'katja_chat', 'coffee_hole_have_fun'
+	end
+	act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
+end
+
+if $ARGS[0] = 'coffee_hole_have_fun':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/Coffe_hole1.jpg"></center>'
+	minut += 5
+	if locat['katja'] = 29:
+		'"Come on, Katja. Let''s do something fun instead of studying," you say.'
+		'"No. I really need to study," she answers.'
+		if katjaQW['QWstage'] >= 6 and (katjaQW['lazer_anal'] + katjaQW['lazer_pussy']) > 0 and week < 6 and katjaQW['Lazar_day'] ! daystart:
+			act 'Suggest that you call Lazar':
+				*clr & cla
+				katjaQW['Lazar_day'] = daystart
+				minut += 5
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Why don''t we call Lazar to see if he wants to have some fun?" you ask.'
+				if katjaQW['horny'] >= 100:
+					'Katja looks very aroused. "Okay. Let''s call him," she says while biting her lip.'
+					'You call him, and he quickly agrees to have you over.'
+					act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+				elseif katjaQW['horny'] > 80:
+					'"No, I really should study..." she replies, though she''s not very convincing.'
+					gs 'willpower', 'sex', 'force', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can always study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'Katja looks even more aroused, and quickly says, "Yes. I really want it!" she replies before looking around to see if anybody noticed.'
+							if katjaQW['Lazar_Ivan_4some'] > 0 and rand(0,6) = 0:
+								minut += 10
+								'You call him, and he tells you that Ivan is over at his place. You''re sure that Ivan will be up for it again.'
+								'Katja readily agrees to include Ivan in the fun and you tell Lazar you''ll come over. Katja then opens her purse and shows you the black bodysuits you wore last time, suggesting you go to the toilet to change into them since it seemed to turn the boys on.'
+								'You agree and head into the toilet to change while Katja packs up her stuff and pays her bill. She then quickly changes herself and you both leave the Coffee Hole and start walking towards Lazar''s house.'
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+							else
+								'You call him, and he quickly agrees to have you over.'
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+							end
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				elseif katjaQW['horny'] > 65:
+					'"No, I really should be studying," Katja says, but still looks somewhat aroused.'
+					gs 'willpower', 'sex', 'force'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'Katja looks even more aroused, and after a little hesitation says, "Yes. I really want it!" she replies before looking around to see if anybody noticed.'
+							if katjaQW['Lazar_Ivan_4some'] > 0 and rand(0,6) = 0:
+								minut += 10
+								'You call him, and he tells you that Ivan is over at his place. You''re sure that Ivan will be up for it again.'
+								'Katja readily agrees to include Ivan in the fun and you tell Lazar you''ll come over. Katja then opens her purse and shows you the black bodysuits you wore last time, suggesting you go to the toilet to change into them since it seemed to turn the boys on.'
+								'You agree and head into the toilet to change while Katja packs up her stuff and pays her bill. She then quickly changes herself and you both leave the Coffee Hole and start walking towards Lazar''s house.'
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+							else
+								'You call Lazar, and he quickly agrees to have you over.'
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+							end
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				elseif katjaQW['horny'] > 50:
+					'"No, I should be studying," Katja says, but something in her voice makes you think that she can be convinced.'
+					gs 'willpower', 'sex', 'force', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'She looks shocked at what you said, but is also blushing heavily. After a long pause, she finally concedes. "Okay, I guess you''re right. Studying can probably wait a little."'
+							if katjaQW['Lazar_Ivan_4some'] > 0 and rand(0,6) = 0:
+								minut += 10
+								'You call him, and he tells you that Ivan is over at his place. You''re sure that Ivan will be up for it again.'
+								'Katja readily agrees to include Ivan in the fun and you tell Lazar you''ll come over. Katja then opens her purse and shows you the black bodysuits you wore last time, suggesting you go to the toilet to change into them since it seemed to turn the boys on.'
+								'You agree and head into the toilet to change while Katja packs up her stuff and pays her bill. She then quickly changes herself and you both leave the Coffee Hole and start walking towards Lazar''s house.'
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+							else
+								'You call Lazar, and he quickly agrees to have you over.'
+								act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+							end
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				else
+					KatjaQW['dom'] += 1
+					'"No, I need to study!" she says in a voice that makes it clear that you won''t convince her otherwise.'
+					act 'Go to the library with Katja': minut += 15 & gt 'katja_uni', 'library2' 
+					act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
+				end
+			end
+		end
+		act 'Let''s go to the mall':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"Let''s go to the mall and try out clothes instead," you say.'
+			'"No, I need to study," Katja responds.'
+			if katjaQW['slut'] >= 100:
+				gs 'willpower', 'misc', 'force', 'easy'
+			elseif katjaQW['slut'] >= 50:
+				gs 'willpower', 'misc', 'force'
+			else
+				gs 'willpower', 'misc', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				act 'Convince her (<<will_cost>> Willpower)':
+					*clr & cla
+					KatjaQW['dom'] -= 1
+					gs 'willpower', 'pay', 'force'
+					gs 'stat'
+					locat['katja_rand1'] = daystart
+					locat['katja_save1'] = 44
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'"Come on, Katja!" you plead. "There will be plenty of time for studying later. Please, it''s going to be so much fun!" you say.'
+					'After a little back and forth, Katja relents and agrees to go to the mall.'
+					act 'Go to the city mall with Katja': minut += 15 & gt 'katja_city', 'metro'
+				end
+			else
+				act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+			act 'Say goodbye and get up': KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+		end	
+		act 'Let''s go to your room':
+			*clr & cla
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"Let''s go to your room and hang out instead," you beg.'
+			'"No, I need to study," she replies.'
+			if katjaQW['slut'] >= 100:
+				gs 'willpower', 'misc', 'force', 'easy'
+			elseif katjaQW['slut'] >= 50:
+				gs 'willpower', 'misc', 'force'
+			else
+				gs 'willpower', 'misc', 'force', 'hard'
+			end
+			if will_cost <= pcs_willpwr:
+				act 'Convince her (<<will_cost>> Willpower)':
+					*clr & cla
+					KatjaQW['dom'] -= 1
+					gs 'willpower', 'pay', 'force'
+					gs 'stat'
+					locat['katja_rand1'] = daystart
+					locat['katja_save1'] = 31
+					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+					'"Come on, Katja! There will be plenty time for studying later. Please, we should hang out more before you go," you say.'
+					'After a little back and forth, Katja relents and agree to go to her room.'
+					act 'Go with Katja to her room': minut += 15 & gt 'katja_dorm', 'start'
+				end
+			else
+				act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Go to the library with Katja': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_uni', 'library2' 
+			act 'Say goodbye and get up': KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'			
+		end
+	elseif locat['katja'] ! 30:
+		'"Come on, Katja! Let''s do something else," you plead.'
+		'"What do you want to do?" she asks.'
+		if katjaQW['QWstage'] >= 6 and (katjaQW['lazer_anal'] + katjaQW['lazer_pussy']) > 0 and week < 6 and katjaQW['Lazar_day'] ! daystart:
+			act 'Suggest that you call Lazar':
+				*clr & cla
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Why don''t we call Lazar to see if he wants to have some fun?" you ask.'
+				if katjaQW['horny'] > 80:
+					katjaQW['Lazar_day'] = daystart
+					'Katja looks very aroused. "Okay. Let''s call him," she says while biting her lip.'
+					'You call Lazar, and he quickly agrees to have you over.'
+					act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+				elseif katjaQW['horny'] > 65:
+					'"No, I''m not in the mood," she replies, but she doesn''t sound very convincing.'
+					gs 'willpower', 'sex', 'force'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'Katja''s face turns red and after a short pause she says, "Yes, I do really want it." She then looks around to see if anybody noticed.'
+							'You call Lazar, and he quickly agrees to have you over.'
+							act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					if  locat['katja'] = 44:
+						act 'Go with Katja to the city mall': KatjaQW['dom'] += 1 & minut += 15 & gt 'katja_city', 'metro' 
+					elseif   locat['katja'] = 31:
+					
+					end
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				elseif katjaQW['horny'] > 50:
+					'"No, I don''t feel like it," Katja says, but something tells you that she could be convinced.'
+					gs 'willpower', 'sex', 'force', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'She looks shocked at what you said, but is also blushing heavily. After a long pause, she finally concedes. "Okay, I guess you''re right. Studying can probably wait a little."'
+							'You call Lazar, and he quickly agrees to have you over.'
+							act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffe_hole_event'
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				else
+					KatjaQW['dom'] += 1
+					'"No, I don''t want to," Katja responds in a stern voice. You realize that you won''t convince her otherwise.'
+				end
+				if locat['katja'] = 44:
+					act 'Go to the mall with Katja': minut += 15 & & gt 'katja_city', 'metro'
+				end
+				if locat['katja'] = 31:
+					act 'Go with Katja to her room': minut += 15 & gt 'katja_dorm', 'start'
+				end
+				act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
+			end
+		end
+		if locat['katja'] ! 44:
+			act 'Let''s go to the mall':
+				*clr & cla
+				gs 'stat'
+				locat['katja_rand1'] = daystart
+				locat['katja_save1'] = 44
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Let''s go to the mall and try out clothes," you say.'
+				'"Okay," she replies.'
+				act 'Go with Katja to the city mall': minut += 15 & gt 'katja_city', 'metro'
+			end
+		end
+		if locat['katja'] ! 31:
+			act 'Let''s go to your room':
+				*clr & cla
+				gs 'stat'
+				locat['katja_rand1'] = daystart
+				locat['katja_save1'] = 31
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Let''s go to your room. I''m sure we can find something fun to do there," you say with a wink.'
+				'"Okay," she says while blushing.'
+				act 'Go with Katja to her room': minut += 15 & gt 'katja_dorm', 'start'
+			end
+		end
+	else
+		'"Come on, Katja! Let''s do something else instead of just sitting here," you say.'
+		'"What do you want to do?" she asks.'
+		if katjaQW['QWstage'] >= 6 and (katjaQW['lazer_anal'] + katjaQW['lazer_pussy']) > 0 and week < 6 and katjaQW['Lazar_day'] ! daystart:
+			act 'Suggest that you call Lazar':
+				*clr & cla
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Why don''t we call Lazar to see if he wants to have some fun?" you ask.'
+				if katjaQW['horny'] > 80:
+					katjaQW['Lazar_day'] = daystart
+					'Katja looks very aroused. "Okay. Let''s call him," she says while biting her lip.'
+					'You call him, and he quickly agrees to have you over.'
+					act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+				elseif katjaQW['horny'] > 65:
+					'"No, I am not in the mood," Katja says, but doesn''t sound very convincing.'
+					gs 'willpower', 'sex', 'force'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'Katja''s face turns red and after a short pause she says, "Yes, I do really want it." She then looks around to see if anybody noticed.'
+							'You call Lazar, and he quickly agrees to have you over.'
+							act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffe_hole_event'
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				elseif katjaQW['horny'] > 50:
+					'"No, I don''t feel like it," Katja says, but something in her voice makes you think that she can be convinced.'
+					gs 'willpower', 'sex', 'force', 'easy'
+					if will_cost <= pcs_willpwr:
+						act 'Convince her (<<will_cost>> Willpower)':
+							*clr & cla
+							KatjaQW['dom'] -= 1
+							KatjaQW['horny'] += 10
+							gs 'willpower', 'pay', 'force'
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+							'"Come on, Katja! This will be much more fun and we can study afterwards. Don''t you want to feel his big dick in your '+iif(katjaQW['lazar_pussy'] = 1, 'tight pussy', 'tight ass')+'?" you ask, leaning in to whisper the last part in her ear.'
+							'She looks shocked at what you said, but is also blushing heavily. After a long pause, she finally concedes. "Okay, I guess you''re right. Studying can probably wait a little."'
+							'You call Lazar, and he quickly agrees to have you over.'
+							act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+						end
+					else
+						act 'Convince her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					end
+					act 'Continue talking': KatjaQW['dom'] += 1 & gt 'katja_chat', 'coffe_hole_event'
+					act 'Say goodbye and get up':  KatjaQW['dom'] += 1 & gt 'city_coffee_hole', 'inner'
+				else
+					KatjaQW['dom'] += 1
+					act 'Continue talking': gt 'katja_chat', 'coffe_hole_event'
+					act 'Say goodbye and get up': gt 'city_coffee_hole', 'inner'
+				end
+			end
+		end
+		act 'Let''s go to the mall':
+			*clr & cla
+			locat['katja_rand1'] = daystart
+			locat['katja_save1'] = 44
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"Let''s go to the mall and try out clothes," you say.'
+			'"Okay," she replies. "Just let me finish my coffee."'
+			act 'Go with Katja to the city mall': minut += 15 & gt 'katja_city', 'metro'
+		end
+		act 'Let''s go to your room':
+			*clr & cla
+			gs 'stat'
+			locat['katja_rand1'] = daystart
+			locat['katja_save1'] = 31
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"Let''s go to your room. I''m sure we can find something fun to do there," you say with a wink.'
+			'"Okay," she says while blushing.'
+			act 'Go with Katja to her room': minut += 15 & gt 'katja_dorm', 'start'
+		end
+		act 'Stay and order from the menu (0:05)': katjaQW['brunch_bought'] = 1 & gs 'food_menu'
+		act 'Stay and continue talking': gt 'katja_chat', 'city_coffee_hole_event'
+		act 'Say goodbye and leave': gt 'city_coffee_hole', 'inner'
+	end
+end
+
 --- katja_chat ---------------------------------
 

+ 145 - 102
locations/katja_city.qsrc

@@ -22,7 +22,7 @@
 !!							 So if you want to check if Katja is not wearing panties at school, use katjaQW['pantiesQWstage'] >= 5. (katjaTanga, katja_tanga_end)
 
 !! katjaQW['school_kiss'] Increases the first two times you kiss at school, used to trigger the kissing competition in the park. (flag_start_parc)
-									
+
 !! katjaQW['slut'] a number that increases as Katja becomes more and more sexually liberated, and allows her to be willing to do more sexual stuff. (katjaSlut)
 !! katjaQW['horny'] a measure of Katja''s arousal. Grows until she has an orgasm and will determine how willing she is at the moment to have sex.
 !! katjaQW['dom'] a number that tells if Katja is dominant or submissive. 0 is neutral, negative means she is submissive and positive means that she is dominant. In general the absolute value needs to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
@@ -76,12 +76,55 @@
 !! katjaQW['know_going_to_teaching_degree'] = 1 you have told Katja that you are going to the university to study in the teaching program.
 !! katjaQW['meet_uni_class'] = 1 You have met Katja in your uni class.
 
+if $ARGS[0] = 'metro':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/waitning_metro.jpg"></center>'
+	'You walk to the Metro station and '+iif(money >= 16, 'pay the fare.', ' since you don''t have any money Katja pays the fare for you.')+' You then go down to the platform and chat while you wait for the train.'
+	if money >= 16: money -= 16
+	act 'Wait for the train':
+		!! Here will be a check for random events as soon as some are written.
+		gt 'katja_city', 'metro_ride'
+	end
+end
+
+if $ARGS[0] = 'metro_ride':
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/riding_metro.jpg"></center>'
+	'The train arrives and you board before finding a place to sit as the train leaves the station.' 
+	act 'Chat with Katja':
+		!! Here will be a check for random events as soon as some are written.
+		gt 'katja_city', 'metro_get_off'
+	end
+end
+
+if $ARGS[0] = 'metro_get_off':
+	minut += 5
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/riding_metro.jpg"></center>'	
+	'You chat with Katja as the train heads through the tunnel. After a short time, you arrive at your destination.'  
+	act 'Get off the train and leave the metro':
+		!! Here will be a check for random events as soon as some are written.
+		gt 'katja_city', 'metro_destination'
+	end
+end
 
+if $ARGS[0] = 'metro_destination':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/leaving_metro.jpg"></center>'
+	if locat['katja'] = 44:
+		minut += 5
+		gs 'stat'
+		'You exit the metro station and walk to the Galleria shopping mall.' 
+		act 'Start shopping': gt 'katja_chat', 'chat1'
+	else
+		'You exit the metro station near the university and say goodbye to each other.'
+		act 'Continue': gt 'city_island'
+	end
+end
 
 if $ARGS[0] = 'clothes_start1':
 	katjaQW['shopping_day'] = daystart
 	gs 'npc_relationship', 'modify', 'A14', 'like'
-	!! This is just temporary so that only Pussy-Cats can be choose until the others are added.
+	!! This is just temporary so that only Pussy-Cats can be choosen until the others are added.
 	if rand(1,5) = 0:
 		$store_choice = 'Fashionista'
 	elseif rand(1,4) = 0:
@@ -90,7 +133,7 @@ if $ARGS[0] = 'clothes_start1':
 		$store_choice = 'Pussy-Cats'
 	end
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-	'You suggest that while you are here you should try on some clothes. Katja almost jumps with joy. "Yes, let''s! It will be so much fun!" she says.'
+	'You suggest that you should try on some clothes while you''re here and Katja almost jumps with joy. "Yes, let''s! It will be so much fun!"'
 	if rand(0,1):
 		'"Let''s go to <<$store_choice>>," Katja says.'
 		act 'Go to <<$store_choice>>': gt 'katja_city', $store_choice
@@ -118,7 +161,7 @@ if $ARGS[0] = 'clothes_start2':
 			$store_choice = 'Pussy-Cats'
 		end
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-		'You tell Katja that you would love to try on clothes with her and she gives you a big hug. "This will be so much fun!" she says.'
+		'You tell her that you would love to try on clothes and she gives you a big hug. "This will be so much fun!" she says.'
 		if rand(0,1) = 1:
 			'"Let''s go to <<$store_choice>>," Katja says.'
 			act 'Go to <<$store_choice>>': gt 'katja_city', $store_choice
@@ -145,8 +188,8 @@ if $ARGS[0] = 'Pussy-Cats':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWS1.jpg"></center>'
 	'You walk into Pussy-Cats, the trendy store for cool kids like you, but still affordable enough that you might be able to buy what you try on if you really like it.'
-	'You start browsing the stands looking at all the new fashion trends for the young and hip. After a while, you decide that both of you should pick a set that you think would look great on the other.' 
-	'Spending some time looking, you find something that you really would like to see Katja in. You return to her and she also has some clothes for you to try on. You find your way to the changing rooms and find one that is so big you can both be in it at the same time.'
+	'You start browsing the stands looking at all the new fashion trends for the young and hip. After a while, you decide that you should each pick a set that you think would look great on the other.' 
+	'Spending some time looking, you find something that you really would like to see Katja in. You return to her and she also has some clothes for you to try on. You head to the changing rooms and find one big enough for the two of you.'
 	act 'Try on clothes':
 		numrand = rand(1, 100)
 
@@ -157,8 +200,8 @@ if $ARGS[0] = 'Pussy-Cats':
 		loop_counter += 1
 		if loop_counter = 600:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-			'You try to put on what Katja brought you, but it''s '+iif(salo < 60, 'way to loose and will fall off', 'so tight you can''t get into it')+' so you give up. "I''m very sorry, <<$pcs_lastname>>, that I miscalculated your size. Let me get something else," Katja says.'
-			'You stop her before she runs out, "Hey don''t be sorry, it''s not your fault. Try what I picked out first."'
+			'You try to put on what Katja brought you, but it''s '+iif(salo < 60, 'way too loose and will fall off', 'so tight you can''t get into it')+' so you give up. "I''m sorry, <<$pcs_nickname>>. I''ve miscalculated your size. Let me get something else," Katja says.'
+			'You stop her before she runs out. "Hey don''t be sorry, it''s not your fault. Try what I picked out first."'
 			act 'Katja tries the clothes you picked': gt 'katja_city', 'pussy_cat_outfit<<rand(0,3)>>'
 		else
 			if rand(0,1) = 1:
@@ -181,19 +224,19 @@ if $ARGS[0] = 'Pussy-Cats':
 				if cats_dress[numrand] = 0:
 					'<center><b><font color="maroon">Pussy-Cats</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/pc/items/cats/dress/<<numrand>>.jpg"></center>'
-					'You try on the dress Katja has picked for you, while she is looking on excitedly. She seems to like it, but it is clear that she is waiting for your reaction before saying anything.'
+					'You try on the dress Katja has picked for you while she looks on excitedly. She seems to like it, but it''s clear that she''s waiting for your reaction before saying anything.'
 
 					gs 'clothing', 'get_price', 'cats_dresss', numrand, 3000
 
 					act 'Tell her that you like it':
 						cla
 						gs 'npc_relationship', 'modify', 'A14', 'love'
-						'"This is really nice. As always, your fashion sense sense is impeccable," you say. Katja''s face lights up like a Christmas tree.'
+						'"This is really nice. As always, your fashion sense sense is impeccable," you say and Katja''s face lights up like a Christmas tree.'
 						'You look at the price tag and see that it costs <<price>>.'
 						if money > price: 
 							act 'Buy the dress (cash)':
 								cla
-								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
+								'"I''m going to buy this dress after you try on what I picked for you."'
 								'"That''s so great!" she says, looking really happy.'
 								money -= price
 								gs 'clothing', 'quick_buy', 'cats_dress', numrand, 3000, 'money'							
@@ -203,7 +246,7 @@ if $ARGS[0] = 'Pussy-Cats':
 						if karta > price:
 							act 'Buy the dress (card)':
 								cla
-								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
+								'"I''m going to buy this dress after you try on what I picked for you."'
 								'"That''s so great!" she says, looking really happy.'
 								gs 'clothing', 'quick_buy', 'cats_dress', numrand, 3000, 'karta'							
 								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
@@ -211,15 +254,15 @@ if $ARGS[0] = 'Pussy-Cats':
 						end
 						act 'Say it is too expensive for you':
 							cla
-							'"I wish I could afford to buy it but I don''t have the money right now," you say.'
-							'"That''s totally fine, we didn''t do this to buy stuff, just to have fun trying on new things," Katja says.' 
+							'"I wish I could afford to buy it, but I don''t have the money right now," you say.'
+							'"That''s totally fine. We didn''t do this to buy stuff, just to have fun trying on new things," she replies.' 
 							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 						end
 					end
-					act 'Tell her you don''t think the dress is really you':
+					act 'It''s not really you':
 						cla
-						'"It''s nice, but I don''t think that this dress is really me," you tell Katja, trying to let her down gently.'
-						'"Well, I had to try," she says, somberly. "You know you should try new things once in a while or else you will miss out on so many great things."'
+						'"It''s nice, but I don''t think that this dress is really me," you tell her, trying to let her down gently.'
+						'"Well, I had to try," she says somberly. "You know you should try new things once in a while or else you will miss out on so many great things."'
 						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 					end
 				else
@@ -245,19 +288,19 @@ if $ARGS[0] = 'Pussy-Cats':
 				if cats_outfits[numrand] = 0:
 					'<center><b><font color="maroon">Pussy-Cats</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/pc/items/cats/dress/<<numrand>>.jpg"></center>'
-					'You try on the clothes Katja picked out for you, while she looks on excitedly. She seems to like it, but it is clear she is waiting for your reaction before saying anything.'
+					'You try on the clothes Katja picked out for you while she looks on excitedly. She seems to like it, but it''s clear she''s waiting for your reaction before saying anything.'
 
 					gs 'clothing',  'get_price', 'cats_outfits', numrand, 3000
 
 					act 'Tell her that you like it':
 						cla
 						gs 'npc_relationship', 'modify', 'A14', 'love'
-						'"This is really nice. As always, your fashion sense sense is impeccable," you say. Katja''s face lights up like a Christmas tree.'
+						'"This is really nice. As always, your fashion sense sense is impeccable," you say and Katja''s face lights up like a Christmas tree.'
 						'You look at the price tag and see that it costs <<price>>.'
 						if money >= price: 
 							act 'Buy the clothes (cash)':
 								cla
-								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
+								'"I''m going to buy this dress after you try on what I picked for you."'
 								'"That''s so great!" she says, looking really happy.'
 								gs 'clothing', 'quick_buy', 'cats_outfits', numrand, 3000, 'money'							
 								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
@@ -266,7 +309,7 @@ if $ARGS[0] = 'Pussy-Cats':
 						if card >= price:
 							act 'Buy the clothes (card)':
 								cla
-								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
+								'"I''m going to buy this dress after you try on what I picked for you."'
 								'"That''s so great!" she says, looking really happy.'
 								gs 'clothing', 'quick_buy', 'cats_outfits', numrand, 3000, 'karta'							
 								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
@@ -274,15 +317,15 @@ if $ARGS[0] = 'Pussy-Cats':
 						end
 						act 'Say it is too expensive for you':
 							cla
-							'"I wish I could afford to buy it but I don''t have the money right now," you say.'
-							'"That''s totally fine, we didn''t do this to buy stuff, just to have fun trying on new things," Katja says.'  
+							'"I wish I could afford to buy it, but I don''t have the money right now," you say.'
+							'"That''s totally fine. We didn''t do this to buy stuff, just to have fun trying on new things," she replies.'  
 							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 						end
 					end
-					act 'Tell her you don''t think the dress is really you':
+					act 'It''s not really you':
 						cla
-						'"It''s nice, but I don''t think that this dress is really me," you tell Katja, trying to let her down gently.'
-						'"Well, I had to try," she says, somberly. "You know you should try new things once in a while or else you will miss out on so many great things."'
+						'"It''s nice, but I don''t think that this dress is really me," you tell her, trying to let her down gently.'
+						'"Well, I had to try," she says somberly. "You know you should try new things once in a while or else you will miss out on so many great things."'
 						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 					end
 				else
@@ -296,25 +339,25 @@ end
 if $ARGS[0] = 'pussy_cat_outfit1':
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_1.jpg"></center>'
-	'While you change back to your original clothes, Katja puts on the sleeveless shirt and very short pants you have chosen for her. When she is finished dressing, she turns around so you can get a good look at her.'
+	'While you change back to your original clothes, Katja puts on the sleeveless shirt and very short pants you''ve chosen for her. Once she''s finished dressing, she turns around so you can get a good look at her.'
 	if katjaQW['slut'] >= 100:
-		'"Wow, these are so great," Katja says when she sees herself in the mirror. "I''m definitely going to be the sexiest girl on campus wearing these. Though I should probably be weary of Lizaveta seeing me wearing this; she might start spreading rumors in Pav that I''ve become a whore," Katja says with a wink.'
+		'"Wow, these are so great," she says when she sees herself in the mirror. "I''m definitely going to be the sexiest girl on campus wearing these. Though I should probably be weary of Lizaveta seeing me wearing this; she might start spreading rumors that I''ve become a whore," she says with a wink.'
 	elseif katjaQW['slut'] >= 80:
-		'"Damn, I look sexy in these!" Katja says. "But maybe too sexy. I think that this can only be used for special occasions and not for going to class."'
+		'"Damn, I look sexy in these!" she says. "Maybe too sexy. I think this should only be used for special occasions and not for going to class."'
 	elseif katjaQW['slut'] >= 60:
-		'"Wow, I don''t know," Katja says. "I definitely look sexy in this, but I''m not sure that I can wear it anywhere."'
+		'"Wow, I don''t know..." she says. "I definitely look sexy in this, but I''m not sure if I can wear it anywhere."'
 	elseif katjaQW['slut'] >= 40:
-		'"Well, this is too much," Katja says. "This isn''t something I can wear anywhere."' 
-		'"But you have to agree that that you look sexy," you say.'
-		'"Well yeah, but I can''t see myself wearing it outside here," Katja answers.' 
+		'"This is too much," she says. "This isn''t something I can wear anywhere."' 
+		'"But you have to agree that that you look sexy?" you reply.'
+		'"Well yeah, but I can''t see myself wearing it outside here," se+he answers.' 
 	elseif katjaQW['slut'] >= 20:
-		'"What are you thinking, <<$pcs_nickname>>?!" Katja says. "These are clothes for sluts."'
-		'"Come on, Katja, you look so sexy in it," you say.'
-		'"Maybe. Okay, you are right, but you are not going to see me in it outside this changing room," Katja answers.'
+		'"What were you thinking, <<$pcs_nickname>>?!" Katja says. "These are clothes for sluts!"'
+		'"Come on, Katja. You look so sexy in it!" you reply.'
+		'"Maybe, but you''re not going to see me in it outside this changing room," she answers.'
 	else
-		'"What the heck, are you trying to turn me into a prostitute?" Katja almost yells.'
-		'"Come on, Katja, you look so sexy in these," you say.'
-		'"We are not having this conversation. This is coming off right now!" she replies.'  
+		'"What the heck? Are you trying to turn me into a prostitute?!" she almost yells.'
+		'"Come on, Katja! You look so sexy in these," you reply.'
+		'"We are not having this conversation! This is coming off right now!" she replies.'  
 	end
 	act 'Ask her to turn around':
 		*clr & cla
@@ -323,25 +366,25 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 		if katjaQW['slut'] < 20:
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'"Come on, turn around and let me see you from behind," you say.'
-			'"No," Katja answers as she start taking the clothes off. "I still don''t know what you were thinking choosing these shorts," she says.'
-			'You let her change clothes in silence. When she is finished, she says, "Well, thanks for this anyway, but next time you should choose some proper clothes for me. Let''s leave the shop."'
+			'"No," Katja answers as she starts taking the clothes off. "I still don''t know what you were thinking choosing these shorts!"'
+			'You let her change clothes in silence. "Well, thanks for this anyway. You should choose some proper clothes for me next time though," she says once she''s finished.'
 			act 'Leave': minut += 3 & gt $loc, $loc_arg
 		else
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_2.jpg"></center>'
 			'"Come on, turn around and let me see you from behind," you say.'
 			iif(katjaQW['slut'] >= 80, '"Of course," Katja says. "I''m sure you''ll enjoy the view!"', '"Really, <<$pcs_nickname>>?!"')
 			'"Come on, it''s just me," you answer.'
-			'After a moments hesitation, she answers, "Okay."'
+			'After a moment''s hesitation, she answers, "Okay."'
 			'She turns around and shows you a sight that barely leaves anything to the imagination as the shorts have crept up her butt crack. "Damn that looks good on you," you say. "Great ass!"'
-			iif(katjaQW['slut'] >= 80, '"Thanks!" Katja says. "These will really make me the center of attention at a party."', '"Don''t say that!" Katja says. "It''s really annoying how they creep up my butt!"')+' She then turns around, facing you again.'
+			iif(katjaQW['slut'] >= 80, '"Thanks!" Katja says. "These will really make me the center of attention at a party."', '"Don''t say that!" Katja says. "It''s really annoying how they creep up my butt!"')+' She then turns around to face you again.'
 			act 'Continue':
 				*clr & cla
 				minut += 1
 				gs 'stat'	
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_3.jpg"></center>'
-				'"Well, this was fun but I should change back," Katja says while starting to unbutton the shirt.'
+				'"Well, this was fun, but I should change back," she says while starting to unbutton the shirt.'
 				if npc_sex['A14'] > 0 and katjaQW['slut'] > 60 and rand(0,3) = 0:
-					'"Why don''t I give you a little show?" Katja says with a mischievous smile.'
+					'"Why don''t I give you a little show?" she says with a mischievous smile.'
 					act 'Enjoy the striptease': gt 'katja_city', 'pussy_cat_outfit1_strip'
 				else
 					if katjaQW['QWstage'] > 2:
@@ -351,7 +394,7 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 							gs 'willpower', 'misc', 'force', 'easy'
 							if will_cost <= pcs_willpwr:
 								act 'Ask Katja to put on a show (<<will_cost>> Willpower)':
-									gs 'willpower', 'pay'
+									gs 'willpower', 'pay', 'force'
 									gs 'stat'
 									gt 'katja_city', 'pussy_cat_outfit1_strip'					
 								end
@@ -365,7 +408,7 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 						minut += 3
 						gs 'stat'	
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_3.jpg"></center>'
-						'Katja finishes up changing back to her original clothes and you leave the shop. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+						'Katja finishes changing back to her original clothes and you leave the shop. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 						act 'Leave': minut += 2 & gt $loc, $loc_arg
 					end
 				end
@@ -379,7 +422,7 @@ if $ARGS[0] = 'pussy_cat_outfit1_strip':
 	katjaQW['horny'] += 10
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_4.jpg"></center>'
-	'Katja starts by moving in a more sensual way, while she slowly unbuttons the shirt until it''s finally open and she lets it fall to the side revealing her breast that isn''t covered by a bra. Then she unbuttons the pants and puts her hands on her sides.'
+	'Katja starts by moving in a more sensual way while she slowly unbuttons the shirt before letting it fall to the side, revealing her bare breast. She then unbuttons the pants and puts her hands on her sides.'
 	if npc_sex['A14'] > 0:
 		if max(katjaQW['horny'],100) > rand(50,150) and katjaQW['slut'] >= 80:
 			act 'Katja makes things more interesting': gt 'katja_city', 'pussy_cat_outfit1_play'
@@ -387,7 +430,7 @@ if $ARGS[0] = 'pussy_cat_outfit1_strip':
 			gs 'willpower', 'mast', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Ask Katja to touch herself (<<will_cost>> Willpower)':
-					gs 'willpower', 'pay'
+					gs 'willpower', 'pay', 'force'
 					gs 'stat'
 					gt 'katja_city', 'pussy_cat_outfit1_play'					
 				end
@@ -410,8 +453,8 @@ if $ARGS[0] = 'pussy_cat_outfit1_strip2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_5a.jpg"></center>'
 	'Katja slowly pulls her pants halfway down her thighs, then lets go of them and puts her arms in front of her in a way that pushes her breasts forward. "See something you like?" she asks in a seductive tone.'
 	'"Very impressive," you say.'
-	'"Enough with this," she says with a laugh, and starts to change her clothes normally.'
-	'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+	'"Enough of this," she says with a laugh, and starts to change her clothes normally.'
+	'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 	act 'Leave': minut += 2 & gt $loc, $loc_arg
 end
 
@@ -427,25 +470,25 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 		katjaQW['horny'] += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_6.jpg"></center>'
-		'As Katja gets closer to cumming, she removes her hand from her breast and pulls down the pants so that her other hand has better access.'
+		'As she gets closer to cumming, she removes her hand from her breast and pulls down the pants so that her other hand has better access.'
 		if katjaQW['know_butt_plug'] = 0:
-			'Out of your eye, you notice that Katja''s bag is open and see something that surprises you. You open the bag to be sure, and pull out a butt plug and a vibrator. Seems Katja is more naughty than you knew.'
-			'"Well, well, what do we have here?" you say as you show your findings to Katja. She immediately stops what she is doing and her face becomes red like a tomato.' 
-			'"I... Vicky gave them to me when I moved to the dorm. It isn''t something I would use," Katja stammers.'
+			'Out of your eye, you notice that Katja''s bag is open and see something that surprises you. You open the bag and pull out a butt plug and a vibrator. Seems Katja is more naughty than you knew.'
+			'"Well, well, what do we have here?" you say as you show your findings to Katja, who immediately stops what she''s doing and blushes bright red.' 
+			'"I... Vicky gave them to me when I moved to the dorm. They aren''t something I would use," she stammers.'
 			'"Then why are they in your bag if you don''t use them?" you ask.'
-			'"Because I don''t want Sofia to find them; that girl gets into all my stuff and if she finds it, she will not stop asking me about it." Katja answers.'
+			'"Because I don''t want Sofia to find them. That girl gets into all my stuff and if she finds them, she won''t stop asking me about it," she answers.'
 			'"So you have never used them?" you ask.'
 			if katjaQW['masturbates'] + npc_ass['A14'] = 0:
-				'"I have never used any of them," Katja says.'
-				'"Well, then you are going to try several new things today," you say and hand her the butt plug.'
+				'"I''ve never used any of them," she says.'
+				'"Well, then you''re going to try several new things today," you say and hand her the butt plug.'
 			elseif katjaQW['masturbates'] + npc_ass['A14'] = 1:
-				'"I have never used the '+iif(katjaQW['masturbates'] = 1, 'butt plug', 'vibrator')+'." Katja says.'
-				'"So you have used the '+iif(katjaQW['masturbates'] = 1, 'vibrator', 'butt plug')+'. But you are still going to try something new today," you say and hand her the butt plug.'
+				'"I''ve never used the '+iif(katjaQW['masturbates'] = 1, 'butt plug', 'vibrator')+'." she says.'
+				'"So you''ve used the '+iif(katjaQW['masturbates'] = 1, 'vibrator', 'butt plug')+'? You''re going to try something new today," you say and hand her the butt plug.'
 			else
-				'Katja doesn''t say anything, but her face is becoming even more red than before. "So you have been using them, you dirty girl!" you say with a smile. "Show me how you use them," you say as you hand Katja the butt plug.'
+				'Katja doesn''t say anything, but her face is becoming even more red than before. "So you have been using them, you dirty girl!" you say with a smile. "Show me how you use them," you say as you hand her the butt plug.'
 			end
 		else
-			'You look into Katja''s bag and find her butt plug and vibrator. "Use these to make the show even better," you say as you hand Katja the butt plug.'
+			'You look into Katja''s bag and find her butt plug and vibrator. "Use these to make the show even better," you say as you hand her the butt plug.'
 		end
 		act 'Watch Katja insert the butt plug':
 			*clr & cla
@@ -455,14 +498,14 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 			if npc_ass['A14'] = 0:
 				npc_ass['A14'] = 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_7a.jpg"></center>'		
-				'"I have never put anything in my butt before!" Katja says.'
-				'"There''s a first time for everything," you say. "Lick it first to lubricate it."'
-				'Katja does as you say and starts to lick the butt plug. After a minute, you say, "I think it is wet enough for you to put it in. Lie down in the chair, it might be easier to put it in from that position."'
-				'She moves to the chair and then guides the butt plug to the opening of her ass. She starts pushing it in, but clearly meets some resistance. "Take you time," you say. But Katja seems determined and after a short while she pushes the butt plug completely into her ass with a slight groan of pain.'
+				'"I''ve never put anything in my butt before!" Katja protests.'
+				'"There''s a first time for everything," you reply. "Lick it first to lubricate it."'
+				'Katja does as you say and starts to lick the butt plug. After a minute, you say, "I think it''s wet enough for you to put it in now. Lie down in the chair; it will be easier to put it in from that position."'
+				'She moves to the chair and then guides the butt plug to the opening of her ass. She starts pushing it in, but clearly meets some resistance. "Take your time," you say, but Katja seems determined and after a short while she pushes the butt plug completely into her ass with a slight groan of pain.'
 			else
 				if npc_ass['A14'] < 5: npc_ass['A14'] += 1
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_7b.jpg"></center>'		
-				'Katja takes the butt plug and starts licking it. After a minute or so she lies down in the chair and starts pushing the butt plug into her ass.'+iif(npc_ass['A14'] <= 5, ' You can see that there is some resistance and Katja holds back some near inaudible groans of pain.', 'The butt plug goes in without any resistance, and she pulls it back and forth a little while moaning slightly.')
+				'Katja takes the butt plug and starts licking it. After a minute or so, she lies down in the chair and starts pushing the butt plug into her ass.'+iif(npc_ass['A14'] <= 5, ' You can see that there is some resistance and Katja holds back some near inaudible groans of pain.', 'The butt plug goes in without any resistance, and she pulls it back and forth a little while moaning slightly.')
 			end
 			act 'Watch Katja''s reaction':
 				*clr & cla
@@ -477,11 +520,11 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 					katjaQW['horny'] += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_9.jpg"></center>'		
-					'"Here, Katja. Use this," you say as you turn on the vibrator and give it to her. '+iif(katjaQW['masturbates'] = 1 or katjaQW['know_butt_plug'] = 1, 'Katja clearly knows what she is doing and puts it to her clit and starts to moan.', 'Katja looks at it a little nervously, and then starts putting it around her pussy. You are just about to give her some pointers when she finally puts it to her clit and gives out a loud moan.')
+					'"Here. Use this," you say as you turn on the vibrator and give it to her. '+iif(katjaQW['masturbates'] = 1 or katjaQW['know_butt_plug'] = 1, 'Katja clearly knows what she''s doing and puts it to her clit and starts to moan.', 'Katja looks at it a little nervously, and then starts putting it around her pussy. You''re just about to give her some pointers when she finally puts it to her clit and lets out a loud moan.')
 					act 'Masturbate while you watch Katja':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_10.jpg"></center>'		
-						'You put you hand down your '+iif(CloSkirtShortness > 0, 'skirt', 'pants')+' and start to rub your clit while you watch Katja. She starts really getting into it, she seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
+						'You put you hand down your '+iif(CloSkirtShortness > 0, 'skirt', 'pants')+' and start to rub your clit while you watch Katja. She starts really getting into it, and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
 						gs 'arousal', 'foreplay', 3
 						gs 'arousal', 'clit_finger', -3, 'masturbate'
 						gs 'arousal', 'end'
@@ -492,15 +535,15 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 						*nl
 						'After she comes down, she says, "Wow, that was intense!"'
 						'"It was a great show," you tell her.'
-						'"Thanks. I think." Katja says blushing. "Let me get changed," she says and start taking off the rest of the shirt.'
-						'She starts to take out the butt plug but you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes but keeps it in as she puts on her clothes.'
-						'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+						'"Thanks. I think," she says while blushing. "Let me get changed," she says and start taking off the rest of the shirt.'
+						'She starts to take out the butt plug, but you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
+						'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 						act 'Leave': minut += 2 & gt $loc, $loc_arg		
 					end
 					act 'Just watch Katja':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_1_10.jpg"></center>'		
-						'You intensely watch Katja. She starts really getting into it, she seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
+						'You intensely watch Katja. She starts really getting into it, and seems to have a hard time keeping her voice down. After a few minutes, she starts convulsing and has a powerful orgasm. Afterwards, she just lies in the chair, catching her breath.'
 						gs 'arousal', 'foreplay', 3
 						gs 'arousal', 'end'
 						if katjaQW['know_butt_plug'] = 0: katjaQW['know_butt_plug'] = 1
@@ -510,9 +553,9 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 						*nl
 						'After she comes down, she says, "Wow, that was intense!"'
 						'"It was a great show," you tell her.'
-						'"Thanks. I think" Katja says blushing. "Let me get changed," she says and start taking off the rest of the shirt.'
-						'She starts to take out the butt plug but you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes but keeps it in as she puts on her clothes.'
-						'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+						'"Thanks. I think," she says while blushing. "Let me get changed," she says and start taking off the rest of the shirt.'
+						'She starts to take out the butt plug, but you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
+						'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 						act 'Leave': minut += 2 & gt $loc, $loc_arg		
 					end
 				end
@@ -524,11 +567,11 @@ end
 if $ARGS[0] = 'pussy_cat_outfit2':
 	minut += 5
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_1.jpg"></center>'
-	'While you change back to your original clothes, Katja puts on the white shirt and short skirt you have chosen for her. When she''s finished dressing, she turns around so you can get a good look at her.'
+	'While you change back to your original clothes, Katja puts on the white shirt and short skirt you have chosen for her. Once she''s finished dressing, she turns around so you can get a good look at her.'
 	if katjaQW['slut'] >= 40:
-		'"This looks good," Katja says when she sees herself in the mirror. "It''s a nice dress for a warm summer night," she continues. "I might buy this."'
+		'"This looks good," she says when she sees herself in the mirror. "It''s a nice dress for a warm summer night," she continues. "I might buy this."'
 	else
-		'"This looks good," Katja says when she sees herself in the mirror. "But it''s a bit short, and kind of see through. I''m not sure if I''m brave enough to wear this in public," she continues.'
+		'"This looks good," she says when she sees herself in the mirror. "But it''s a bit short, and kind of see through. I''m not sure if I''m brave enough to wear this in public," she continues.'
 	end
 	act 'Katja starts to change':
 		*clr & cla
@@ -543,14 +586,14 @@ if $ARGS[0] = 'pussy_cat_outfit2':
 			if katjaQW['slut'] < 40:
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'"So do your panties match the bra?" you ask.'
-				'"What?!" Katja gasps. "Why would you ask me that?!"'
-				'"No reason," you say when it''s clear she''s not comfortable with the question, and you let her change in peace.'
-				'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+				'"What?!" she gasps. "Why would you ask me that?!"'
+				'"No reason," you reply when it''s clear she''s not comfortable with the question, and you let her change in peace.'
+				'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 				act 'Leave': minut += 2 & gt $loc, $loc_arg
 			else
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_3.jpg"></center>'
 				'"So do your panties match the bra?" you ask.'
-				iif(katjaQW['slut'] >= 80, '"Are you assuming I''m wearing panties?" Katja asks slyly.', '"Really, <<$pcs_nickname>>?! You don''t ask a good girl such a question!" Katja says with a wink')
+				iif(katjaQW['slut'] >= 80, '"Are you assuming I''m wearing panties?" she asks slyly.', '"Really, <<$pcs_nickname>>?! You don''t ask a good girl such a question!" she says with a wink.')
 				'"Come on, be a really good girl and show me it''s just me," you answer.'
 				'After a moment''s hesitation, she relents. "Okay."'
 				'She slowly pulls up the skirt to reveal her smoothly shaved pussy.'
@@ -560,11 +603,11 @@ if $ARGS[0] = 'pussy_cat_outfit2':
 					if katjaQW['pantiesQWstage'] < 4: katjaQW['pantiesQWstage'] += 1
 					'It''s clear from Katja''s reddening face that she is embarrassed by you seeing her without panties.'
 					'"Don''t say anything," she says. "It''s just that all my panties are in the laundry," she says, not sounding very truthful. "I normally never go without panties."'
-					iif($panties_worn = 'nude', '"You should. It is very liberating," you tell her as you flash her your naked pussy', '"Why am I not completely convinced that is the case?" you say')+'  and her head turns even more red.'
+					iif($panties_worn = 'nude', '"You should. It is very liberating," you tell her as you flash her your naked pussy', '"Why am I not completely convinced that is the case?" you say')+'  and her face turns even more red.'
 				end
-				'"Well, this was fun but I should change back," Katja says.'
+				'"Well, this was fun but I should change back," she says.'
 				if npc_sex['A14'] > 0 and katjaQW['slut'] > 60 and rand(0,3) = 0:
-					'"Why don''t I give you a little show?" Katja says with a mischievous smile.'
+					'"Why don''t I give you a little show?" she says with a mischievous smile.'
 					act 'Enjoy the striptease': gt 'katja_city', 'pussy_cat_outfit2_strip'
 				else
 					if katjaQW['QWstage'] > 2:
@@ -588,7 +631,7 @@ if $ARGS[0] = 'pussy_cat_outfit2':
 						minut += 3
 						gs 'stat'	
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_2.jpg"></center>'
-						'Katja finishes changing and you leave the shop. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+						'Katja finishes changing and you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 						act 'Leave': minut += 2 & gt $loc, $loc_arg
 					end
 				end
@@ -610,7 +653,7 @@ if $ARGS[0] = 'pussy_cat_outfit2_strip':
 			gs 'willpower', 'mast', 'force'
 			if will_cost <= pcs_willpwr:
 				act 'Ask Katja to touch herself (<<will_cost>> Willpower)':
-					gs 'willpower', 'pay'
+					gs 'willpower', 'pay', 'force'
 					gs 'stat'
 					gt 'katja_city', 'pussy_cat_outfit2_play'					
 				end
@@ -633,8 +676,8 @@ if $ARGS[0] = 'pussy_cat_outfit1_strip2':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_5a.jpg"></center>'
 	'Katja finally takes the shirt off and throws it over her shoulder, holding it in one hand while she lifts the skirt with the other while looking directly at you . "See something you like?" she asks in a seductive tone.'
 	'"Very nice," you reply.'
-	'"Enough with this," she says with a laugh, and starts to change her clothes normally.'
-	'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+	'"Enough of this," she says with a laugh, and starts to change her clothes normally.'
+	'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 	act 'Leave': minut += 2 & gt $loc, $loc_arg
 end
 
@@ -646,17 +689,17 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 	'Katja stops taking off the shirt and moves her hand to her pussy, slowly starting to play with it. She seems to getting really into it.'
 	if katjaQW['know_butt_plug'] = 0:
 		'Out of your eye, you notice that Katja''s bag is open and see something that surprises you. You open the bag and pull out a butt plug and a vibrator. Seems Katja is more naughty than you knew.'
-		'"Well, well, what do we have here?" you say as you show your findings to Katja. She immediately stops what she''s doing and her face turns as red as a tomato.' 
-		'"I... Vicky gave them to me when I moved to the dorm. It isn''t something I would use," Katja stammers.'
+		'"Well, well, what do we have here?" you say as you show your findings to Katja, who immediately stops what she''s doing and blushes bright red.' 
+		'"I... Vicky gave them to me when I moved to the dorm. They aren''t something I would use," Katja stammers.'
 		'"Then why are they in your bag if you don''t use them?" you ask.'
-		'"Because I don''t want Sofia to find them; that girl gets into all my stuff and if she finds it, she won''t stop asking me about it," Katja answers.'
-		'"So you have never used them?" you ask.'
+		'"Because I don''t want Sofia to find them. That girl gets into all my stuff and if she finds them, she won''t stop asking me about it," she answers.'
+		'"So you''ve never used them?" you ask.'
 		if katjaQW['masturbates'] + npc_ass['A14'] = 0:
-			'"I''ve never used any of them," Katja says.'
+			'"I''ve never used any of them," she replies.'
 			'"Well, then you''re going to try several new things today," you say and hand her the butt plug.'
 		elseif katjaQW['masturbates'] + npc_ass['A14'] = 1:
-			'"I have never used the '+iif(katjaQW['masturbates'] = 1, 'butt plug', 'vibrator')+'." Katja says.'
-			'"So you have used the '+iif(katjaQW['masturbates'] = 1, 'vibrator', 'butt plug')+'. But you are still going to try something new today," you say and hand her the butt plug.'
+			'"I''ve never used the '+iif(katjaQW['masturbates'] = 1, 'butt plug', 'vibrator')+'." she says.'
+			'"So you''ve used the '+iif(katjaQW['masturbates'] = 1, 'vibrator', 'butt plug')+'? You''re going to try something new today," you say and hand her the butt plug.'
 		else
 			'Katja doesn''t say anything, but her face is becoming even more red than before. "So you have been using them, you dirty girl!" you say with a smile. "Show me how you use them," you say as you hand her the butt plug.'
 		end
@@ -671,10 +714,10 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_6.jpg"></center>'		
 		if npc_ass['A14'] = 0:
 			npc_ass['A14'] = 1
-			'"I''ve never put anything in my butt before!" Katja s.'
-			'"There''s a first time for everything," you say. "Lick it first to lubricate it."'
+			'"I''ve never put anything in my butt before!" Katja protests.'
+			'"There''s a first time for everything," you reply. "Lick it first to lubricate it."'
 			'Katja does as you say and starts licking the butt plug. After a minute, you say "I think it''s wet enough for you to put it in. Lie down in the chair. It''ll make it easier to put it in."'
-			'She takes off the rest of the clothes except her bra and moves to the chair before guiding the butt plug to the opening of her ass. She starts pushing it in, but clearly meets some resistance. "Take you time," you say. But Katja seems determined and after a short while she pushes the butt plug completely into her ass with a slight groan of pain.'
+			'She takes off the rest of the clothes except her bra and moves to the chair before guiding the butt plug to the opening of her ass. She starts pushing it in, but clearly meets some resistance. "Take your time," you say, but Katja seems determined and after a short while she pushes the butt plug completely into her ass with a slight groan of pain.'
 		else
 			if npc_ass['A14'] < 5: npc_ass['A14'] += 1
 			'Katja takes the butt plug and starts licking it. After a minute or so, she takes off the rest of the clothes except her bra and lies down in the chair before pushing the butt plug into her ass.'+iif(npc_ass['A14'] <= 5, ' You can see that there is some resistance and Katja holds back some near inaudible groans of pain.', 'The butt plug goes in without any resistance, and she pulls it back and forth a little while moaning slightly.')
@@ -707,7 +750,7 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 					*nl
 					'After she comes down, she says, "Wow, that was intense!"'
 					'"It was a great show," you tell her.'
-					'"Thanks. I think," she says blushing. "Let me get changed," she says and start taking off the shirt.'
+					'"Thanks. I think," she says while blushing. "Let me get changed," she says and start taking off the shirt.'
 					'She starts takes out the butt plug when you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
 					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 					act 'Leave': minut += 2 & gt $loc, $loc_arg		
@@ -727,7 +770,7 @@ if $ARGS[0] = 'pussy_cat_outfit2_play':
 					'"It was a great show," you tell her.'
 					'"Thanks. I think," she says blushing. "Let me get changed," she says and start taking off the shirt.'
 					'She starts to take out the butt plug when you stop her. "Keep it in until you get home. It will be a good experience for you," you say. She blushes, but keeps it in as she puts on her clothes.'
-					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," Katja says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
+					'A few minutes later, you leave the store. "That was fun, <<$pcs_nickname>>," she says. "We should do this again!" She waves goodbye and leaves you alone in the mall.'
 					act 'Leave': minut += 2 & gt $loc, $loc_arg		
 				end
 			end

+ 84 - 37
locations/katja_dorm.qsrc

@@ -26,6 +26,7 @@
 !! katjaQW['slut'] a number that increases as Katja becomes more and more sexualy liberated, and alows her to be villing to do more sexual stuff. (katjaSlut)
 !! katjaQW['horny'] a messure of Katja''s arousal. Grows until she have an orgasmn and will determine how willing she is at the moment to have sex.
 !! katjaQW['dom'] a number that tells if Katja is dominant or submissive. 0 is neutral, a negative means she is submissive and a positive means she is dominant. In general the absolute value needs to be above 30 before you will see any effect. (katjaDom but not a 1 to 1 translation since that variable was all over the place.)
+!! katjaQW['simultanous_boys'] the number of boys Katja have been with at the same time, Is not really set before the number is 2.
 
 !! katjaQW['park_sex'] 	a measure of what experience Katja has had with random guys in the park. 0 means she has not had sex with anybody in the park,
 !!					1 means that she has had sex with one guy at a time (either alone, in a threesome with the player character or while the player had sex with another guy next to them)
@@ -36,6 +37,8 @@
 !! npc_throat['A14'] The capacity for Katja to take a dick (or dildo) down her throat. (KatjaThroat)
 !! npc_vag['A14'] The capacity for Katja to take a dick (or dildo) in the vagina.
 !! npc_ass['A14'] The capacity for Katja to take a dick (or dildo) in her ass. (KatjaAnus)
+!! katjaQW['deepthroat'] Number of time Katja have been deepthroated 
+!! katjaQW['dp'] the number of times Katja have been double penetrated. 
 
 !! katjaQW['strapon_bj'] = 1 Katja has given a BJ to your strap-on.
 !! katjaQW['strapon_vag'] = 1 You have fucked Katja''s pussy with your strap-on.
@@ -47,12 +50,14 @@
 !! katjaQW['marcus_pussy'] = 1 Katja has taken Marcus''s cock in her pussy.
 !! katjaQW['marcus_anal'] = 1 Katja has taken Marcus''s cock in her ass.
 !! katjaQW['marcus_disco'] = 1 Katja and the player character have had a threesome with Marcus at the community center disco.
-!! katjaQW['lazar_pussy'] = 1 Katja has taken Ivan''s cock in her pussy.
-!! katjaQW['lazar_anal'] = 1 Katja has taken Ivan''s cock in her ass.
+!! katjaQW['lazar_pussy'] = 1 Katja has taken Lazar''s cock in her pussy.
+!! katjaQW['lazar_anal'] = 1 Katja has taken Lazar''s cock in her ass.
 
 !! katjaQW['lazar_pussy_talk'] = 1 Katja and the player character have talked about having sex with Lazar.
 !! katjaQW['lazar_anal_talk'] = 1 Katja and the player character have talked about having anal sex with Lazar.
 
+!! katjaQW['Lazar_Ivan_4some'] 1 means the had a foursome but no double penetration, 2 means that the player character recieved a double penetration during the first foursome and have not talked about it yet, and 3 is if the player character have recieved a double penetration and they have talked about the first foursome.
+
 !! katjaQW['Marcus_day'] is set to daystart if you or Katja ask to have a threesome with Marcus. Such that the question will only be asked once per day.
 !! katjaQW['Lazar_day'] is set to daystart if you or Katja ask to have a threesome with Lazar. Such that the question will only be asked once per day.
 
@@ -115,7 +120,7 @@ if $ARGS[0] = 'start':
 			'Katja is heading out the door to class and has no time to talk.'
 		end
 	else
-		'Katja is not in her room'
+		'Katja is not in her room.'
 	end
 
 	act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
@@ -144,7 +149,7 @@ if $ARGS[0] = 'talk':
 	end
 
 	if locat['katja'] ! 31:
-		!!Right now we only check to shee if Katja is supposed to be home and available for chatting, if not she will show out. Later when other actions are written then you might be able to follow her.
+		!!Right now we only check to shee if Katja is supposed to be home and available for chatting, if she is she will show you out. Later when other actions are written then you might be able to follow her.
 		'"Sorry, but I have to run now. See you later," she says.'
 		act 'Leave Katja''s dorm room': minut += 2 & gt 'uni_dorm', 'second_floor'
 	else
@@ -157,8 +162,8 @@ if $ARGS[0] = 'talk':
 			!!If Katja have been corrupted enough, have had sex with the player and Lazar have hit on her and Sveta at the uni cafe. She will if she is horny ask the player if the should have anal sex with him, provided they have not already done so before.
 				gt 'Katja_dorm', 'lazar_anal_talk'
 			else
-				if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and min(katjaQW['horny'],100) > rand(40,160)):
-					if katjaQW['lazer_anal'] + katjaQW['lazer_pussy'] = 2 and katjaQW['lazar_day'] ! daystart and rand(0,6) = 0:
+				if min(katjaQW['horny'],100) > rand(40,400) or (katjaQW['QWstage'] = 2 and katjaQW['boy_block'] = 0 and min(katjaQW['horny'],100) > rand(40,160)):
+					if katjaQW['lazer_anal'] + katjaQW['lazer_pussy'] >= 2 and katjaQW['lazar_day'] ! daystart and rand(0,6) = 0:
 						!! Katja want to have a threesome with Lazar
 						gt 'katja_dorm', 'lazar_kiss'
 					elseif katjaQW['QWstage'] > 2:
@@ -278,18 +283,12 @@ if $ARGS[0] = 'chat':
 		end
 	end
 
-	!!if katjaQW['QWstage'] = 4 and katjaQW['marcus_pussy'] = 0: act 'Tell her you''ll find a boy for her to have sex with': gt 'KatjaHomeTalk', 'boy_discussion'
-	!!If Katja asked your help in finding a boy to try sex with and you said no. You have the choice to reverse that decision.
-
-	!!if katjaQW['anal_quest'] = 1: act 'Tell her you''ll find a boy for her to try anal with': gt 'KatjaHomeTalk', 'anal_discussion'
-	!!If Katja asked your help in finding a boy to try anal sex with and you said no. You have the choice to reverse that decision.
-
 	if katjaQW['slut'] >= 50 and katjaQW['horny'] >= 80 and npc_sex['A14'] > 0:
 		!!If you are in a sexual relationship and you can see that Katja is very horny, then you have the possibility to start sex.
 		act 'Lick Katja': gt 'KatjaEvDin', 'kuni_dom'
 	end
 
-	if katjaQW['QWstage'] >= 6 and week < 6 and katjaQW['horny'] > 80 and katjaQW['Lazar_day'] ! daystart:
+	if katjaQW['QWstage'] >= 6 and (katjaQW['lazer_anal'] + katjaQW['lazer_pussy']) > 0 and week < 6 and katjaQW['horny'] > 80 and katjaQW['Lazar_day'] ! daystart:
 		act 'Suggest that you call Lazar':
 			*clr & cla
 			katjaQW['Lazar_day'] = daystart
@@ -298,8 +297,30 @@ if $ARGS[0] = 'chat':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 			'Katja looks very aroused, so you suggest calling Lazar to see if he wants to have some fun with you.'
 			'"Okay. Let''s call him," she says while looking very excited.'
-			'You call him, and he quickly agrees to have you over.'
-			act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+			if katjaQW['QWstage'] >= 6 and katjaQW['anal_quest'] >= 3 and rand(0,6)=0:
+				'You call him, and he tells you that Ivan is over at his place, but '+iif(katjaQW['Lazar_Ivan_4some'] = 0, 'he''s sure that Ivan would like to join the fun as long as you''re willing to take it in the ass', 'you had a lot of fun last time and he''s sure Ivan is up for it again')+'.'
+				if katjaQW['Lazar_Ivan_4some'] = 0:
+					if katjaQW['simultanous_boys'] >= 2 or KatjaQW['slut'] >= 80 or (katjaQW['ivan_anal'] = 1 and KatjaQW['slut'] >= 70):
+						minut += 5
+						'"Sounds fun," Katja says. "'+iif(katjaQW['simultanous_boys'] >= 2, 'It''ll be fun to have sex with several boys again', 'I think it''s time for me to try sex with two boys at once')+'."'
+						'You tell Lazar that you''ll come over, and when you turn back towards Katja, she has something in her hands. "Look what I have," she says and shows you two almost identically black bodysuits.'
+						'"I think it would be sexy if we were these matching bodysuits," she says. You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
+						act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+					else
+						'Katja suddenly looks nervous when you tell her that Ivan is at Lazar''s place. "I... I don''t think... I think .... It''s best if we wait for another time. I''m not ready for two guys at the same time."'
+						'You accept Katja''s decision and tell Lazar that you won''t be coming over. He''s a little disappointed, but tells you to call him another time.'
+						act 'Continue': gt 'katja_dorm', 'talk'
+					end
+				else
+					minut += 5
+					'Katja readily agrees to also include Ivan in the fun and you tell Lazar you''ll come over. Katja then runs to her drawer and pulls out the black bodysuits you wore last time and suggests you do it again since it seemed to turn the boys on.'
+					'You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
+					act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+				end
+			else
+				'You call him, and he quickly agrees to have you over.'
+				act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+			end
 		end
 	end
 
@@ -317,8 +338,7 @@ if $ARGS[0] = 'chat':
 				'<center><b><font color="maroon"><<$npc_firstname[''A14'']>> <<$npc_lastname[''A14'']>></font></b></center>'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				'"Katja, I need to tell you something," you say. "I''m pregnant again."'
-				'Katja''s face lights up.'
-				'"Congratulations! This is even more exciting than last time! Every time you tell me you''re pregnant, I feel better about my pregnancy. Hell, that''s probably why you keep getting pregnant, isn''t it?" she giggles jokingly.'
+				'Her face lights up. "Congratulations! This is even more exciting than last time! Every time you tell me you''re pregnant, I feel better about my pregnancy. Hell, that''s probably why you keep getting pregnant, isn''t it?" she giggles jokingly.'
 				act 'Next':gt 'KatjaHomeTalk', 'katjaknows1'
 			end		
 
@@ -392,7 +412,7 @@ if $ARGS[0] = 'sofia_meet':
 	sofiaQW['know'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big260.jpg"></center>'
-	'Just as you are about to leave, the door opens and a girl walks in.'
+	'Just as you''re about to leave, the door opens and a girl walks in.'
 	'"Hi, Katja! I''m home early since Maxim suddenly had a meeting with one of his professors. I swear that he''s doing so much to study hard; almost too much. Always trying to meet with his teachers. I told him that they might see it as..." She suddenly stops, having noticed you. "Oh, you have a guest."'
 	'"Sofia, this is <<$pcs_nickname>>, my '+iif($university['enrolled_in'] = 'teaching_studies', 'classmate and ', '')+'friend from school who was just about to leave," Katja replies before she turns to you. "<<$pcs_nickname>>, this is Sofia, my roommate."'
 	'"Hi <<$pcs_nickname>>, it''s so nice to meet Katja''s friends since she doesn''t seem to have a lot of them," Sofia says, which clearly makes Katja blush. "So '+iif( $university['enrolled_in'] = 'teaching_studies', 'you''re also studying to become a teacher like Katja', 'what are you studying')+'?" she asks.'
@@ -480,7 +500,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 								cla
 								'"I''ve had sex before. In fact, I''ve had sex with Lazar before," you answer.'
 								'"How was it? Is he a good lover? Was he your first? Do you hook up with him often?" Katja asks, almost frantically.'
-								'"Wow. Why do I get the feeling that there is something else going on? Do you want to have sex with Lazar?" you ask'
+								'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have sex with Lazar?" you ask'
 								'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally says.'
 								act 'Agree':
 									if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
@@ -540,7 +560,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 						minut += 5
 						cla
 						'"I''m not that into Lazar. I don''t think I want to have sex with him," you tell Katja.'
-						'"Why? He''s so handsome, and he seems to be more mature now. Yes, I know he is just with a girl to have sex. But that''s also what we want. I''m not looking for a relationship," Katja says.'
+						'"Why? He''s so handsome, and he seems to be more mature now. Yes, I know he''s just with a girl to have sex, but that''s also what we want. I''m not looking for a relationship," she replies.'
 						'"I just don''t think that he''s a guy I want to have sex with," you respond.'
 						'"Okay," Katja says, but it doesn''t seem like she really accepts your answer.'
 						act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'				
@@ -559,11 +579,11 @@ if $ARGS[0] = 'lazar_pussy_talk':
 							gt 'katja_dorm', 'lazar_refuse', 'pussy'
 						end
 					else
-						'"We have had anal sex with a guy, but have you ever had vaginal sex with one?" she continues.'
+						'"We''ve had anal sex with a guy, but have you ever had vaginal sex with one?" she continues.'
 						if stat['vaginal'] = 0:
 							act 'Tell her you haven''t':
 								cla
-								'"No. I have never had '+iif(stat['anal'] = 0, 'sex', 'vaginal sex')+'with a guy," you say.'
+								'"No. I''ve never had '+iif(stat['anal'] = 0, 'sex', 'vaginal sex')+'with a guy," you say.'
 								'"Me neither," Katja says. "Do you want to try?" she asks hesitantly.'
 								'"You want Lazar to be the first guy in our pussies?" you ask, surprised. Katja just bites her lips and slowly nods.'
 								act 'Agree':
@@ -580,8 +600,8 @@ if $ARGS[0] = 'lazar_pussy_talk':
 								act 'Tell her you''ve fucked Lazar before':
 									cla
 									'"I''ve had vaginal sex before. In fact, I''ve had sex with Lazar before," you answer'
-									'"How was it? Is he a good lover? Was he you first? Do you hook up with him often?" Katja asks, almost frantically.'
-									'"Wow. Why do I get the feeling that there is something else going on? Do you want to have sex with Lazar?" you ask.'
+									'"How was it? Is he a good lover? Was he your first? Do you hook up with him often?" Katja asks, almost frantically.'
+									'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have sex with Lazar?" you ask.'
 									'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally says.'
 									act 'Agree':
 										if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
@@ -615,7 +635,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 				end
 			else
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'"You know Sveta, when we talked with Lazar at the café, he seemed really into us," Katja says. "Maybe we should call him and see if he''s up to having some fun with us?"'
+				'"You know <<$pcs_nickname>>, when we talked with Lazar at the café, he seemed really into us," Katja says. "Maybe we should call him and see if he''s up to having some fun with us?"'
 				act 'Agree':
 					if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
 					gt 'katja_dorm', 'lazar_agree'
@@ -630,7 +650,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 					cla
 					katjaQW['lazer_pussy_talk'] = 2
 					'"I''m not that into Lazar. I don''t think I want to have sex with him," you tell Katja.'
-					'"Why? He is handsome, and he seems to be more mature now. Yes, I know he is just with a girl to have sex. But it''s also what we want. I''m not looking for a relationship," Katja says.'
+					'"Why? He is handsome, and he seems to be more mature now. Yes, I know he''s just with a girl to have sex, but it''s also what we want. I''m not looking for a relationship," she replies.'
 					'"I just don''t think that he''s a guy I want to have sex with," you say.'
 					'"Okay," Katja says, but it doesn''t seem like she really accepts your answer.'
 					act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'				
@@ -667,7 +687,7 @@ if $ARGS[0] = 'lazar_pussy_talk':
 				else
 					if katjaQW['QWstage'] < 4: katjaQW['QWstage'] = 4
 					'"I''ve never had vaginal sex with a guy," you tell Katja.'
-					'"So, do you want to try it together with me?" Katja says with a mockingly innocent look.'
+					'"So, do you want to try it together with me?" she asks with a mockingly innocent look.'
 				end
 				act 'Agree':
 					if katjaQW['QWstage'] < 5: katjaQW['QWstage'] = 5
@@ -692,14 +712,14 @@ if $ARGS[0] = 'lazar_refuse':
 	if stat['vaginal'] = 0 and $ARGS[1] = 'pussy':
 		act 'Tell her you aren''t ready':
 			cla
-			'"I''m not ready to have sex with a guy," you say. Katja nods but seems a little surprised that she is more ready than you.'
+			'"I''m not ready to have sex with a guy," you say. Katja nods, but seems a little surprised that she''s more ready than you.'
 			act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'		
 		end
 	end
 	if stat['anal'] = 0 and $ARGS[1] = 'anal':
 		act 'Tell her you''re not ready':
 			cla
-			'"I''m not ready to have anal sex with a guy," you say. Katja nods but seems a little surprised that she is more ready than you.'
+			'"I''m not ready to have anal sex with a guy," you say. Katja nods, but seems a little surprised that she''s more ready than you.'
 			act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'		
 		end
 	end
@@ -726,9 +746,9 @@ if $ARGS[0] = 'lazar_agree':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 	if katjaQW['QWstage'] = 5:
 		'"Okay. We should let Lazar be '+iif(stat['vaginal'] >0, 'your', 'our')+' first guy," you agree.'
-		'Katja looks a little embarrassed but has a naughty gleam in her eyes.'
+		'Katja looks a little embarrassed, but has a naughty gleam in her eyes.'
 	elseif katjaQW['QWstage'] > 5:
-		'"Okay. We can include Lazar in our harem of hot guys," you say. Which gets Katja to start laughing.'
+		'"Okay. We can include Lazar in our harem of hot guys," you say, which causes Katja to start laughing.'
 		'When she stops, she looks very excited. "Great. I want his cock in my pussy!"'
 	end
 	if katjaQW['anal_quest'] = 2:
@@ -738,7 +758,7 @@ if $ARGS[0] = 'lazar_agree':
 				'"Of course. We already agreed to that," you answer.'
 			else
 				'"Okay. We should let Lazar be the first guy to fuck '+iif(stat['anal'] >0, 'your', 'our')+' ass," you agree.'
-				'Katja looks a little embarrassed but has a naughty gleam in her eyes.'			
+				'Katja looks a little embarrassed, but has a naughty gleam in her eyes.'			
 			end
 		else
 			katjaQW['lazer_anal_talk'] = 1
@@ -751,7 +771,7 @@ if $ARGS[0] = 'lazar_agree':
 			'"And we''ll also let him fuck our butts, like '+iif(katjaQW['lazer_anal'] = 0, 'we let others do', 'before')+'?" Katja asks.'
 			'"If he wants to, of course," you answer.'
 		else
-			'"Okay. We can include Lazar in our harem of guys we let buttfuck us," you say. Which gets Katja to start laughing.'
+			'"Okay. We can include Lazar in our harem of guys we let buttfuck us," you say, which causes Katja to start laughing.'
 			'When she stops, she looks very excited. "Great. I want his cock in my ass!"'
 		end
 	end
@@ -847,7 +867,7 @@ if $ARGS[0] = 'lazar_anal_talk':
 							act 'Tell her you''ve fucked Lazar before':
 								cla
 								'"I''ve had anal sex before. In fact, I''ve had anal sex with Lazar before," you answer.'
-								'"How was it? Is he a good lover? Was he you first? Do you hook up with him often?" Katja asks, almost frantically.'
+								'"How was it? Is he a good lover? Was he your first? Do you hook up with him often?" Katja asks, almost frantically.'
 								'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have anal sex with Lazar?" you ask.'
 								'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally replies.'
 								act 'Agree':
@@ -932,7 +952,7 @@ if $ARGS[0] = 'lazar_anal_talk':
 								act 'Tell her you''ve fucked Lazar before':
 									cla
 									'"I''ve had anal sex before. In fact, I''ve had anal sex with Lazar before," you answer.'
-									'"How was it? Is he a good lover? Was he you first? Do you hook up with him often?" Katja asks, almost frantically.'
+									'"How was it? Is he a good lover? Was he your first? Do you hook up with him often?" Katja asks, almost frantically.'
 									'"Wow. Why do I get the feeling that there''s something else going on? Do you want to have anal sex with Lazar?" you ask.'
 									'Katja just sheepishly looks down and then slightly nods. "I''ve never tried it. But I think I want to," she finally responds.'
 									act 'Agree':
@@ -981,7 +1001,7 @@ if $ARGS[0] = 'lazar_anal_talk':
 					cla
 					katjaQW['lazer_anal_talk'] = 2
 					'"I''m not that into Lazar. I don''t think I want to have sex with him," you tell Katja.'
-					'"Why? He is handsome, and he seems to be more mature now. Yes, I know he is just with a girl to have sex. But it''s also what we want. I''m not looking for a relationship," Katja says.'
+					'"Why? He is handsome, and he seems to be more mature now. Yes, I know he'' just with a girl to have sex, but it''s also what we want. I''m not looking for a relationship," she replies.'
 					'"I just don''t think that he''s a guy I want to have sex with," you say.'
 					'"Okay," Katja says, but it doesn''t seem like she really accepts your answer.'
 					act 'Talk about something else': gt 'Katja_dorm_talk', 'talk'
@@ -1043,7 +1063,34 @@ if $ARGS[0] = 'lazar_kiss':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_kiss.jpg"></center>'
 	'Katja almost jumps you and gives you a kiss. Afterwards, she looks at you a little hesitantly. "You know, why don''t we call Lazar to see if he wants us to come over?"'
-	act 'Agree': gt 'katja_uni_sex', 'lazar_katja_uni_3some'
+	act 'Agree': 
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+		if katjaQW['QWstage'] >= 6 and katjaQW['anal_quest'] >= 3 and rand(0,6)=0:
+			'You call him, and he tells you that Ivan is over at his place, but '+iif(katjaQW['Lazar_Ivan_4some'] = 0, 'he''s sure that Ivan would like to join the fun as long as you''re willing to take it in the ass', 'you had a lot of fun last time and he''s sure Ivan is up for it again')+'.'
+			if katjaQW['Lazar_Ivan_4some'] = 0:
+				if katjaQW['simultanous_boys'] >= 2 or KatjaQW['slut'] >= 80 or (katjaQW['ivan_anal'] = 1 and KatjaQW['slut'] >= 70):
+					minut += 5
+					'"Sounds fun," Katja says. "'+iif(katjaQW['simultanous_boys'] >= 2, 'It''ll be fun to have sex with several boys again', 'I think it''s time for me to try sex with two boys at once')+'."'
+					'You tell Lazar that you''ll come over, and when you turn back towards Katja, she''s holding something in her hands. "Look what I have," she says and shows you two almost identically black bodysuits.'
+					'"I think it would be sexy if we were these matching bodysuits," she says. You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
+					act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+				else
+					'Katja suddenly looks nervous when you tell her that Ivan is at Lazar''s place. "I... I don''t think... I think .... It''s best if we wait for another time. I''m not ready for two guys at the same time."'
+					'You accept Katja''s decision and tell Lazar that you won''t be coming over. He''s a little disappointed, but tells you to call him another time.'
+					act 'Continue': gt 'katja_dorm', 'talk'
+				end
+			else
+				minut += 5
+				'Katja readily agrees to also include Ivan in the fun and you tell Lazar you''ll come over. Katja then runs to her drawer and pulls out the black bodysuits you wore last time and suggests you do it again since it seemed to turn the boys on.'
+				'You agree and the two of you quickly change into the bodysuits before you head out the door and start walking towards Lazar''s house.'
+				act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_ivan_katja_uni_4some'
+			end
+		else
+			'You call him, and he quickly agrees to have you over.'
+			act 'Go to Lazar''s place': gt 'katja_uni_sex', 'lazar_katja_uni_3some'	
+		end
+	end
 	act 'You''re not in the mood': katjaQW['horny'] -= 20 & gt 'Katja_dorm', 'Talk'
 end
 

+ 0 - 2
locations/katja_lake.qsrc

@@ -1159,7 +1159,6 @@ if $ARGS[0] = 'saune_time':
 				act 'Sauna sex!':
 					*clr & cla
 					gs 'willpower', 'pay', 'sel'
-					gs 'willpower', 'pay', 'self', 'medium'
 					gs 'stat'
 					gt 'katja_lake','sauna_sex1'
 				end
@@ -1173,7 +1172,6 @@ if $ARGS[0] = 'saune_time':
 					act 'Ice dipping!':
 						*clr & cla
 						gs 'willpower', 'pay', 'force'
-						gs 'willpower', 'pay', 'force', 'easy'
 						gs 'stat'
 						gt 'katja_lake','ice_dipping'
 					end

+ 77 - 16
locations/katja_meynold_schedule.qsrc

@@ -204,8 +204,17 @@ else
 				end
 			elseif hour < 12:
 				if week = 5:
-					!!Library - Studying for classes. 
-					locat['katja']  = 29
+					if hour < 11:
+						!!Library - Studying for classes. 
+						locat['katja']  = 29
+					else
+						!!Coffee shop - eating lunch/hanging out check to see if the player have convinced Katja to go somewhere else 
+						if locat['katja_rand1'] ! daystart:
+							locat['katja']  = 30
+						else
+							locat['katja'] = locat['katja_save1']
+						end				
+					end
 				elseif hour = 11 and minut >= 30:
 					if sunWeather = 1 and temper > 15:
 						!!IUniversity grounds - waiting for class
@@ -220,8 +229,12 @@ else
 				end
 			elseif hour < 13:
 				if week = 5:
-					!!Coffee shop - eating lunch/hanging out
-					locat['katja']  = 30
+					!!Coffee shop - eating lunch/hanging out check to see if the player have convinced Katja to go somewhere else 
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 30
+					else
+						locat['katja'] = locat['katja_save1']
+					end
 				elseif minut < 30:
 					!!University classsroom  - attending lecture
 					locat['katja']  = 26
@@ -244,8 +257,12 @@ else
 						locat['katja']  = 26				
 					end
 				else
-					!!Library - Studying for classes. 
-					locat['katja']  = 29
+					!!Library - Studying for classes. check to see if the player have convinced Katja to go somewhere else 
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 29
+					else
+						locat['katja'] = locat['katja_save1']
+					end
 				end
 			elseif hour < 15:
 				if week < 4:
@@ -262,8 +279,24 @@ else
 						locat['katja']  = 26				
 					end
 				else
-					!!Library - Studying for classes. 
-					locat['katja']  = 29
+					!!Library - Studying for classes, check to see if the player have convinced Katja to go somewhere else 
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 29
+					else
+						locat['katja'] = locat['katja_save1']
+					end 
+				end
+			elseif hour < 17:
+				if week = 5:
+					!!Library - Studying for classes, check to see if the player have convinced Katja to go somewhere else 
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 29
+					else
+						locat['katja'] = locat['katja_save1']
+					end
+				else
+					!!Dormroom - relaxing/studying
+					locat['katja']  = 31
 				end
 			elseif hour < 18:
 				!!Dormroom - relaxing/studying
@@ -375,8 +408,12 @@ else
 					!!Dormroom - Getting Dressed and Doing Makeup
 					locat['katja']  = 22
 				elseif hour < 12:
-					!!Coffee shop - eating brunch/hanging out
-					locat['katja']  = 30
+					!!Coffee shop - eating brunch/hanging out, check to see if the player have convinced Katja to go somewhere else 
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 30
+					else
+						locat['katja'] = locat['katja_save1']
+					end
 				elseif hour < 16:
 					!!Randomized locations, depending on weather. 42 - city beach, 43 - central park, 44 - shopping mall in city center.
 					if locat['katja_rand1'] ! daystart:
@@ -555,14 +592,22 @@ else
 					locat['katja'] = 49
 				elseif (university['exam_week'] = 2 and week = 5):
 					!!Coffee shop - eating brunch/hanging out
-					locat['katja']  = 30
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 30
+					else
+						locat['katja'] = locat['katja_save1']
+					end
 				else
 					!!Library - Studying for exam. 
 					locat['katja']  = 29
 				end
 			elseif hour < 13:
 				!!Coffee shop - eating lunch/hanging out
-				locat['katja']  = 30
+				if locat['katja_rand1'] ! daystart:
+					locat['katja']  = 30
+				else
+					locat['katja'] = locat['katja_save1']
+				end
 			elseif hour < 16:
 				if university['exam_week'] = 2:
 					if week = 4:
@@ -570,7 +615,11 @@ else
 						locat['katja'] = 50
 					else
 						!!Coffee shop - hanging out
-						locat['katja']  = 30
+						if locat['katja_rand1'] ! daystart:
+							locat['katja']  = 30
+						else
+							locat['katja'] = locat['katja_save1']
+						end
 					end
 				else
 					!!Library - Studying for classes. 
@@ -709,7 +758,11 @@ else
 					locat['katja']  = 22
 				elseif hour < 12:
 					!!Coffee shop - eating brunch/hanging out
-					locat['katja']  = 30
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 30
+					else
+						locat['katja'] = locat['katja_save1']
+					end
 				elseif hour < 16:
 					!!Randomized locations, depeding on weather. 42 - city beach, 43 - central park, 44 - shoping mall in city center.
 					if locat['katja_rand1'] ! daystart:
@@ -948,7 +1001,11 @@ else
 				end
 			elseif hour < 12 or (hour = 12 and minut < 30):
 				!!Coffee shop - eating lunch/hanging out
-				locat['katja']  = 30
+				if locat['katja_rand1'] ! daystart:
+					locat['katja']  = 30
+				else
+					locat['katja'] = locat['katja_save1']
+				end
 			elseif hour < 16:
 				!!Randomized locations, depeding on weather. 42 - city beach, 43 - central park, 44 - shoping mall in city center.
 				if locat['katja_rand1'] ! daystart:
@@ -1083,7 +1140,11 @@ else
 					locat['katja']  = 22
 				elseif hour < 12:
 					!!Coffee shop - eating brunch/hanging out
-					locat['katja']  = 30
+					if locat['katja_rand1'] ! daystart:
+						locat['katja']  = 30
+					else
+						locat['katja'] = locat['katja_save1']
+					end
 				elseif hour < 16:
 					!!Randomized locations, depeding on weather. 42 - city beach, 43 - central park, 44 - shoping mall in city center.
 					if locat['katja_rand1'] ! daystart:

+ 39 - 0
locations/katja_uni.qsrc

@@ -899,6 +899,45 @@ if $ARGS[0] = 'library':
 	end
 end
 
+if $ARGS[0] = 'library2':
+	cla & *clr
+	menu_off = 1
+	minut += 2
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'library'
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/city/island/university/library/library.jpg"></center>'
+	'You and Katja arrive at the university library, where she finds a table and starts to pull out her books from her backpack. "Thanks for coming here with me <<$pcs_nickname>>," she says.'
+	if $university['enrolled_in'] = 'teaching_studies':	
+		if university['semester_week'] > 0:
+			i = 0
+			:study_loop
+			if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>':
+				if dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_grade_gain'']') < dyneval ('RESULT = class[''<<$class_list_institution[i]>>_<<$class_list_name[i]>>_optional_weekly_max'']'):
+					dynamic '	act ''Ask if you can study for your <<$class_list_name[i]>> class together'': gt ''katja_uni'', ''studying_ask'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
+				else
+					*nl
+					'You don''t need to study any more this week for your <<$class_list_name[i]>> class.'
+				end
+			end
+		
+			i += 1
+			if ARRSIZE('class_list_institution') >= i: jump 'study_loop'
+			killvar 'i'
+		elseif university['exam_week'] > 0:
+			i = 0
+			:exam_loop
+			if $class_list_institution[i] = 'uni_<<$university[''enrolled_in'']>>_semester_<<university[''enrolled_in_semester'']>>' and func('uni_programs', 'exam', 'is_over', $class_list_name[i]) = 0:
+				dynamic '	act ''Ask if you can study for your <<$class_list_name[i]>> exam together'': gt ''katja_uni'', ''studying_exam_ask'', ''<<$class_list_institution[i]>>'', ''<<$class_list_name[i]>>'' '
+			end
+		
+			i += 1
+			if ARRSIZE('class_list_institution') >= i: jump 'exam_loop'
+			killvar 'i'
+		end			
+	end
+	act 'Watch her studying': gt 'katja_uni', 'study_watch'
+end
+
 if $ARGS[0] = 'studying_ask':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/studying_alone.jpg"></center>'

+ 379 - 33
locations/katja_uni_sex.qsrc

@@ -112,7 +112,7 @@ if $ARGS[0] = 'library_licking1':
 	gs 'willpower', 'cuni', 'self', 'easy'
 	if will_cost <= pcs_willpwr:
 		act 'Crawl under the table to lick Katja''s pussy (<<will_cost>> Willpower)':
-			gs 'willpower', 'pay', 'force'
+			gs 'willpower', 'pay', 'self'
 			gt 'katja_uni_sex', 'library_licking2'
 		end
 	else
@@ -512,13 +512,13 @@ if $ARGS[0] = 'lazar_katja_uni_3some':
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some1.jpg"></center>'
 	'You and Katja leave the dorms, making your way off-campus to where Lazar lives. It''s not too far from the campus that you find the address. It''s a surprisingly nice looking house, fairly big too. At a guess, you would assume it has at least three or four bedrooms, maybe as many as five. You share a look as you take it in.'
 	'"This is a really nice house," Katja says before knocking on the door.'
-	'A few moments later Lazar opens the door and is all smiles. He steps aside to invite you both in, closing the door behind you. He leads you into a really nice living room that is open to the kitchen in back. "Have a seat girls, make yourself comfortable."'
+	'A few seconds later, Lazar opens the door and is all smiles. He steps aside to invite you both in before closing the door behind you. He leads you into a really nice living room that is open to the kitchen in back. "Have a seat girls, make yourself comfortable."'
 	act 'Sit down':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some2.jpg"></center>'
-		'The three of you sit down. Katja asks him, "Do you live here alone?"'
-		'He shakes his head, "Nah, I got some roommates, but they''re out at the moment." He looks the two of you over with a lustful look in his eyes, "so we got the place all to ourselves."'
+		'The three of you take a seat. "Do you live here alone?" Katja asks.'
+		'He shakes his head, "Nah, I got some roommates, but they''re out at the moment." He looks the two of you over with a lustful look in his eyes. "So we got the place all to ourselves."'
 		'Lazar takes out his phone and starts snapping photos of the two of you; Katja quickly gets into it and starts posing. He asks the two of you to scoot really close together and he takes several more pictures like that. "Okay girls, how about you kiss each other; girls making out is hot."'
 		act 'Kiss Katja':
 			*clr & cla
@@ -537,7 +537,7 @@ if $ARGS[0] = 'lazar_katja_uni_3some':
 				act 'Take off your top':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some5.jpg"></center>'
-					'Your tops quickly hit the floor and you keep doing poses for a bit. You start to wonder if this is all Lazar wants you to do.'
+					'Your tops quickly hit the floor as you keep doing poses. You start to wonder if this is all Lazar wants you to do.'
 					'Katja seems to be thinking the same thing. "Are you just going to keep taking pictures or are you going to come over here'+iif(kajtaQW['slut'] > 70 and ( katjaQW['QWstage'] > 4 or katjaQW['anal_quest'] > 2), ' and fuck us', '')+'?" she asks.'
 					gs 'arousal', 'flash', 1, 'group'
 					gs 'stat'
@@ -563,6 +563,7 @@ if $ARGS[0] = 'lazar_katja_uni_3some':
 								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some8.jpg"></center>'
 								'Katja quickly takes his cock into her mouth and mimics what you did while stroking his shaft with her hand; Lazar starts to moan a little from the attention he is getting.'
 								'"Okay, I need to fuck one of you," he groans.'
+								if npc_throat['A14'] < dick: npc_throat['A14'] += 1
 								gs 'arousal', 'erotic_nudity', 1, 'group'
 								gs 'stat'
 								if katjaQW['QWstage'] >= 5:
@@ -570,8 +571,8 @@ if $ARGS[0] = 'lazar_katja_uni_3some':
 									act 'Continue': gt 'katja_uni_sex', 'katja_vag_fucked_lazar'
 								else
 									'He reaches over and slaps Katja on the ass. "You''re up first." He then turns to you, "Sit at that end of the couch and spread your legs."'
-									'You don''t move yet. "You only get to fuck our butts today."'
-									'He snorts a laugh. "I can work with that. Then you lay on your back and Katja can climb on top of you sixty nine position."'
+									'You don''t move. "You only get to fuck our butts today."'
+									'He snorts a laugh. "I can work with that. Get on your back and Katja can climb on top of you sixty nine style."'
 									act 'Continue': gt 'katja_uni_sex', 'katja_anal_fucked'
 								end
 							end
@@ -594,19 +595,19 @@ if $ARGS[0] = 'katja_vag_fucked_lazar':
 	if npc_vag['A14'] = 0:
 		katjaQW['slut'] += 5
 		'Katja looks back at him, "Please be gentle, this is my first time."'
-		'He looks a bit surprised for a moment. "You sure you want me to be your first? I can just fuck your ass instead..." He trails off as she interrupts him.'
-		'"No, I''m sure. I''m ready and I want you to be my first," shes before turning her attention to you and starts licking your clit. You hear her moan into you and tense up as Lazar enters her from behind. He is very slow and gentle with her, before long she is starting to moan in pleasure as she eats you out. "This doesn''t hurt nearly as much as I thought it would." She says.'
+		'He looks a bit surprised. "You sure you want me to be your first? I can just fuck your ass instead..." He trails off as she interrupts him.'
+		'"No, I''m sure. I''m ready and I want you to be my first," she says before turning her attention to you and starts licking your clit. You hear her moan into you and tense up as Lazar enters her from behind. He is very slow and gentle with her, before long she is starting to moan in pleasure as she eats you out. "This doesn''t hurt nearly as much as I thought it would." She says.'
 	elseif katjaQW['QWstage'] = 5:
 		katjaQW['slut'] += 3
 		'Katja looks back at him, "Please be gentle, this is my first time with a guy."'
-		'He looks a bit surprised for a moment. "You''re a virgin? I can just take you in the ass..." He trails off as she interrupts him.'
+		'He looks a bit surprised. "You''re a virgin? I can just take you in the ass..." He trails off as she interrupts him.'
 		'"No, not a virgin! I''ve just never been with a guy before," she clarifies before turning her attention to you and starts licking your clit.'
 		'"Oh," you can sense his slight confusion but he doesn''t let that stop him. Katja moans into you when Lazar enters her from behind. He is very slow and gentle with her; before long she is starting to moan in pleasure while she eats you out.'
 		'The louder she moans, the harder he starts to fuck her. "A dick feels different from a dildo, it is so much warmer!"'
 	elseif katjaQW['lazar_pussy'] = 0:
 		katjaQW['slut'] += 1
-		'Katja looks back at him, "I don''t know what you like, but don''t be too rough with me; I like to make love."'
-		'He chuckles a bit, "I will endeavor to give you the best love making you have ever had." Then she turns her attention to you and starts licking your clit. Katja moans into you as Lazar enters her from behind. He is very slow and gentle with her, before long she is starting to moan in pleasure while she eats you out.'
+		'Katja looks back at him. "I don''t know what you like, but don''t be too rough with me; I like to make love."'
+		'He chuckles. "I will endeavor to give you the best love making you have ever had." Then she turns her attention to you and starts licking your clit. Katja moans into you as Lazar enters her from behind. He is very slow and gentle with her, before long she is starting to moan in pleasure while she eats you out.'
 		'The louder she moans, the harder he starts to fuck her, but he doesn''t get too carried away. "I always heard you were really good; it''s nice to find out the rumors are true!"'
 	else
 		katjaQW['slut'] += 1
@@ -621,8 +622,8 @@ if $ARGS[0] = 'katja_vag_fucked_lazar':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some10.jpg"></center>'
-		'Katja''s cries get louder, though they are mostly muffled by your pussy as she continues to eat you out. While he pounds Katja''s twat, you noticed he''s now looking directly at you, like he wants to swap and fuck you now. He grins, "Alright, I don''t want <<$pcs_nickname>> to feel left out."'
-		'He pulls his cock from Katja''s pussy and takes a seat at his end of the couch, before inviting you to ride him.'
+		'Katja''s cries get louder, though they''re mostly muffled by your pussy as she continues to eat you out. While he pounds Katja''s twat, you noticed he''s now looking directly at you, like he wants to swap and fuck you now. He grins. "Alright, I don''t want <<$pcs_nickname>> to feel left out."'
+		'He pulls his cock from Katja''s pussy and takes a seat at his end of the couch before inviting you to ride him.'
 		gs 'arousal', 'cuni', 3, 'group', 'lesbian'
 		gs 'stat'
 		act 'Your turn': gt 'katja_uni_sex', 'get_fucked_by_lazar'
@@ -638,13 +639,13 @@ if $ARGS[0] = 'get_fucked_by_lazar':
 	'You move down the couch and straddle him, holding yourself over his dick.'
 	if pcs_vag = 0:
 		'"Please, be gentle. This is my first time," you tell him.'
-		'He looks surprised for a moment. "You sure? I could fuck you in the ass instead, if you want."'
+		'He looks surprised. "You sure? I could fuck you in the ass instead, if you want."'
 		'You shake your head. "No, I''m sure. I''m ready and I want you to by my first."'
 		'You start to lower yourself, you feel the tip of his dick slide into your twat and you slow down as you take more of his length into you. You feel the pain of your hymen tearing, but it also feels good, better than you''d have thought.'
 		'Lazar seems content to let you control things and he coaxes Katja to sit on his face.'
 	elseif stat['vaginal'] = 0:
 		'"Please be gentle, this is my first time with a man," you tell him.'
-		'He looks a bit surprised for a moment. "You''re a virgin? You sure? I could fuck you in the ass instead, if you want.'
+		'He looks a bit surprised. "You''re a virgin? You sure? I could fuck you in the ass instead, if you want."'
 		'"No, I''m not a virgin! I''ve just never been with a guy before," you tell him as you slowly start lowering yourself down, guiding his dick into your wet slit.'
 		'"Oh," You can sense his slight confusion. As you slowly lower yourself more until you feel completely full, Lazar seems content to just let you control things and he coaxes Katja to sit on his face so he can eat her out.'
 		'You moan loudly as you take more of his <<dick>>cm <<$dick_girth>> dick inside of you. "A dick feels different from a dildo, it is so much warmer!" You say to Katja as you slowly ride Lazar''s cock.'
@@ -672,8 +673,8 @@ if $ARGS[0] = 'get_fucked_by_lazar':
 			act 'Ride him':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_katja_uni_3some11.jpg"></center>'
-				'You resist him trying to move you. "Nope no ass for you today, just be quiet and let me ride you." It feels so good to be in control, as you straddle his lap and plung his dick back in your wet pussy, Katja remotes his face as you keep riding him.'
-				'"Fuck... I''m about to cum." Groans loudly, you both quickly climb off him after he says that.'
+				'You resist him trying to move you. "Nope, no ass for you today. Just be quiet and let me ride you." It feels so good to be in control. As you straddle his lap and plung his dick back in your wet pussy, Katja remounts his face as you keep riding him.'
+				'"Fuck... I''m about to cum," he groans loudly, and you both quickly climb off him.'
 				gs 'arousal', 'vaginal', 3, 'group'
 				gs 'stat'
 				act 'Back to your knees': gt 'katja_uni_sex', 'lazar_katja_cum'
@@ -695,13 +696,13 @@ if $ARGS[0] = 'katja_anal_fucked':
 		'Katja looks back at Lazar, pleadingly. "Um, this is my first time trying anal. So please, go slow."'
 		'He chuckles and gives her ass a slap. "Don''t worry, your ass is in good hands; just relax."'
 		'He presses his dick against her asshole and pushes until the head pops inside her. She hisses in pain and he stops. "Just take a deep breath and relax."'
-		'She does as he says and he starts slowly fucking her butt, stopping occasionally to let her relax. After a while, she stops tensing up and he starts going a little deeper and faster but still not too hard. "This doesn''t hurt like I thought it would! It actually feels kinda good," she says.'
+		'She does as he says and he starts slowly fucking her butt, stopping occasionally to let her relax. After a while, she stops tensing up and he starts going a little deeper and faster, but still not too hard. "This doesn''t hurt like I thought it would! It actually feels kind of good," she says.'
 	elseif katjaQW['anal_quest'] = 2:
 		katjaQW['slut'] += 3
 		'Katja looks back at Lazar. "This is my first time with a guy, so let''s take it slow. Okay?"'
 		'He chuckles and gives her ass a slap. "Don''t worry your ass is in good hands; just stay relaxed."'
-		'He presses his dick against her asshole and pushes until the head pops inside her. She groans a bit and he stops. "Just take a deep breath and relax."'
-		'She does as he says and he starts slowly fucking her butt, but he realizes that she seems kinda into it so he starts going a bit deeper and harder. She starts moaning in pleasure; the louder she gets, the harder he fucks her. "A dick feels different from a dildo, it is so much hotter."'
+		'He presses his dick against her asshole and pushes until the head pops inside her. She groans and he stops. "Just take a deep breath and relax."'
+		'She does as he says and he starts slowly fucking her ass, but he realizes that she seems rather into it so he starts going a bit deeper and harder. She starts moaning in pleasure; the louder she gets, the harder he fucks her. "A dick feels different from a dildo, it is so much hotter."'
 	elseif katjaQW['lazar_anal'] = 0:
 		katjaQW['slut'] += 1
 		'Katja glances back at Lazar. "I''m not sure what you like, but just don''t get too rough with me."'
@@ -757,7 +758,7 @@ if $ARGS[0] = 'fucked_anal_by_lazar':
 		'His head pops into your butt and he slowly fills you up with his <<dick>>cm member. He stops for a second before he starts to slowly fuck you.'
 		'"It feels so different from a dildo, doesn''t it, <<$pcs_nickname>>?" Katja asks you. "It''s so much hotter than a toy!"'
 	elseif npc_sex['A149'] = 0:
-		'I''m not sure what you like, but don''t get too rough," you tell him.'
+		'"I''m not sure what you like, but don''t get too rough," you tell him.'
 		'"Don''t worry," he says in his most reassuring voice. "It will feel good. Just remember to breathe and relax."'
 		'You take a deep breath and slowly release it as you feel the tip of his cock pressing against your butthole.'
 		'His head pops into your butt and he slowly fills you up with his <<dick>>cm member. He stops for a second before he starts to slowly fuck you.'
@@ -786,7 +787,7 @@ end
 if $ARGS[0] = 'lazar_katja_cum':
 	CLOSE ALL
 	*clr & cla
-	 katjaQW['horny'] = 0
+	katjaQW['horny'] = 0
 	menu_off = 1
 	if npc_sex['A149'] = 0: npc_sex['A149'] = 1
 	gs 'stat'
@@ -805,31 +806,376 @@ if $ARGS[0] = 'lazar_katja_cum':
 		if katjaQW['QWstage'] = 5 and katjaQW['anal_quest'] = 2:
 			katjaQW['QWstage'] = 6 
 			katjaQW['anal_quest'] = 3
-			'As you are walking back towards the campus Katja is silent and looks a little thoughtful so you ask "So Katja how was your fist time having sex with a boy?"'
-			'"It was great she answers. Having a cock in my pussy and as was so exiting" she says "I don''t thing many girls doe both for the first time at the same time" she continues practically gleaming'
-			'"This is definitely something we need to repeat." she says "But don''t worry I still love your tongue on my pussy."'
+			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your first time having sex with a boy?" you ask.'
+			'"It was great!" she answers. "Having a cock in my pussy and ass was so exciting! I don''t thing many girls do both for the first time at the same time," she continues, practically gleaming.'
+			'"This is definitely something we need to repeat," she says. "Don''t worry, I still love your tongue on my pussy."'
 		elseif katjaQW['QWstage'] = 5:
 			katjaQW['QWstage'] = 6 
-			'As you are walking back towards the campus Katja is silent and looks a little thoughtful so you ask "So Katja how was your fist time having sex with a boy?"'
-			'"It was good" she answers "It is definitely something we need to repeat." she says "But don''t worry I still love your tongue on my pussy."'			
+			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your fist time having sex with a boy?" you ask.'
+			'"It was good," she answers "It''s definitely something we need to repeat," she says "Don''t worry, I still love your tongue on my pussy."'			
 		elseif katjaQW['anal_quest'] = 2:
 			katjaQW['anal_quest'] = 3
-			'As you are walking back towards the campus Katja is silent and looks a little thoughtful so you ask "So Katja how was your fist time having dick in you ass?"'
-			'"It was an interesting experience and kind of exiting" she says "This is something I want to try again. But don''t worry I still love your tongue on my pussy."'		
+			'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your fist time having a dick in your ass?" you ask.'
+			'"It was an interesting experience and kind of exciting," she says "This is something I want to try again. Don''t worry, I still love your tongue on my pussy."'		
 		else
-			'As you are walking back towards the campus Katja starts talking about how great the sex with Lazar was to which you agree.'
+			'As you walk back towards the campus, Katja starts talking about how great the sex with Lazar was, to which you agree.'
 		end
 			'You continue to chat about the experience on the way back.'
 			if locat['katja'] = 31:
-				'"Want to come back to my dorm room" Katja ask as you reach campus.'
+				'"Want to come back to my dorm room?" she asks as you reach campus.'
 				act 'Go with Katja to her room': minut +=5 & gt 'katja_dorm', 'start'
+			elseif locat['katja'] = 44:
+				'"I''m going to the city mall to look at clothes. Want to come?" she asks before you arrive at the campus.'
+				act 'Go with Katja to the city mall': minut += 5 & gt 'katja_city, metro' 
+			elseif locat['katja'] = 29:
+				'"I need to go to the library to study. Want to join me?" she asks as you reach campus.'
+				act 'Go to the library with Katja': minut += 5 & gt 'katja_uni', 'library2' 
 			else
-				'"I have to run do something else. See you soon" Katja says as you reach campus.'
+				'"I have to run and do something. See you soon," she says as you reach campus.'
 			end
 			act 'Say goodbye to Katja': gt 'uni_grounds', 'main'
 		and
 	end
 end
 
+if $ARGS[0] = 'lazar_ivan_katja_uni_4some':
+	CLOSE ALL
+	*clr & cla
+	menu_off = 1
+	minut += 20
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KH.jpg"></center>'
+	'You and Katja make your way towards Lazar''s house. '+iif(katjaQW['ivan_anal'] = 1, '"It''s going to be fun having Ivan there. He really knows how to use his cock in your ass,"', '"I''ve heard that Ivan has a big cock and only fucks girls in the ass. At least I have some experience with that,"')+' Katja says with a giggle.' 
+	'"'+iif(IvanShowerQW = 11, 'Ivan definitely knows how to please a girl during anal sex,', 'I''ve heard the same and I''m looking forward to trying it,')+'" you answer.'
+	iif(katjaQW['ivan_anal'] = 1, '"Good thing we get to experience it again,"', '"Well now '+iif(IvanShowerQW = 11, 'I also', 'we')+' get to experience it,"')+' Katja says, continuing to giggle.'
+	*nl
+	'You arrive at Lazar''s house and he lets you in. Ivan is sitting and '+iif(katjaQW['ivan_anal'] = 1, 'gets up to give both you and Katja a big hug,', 'gets up to greet you')+' and tells you it''s great seeing you again.' 
+	'You sit down and the four of you spend some time talking. It''s mostly just Ivan talking about how his training is going, with Lazar taking occasional jabs at him not being a professional yet. Ivan just shoots back at him for studying instead of playing football.'
+	'After a while, you can see that Katja is getting more and more horny so you lean over to her and whisper "Why don''t we give them a show to get this party started?"  She agrees with an enthusiastic nod.'
+	act 'Strip with Katja':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some1.jpg"></center>'
+		'The two of you get up and begin dancing, removing your outer clothes to reveal the matching black bodysuits that you had prepared. You start dancing intimately, kissing each other on occasion before slowly peeling off each other''s bodysuits.'
+		'"Yes. Go, girls!" Lazar shouts.'
+		iif(katjaQW['ivan_anal'] = 1, '"Whoa. This is really hot. Fantastic to finally see two of the hottest girls in class like this,"', '"Whoa. Show us those bodies again,"')+' Ivan chimes in.'
+		'Encouraged, you and Katja continue and are so engrossed by each other that you don''t notice that the guys have taken their clothes off.' 
+		gs 'arousal', 'foreplay', 5, 'group', 'lesbian'
+		gs 'stat'
+		act 'The guys join':
+			*clr & cla
+			gs 'boyStat', 'A3', 'A149'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some2.jpg"></center>'
+			'While you and Katja are sitting on your knees on the couch, sharing a long kiss, the guys move in. Katja quickly has Lazar''s <<$boydesc2>>, <<dick2>> cm, <<$dick_girth2>> dick in her hand, while Ivan approaches you from behind.'
+			'You and Katja break off your kiss and, with a look, decide to give the guys some attention.'
+			gs 'arousal', 'foreplay', 2, 'group'
+			gs 'arousal', 'kiss', -2, 'group', 'lesbian'
+			gs 'stat'
+			act 'Suck some dick':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some3.jpg"></center>'
+				'You turn around and take Ivan''s <<$boydesc1>>, <<dick1>> cm, <<$dick_girth1>> cock in your eager mouth. At the same time, Katja is exploring Lazar''s cock with her mouth.' 
+				'"Suck that dick," Ivan says.'
+				'"Yeah, show us what good little cocksucking sluts you are!" Lazar adds, and the two of you start sucking eagerly to show off your skills.'
+				if npc_throat['A14'] < dick2: npc_throat['A14'] += 1
+				gs 'arousal', 'bj', 3, 'dick1', 'group'
+				gs 'stat'
+				act 'Swap cocks':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some4.jpg"></center>'
+					'"Let''s see if you both are equally skilled," Ivan says when he pulls you of his cock.'
+					'"Yes, let''s switch," Lazar agrees, letting Katja off his dick.' 
+					'You and Katja turn around and, without changing places, start devouring Lazar''s cock while Katja takes Ivan''s dick in her hungry mouth.'
+					if npc_throat['A14'] < dick1: npc_throat['A14'] += 1
+					gs 'arousal', 'bj', 2, 'dick2', 'group'
+					gs 'stat'
+					act 'Deepthroat':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some5.jpg"></center>'
+						'"I want to see how far you can take our dicks down your throats," Lazar says, removing your head from his cock.'
+						'"Sounds great," Ivan replies, removing Katja''s mouth from his cock.'
+						'He then grabs you and throws you down on your back on the couch with your feet in the air and head dangling free. Meanwhile, Lazar does the same to Katja.' 
+						if katjaQW['deepthroat'] = 0:
+							katjaQW['deepthroat'] = 1
+							katjaQW['slut'] += 5
+							katjaQW['horny'] -= 10
+							if npc_throat['A14'] < dick2: npc_throat['A14'] += 2
+							'Katja is very surprised as Lazar rams his cock down her throat, and it is clearly causing her problems. But she seems almost too shocked to do anything and is just laying there as he has his way with her.'
+						elseif katjaQW['deepthroat'] < 10 or 2*npc_throat['A14'] < dick2:
+							katjaQW['deepthroat'] += 1
+							katjaQW['slut'] += 3
+							katjaQW['horny'] -= 5
+							if npc_throat['A14'] < dick2: npc_throat['A14'] += 2
+							'Katja knows what''s coming, but is still not completely prepared, when Lazar rams his cock down her throat. She tries to take it like a pro, but she clearly has problems not gagging under Lazar''s onslaught.'
+						else
+ 							katjaQW['deepthroat'] += 1
+							katjaQW['slut'] += 1
+							katjaQW['horny'] += 10
+							if npc_throat['A14'] < dick2: npc_throat['A14'] += 1
+							'Katja is ready as Lazar rams his cock down her throat. She takes it like a pro under Lazar''s onslaught, seemingly having no gag reflex, and even seems to be enjoying it.'
+						end
+						if 2*pcs_throat < dick1:
+							'You only have a moment before Ivan stuffs his <<$boydesc1>>, <<$dick_girth1>> cock in your throat. You have a lot of trouble accommodating it and your gag reflex is constantly giving you problems.'
+						elseif pcs_throat < dick1:
+							'You only have a moment before Ivan stuffs his <<$boydesc1>>, <<$dick_girth1>> cock in your throat. You have a little trouble accommodating it and your gag reflex is occasionally giving you problems.'
+						else
+							'You only have a moment before Ivan stuffs his <<$boydesc1>>, <<$dick_girth1>> cock in your throat. You have no trouble taking it all and you deepthroat it like a pro.'
+						end
+						gs 'arousal', 'bj', 4, 'dick2', 'group', 'deepthroat'
+						gs 'stat'
+						act 'Start getting butt fucked':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some6.jpg"></center>'
+							'"Time to try those assholes," Ivan says and Lazar quickly agrees.' 
+							'"Get on all fours," Lazar demands.'   
+							'You and Katja quickly follow orders and crawl up on the couch, discarding the rest of your bodysuits as you do so and present your butts to the guys.' 
+							if auto_anal_lube = 1:
+								if lubri > 0:
+									lubri -= 1
+									'You hand your bottle of lube to Ivan. "Use this," you tell him.'
+									'"Okay," he answers and squirts some on your butthole and uses his fingers to apply it properly.'
+									'You look over at Katja and see that she''s doing the same with Lazar.'
+								else
+									'You grab your bottle of lube but notice it''s empty. A little panicked, you look over and see that Katja has already handed Lazar her bottle of lube and he''s applying it to her asshole.'
+									'"Katja, can I borrow some lube please?" you ask.'
+									'"Of course," she answers.'
+									'Lazar passes the bottle to Ivan, and you soon feel the cool ointment being spread on your asshole by Ivan''s finger.'
+								end
+								'After both of you are lubed up, the guys positions their dicks at your assholes.' 
+								gs 'arousal', 'anal_finger', 1, 'lube', 'group'
+								katjaQW['lube'] = 1
+							else
+								'Ivan applies some spit to your asshole and you can see Lazar doing the same to Katja before they position their dicks.' 
+							end
+							'They then slowly push their dicks into your assholes. '+iif(IvanShowerQW = 11, '"Your ass is great as always,"', '"I''ve wanted to try your asshole for a long time,"')+' Ivan says. You don''t answer him because your mouth has found Katja''s and you are kissing her.'
+							gs 'arousal', 'anal', 2, 'dick1', 'group'
+							gs 'arousal', 'kiss', -2, 'group', 'lesbian'
+							gs 'stat'
+							act 'Get your ass pounded':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some7.jpg"></center>'
+								'The guys start picking up the pace and they''re soon pounding your assholes fast and hard. You can see that Katja is '+iif( npc_ass['A14'] + 8*katjaQW['lube'] < dick2, 'taking Lazar''s <<$boydesc2>>, <<$dick_girth2>> cock like a pro and', 'having some trouble taking Lazar''s <<$boydesc2>>, <<$dick_girth2>> cock, so you')+' decide to give her another deep kiss.'
+								'While you and Katja''s tongues are fighting in each other''s mouths, you hear Ivan say "This'+iif( pcs_ass < dick1, ' is a nice, tight asshole', ' asshole is used to taking big dicks, but it''s still great')+'."'
+								gs 'arousal', 'anal', 4, 'dick1', 'group'
+								gs 'arousal', 'kiss', -4, 'group', 'lesbian'
+								gs 'stat'								
+								if npc_ass['A14'] < dick2: npc_ass['A14'] += 1
+								if npc_ass['A14']*2 < dick2: npc_ass['A14'] += 1
+								'After a few minutes, the guys get off you. "I want some pussy now," Lazar says as he lies on his back on the couch. "Jump on, <<$pcs_nickname>>."'
+								act 'Get on Lazar''s cock':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some8.jpg"></center>'
+									'You do as Lazar says and sit down on his <<$boydesc2>>, <<$dick_girth2>> dick. Ivan moves so that his cock is in your face and Katja joins you in sucking it while you ride Lazar.'
+									'After a short period of time, Ivan moves away and gets behind you, lining his dick with your asshole.'
+									gs 'arousal', 'vaginal', 3, 'dick2', 'group'
+									gs 'arousal', 'bj', -2, 'dick1', 'group'
+									gs 'stat'
+									if katjaQW['Lazar_Ivan_4some'] < 2:
+										act 'Tell them you have never had a double penetration before':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some8b.jpg"></center>'
+											'"Stop, Ivan! I''ve never had two cocks at the same time," you say.'
+											'"So you want me to not do it?" he asks. "I''ll be gentle and I''m sure you''ll like it," he continues.' 
+											act 'Tell him to do it': gt 'katja_uni_sex', 'lazar_ivan_dp'
+											act 'Tell him to not do it':
+												cla
+												*nl
+												'"No, I don''t want you to do it," you tell him.'
+												'"Okay," he answers, "I want to try Katja''s ass anyway," he says.'
+												act 'Back to butt fucking':  gt 'katja_uni_sex', 'lazar_ivan_anal2'	
+											end
+										end
+									end
+									act 'Tell Ivan to stuff your ass': gt 'katja_uni_sex', 'lazar_ivan_dp'
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'lazar_ivan_dp':
+	if  katjaQW['Lazar_Ivan_4some'] = 0: 
+		katjaQW['Lazar_Ivan_4some'] = 2
+	elseif katjaQW['Lazar_Ivan_4some'] = 1: 
+		katjaQW['Lazar_Ivan_4some'] = 3
+	end
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some9.jpg"></center>'
+	'Lazar stops moving and Katja moves down to see the penetrations and starts playing with his balls before Ivan slowly puts his dick into your ass, pausing for a short while after it''s completely in.' 
+	'Seeing they are completely in, Katja says "Start moving, guys!" and they slowly start thrusting, eventually picking up the speed. Katja continues to excitedly encourage them to go faster and faster.' 
+	gs 'arousal', 'vaginal', 3, 'dick2', 'group'
+	gs 'arousal', 'anal', -3, 'dick1', 'group'
+	gs 'stat'
+	act 'Get both of your holes pounded':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some10.jpg"></center>'
+		'They have really amped up the intensity and you''re getting both your ass and pussy pounded hard. Katja moves around and her mouth and tongue finds yours and you start making out.'
+		gs 'arousal', 'vaginal', 3, 'dick2', 'group'
+		gs 'arousal', 'anal', -3, 'dick1', 'group'
+		gs 'arousal', 'kiss', -3, 'lesbian', 'group'
+		gs 'stat'
+		*nl
+		'After some minutes, the guys stop. "Now it''s Katja''s turn," Lazar says.'
+		'"Yeah, I also want to try her ass," Ivan agrees.'
+		if kajtaQW['dp'] = 0:
+			'"I''ve never tried something like that!" Katja says, a little shocked. "I don''t know if I''ll... be able to..." she stammers.'
+			'"Well, there''s a first time for everything," Lazar says.'  
+			if katjaQW['slut'] < 100 or katjaQW['horny'] < 100:
+				'"No," Katja suddenly says in a firm voice. "No, there doesn''t need to be a first time, and definitely not now!"'
+				'The guys look disappointed, but understand that there might be other opportunities in the future.'
+				'"At least let me fuck your ass," Ivans says.'
+				'"Okay, we can do that," she says.'
+				act 'More butt fucking':  gt 'katja_uni_sex', 'lazar_ivan_anal2'
+			else
+				'After a long pause, Katja says "Okay... I do want to try. But please be gentle."'
+				'The two guys look very excited.'
+				act 'Watch Katja''s first DP': gt 'katja_uni_sex', 'lazar_ivan_katja_dp'
+			end
+		else
+			if kajtaQW['dp'] < 5:
+				'"Okay... But please be gentle," Katja says, making the guys look very excited.'
+			elseif kajtaQW['dp'] < 10:
+				'"Okay. Let''s do it," she says, making the guys look very excited.'
+			else
+				'"What are you waiting for? I need both my holes stuffed right now!" Katja says, making the guys almost lose their minds in excitement.'
+			end
+			act 'Katja gets a DP': gt 'katja_uni_sex', 'lazar_ivan_katja_dp'
+		end
+	end
+end
+
+if $ARGS[0] = 'lazar_ivan_katja_dp':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some11.jpg"></center>'
+	'Ivan removes his dick from your ass and you get off Lazar. You then take hold of Lazar''s dick and tell Katja to get on it.'
+	if kajtaQW['dp'] = 0:
+		katjaQW['slut'] += 5 
+		'She does so after a little hesitation, '+iif(npc_vag['A14'] < dick2, 'still not completely comfortable with a dick his size', 'taking his <<$boydesc2>> cock like it was something she does every day')+'.'
+		'You then'+iif(katjaQW['lube'] = 1, ' start adding more lube to her asshole and ', ' ')+'decide to give Ivan''s cock a good sloppy blowjob to apply more lubrication.'
+		'After a minute of getting his dick ready and Katja comfortable on Lazar''s cock, you guide Ivan''s <<$dick_girth1>> dick into Katja''s'+iif(npc_ass['A14'] < 5, ' tiny', ' '+iif(npc_vag['A14'] < 10, 'somewhat', 'well')+'used')+' asshole.' 
+	elseif kajtaQW['dp'] < 5:
+		katjaQW['slut'] += 3 
+		'She does so with little hesitation '+iif(npc_vag['A14'] < dick2, 'still not completely comfortable with dicks his size', 'taking his <<$boydesc2>> cock as if it were something she does everyday')+'.'
+		'You then'+iif(katjaQW['lube'] = 1, ' start adding more lube to her asshole and ', ' ')+'decide to give Ivan''s cock a good sloppy blowjob to apply more lubrication.'
+		'After a minute of getting his dick ready with Katja already riding Lazar''s cock, you stop her and guide Ivan''s <<$dick_girth1>> dick into Katja''s'+iif(npc_ass['A14'] < 5, ' tiny', ' '+iif(npc_vag['A14'] < 10, 'somewhat', 'well')+'used')+' asshole.' 
+	else
+		katjaQW['slut'] += 1 
+		'She quickly jumps on it '+iif(npc_vag['A14'] < dick2, 'still not completely comfortable with dicks his size', 'taking his <<$boydesc2>> cock as if it were something she does everyday')+'.'
+		'You then'+iif(katjaQW['lube'] = 1, ' start adding more lube to her asshole and ', ' ')+'decide to give Ivan''s cock a good sloppy blowjob to apply more lubrication, while Katja starts to ride Lazar hard.'
+		'After a minute of getting his dick ready, Katja starts yelling at you. "<<$pcs_nickname>>, get his cock in my ass now!"'
+		'You guide Ivan''s <<$dick_girth1>> dick into Katja''s'+iif(npc_ass['A14'] < 5, ' tiny', ' '+iif(npc_vag['A14'] < 10, 'somewhat', 'well')+'used')+' asshole.' 
+	end
+	gs 'arousal', 'foreplay', 3, 'group', 'lesbian'
+	gs 'arousal', 'bj', -1, 'dick1', 'group'
+	gs 'stat'
+	act 'Watch Katja get two cocks at once':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some12.jpg"></center>'
+		'Ivan slowly pushes his cock into Katja''s ass, taking his time to get as much in he can.'+iif(pc_ass['A14'] + 4*katjaQW['lube'] < dick1 or 2*pc_vag['A14'] < dick2, ' Katja is clearly looking uncomfortable, biting her lips to hide the pain', 'Katja is taking it fine')+'.'
+		if kajtaQW['dp'] = 0:
+			'When Ivan finally stops pushing, Katja lets out a sigh. "Whoa, so this is how it feels having a dick in both your ass and pussy," she says, sounding surprised.'
+			'After a moment, Ivan asks if Katja is okay and if they can start to move. She agrees with a slight nod. The guys then start moving and try to coordinate their thrusts to give Katja the most pleasure.'
+		else
+			if pc_ass['A14'] + 4*katjaQW['lube'] < dick1 or 2*pc_vag['A14'] < dick2:
+				'When Ivan finally stops pushing, you ask Katja if she is okay. She says she is, though she does not sound convincing, so you signal to Ivan that he should hold.'
+				'After a little while, Katja doesn''t seem to be in pain anymore. Ivan asks if she''s okay and if they can start to move, and she agrees with a slight nod. The guys start moving and try to coordinate their thrusts to give Katja the most pleasure.'
+			else
+				'When Ivan stops pushing, he waits a little until Katja '+iif(kajtaQW['dp'] < 5, 'tells them to start moving.', 'yells in frustration, "Fuck me! Use those cocks!"')+' Then the guys start to moving and they try to coordinate their thrusts to give Katja the most pleasure.'
+			end
+		end
+		if npc_vag['A14'] < dick2: npc_vag['A14'] += 1
+		if npc_vag['A14']*2 < dick2: npc_vag['A14'] += 1
+		if npc_ass['A14'] < dick2: npc_ass['A14'] += 1
+		if npc_ass['A14']*2 < dick2: npc_ass['A14'] += 1
+		gs 'arousal', 'foreplay', 1, 'group', 'lesbian'
+		gs 'stat'
+		act 'Watch Katja get both holes plowed at the same time':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some13.jpg"></center>'
+			'The guys begin to pick up pace and before long, they are plowing both of Katja''s holes. '+iif( pc_ass['A14'] + 4*katjaQW['lube'] < dick1 or 2*pc_vag['A14'] < dick2, 'Katja is clearly feeling a mixture of pain and pleasure, but endures', 'Katja seems to take a lot of pleasure from it, and enjoys')+' the pounding.'
+			'After some minutes with Katja letting out moans of'+iif( pc_ass['A14'] + 4* katjaQW['lube'] < dick1 or 2*pc_vag['A14'] < dick2, ' pain and ', ' ')+'pleasure, Lazar says, "I want some of <<$pcs_nickname>>''s sweet ass!" and the guys stop.'
+			kajtaQW['dp'] += 1
+			if  kajtaQW['ivan_lazar_dp'] = 0: kajtaQW['ivan_lazar_dp'] = 1
+			gs 'arousal', 'foreplay', 3, 'group', 'lesbian'
+			gs 'stat'
+			act 'Back to butt fucking':  gt 'katja_uni_sex', 'lazar_ivan_anal2'
+		end
+	end
+end
+
+if $ARGS[0] = 'lazar_ivan_anal2':
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some14.jpg"></center>'
+	'The guys get up and you and Katja quickly end on your backs on the couch with your heads close together. Ivan stuffs his cock in Katja''s ass while Lazar stuffs his cock in yours.'
+	'They start fucking your butts hard, almost like they are almost competing. After a short while, Ivan says "Let''s switch girls again!"'
+	gs 'arousal', 'anal', -3, 'dick2', 'group'
+	gs 'stat'
+	act 'Change partners':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some15.jpg"></center>'
+		'After Lazar has left you, Ivan suddenly picks you up and puts you down on the floor so that your ass is up leaning on the couch, and then Lazar does the same with Katja.' 
+		'Then they start to fuck you deep, and after a short while, Lazar pulls out of Katja and says that he is cumming.' 
+		gs 'arousal', 'anal', -3, 'dick2', 'group'
+		gs 'stat'		
+		act 'Cum shots':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/sex/lazar_ivan_katja_uni_4some15.jpg"></center>'
+			'Lazar cums fast all over Katja''s face. Soon after, Ivan pulls out of you and you and Katja get up and receive his cum all over your faces. To the guys'' amazement, you start licking the cum off each other''s face.'
+			gs 'cum_call', 'mouth', 'A149', 1, 0, 10000, 20	
+			gs 'cum_call', 'face', 'A3', 1, 0, 10000, 20		
+			cumspclnt = 11
+			gs 'cum_cleanup'
+			katjaQW['slut'] += 2 
+			katjaQW['horny'] = 0
+			katjaQW['lube'] = 0
+			gs 'stat'
+			*nl
+			'You and Katja clean up and the guys look exhausted as the two of you get dresssed. Katja picks up both of the bodysuits and places them in her purse. You say goodbye to Lazar and Ivan before leaving the apartment.'
+			act 'Leave': 
+				*clr & cla
+				minut += 10
+				gs 'katja_meynold_schedule'
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/KWT2.jpg"></center>'
+				if katjaQW['Lazar_Ivan_4some'] = 0 or katjaQW['Lazar_Ivan_4some'] = 2:
+					if katjaQW['simultanous_boys'] < 2: katjaQW['simultanous_boys'] = 2
+					if katjaQW['Lazar_Ivan_4some'] = 0:
+						katjaQW['Lazar_Ivan_4some'] = 1
+					else
+						katjaQW['Lazar_Ivan_4some'] = 3
+					end
+					'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your first time having sex with '+iif(katjaQW['simultanous_boys'] < 2, 'two guys at once', 'both Ivan and Lazar')+'?" you ask.'
+					'"It was great!" she answers. "So exciting!'+iif(kajtaQW['dp'] = 1, ' Trying to have a dick in both my pussy and ass at the same time was quite the experience," she continues.', '"')
+					'"It was also nice trying Ivan''s cock'+iif( katjaQW['ivan_anal'] = 1, ' again,', '. He really is an ass man like the rumors said,')+'" Katja says. "This is definitely something we need to repeat."'
+					if katjaQW['ivan_anal'] = 0: katjaQW['ivan_anal'] = 1
+				else			
+					if kajtaQW['dp'] = 1:
+						'As you walk back towards the campus, Katja is silent and looks a little thoughtful. "So? How was your first double penetration?" you ask.'
+						'"It was an interesting experience, trying to have a dick in both my pussy and ass at the same time. I think I need to try it again to really know if it''s something I like," Katja answers.'
+					else
+						'As you walk back towards the campus, Katja starts talking about how great the sex with Lazar and Ivan was, to which you agree.'
+					end
+				end
+				'"'+iif( katjaQW['slut'] < 100, 'But I do feel like a huge slut right now', 'What great sluts we are')+'," Katja says before she bursts out laughing.'
+				*nl
+				'You continue to chat about the experience on the way back.'
+				if locat['katja'] = 31:
+					'"Want to come back to my dorm room?" she asks as you reach campus.'
+					act 'Go with Katja to her room': minut +=5 & gt 'katja_dorm', 'start'
+				elseif locat['katja'] = 44:
+					'"I''m going to the city mall to look at clothes. Want to come?" she asks before you arrive at the campus.'
+					act 'Go with Katja to the city mall': minut += 5 & gt 'katja_city, metro' 
+				elseif locat['katja'] = 29:
+					'"I need to go to the library to study. Want to join me?" she asks as you reach campus.'
+					act 'Go to the library with Katja': minut += 5 & gt 'katja_uni', 'library2' 
+				else
+					'"I have to go do something else. See you soon," she says as you reach campus.'
+				end
+				act 'Say goodbye to Katja': gt 'uni_grounds', 'main'
+			end
+		end
+	end
+end
+
 --- katja_uni_sex ---------------------------------
 

+ 1 - 1
locations/korr.qsrc

@@ -1,5 +1,5 @@
 # korr
-2021/04/20
+!! 2021/04/20
 music_loop = 0
 CLOSE ALL
 $loc = 'korr'

+ 45 - 46
locations/metro_events.qsrc

@@ -32,10 +32,11 @@ if $ARGS[0] = 'a':
 		act 'Move away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	act 'Disregard':
+		cla
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot1.jpg"></center>'
-		'The guy standing behind you, disregarding the other passengers, grabs your ass cheek with his hand while rubbing his crotch against your ass.'
+		'The guy standing behind you disregards the other passengers and grabs your ass cheek with his hand while rubbing his crotch against your ass.'
 		gs 'arousal', 'foreplay', 2, 'sub', 'unknown'
 		gs 'willpower', 'misc', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -53,7 +54,7 @@ if $ARGS[0] = 'a':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frot2.jpg"></center>'
-			'You feel his rock hard cock more clearly now; and by the way it is moving, you''re sure he''s taken it out of his pants and is rubbing it against your ass. His hands continue to cling on to you, squeezing your buttocks.'
+			'You feel his rock hard cock more clearly now. By the way it is moving, you''re sure he''s taken it out of his pants and is rubbing it against your ass. His hands continue to cling on to you, squeezing your buttocks.'
 			gs 'arousal', 'foreplay', 2, 'sub', 'unknown'
 			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -90,7 +91,7 @@ if $ARGS[0] = 'b':
 	spot = 500*rand(16,24)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd2.jpg"></center>'
-	'There is a man standing behind you who begins playing with your skirt.'
+	'There is a man standing behind you who starts playing with your skirt.'
 	gs 'willpower', 'sex', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Move away (<<will_cost>> Willpower)':
@@ -106,7 +107,7 @@ if $ARGS[0] = 'b':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frota1.jpg"></center>'
-		'The man cautiously lifts your skirt and begins caressing your buttocks with his hands.'
+		'The man cautiously lifts your skirt and starts caressing your buttocks.'
 		gs 'arousal', 'foreplay', 2, 'sub', 'unknown'
 		gs 'willpower', 'sex', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
@@ -124,7 +125,7 @@ if $ARGS[0] = 'b':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frota2.jpg"></center>'
-			'The man pulls your panties down to your knees, then lets your skirt fall back into place. He slides his hand between your thighs, caressing your clit. After spending a few minutes pleasuring you, he pulls your hand back, placing it on his cock.'
+			'The man pulls your panties down to your knees, then lets your skirt fall back into place. He slides his hand between your thighs, caressing your clit. After spending a few minutes pleasuring you, he pulls your hand back and places it on his cock.'
 			gs 'arousal', 'foreplay', 2, 'sub', 'unknown'
 			gs 'willpower', 'sex', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
@@ -141,7 +142,7 @@ if $ARGS[0] = 'b':
 			end
 			gs 'willpower', 'hj', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
-				act 'Pull hand away (<<will_cost>> Willpower)':
+				act 'Pull your hand away (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'hj', 'resist', 'medium'
 					gs 'willpower', 'pay', 'resist'
@@ -150,13 +151,13 @@ if $ARGS[0] = 'b':
 					gs 'cum_call', 'butt', 'stranger on the metro', 0, 0, spot, svol
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd1.jpg"></center>'
-					'You angrily pull your hand away, which he allows you to do. A few seconds later, you feel the head of his cock, and hand, bumping against your ass cheek as he jerks off. Minutes later, you feel spurts of hot cum splashing against your ass cheeks. Once he''s finished, he pulls your panties back up over your sperm covered ass and pats you on the ass before disappearing into the crowd.'
+					'You angrily pull your hand away, which he allows you to do. A few seconds later, you feel the head of his cock bumping against your ass cheek as he jerks off. Minutes later, you feel spurts of hot cum splashing against your ass cheeks. Once he''s finished, he pulls your panties back up over your sperm covered ass and pats you on the ass before disappearing into the crowd.'
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Finished':gt 'metro_events', 'fin2'
 				end
 			else
-				act 'Pull hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Pull your hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Stroke his cock':
 				*clr & cla
@@ -164,11 +165,11 @@ if $ARGS[0] = 'b':
 				frot += 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd.jpg"></center>'
-				'With your hand on his cock, you grip it firmly and start stroking. As he seems to really enjoy it, he reaches up and places his hands on your shoulders, trying to push you down to your knees.'
+				'You firmly grip his cock in your hand and start stroking as he places his hands on your shoulders and tries to push you down on your knees.'
 				gs 'arousal', 'hj', 2, 'sub', 'unknown'
 				gs 'willpower', 'hj', 'resist', 'medium'
 				if will_cost <= pcs_willpwr:
-					act 'Pull hand away (<<will_cost>> Willpower)':
+					act 'Pull your hand away (<<will_cost>> Willpower)':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						gs 'arousal', 'end'
@@ -177,13 +178,13 @@ if $ARGS[0] = 'b':
 						gs 'cum_call', 'butt', 'stranger on the metro', 0, 0, spot, svol
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd1.jpg"></center>'
-						'You angrily pull your hand away, which he allows you to do. A few seconds later, you feel the head of his cock, and hand, bumping against your ass cheek as he jerks off. Minutes later, you feel spurts of hot cum splashing against your ass cheeks. Once he''s finished, he pulls your panties back up over your sperm covered ass and pats you on the ass before disappearing into the crowd.'
+						'You angrily pull your hand away, which he allows you to do. A few seconds later, you feel the head of his cock bumping against your ass cheek as he jerks off. Minutes later, you feel spurts of hot cum splashing against your ass cheeks. Once he''s finished, he pulls your panties back up over your sperm covered ass and pats you on the ass before disappearing into the crowd.'
 						gs 'arousal', 'end'
 						gs 'stat'
 						act 'Finished':gt 'metro_events', 'fin2'
 					end
 				else
-					act 'Pull hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+					act 'Pull your hand away (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 				end
 				act 'Squat':
 					*clr & cla
@@ -209,14 +210,15 @@ if $ARGS[0] = 'b':
 						frot += 1
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote2.jpg"></center>'
-						'You obediently open your mouth and begin sucking his hard cock. You''re sitting on your haunches, in the middle of a crowded subway car, sucking a stranger''s cock.'
+						'You obediently open your mouth and begin sucking his hard cock. You''re sitting on your haunches, in the middle of a crowded subway car, sucking a stranger''s cock!'
 						gs 'arousal', 'bj', 3, 'sub', 'unknown'
 						act 'Continue to suck':
 							*clr & cla
 							gs 'cum_call', 'face', 'stranger on the metro', 0, 0, spot, svol
+							
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote3.jpg"></center>'
-							'The man pulls his cock out of your mouth, and hot cum splatters across your cheek and chin. Once he has milked the last drop of sperm from his cock onto your face, he tucks his cock into his pants and moves away. He forces his way through the crowd before disappearing, leaving you alone with his cum all over your face.'
+							'The man pulls his cock out of your mouth, and hot cum splatters across your cheek and chin. Once he''s milked the last drop from his cock onto your face, he tucks it back into his pants and forces his way through the crowd, leaving you alone with his cum all over your face.'
 							gs 'arousal', 'end'
 							gs 'stat'
 							act 'Finished':gt 'metro_events', 'fin2'
@@ -234,7 +236,7 @@ if $ARGS[0] = 'c':
 	spot = 500*rand(16,24)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp.jpg"></center>'
-	'An unknown man nears you from behind, and without any hesitation, shoves his hand down the back of your pants.'
+	'An unknown man approaches you from behind and, without any hesitation, shoves his hand down the back of your pants.'
 	gs 'willpower', 'sex', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Move away (<<will_cost>> Willpower)':
@@ -250,7 +252,7 @@ if $ARGS[0] = 'c':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotp.jpg"></center>'
-		'You enjoy the nice sensation as the stranger caresses your ass. With his other hand, he reaches around and begins fondling your left breast under your shirt.'
+		'You enjoy the sensation of the stranger caressing your ass as his other hand reaches around and starts fondling your left breast under your shirt.'
 		gs 'arousal', 'foreplay', 2, 'sub', 'unknown'
 		gs 'stat'
 		gs 'willpower', 'sex', 'resist', 'medium'
@@ -313,7 +315,7 @@ if $ARGS[0] = 'c':
 						gs 'arousal', 'end'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd1.jpg"></center>'
-						'He stands firm, and once again tries to push you down, but you won''t budge. As he can''t convince you, he relaxes instead, letting you go on as you keep jerking him off. When he moans into your ear, you start stroking it more vigorously and a few minutes later, you feel spurts of hot cum splashing against your ass cheek. Once he''s finished, he pulls your panties back up over your sperm covered ass and pats you on the ass before disappearing into the crowd.'
+						'He stands firm, and once again tries to push you down, but you won''t budge. As he can''t convince you, he relaxes instead, letting you go on as you keep jerking him off. When he moans into your ear, you start stroking it more vigorously, a couple of minutes later, you feel spurts of hot cum splashing against your ass cheek. Once he is finished he pulls your panties back up over your sperm covered ass then pats you on the butt, before moving away, and disappearing in the crowd.'
 						act 'Finished':gt 'metro_events', 'fin2'
 					end
 				else
@@ -325,7 +327,7 @@ if $ARGS[0] = 'c':
 					frot += 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frotd.jpg"></center>'
-					'With your hand on his cock, you grip it firmly and start stroking. As he seems to really enjoy it, he reaches up and places his hands on your shoulders, trying to push you down to your knees.'
+					'You firmly grip his cock in your hand and start stroking as he places his hands on your shoulders and tries to push you down on your knees.'
 					gs 'arousal', 'hj', 2, 'sub', 'unknown'
 					gs 'willpower', 'bj', 'resist', 'medium'
 					if will_cost <= pcs_willpwr:
@@ -364,14 +366,14 @@ if $ARGS[0] = 'c':
 							frot += 1
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote2.jpg"></center>'
-							'You obediently open your mouth and begin sucking his hard cock. You are sitting on your haunches; in the middle of a crowded subway car, sucking a strangers cock.'
+							'You obediently open your mouth and begin sucking his hard cock. You''re sitting on your haunches, in the middle of a crowded subway car, sucking a stranger''s cock!'
 							gs 'arousal', 'bj', 2, 'sub', 'unknown'
 							act 'Continue to suck':
 								*clr & cla
 								gs 'cum_call', 'face', 'stranger on the metro', 0, 0, spot, svol
 								gs 'stat'
 								'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/grop/frote3.jpg"></center>'
-								'The man pulls his cock out of your mouth, and hot cum splatters across your cheek and chin. Once he has milked the last drop of sperm from his cock onto your face, he tucks his cock into his pants and moves away. He forces his way through the crowd before disappearing, leaving you alone with his cum all over your face.'
+								'The man pulls his cock out of your mouth, and hot cum splatters across your cheek and chin. Once he''s milked the last drop from his cock onto your face, he tucks it back into his pants and forces his way through the crowd, leaving you alone with his cum all over your face.'
 								gs 'arousal', 'end'
 								gs 'stat'
 								act 'Finished':gt 'metro_events', 'fin2'
@@ -425,7 +427,6 @@ if $ARGS[0] = 'station':
 					pcs_mood += 10
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/givemoney.jpg"></center>'
 					'You reach into your purse and pull out some money to drop into his case. He looks up at you and smiles and nods his head, but keeps playing. With your good deed done, you leave the station and go on your way.'
-
 					act 'Leave':minut += 5 & gt $loc, $loc_arg
 				end
 			end
@@ -529,7 +530,7 @@ if $ARGS[0] = 'station':
 				if $pantyworntype = 'none':
 					if PCloPants > 0:
 						'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy1.jpg"></center>'
-						'You smile back at her and pull down your pants, flashing your pussy at her. You both share a laugh before going on your way.'
+						'You smile back at her and pull down your pants, flashing your pussy back at her. You both share a laugh before going on your way.'
 					else
 						'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/inside/pussy/hairy4.jpg"></center>'
 						'You smile back at her and pull up your '+iif(PCloSkirt > 0, 'skirt', 'dress')+', flashing your pussy back at her. You both share a laugh before going on your way.'
@@ -659,7 +660,7 @@ if $ARGS[0] = 'station':
 			minut += 10
 			pcs_mood += 10
 			'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/guitarf'+ rand(1,2) +'.jpg"></center>'
-			'You stop and listen to her play several songs, she really is pretty good.'
+			'You stop and listen to her play several songs.'
 			act 'Leave':minut += 5 & gt $loc, $loc_arg
 			if money > 50:
 				act 'Give her money':
@@ -668,7 +669,6 @@ if $ARGS[0] = 'station':
 					pcs_mood += 10
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/givemoney.jpg"></center>'
 					'You reach into your purse and pull out some money to drop into her case. She looks up at you and smiles and nods her head, but keeps playing. With your good deed done, you leave the station and go on your way.'
-
 					act 'Leave':minut += 5 & gt $loc, $loc_arg
 				end
 			end
@@ -713,7 +713,6 @@ if $ARGS[0] = 'station':
 					pcs_mood += 10
 					'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/station/givemoney.jpg"></center>'
 					'You reach into your purse and pull out some money to drop into his case. He looks up at you and smiles and nods his head, but keeps playing. With your good deed done, you leave the station and go on your way.'
-
 					act 'Leave':minut += 5 & gt $loc, $loc_arg
 				end
 			end
@@ -780,37 +779,37 @@ if $ARGS[0] = 'train':
 	metrorand = rand(1,33)
 	if metrorand = 1:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/annoyed.jpg"></center>'
-		'As you take a seat on the metro, you hear a huff. You glance up to see a woman giving you a dirty looks, like you took her seat, or something. She moves over to sit across from you, and for the rest of the ride, gives you a dirty look. You really have no idea what you did, but whatever it was it pissed her off.'
+		'As you take a seat on the metro, you hear a huff. You glance up to see a woman giving you a dirty look, like you took her seat or something. She moves over to sit across from you, and for the rest of the ride and continues giving you a dirty look. You have no idea what you did, but whatever it was really pissed her off.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 2:
 		if PCloskirt = 0: gt 'metro', 'vagon'
 		'<center><video autoplay loop src="images/locations/city/shared/metro/draft.mp4"></video></center>'
-		'You are unable to find a seat that you want to sit in. This train car is badly in need of a cleaning. So instead you find yourself standing for the duration of the ride, There seems to be a draft in the car, every few moments a strong draft rushes through the car, lifting your skirt.'
+		'The train car is in desperate need of cleaning, so you choose to stand for the duration of the ride. There''s also a draft in the car, which lifts your skirt every few seconds.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flasha'+ rand(1,2) +'.jpg"></center>'
-		'As you ride the metro, you notice a young woman. She seems to have almost everyone''s attention, and you soon learn why. She repeatedly lifts her skirt up, flashing her ass to the other passengers in the car. She seems to love the attention that she is getting, as she maintains a very please smile.'
+		'As you ride the metro, you notice a young woman who seems to have almost everyone''s attention, and you soon learn why. She repeatedly lifts her skirt up, flashing her ass at the other passengers. She seems to love the attention that she''s getting, as she maintains a very pleased smile.'
 		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 4:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashb'+ rand(1,2) +'.jpg"></center>'
-		'As you ride the metro, you notice a young woman. She seems to have almost everyone''s attention, and you soon learn why. She repeatedly lifts her shirt up, flashing her boobs to the other passengers in the car. She seems to love the attention she is getting, as she maintains a very pleased smile.'
+		'As you ride the metro, you notice a young woman who seems to have almost everyone''s attention, and you soon learn why. She repeatedly lifts her shirt up, flashing her breasts at the other passengers. She seems to love the attention she''s getting, as she maintains a very pleased smile.'
 		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 5:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashd1.jpg"></center>'
-		'As you ride the metro, you notice a young man. As you are watching in his direction, he reaches into his pants then pulls out his cock, and stares at it. Occasionally he''s bouncing it in place as if he''s playing with it.'
+		'As you ride the metro, you notice a young man. As you look in his direction, he reaches into his pants, pulls out his cock and stares at it. He occasionally bounces it in place as if he''s playing with it.'
 		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 6:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashg'+ rand(1,3) +'.jpg"></center>'
-		'As you ride the metro, you notice a young woman. She seems to have almost everyone''s attention and you soon learn why. She is repeatedly pulling her clothes away, flashing her naked body to the other passengers in the car. She seems to love the attention she is getting, as she maintains a very pleased smile.'
+		'As you ride the metro, you notice a young woman who seems to have almost everyone''s attention and you soon learn why. She repeatedly pulls her clothes away, flashing her naked body at the other passengers. She seems to love the attention she''s getting, as she maintains a very pleased smile.'
 		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -818,7 +817,7 @@ if $ARGS[0] = 'train':
 	elseif metrorand = 7:
 		if hotcat < 7: gt 'metro', 'vagon'
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/flashus'+ rand(1,5) +'.jpg"></center>'
-		'As you ride the metro, you notice a young woman. When she sees you looking at her, she gives you a wicked grin, and winks. She then spreads her legs, showing off her pussy from under her skirt. She sticks out her tongue, and flicks it at you, as if mimicking eating pussy.'
+		'As you ride the metro, you notice a young woman. When she sees you looking at her, she gives you a wicked grin and winks before spreading her legs, showing off her pussy from under her skirt. She sticks out her tongue and flicks it at you, as if mimicking eating pussy.'
 		gs 'arousal', 'erotic_nudity', 5
 		gs 'stat'
 		act 'Ignore her':
@@ -832,19 +831,19 @@ if $ARGS[0] = 'train':
 				if $pantyworntype = 'none':
 					if PCloPants > 0:
 						'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/pussy/hairy1.jpg"></center>'
-						'You smile back at her and pull down your pants flashing your pussy back to her. You both share a laugh before going on your way.'
+						'You smile back at her and pull down your pants, flashing your pussy back at her. You both share a laugh before going on your way.'
 					else
 						'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/inside/pussy/hairy4.jpg"></center>'
-						'You smile back at her and pull up your '+iif(PCloSkirt > 0, 'skirt', 'dress')+' flashing your pussy back to her. You both share a laugh before going on your way.'
+						'You smile back at her and pull up your '+iif(PCloSkirt > 0, 'skirt', 'dress')+', flashing your pussy back at her. You both share a laugh before going on your way.'
 					end
 					gs 'flash', 'pussy', 'outdoors', 3, 1
 				else
 					if PCloPants > 0:
 						'<center><img <<$set_imgh>> src="images/pc/activities/flashing/pants/inside/panty/1.jpg"></center>'
-						'You smile back at her and pull down your pants flashing your panties to her. You both share a laugh before going on your way.'
+						'You smile back at her and pull down your pants, flashing your panties at her. You both share a laugh before going on your way.'
 					else
 						'<center><img <<$set_imgh>> src="images/pc/activities/flashing/dress/inside/panty/4.jpg"></center>'
-						'You smile back at her and pull up your '+iif(PCloSkirt > 0, 'skirt', 'dress')+' flashing your panties to her. You both share a laugh before going on your way.'
+						'You smile back at her and pull up your '+iif(PCloSkirt > 0, 'skirt', 'dress')+', flashing your panties at her. You both share a laugh before going on your way.'
 					end
 					gs 'flash', 'panties', 'outdoors', 1, 1
 				end
@@ -857,11 +856,11 @@ if $ARGS[0] = 'train':
 		end
 	elseif metrorand = 8:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/girlcat.jpg"></center>'
-		'As you ride the metro, you notice a young woman sitting across from you playing on her phone, but that''s not what draws your attention to her; she has large black cat sitting in her lap. The cat seems surprisingly calm and happy considering the strange people around. She occasionally reaches down to pet the cat while playing on her phone. Once the metro comes to a stop, she lifts the cat and carries it in her arms as she leaves the train.'
+		'As you ride the metro, you notice a young woman sitting across from you playing on her phone, but that''s not what draws your attention to her; she has large black cat sitting in her lap. The cat seems surprisingly calm and happy considering the strange people around. She occasionally reaches down to pet the cat while playing on her phone. Once the train comes to a stop, she lifts the cat and carries it in her arms as she disembarks.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 9:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/kilt.jpg"></center>'
-		'As you ride the metro, you notice a foreign man wearing a kilt. You overhear several other men commenting on him wearing a skirt, which he just ignores. He''s likely used to such comments as he has lived in Russia for a long time.'
+		'As you ride the metro, you notice a foreign man wearing a kilt. You overhear several other men commenting on him wearing a skirt, which he just ignores. He''s likely used to such comments.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 10:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/manasleep.jpg"></center>'
@@ -947,7 +946,7 @@ if $ARGS[0] = 'train':
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 24:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sleepexf1.jpg"></center>'
-		'As you find a seat, you notice a woman passed out across from you; you can smell the alcohol from here. Her jacket is open and her shirt pulled down, leaving one of her breasts exposed for everyone to see. Several passengers give her a glance now and again, and a few even take her picture. A group of young men are whispering to each other and laughing while watching her.'
+		'As you find a seat, you notice a woman passed out across from you; you can smell the alcohol from here. Her jacket is open and her shirt pulled down, leaving one of her breasts exposed for everyone to see. Several passengers give her a glance now and again, and a few even take her picture. A group of young men are whispering at each other and laughing while watching her.'
 		gs 'arousal', 'erotic_nudity', 5
 		gs 'arousal', 'end'
 		gs 'stat'
@@ -958,7 +957,7 @@ if $ARGS[0] = 'train':
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 26 and (hour = 7 or hour = 15):
 		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big77.jpg"></center>'
-		'You notice your neighbor <a href="exec:gt ''tryndin'', ''tryndinmetro''">Tryndin</a> in the metro car.'
+		'You spot your neighbor <a href="exec:gt ''tryndin'', ''tryndinmetro''">Tryndin</a> sitting across from you.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 27:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/dog.jpg"></center>'
@@ -970,7 +969,7 @@ if $ARGS[0] = 'train':
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 29:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/mask.jpg"></center>'
-		'You honestly don''t understand how some people get to be the way they are, but such is life in the big city! You just never know what you''re going to encounter, especially on the metro. You wonder if this person is asleep under their mask as they''re sitting there as still as a statue. Another curious passenger must be thinking the same thing and walks up to him, cautiously reaching out to touch his mask. Suddenly, the masked man jumps to life and starts barking and growling at the lady, who darts away into the crowd of other passengers, who are now trying to see what all the commotion is about. As soon as you reach your destination, you get up quickly and leave the bizarre scene.'
+		'You honestly don''t understand how some people get to be the way they are, but such is life in the city. You just never know what you''re going to encounter, especially on the metro. You wonder if this person is asleep under their mask as they''re sitting there as still as a statue. Another curious passenger must be thinking the same thing and walks up to him, cautiously reaching out to touch his mask. Suddenly, the masked man jumps to life and starts barking and growling at the lady, who darts away into the crowd of other passengers, who are now trying to see what all the commotion is about. As soon as you reach your destination, you get up quickly and leave the bizarre scene.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 30:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/oldman_nipples.jpg"></center>'
@@ -979,7 +978,7 @@ if $ARGS[0] = 'train':
 	elseif metrorand = 31:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/police.jpg"></center>'
 		'As you take your spot in the metro, you notice a police officer standing across from you, staring at you. You try to ignore him the best you can by looking down at your phone or around to the other passengers. Whenever you glance back up at him however, he''s still staring right at you. You don''t think he''s even blinked once. "What''s his problem?" you think to yourself.'
-		'You do your best to turn away from his creepy stare, but there''s only so much you can do. Even as the metro pulls up to your stop, you cast one more peek in his direction and he''s still staring right into your eyes.'
+		'You do your best to turn away from his creepy stare, but there''s only so much you can do. Even as the train pulls up to your stop, you cast one more peek in his direction and he''s still staring right into your eyes.'
 		act 'Leave': gt 'metro', 'start'
 	elseif metrorand = 32:
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/rude.jpg"></center>'
@@ -992,7 +991,7 @@ if $ARGS[0] = 'train':
 		act 'Leave': gt 'metro', 'start'
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/kilt.jpg"></center>'
-		'As you ride the metro, you notice a foreign man wearing a kilt. You overhear several other men commenting on him wearing a skirt, which he just ignores. He''s likely used to such comments as he has lived in Russia for a long time.'
+		'As you ride the metro, you notice a foreign man wearing a kilt. You overhear several other men commenting on him wearing a skirt, which he just ignores. He''s likely used to such comments.'
 		act 'Leave': gt 'metro', 'start'
 	end
 end
@@ -1033,7 +1032,7 @@ if $ARGS[0] = 'twobbc':
 				gs 'arousal', 'foreplay', 3, 'exhibitionism'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave': minut += 5 & gt $loc, $loc_arg
+				act 'Leave':minut += 5 & gt $loc, $loc_arg
 			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>'
@@ -1047,7 +1046,7 @@ if $ARGS[0] = 'twobbc':
 			act 'Suck his dick':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/sex/station/2bbc3.jpg"></center>'
-				'You drop down to your knees as you unbutton his pants before reaching inside and pulling his cock free. You stroke it several times before opening your mouth. You take his cock into your mouth, wrapping your lips tightly around the shaft and bobbing your head up and down as you suck his cock. While you''re sucking his dick, you notice his friend walking back over and they exchange a few words in a language you don''t recognize. After their exchange of words, the other guy pulls his dick out of your mouth and they trade places.'
+				'You drop to your knees as you unbutton his pants before reaching inside and pulling his cock free. You stroke it several times before opening your mouth. You take his cock into your mouth, wrapping your lips tightly around the shaft and bobbing your head up and down as you suck his cock. While you''re sucking his dick, you notice his friend walking back over and they exchange a few words in a language you don''t recognize. After their exchange of words, the other guy pulls his dick out of your mouth and they trade places.'
 				gs 'arousal', 'bj', 3, 'exhibitionism'
 				gs 'stat'
 				act 'Suck the other dick':
@@ -1134,7 +1133,7 @@ if $ARGS[0] = 'twobbcfinish':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/shared/metro/metrorestroom.jpg"></center>'
 	'You get down on your knees between them and alternate between sucking one dick and jerking the other one back and forth until they both start to moan. At that point, you start jerking them both off with their dicks pointed at your face. Seconds later, streams of cum start splattering across your face and dripping onto your breasts.'
-	'Once they finish, they laugh and quickly get dressed. "Thank you, you are very good fuck," one of the says before they both walk out, leaving you naked and covered in their cum. You get up and start getting dressed yourself.'
+	'Once they finish, they laugh and quickly get dressed. "Thank you, you are very good fuck," one of them says before they both walk out, leaving you naked and covered in their cum. You get up and start getting dressed yourself.'
 	gs 'arousal', 'bj', 5, 'exhibitionism', 'group', 'sub'
 	gs 'arousal', 'hj', -5, 'exhibitionism', 'group', 'sub'
 	gs 'cum_call', 'face', 'unknown African man'

+ 11 - 4
locations/music_actions.qsrc

@@ -2,6 +2,7 @@
 
 if $ARGS[0] = 'music_icon':
     !! Everywhere
+    ml_time_left = ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if alko > 5:
         'You are too drunk to stream or record music without messing up or throwing up into your guitar.'
     !! $location_type = ''public_outdoors'' means parks, streets. Some event types can be placed in these locations : playing music, recording music - e.g in front of
@@ -11,18 +12,24 @@ if $ARGS[0] = 'music_icon':
             'It''s too early to do anything noisy like playing the guitar or singing.'
         elseif hour > 22:
             'It''s too late to do anything noisy like playing the guitar or singing.'
-        elseif ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
         else
-            pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+            if ml_settings['its_me'] = 1: 
+                if ml_guitar['hasguitar'] = 1 and (ml_guitar['carried'] = 1 or $ml_guitar['location'] = $loc):
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_guitaraction01.png"></a></center>'
+                else
+                    pl '<center><a href="exec: gs ''music_actions'', ''start''"><img title="Click to to see available music activities." height = 120 src="images/system/icons/icon_transp_singeraction01.png"></a></center>'
+                end
+            else
+                act 'Available musical activities': gs 'music_actions', 'start'
+            end
         end
         if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 
+
 if $ARGS[0] = 'start': 
     cla
-
     ml_time_left =  ml_performance['max_perform_minutes']-ml_performance['performed_minutes']
     if $location_type = 'public_outdoors': 
         !! In public, Sveta is never alone

+ 1 - 0
locations/music_guitarlesson.qsrc

@@ -53,6 +53,7 @@ if $ARGS[0] = 'setlessonday':
 	'<a href="exec: ml_guitarlesson[''lessonday''] = 4 & $ml_guitarlesson[''lessonday''] = ''Thursday''  & gt ''music_guitarlesson'', ''goodbye''">Thursday</a>'
 	'<a href="exec: ml_guitarlesson[''lessonday''] = 5 & $ml_guitarlesson[''lessonday''] = ''Friday''  & gt ''music_guitarlesson'', ''goodbye''">Friday</a>'
 	'<a href="exec: ml_guitarlesson[''lessonday''] = 6 & $ml_guitarlesson[''lessonday''] = ''Saturday''  & gt ''music_guitarlesson'', ''goodbye''">Saturday</a>'
+	act 'Don''t arrange a lesson day': gt 'pav_commclubs'
 end
 
 

+ 6 - 5
locations/npcstatic3.qsrc

@@ -298,13 +298,14 @@ npc_dick['A<<npctemp>>'] = 16
 
 
 npctemp = 127
-$npc_dna['A<<npctemp>>'] = '1797467433 2003489967 1798597247 1058757155 1598996372 1954728943 1657496532'
-$npc_usedname['A<<npctemp>>'] = 'Gosha'
-$npc_notes['A<<npctemp>>'] = 'Dimka''s friend Gosha.'
+$npc_firstname['A<<npctemp>>'] = 'Shulyov'
+$npc_nickname['A<<npctemp>>'] = 'Shul'
+$npc_lastname['A<<npctemp>>'] = 'Ivanko'
+$npc_notes['A<<npctemp>>'] = 'Shulyov Ivanko is Sonia''s older step brother, his father marrying her mother when they were both only a few years old. His step mother even changed her and Sonia''s last name to match his father''s.'
 npc_gender['A<<npctemp>>'] = 0
 gs 'npcstaticdefaults', 'defaults'
-$npc_thdick['A<<npctemp>>'] = 'well proportioned'
-npc_dick['A<<npctemp>>'] = 14
+$npc_thdick['A<<npctemp>>'] = 'thick'
+npc_dick['A<<npctemp>>'] = 16
 
 
 npctemp = 128

+ 1 - 1
locations/npcstatic5.qsrc

@@ -623,7 +623,7 @@ $npc_nickname['A<<npctemp>>'] = 'Nat'
 $npc_lastname['A<<npctemp>>'] = 'Pavlova'
 $npc_usedname['A<<npctemp>>'] = 'Natalia'
 npc_dob['A<<npctemp>>'] = 20000330
-$npc_notes['A<<npctemp>>'] = 'Natalia is a very smart but weak willed girl. She constantly struggles to maintain friendships but her good looks and eagerness to help others, prevents her from being an outcast. She is rarely seen with anyone but one thing she always keeps with her, is a special notebook that she never lets anyone touch.'
+$npc_notes['A<<npctemp>>'] = 'Natalia is a very smart, but weak willed girl. She constantly struggles to maintain friendships, but her friendly attitude and eagerness to help others prevents her from being an outcast, despite being a little chubby and not overly attractive. She is rarely seen hanging out with anyone. She fiercely guards a notebook she likes to keep private, never letting anyone read or even touch it.'
 npc_gender['A<<npctemp>>'] = 1
 gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'group', 'nerd'

+ 6 - 6
locations/olutaxi.qsrc

@@ -422,11 +422,11 @@ if $ARGS[0] = 'olu_taxi_sex':
 			if stat['think_virgin'] = 0:act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal' 
 			act 'Just the butt': gt 'olutaxi', 'olu_taxi_sex_anal'
 			
-			gs 'willpower', 'bj', 'force', 'easy'
+			gs 'willpower', 'bj', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
 				act 'Just a BJ (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'pay', 'force'
+					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
 					'You decide you don''t feel like fucking today and just want to suck him off. So you climb off the seat and squat in the floor instead and keep sucking his dick, so as not to tempt him to try and turn you around. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his cock.'
@@ -465,11 +465,11 @@ if $ARGS[0] = 'olu_taxi_sex':
 				gs 'stat'
 				if stat['think_virgin'] = 0:act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal' 
 				act 'Just the butt': gt 'olutaxi', 'olu_taxi_sex_anal'
-				gs 'willpower', 'bj', 'force', 'easy'
+				gs 'willpower', 'bj', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
 					act 'Suck him off instead (<<will_cost>> Willpower)':
 						*clr & cla
-						gs 'willpower', 'pay', 'force'
+						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
 						'You decide you don''t feel like fucking today and just want to suck him off. Before he can raise up and climb between your legs, you pull away from him enough he stops licking your twat. You get off the seat and squat in the floor, encouraging him to get back up. Once he kneels back on the seat you lean forward and start sucking his dick again. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his cock.'
@@ -559,11 +559,11 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 				end
 			end
 		end
-		gs 'willpower', 'bj', 'force', 'easy'
+		gs 'willpower', 'bj', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
 			act 'Just a BJ (<<will_cost>> Willpower)':
 				*clr & cla
-				gs 'willpower', 'pay', 'force'
+				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
 				'You decide you don''t feel like getting butt fucked today and just want to suck him off instead. So when he pulls his dick out of you, you climb off the seat, and squat in the floor instead. He gets up on his knees obviously knowing you want to suck his dick again. You start sucking on his dick and you can taste your own pussy juices on his cock. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his dick.'

+ 5 - 5
locations/pav_clinic.qsrc

@@ -156,16 +156,16 @@ if $ARGS[0] = '':
 				else
 					if pcs_missing_teeth = 1:
 						zubpay = 30000
-						'The dentist examines you and says, it will cost you <<3000>> <b>₽</b> to replace your tooth'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to replace your tooth'
 					elseif pcs_missing_teeth > 1:
 						zubpay = pcs_missing_teeth * 30000
-						'The dentist examines you and says, it will cost you <<pcs_missing_teeth * 30000>> <b>₽</b> to fill the gaps'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to fill the gaps'
 					elseif pcs_teeth = 0:
 						zubpay = 3000
-						'The dentist examines you and says, it will cost you <<3000>> <b>₽</b> to brighten and polish your teeth.'
+						'The dentist examines you and says, it will cost you <<zubpay>> <b>₽</b> to brighten and polish your teeth.'
 					elseif pcs_teeth > 0:
 						zubpay = 4500
-						'The dentist examinees you and says, it will cost you <<4500>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months and he can''t promise they will be completely straight after one treatment.'
+						'The dentist examinees you and says, it will cost you <<zubpay>><b>₽</b> to straighten your teeth and you will have to wear a brace for three months and he can''t promise they will be completely straight after one treatment.'
 					end
 
 					if money < zubpay and karta < zubpay:
@@ -183,7 +183,7 @@ if $ARGS[0] = '':
 								elseif pcs_teeth > 0:
 									dentistday = daystart + 180
 									pcs_brace = 1
-									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to comeback it six months to have it taken of.'
+									'You pay the dentist to straighten your teeth. After and hour of work he have attached a brace to teeth and tells you to come back it six months to have it taken of.'
 								else
 									dentistday = daystart + 90
 									pcs_teeth = -1

+ 26 - 40
locations/pav_disco_coolkids.qsrc

@@ -4,8 +4,7 @@
 if $ARGS[0] = 'dimka':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A1'] ! daystart: gs 'npc_relationship', 'modify', 'A1', 'like'
-	npc_rel_disco['A1'] = daystart
+	gs 'npc_relationship', 'modify', 'A1', 'like', 1, 'pav_disco'
 	gs 'stat'
 	gs 'dinnpc'
 	if rand(1,4) = 1:
@@ -282,9 +281,8 @@ end
 
 if $ARGS[0] = 'marcus':
 	*clr & cla
-	minut += 5
-	if npc_rel_disco['A146'] ! daystart: gs 'npc_relationship', 'modify', 'A146', 'like'
-	npc_rel_disco['A146'] = daystart
+	minut += 5	
+	gs 'npc_relationship', 'modify', 'A146', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 	if rand(1,3) = 1:
@@ -456,10 +454,8 @@ if $ARGS[0] = 'andrey' or $ARGS[0] = 'stasya': gt 'pav_disco_coolkids', 'andrey_
 if $ARGS[0] = 'andrey_stasya':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A147'] ! daystart: gs 'npc_relationship', 'modify', 'A147', 'like'
-	npc_rel_disco['A147'] = daystart
-	if npc_rel_disco['A139'] ! daystart: gs 'npc_relationship', 'modify', 'A139', 'like'
-	npc_rel_disco['A139'] = daystart
+	gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,5) <= 2:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance1.jpg"></center>'
@@ -489,7 +485,7 @@ if $ARGS[0] = 'andrey_stasya':
 						gs 'stat'
 						act 'No':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A139', 'like'
+							gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 							'You shake your head. "No thanks, I''m having fun here. Maybe some other time?"'
@@ -501,8 +497,8 @@ if $ARGS[0] = 'andrey_stasya':
 						end
 						act 'Yes':
 							*clr & cla
-							gs 'npc_relationship', 'modify', 'A147', 'like'
-							gs 'npc_relationship', 'modify', 'A139', 'dislike'
+							gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
+							gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya_dance2.jpg"></center>'
 							'You nod your head. "Sure, that sounds like fun. What did you have in mind?"'
@@ -552,7 +548,7 @@ if $ARGS[0] = 'andrey_stasya':
 					'Whatever it is, it seems Stasya isn''t into it but after a bit of back and forth she either relents or changes her mind, because you see Andrey grin before kissing her. After his kiss with Stasya he turns to you. "How about we get out of here and go back to my place? I can get Marcus to come over."'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A139', 'like'
+						gs 'npc_relationship', 'modify', 'A139', 'like', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya.jpg"></center>'
 						'You shake your head. "No thanks, I''m having fun here. Maybe some other time?"'
@@ -564,8 +560,8 @@ if $ARGS[0] = 'andrey_stasya':
 					end
 					act 'Yes':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A147', 'like'
-						gs 'npc_relationship', 'modify', 'A139', 'dislike'
+						gs 'npc_relationship', 'modify', 'A147', 'like', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A139', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/andrey_stasya.jpg"></center>'
 						'You nod your head. "Sure, that sounds like fun. What did you have in mind?"'
@@ -608,8 +604,7 @@ end
 if $ARGS[0] = 'mefodiy':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A148'] ! daystart: gs 'npc_relationship', 'modify', 'A148', 'like'
-	npc_rel_disco['A148'] = daystart
+	gs 'npc_relationship', 'modify', 'A148', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big148.jpg"></center>'
 	if rand(1,4) = 1:
@@ -738,8 +733,7 @@ end
 if $ARGS[0] = 'igor':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A14'] ! daystart: gs 'npc_relationship', 'modify', 'A14', 'like'
-	npc_rel_disco['A14'] = daystart
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 	if rand(1,4) = 1:
@@ -931,8 +925,7 @@ end
 if $ARGS[0] = 'bella':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A22'] ! daystart: gs 'npc_relationship', 'modify', 'A22', 'like'
-	npc_rel_disco['A22'] = daystart
+	gs 'npc_relationship', 'modify', 'A22', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big22.jpg"></center>'
 	'You see Bella hanging out with the other cool kids.'
@@ -977,8 +970,7 @@ end
 if $ARGS[0] = 'vicky':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A15'] ! daystart: gs 'npc_relationship', 'modify', 'A15', 'like'
-	npc_rel_disco['A15'] = daystart
+	gs 'npc_relationship', 'modify', 'A15', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big15.jpg"></center>'
 	'You see Vicky hanging out with the other cool kids.'
@@ -1020,8 +1012,7 @@ end
 if $ARGS[0] = 'inna':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A17'] ! daystart: gs 'npc_relationship', 'modify', 'A17', 'like'
-	npc_rel_disco['A17'] = daystart
+	gs 'npc_relationship', 'modify', 'A17', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big17.jpg"></center>'
 	'You see Irina hanging out with the other cool kids.'
@@ -1059,8 +1050,7 @@ end
 if $ARGS[0] = 'katja':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A14'] ! daystart: gs 'npc_relationship', 'modify', 'A14', 'like'
-	npc_rel_disco['A14'] = daystart
+	gs 'npc_relationship', 'modify', 'A14', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/katja_dance1_1.jpg"></center>'
@@ -1399,8 +1389,7 @@ end
 if $ARGS[0] = 'lizaveta':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A140'] ! daystart: gs 'npc_relationship', 'modify', 'A140', 'like'
-	npc_rel_disco['A140'] = daystart
+	gs 'npc_relationship', 'modify', 'A140', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big140.jpg"></center>'
 	'You see Lizaveta hanging out with the other cool kids.'
@@ -1439,8 +1428,7 @@ end
 if $ARGS[0] = 'sonia':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A25'] ! daystart: gs 'npc_relationship', 'modify', 'A25', 'like'
-	npc_rel_disco['A125'] = daystart
+	gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) <= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_dance.jpg"></center>'
@@ -1492,7 +1480,7 @@ if $ARGS[0] = 'sonia':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1537,8 +1525,7 @@ end
 if $ARGS[0] = 'sonia_outcast':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A125'] ! daystart: gs 'npc_relationship', 'modify', 'A125', 'like'
-	npc_rel_disco['A125'] = daystart
+	gs 'npc_relationship', 'modify', 'A125', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,5) <= 4:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_outcast_dance1.jpg"></center>'
@@ -1590,7 +1577,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1617,7 +1604,7 @@ if $ARGS[0] = 'sonia_outcast':
 				end
 				act 'Yes':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her. "Okay, let''s go."'
@@ -1632,7 +1619,7 @@ if $ARGS[0] = 'sonia_outcast':
 				act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 				act 'Ask her to dance':
 					*clr & cla
-					gs 'npc_relationship', 'modify', 'A25', 'like'
+					gs 'npc_relationship', 'modify', 'A25', 'like', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 					'You smile at her reaction. "Would you like to dance then?"'
@@ -1702,7 +1689,7 @@ if $ARGS[0] = 'sonia_outcast_dance':
 						if will_cost <= pcs_willpwr:
 							act 'No (<<will_cost>> Willpower)':
 								*clr & cla
-								gs 'npc_relationship', 'modify', 'A25', 'hate'
+								gs 'npc_relationship', 'modify', 'A25', 'hate', 1, 'pav_disco2'
 								gs 'willpower', 'pay', 'resist'
 								discoenable['A25'] = 0
 								minut += 5
@@ -1736,8 +1723,7 @@ end
 if $ARGS[0] = 'natasha':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A16'] ! daystart: gs 'npc_relationship', 'modify', 'A16', 'like'
-	npc_rel_disco['A16'] = daystart
+	gs 'npc_relationship', 'modify', 'A16', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) >= 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/natasha_dance.jpg"></center>'

+ 32 - 46
locations/pav_disco_gopniks.qsrc

@@ -7,12 +7,9 @@ if $ARGS[0] = 'vitek' or $ARGS[0] = 'dan' or $ARGS[0] = 'shulga': gt 'pav_disco_
 if $ARGS[0] = 'vitek_dan_vasily':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A9'] ! daystart: gs 'npc_relationship', 'modify', 'A9', 'like'
-	npc_rel_disco['A9'] = daystart
-	if npc_rel_disco['A10'] ! daystart: gs 'npc_relationship', 'modify', 'A10', 'like'
-	npc_rel_disco['A10'] = daystart
-	if npc_rel_disco['A11'] ! daystart: gs 'npc_relationship', 'modify', 'A11', 'like'
-	npc_rel_disco['A11'] = daystart
+	gs 'npc_relationship', 'modify', 'A9', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A10', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A11', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 	'Vitek, Dan and Vasily are hanging out in the dark corner of the hall with the other gopniks. It''s dimly lit and hard to make out details, but it looks like they''re sharing some beers they''ve smuggled in.'
@@ -57,9 +54,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike'
+					gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -85,9 +82,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike'
+						gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
@@ -143,9 +140,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A9', 'dislike'
-					gs 'npc_relationship', 'modify', 'A10', 'dislike'
-					gs 'npc_relationship', 'modify', 'A11', 'dislike'
+					gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+					gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -171,9 +168,9 @@ if $ARGS[0] = 'vitek_dan_vasily':
 						*clr & cla
 						gs 'willpower', 'pay', 'resist'
 						grupvalue[4] -= 1
-						gs 'npc_relationship', 'modify', 'A9', 'dislike'
-						gs 'npc_relationship', 'modify', 'A10', 'dislike'
-						gs 'npc_relationship', 'modify', 'A11', 'dislike'
+						gs 'npc_relationship', 'modify', 'A9', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A10', 'dislike', 1, 'pav_disco2'
+						gs 'npc_relationship', 'modify', 'A11', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/vitek_dan_vasily.jpg"></center>'
 						'You shake your head. "No thanks. Maybe later."'
@@ -374,8 +371,7 @@ end
 if $ARGS[0] = 'radomir':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A154'] ! daystart: gs 'npc_relationship', 'modify', 'A154', 'like'
-	npc_rel_disco['A154'] = daystart
+	gs 'npc_relationship', 'modify', 'A154', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/radomir_dance1.jpg"></center>'
@@ -396,7 +392,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -433,7 +429,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -471,7 +467,7 @@ if $ARGS[0] = 'radomir':
 					'"You''re too beautiful to stay here in the shadows. Why don''t we go and dance so I can show you off?"'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A154', 'dislike'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You shake your head. "No thanks, I don''t feel like dancing right now."'
@@ -516,7 +512,7 @@ if $ARGS[0] = 'radomir':
 							*clr & cla
 							gs 'willpower', 'pay', 'resist'
 							minut += 5
-							gs 'npc_relationship', 'modify', 'A154', 'loathe'
+							gs 'npc_relationship', 'modify', 'A154', 'loathe', 1, 'pav_disco2'
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 							'You try to twist your arm out of his grasp, but he has a very firm grip on you and unless you want to start a fight in the middle of the disco, you''re unable to get away. "Ow, let go! You''re hurting me!"'
@@ -540,7 +536,7 @@ if $ARGS[0] = 'radomir':
 					'"You''re too beautiful to stay here in the shadows. Why don''t we go and dance so I can show you off?"'
 					act 'No':
 						*clr & cla
-						gs 'npc_relationship', 'modify', 'A154', 'dislike'
+						gs 'npc_relationship', 'modify', 'A154', 'dislike', 1, 'pav_disco2'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big154.jpg"></center>'
 						'You shake your head. "No thanks, I don''t feel like dancing right now."'
@@ -630,8 +626,7 @@ end
 if $ARGS[0] = 'roman':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A157'] ! daystart: gs 'npc_relationship', 'modify', 'A157', 'like'
-	npc_rel_disco['A157'] = daystart
+	gs 'npc_relationship', 'modify', 'A157', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big157.jpg"></center>'
 	'Roman is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks and sharing some beers they''ve smuggled in.'
@@ -665,7 +660,7 @@ if $ARGS[0] = 'roman':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					grupvalue[4] -= 1
-					gs 'npc_relationship', 'modify', 'A157', 'loathe'
+					gs 'npc_relationship', 'modify', 'A157', 'loathe', 1, 'pav_disco2'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 					'You shake your head. "No thanks. Maybe later."'
@@ -722,8 +717,7 @@ end
 if $ARGS[0] = 'valentin':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A158'] ! daystart: gs 'npc_relationship', 'modify', 'A158', 'like'
-	npc_rel_disco['A158'] = daystart
+	gs 'npc_relationship', 'modify', 'A158', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big158.jpg"></center>'
 	'Valentin is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -836,8 +830,7 @@ end
 if $ARGS[0] = 'arkadi':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A156'] ! daystart: gs 'npc_relationship', 'modify', 'A156', 'like'
-	npc_rel_disco['A156'] = daystart
+	gs 'npc_relationship', 'modify', 'A156', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big156.jpg"></center>'
 	'Arkadi is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but he seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -921,8 +914,7 @@ end
 if $ARGS[0] = 'niko':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A189'] ! daystart: gs 'npc_relationship', 'modify', 'A189', 'like'
-	npc_rel_disco['A189'] = daystart
+	gs 'npc_relationship', 'modify', 'A189', 'like', 1, 'pav_disco'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big189.jpg"></center>'
 	act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 !!	if dance = 1
@@ -932,8 +924,7 @@ end
 if $ARGS[0] = 'lavrenti':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A155'] ! daystart: gs 'npc_relationship', 'modify', 'A155', 'like'
-	npc_rel_disco['A155'] = daystart
+	gs 'npc_relationship', 'modify', 'A155', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lavrenti_dance1.jpg"></center>'
@@ -1086,8 +1077,7 @@ end
 if $ARGS[0] = 'pauline':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A24'] ! daystart: gs 'npc_relationship', 'modify', 'A24', 'like'
-	npc_rel_disco['A24'] = daystart
+	gs 'npc_relationship', 'modify', 'A24', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big24.jpg"></center>'
 	'Pauline is hanging out in the dark corner of the hall with the other gopniks. It''s dim and hard to make out details, but she seems to be talking to several of the other gopniks while sharing some beers they''ve smuggled in.'
@@ -1190,10 +1180,8 @@ if $ARGS[0] = 'lena' or $ARGS[0] = 'lera': gt  'pav_disco_gopniks', 'lena_lera'
 if $ARGS[0] = 'lena_lera':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A20'] ! daystart: gs 'npc_relationship', 'modify', 'A20', 'like'
-	npc_rel_disco['A20'] = daystart
-	if npc_rel_disco['A21'] ! daystart: gs 'npc_relationship', 'modify', 'A21', 'like'
-	npc_rel_disco['A21'] = daystart
+	gs 'npc_relationship', 'modify', 'A20', 'like', 1, 'pav_disco'
+	gs 'npc_relationship', 'modify', 'A21', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,3) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/lena_lera_dance1.jpg"></center>'
@@ -1375,8 +1363,7 @@ end
 if $ARGS[0] = 'nush':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A144'] ! daystart: gs 'npc_relationship', 'modify', 'A144', 'like'
-	npc_rel_disco['A144'] = daystart
+	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,2) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/anushka_dance1.jpg"></center>'
@@ -1679,8 +1666,7 @@ end
 if $ARGS[0] = 'alyona':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A143'] ! daystart: gs 'npc_relationship', 'modify', 'A143', 'like'
-	npc_rel_disco['A143'] = daystart
+	gs 'npc_relationship', 'modify', 'A143', 'like', 1, 'pav_disco'
 	gs 'stat'
 	if rand(1,4) = 1:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/alyona_dance1.jpg"></center>'

+ 9 - 18
locations/pav_disco_jocks.qsrc

@@ -4,8 +4,7 @@
 if $ARGS[0] = 'lazar':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A149'] ! daystart: gs 'npc_relationship', 'modify', 'A149', 'like'
-	npc_rel_disco['A149'] = daystart
+	gs 'npc_relationship', 'modify', 'A149', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if rand(1,4) = 1:
@@ -135,8 +134,7 @@ end
 if $ARGS[0] = 'ivan':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A3'] ! daystart: gs 'npc_relationship', 'modify', 'A3', 'like'
-	npc_rel_disco['A3'] = daystart
+	gs 'npc_relationship', 'modify', 'A3', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big3.jpg"></center>'
 	'To your surprise, you see Ivan hanging out with the other jocks, talking to a few of them and smiling. You almost never see him here.'
@@ -194,8 +192,7 @@ end
 if $ARGS[0] = 'fedor':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A5'] ! daystart: gs 'npc_relationship', 'modify', 'A5', 'like'
-	npc_rel_disco['A5'] = daystart
+	gs 'npc_relationship', 'modify', 'A5', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big5.jpg"></center>'
 	if FedorLove < 0:
@@ -208,8 +205,7 @@ end
 if $ARGS[0] = 'svyatoslav':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A8'] ! daystart: gs 'npc_relationship', 'modify', 'A8', 'like'
-	npc_rel_disco['A8'] = daystart
+	gs 'npc_relationship', 'modify', 'A8', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big8.jpg"></center>'
 	if rand(1,4) = 1:
@@ -319,8 +315,7 @@ end
 if $ARGS[0] = 'vanya':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A165'] ! daystart: gs 'npc_relationship', 'modify', 'A165', 'like'
-	npc_rel_disco['A165'] = daystart
+	gs 'npc_relationship', 'modify', 'A165', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big165.jpg"></center>'
 	'You see Vanya hanging out with the cool kids and jocks.'
@@ -371,8 +366,7 @@ end
 if $ARGS[0] = 'erast':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A150'] ! daystart: gs 'npc_relationship', 'modify', 'A150', 'like'
-	npc_rel_disco['A150'] = daystart
+	gs 'npc_relationship', 'modify', 'A150', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big150.jpg"></center>'
 	'You''re a little surprised to see Erast hanging out with the cool kids and jocks, standing near one of the tables with his arms crossed. You rarely see him here and you don''t think he''s enjoying himself, but he gives polite smiles to people that talk to him.'
@@ -431,8 +425,7 @@ end
 if $ARGS[0] = 'albina':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A23'] ! daystart: gs 'npc_relationship', 'modify', 'A23', 'like'
-	npc_rel_disco['A23'] = daystart
+	gs 'npc_relationship', 'modify', 'A23', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big23.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -756,8 +749,7 @@ end
 if $ARGS[0] = 'lariska':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A13'] ! daystart: gs 'npc_relationship', 'modify', 'A13', 'like'
-	npc_rel_disco['A13'] = daystart
+	gs 'npc_relationship', 'modify', 'A13', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big13.jpg"></center>'
 	if rand(1,4) <= 3:
@@ -878,8 +870,7 @@ end
 if $ARGS[0] = 'lina':
 	*clr & cla
 	minut += 5
-	if npc_rel_disco['A19'] ! daystart: gs 'npc_relationship', 'modify', 'A19', 'like'
-	npc_rel_disco['A19'] = daystart
+	gs 'npc_relationship', 'modify', 'A19', 'like', 1, 'pav_disco'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big19.jpg"></center>'
 	if rand(1,4) <= 3:

+ 2 - 2
locations/pav_discoev1.qsrc

@@ -428,11 +428,11 @@ if $ARGS[0] = 'girlfriend_ask':
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'
 			'You agree to date Igor and a smile blossoms on his face as he hugs you tightly. "I''m so happy, <<$pcs_nickname>>! Now that we''re a couple... Can we kiss?"'
 			'Something about the eagerness with which he suggests this makes you think he''s never kissed a girl before. Without waiting for your answer, he''s already leaning in to kiss you...'
-			gs 'willpower', 'misc', 'force', 'medium'
+			gs 'willpower', 'kiss', 'resist', 'medium'
 			if will_cost <= pcs_willpwr:
 				act 'Stop him (<<will_cost>> Willpower)':
 					*clr & cla
-					gs 'willpower', 'pay', 'force'
+					gs 'willpower', 'pay', 'resist'
 					IgorDominaQW = 1
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big4.jpg"></center>'

+ 3 - 3
locations/pav_hotel.qsrc

@@ -100,9 +100,9 @@ if hour = 0 and hotresepQW_day ! daystart and (hotresepQW < 3 or (hotresepQW = 3
 						'You have seen enough and quietly go back to your room'
 
 						act 'Continue':
-							if hotelroom = 1:gt'hotelroom','normal'
-							if hotelroom = 2:gt'hotelroom','better'
-							if hotelroom = 3:gt'hotelroom','best'
+							if hotelRoom['pav_hotel'] = 1:gt'hotelroom','normal'
+							if hotelRoom['pav_hotel'] = 2:gt'hotelroom','better'
+							if hotelRoom['pav_hotel'] = 3:gt'hotelroom','best'
 						end
 					end
 				end

+ 51 - 4
locations/pav_park.qsrc

@@ -153,10 +153,14 @@ if $ARGS[0] = 'start':
 			end
 		end
 	end
-	act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
-	act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
-	act 'Walk to Pushkin (0:10)':minut += 10 & gt 'liam'
-	act 'Go further into the park':minut += 2 & gt 'pav_park', 'deeper_park'
+	
+	if pcs_ski_worn = 1:
+		'<b>You need to remove your skates before you can leave the area.<\b>'
+		act 'Walk to the Residential area (0:05)':minut += 5 & gt 'pav_residential'
+		act 'Walk to the Commercial area (0:05)':minut += 5 & gt 'pav_commercial'
+		act 'Walk to Pushkin (0:10)':minut += 10 & gt 'liam'
+		act 'Go further into the park':minut += 2 & gt 'pav_park', 'deeper_park'
+	end
 
 	if hour > 8 and hour < 19:'There''s a small <a href="exec:minut += 5 & gt ''gskino''">movie theatre</a> in the park.'
 	'The newly opened cafe <a href="exec:gt''cafe_parco'',''start''">"Del Parco"</a>, with an eye-catching facade, lots of tables and a summer terrace. Two paths lead out of the park. One brings you to the <a href="exec:minut += 5 & gt ''pav_commercial''">commercial</a> area, the other to the <a href="exec:minut += 5 & gt ''pav_residential''">residential</a> area.'
@@ -203,6 +207,33 @@ if $ARGS[0] = 'start':
         end
     end 
 
+	if month = 12 or month < 3:
+		if pcs_ski_worn = 1:
+			act'Take off your skates':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				pcs_ski_worn = 0
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skiing_3.jpg"></center>'
+				'You can''t believe your time skiing is already over. It feels like you just put on your ski boots and started around the lake. But now, as you sit down on the bench to take them off, your legs are tired and sore from a day of skiing. You unlace your boots and wiggle your toes, relieved to finally be able to stretch them out. You stand up and take a few steps, savouring the feeling of being barefoot after a day in stiff ski boots before you put your regular shoes back on.'
+				act'Continue':gt'pav_lake'
+			end
+			act'Ski around the park (30 mins)': gt 'pav_park', 'ski'
+		elseif pcs_ski_worn ! 1 and pcs_ski_owned > 0 and hour >= 8 and hour <= 17:
+			act'Put your skis on':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				pcs_ski_worn = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skiing_1.jpg"></center>'
+				'You pull your ski boots out of your bag and sit down on the bench near the lake. The cold air nips at your cheeks as you begin to lace up your boots. You wiggle your toes, trying to get them as far back in the boots as possible. They feel a bit tight, but you know they''ll stretch out as you ski. You stand up and take a few steps, getting a feel for the boots.'
+				act 'Continue': gt'pav_lake'
+			end
+		end
+	end
+
 	if hour >= 8 and hour < 22:
 		act 'Distribute flyers to earn money (<b>₽</b>50) (1:00)':
 			*clr & cla
@@ -303,6 +334,22 @@ if $ARGS[0] = 'start':
 	gs 'camera', 'check_location'
 end
 
+if $ARGS[0] = 'ski':
+	*clr & cla
+	$loc = 'pav_park'
+	$loc_arg = 'ski'
+	$location_type = 'public_outdoors'
+	$menu_loc = 'pav_park'
+	$menu_arg = 'ski'
+	pcs_mood += 15
+	menu_off = 0
+	minut += 30
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/skiing_2.jpg"></center>'
+	'As you ski, you take in the breathtaking views of the snow-covered trees, the crisp blue sky above and all the people ice skating out on the lake. The sound of your skis slices through the snow filled air. You feel a sense of freedom and exhilaration as you carve your way around the lake. The cold air fills your lungs and you can''t help but smile, feeling alive and free.'
+	act 'Finish skiing'
+end
+
 ! Albina Starlets events.
 
 if $ARGS[0] = 'alb_father_meeting_1':

+ 2 - 2
locations/pav_parkev.qsrc

@@ -116,13 +116,13 @@ if $ARGS[0] = 'walk1':
 			'Two girls are drinking beers on one of the benches on the primary walkway near the front of the park. You can''t hear what they''re talking about, but they''re laughing, smiling and having a good time hanging out together.'
 		elseif temprand = 3:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/bench_flash_pussy.jpg"></center>'
-			'Sitting on one of the benches on the primary walkway near the front of the park is a woman that looks several years older than your sister. She''s relatively intent on reading a book in her lap, occasionally pausing to look up as if contemplating what she''s reading. You have no clue what the book is, but it seems to have her fully engrossed.'
+			'Sitting on one of the benches on the primary walkway near the front of the park is a woman that looks several years older than your sister. A handsome man walks towards her and she puts her feet on the bench, spreading her legs wide, showing off her pussy to him and anyone else that happens to be looking at the time. He laughs and walks over and kisses her as she closes her legs and gets up, and the two walk away together.'
 			gs 'arousal', 'erotic_nudity', 1
 			gs 'arousal', 'end'
 			gs 'stat'
 		elseif temprand = 4:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/bench_girl_book.jpg"></center>'
-			'Sitting on one of the benches on the primary walkway near the front of the park is a woman that looks several years older than your sister. A handsome man walks towards her and she puts her feet on the bench, spreading her legs wide, showing off her pussy to him and anyone else that happens to be looking at the time. He laughs and walks over and kisses her as she closes her legs and gets up, and the two walk away together.'
+			'Sitting on one of the benches on the primary walkway near the front of the park is a woman that looks several years older than your sister. She''s relatively intent on reading a book in her lap, occasionally pausing to look up as if contemplating what she''s reading. You have no clue what the book is, but it seems to have her fully engrossed.'
 		elseif temprand = 5:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/park/event/walk/day/bench_girl_flash1.jpg"></center>'
 			'Sitting on one of the benches on the primary walkway near the front of the park is a girl about your sister''s age. She seems to be intent on looking in your direction. She starts to smile as you get closer.'

+ 229 - 0
locations/pavlov_home.qsrc

@@ -0,0 +1,229 @@
+# pavlov_home
+
+if $ARGS[0] = 'PavlovHome':	
+	*clr & cla
+	minut += 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/hallway.jpg"></center>'
+	'The hallway of your Master''s home. '	
+	act '<b>Leave Master''s Home</b>': gt 'pav_complex','start'
+	act 'Master''s Bedroom': gt 'pavlov_home','bedroom'
+	act 'Bathroom': gt 'pavlov_home','bathroom'
+	act 'spare room': gt 'pavlov_home','second_bedroom'
+	act 'Living room': gt 'pavlov_home','livingroom'
+	act 'Kitchen': gt 'pavlov_home','kitchen'
+end	
+
+if $ARGS[0] = 'bedroom':	
+	*clr & cla
+	$loc = 'pavlov_home'
+	$loc_arg = 'bedroom'
+	$location_type = 'private'
+	$locclass = 'bedr'
+	!! The two variables below this are needed only if a mirror is called in that room, to help return you here after done
+	$locM = 'pavlov_home'
+	$locM_arg = 'bedroom'
+	minut += 1
+	gs'stat'
+	'<center><b><font color = maroon>Master''s Bedroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/bedroom.jpg"></center>'
+	'text <a href="exec:gt ''mirror'', ''start''">mirrors</a>, and she even has a packed <a href="exec:gt ''pavlov_home'', ''Shoe Closet''">shoe closet</a>.'
+	act 'Leave room':gt 'pavlov_home', 'hallway'
+end	
+
+if $ARGS[0] = 'kitchen':	
+	$loc = 'pavlov_home'
+	$loc_arg = 'kitchen'
+	$menu_loc = 'pavlov_home'
+	$menu_arg = 'kitchen'
+	$locclass = 'kitr'
+	menu_off = 0
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	gs 'kit_din'
+	'<center><b><font color = maroon>Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/kitchen.jpg"></center>'
+	'The room is <<$hypnoKitchenDirtiness>>, and there are dishes on most of the available surfaces.'
+	act 'Leave':gt 'pavlov_home','hallway'
+	act 'Look in the fridge': gt 'pavlov_home', 'fridge'
+	dynamic $fill_bottle
+	dynamic $driwater
+end
+
+if $ARGS[0] = 'fridge':
+	menu_off = 1
+	*clr & cla
+	minut += 1
+	if anushfood_day ! daystart:
+		anushbeer_count = 2
+		anushvodka_count = 5
+		anushsup_count = 1
+	end
+	gs 'stat'
+	if anushbeer_count = 2:
+		$anush_beer = ' 2 beers,'
+	elseif anushbeer_count = 1:
+		$anush_beer = ' 1 beer,'
+	else
+		$anush_beer = ''
+	end
+
+	if anushvodka_count = 5:
+		$anush_vodka = ' a full bottle of vodka,'
+	elseif anushvodka_count = 3:
+		$anush_vodka = ' a half-empty bottle of vodka,'
+	elseif anushvodka_count = 1:
+		$anush_vodka = ' a nearly empty bottle of vodka,'
+	else
+		$anush_vodka = ''
+	end
+
+	if anushsup_count >= 1:
+		$anush_sup = ' some left overs'
+	else
+		$anush_sup = ''
+	end
+
+	if anushbeer_count = 0 and anushvodka_count = 0 and anushsup_count = 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holodpusto.jpg"></center><br><font color = red>empty shelves.</font>'
+	if anushbeer_count > 0 and anushvodka_count > 0 and anushsup_count > 0:$r_pusto = '<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/holod'+rand(1,3)+'.jpg"></center>'
+	'You open the fridge and see:<<$anush_vodka>><<$anush_beer>><<$anush_sup>><<$r_pusto>>'
+
+	act 'Close the refrigerator': gt 'pavlov_home', 'kitchen'
+	if anushbeer_count > 0:
+		act 'Have a beer':
+			*clr & cla
+			minut += 5
+			gs 'drugs', 'alcohol', 'beer'
+			anushfood_day = daystart
+			anushbeer_count -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/beer'+rand(1,3)+'.jpg"></center>'
+			'You take a bottle of beer from the fridge and drink it, which quenches your thirst.'
+
+			act 'Continue': gt 'pavlov_home', 'fridge'
+		end
+	end
+	if anushvodka_count > 0:
+		act 'Drink some vodka':
+			*clr & cla
+			minut += 1
+			gs 'drugs', 'alcohol', 'vodka'
+			anushfood_day = daystart
+			anushvodka_count -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka'+rand(1,2)+'.jpg"></center>'
+			'You pour some vodka in a glass and drink it. You shiver as you feel the warm, burning sensation slowly slide down your gullet.'
+			act 'Put the bottle back in the fridge': gt 'pavlov_home', 'fridge'
+
+			act 'Drink more vodka':
+				*clr & cla
+				if anushvodka_count = 0:
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka0.jpg"></center>'
+					'<font color = red>There''s no vodka left. You drank it all!</font>'
+				elseif anushvodka_count > 0:
+					minut += 1
+					gs 'drugs', 'alcohol', 'vodka'
+					anushvodka_count -= 1
+					gs 'stat'
+					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/kuh/vodka'+rand(1,2)+'.jpg"></center>'
+					'You pour yourself another glass and drain it in one gulp. Wow, that stuff is strong!'
+				end
+				act 'Continue': gt 'pavlov_home', 'fridge'
+			end
+		end
+	end
+	if anushsup_count > 0:
+		act 'Eat some leftovers':
+			*clr & cla
+			minut += 5
+			anushfood_day = daystart
+			anushsup_count -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/shared/food/leftovers.jpg"></center>'
+			pcs_health += 10
+			pcs_mood += 20
+			fat += 2
+			pcs_energy += 50
+			if pcs_hydra >= 100:
+				pcs_hydra += 20
+			else
+				pcs_hydra += 40
+			end
+			cumspclnt = 2
+			gs 'cum_cleanup'
+			pcs_breath = 0
+			'It seems to be leftovers from a ready to make meal. You wonder if anyone here knows how to cook.'
+			act 'Continue': gt 'pavlov_home', 'fridge'
+		end
+	end
+end	
+
+if $ARGS[0] = 'Livingroom':	
+	*clr & cla
+	minut += 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/livingroom.jpg"></center>'
+	'text'
+	
+	act 'Hallway':gt 'pavlov_home', 'hallway'
+end		
+
+if $ARGS[0] = 'bathroom':
+	$loc = 'pavlov_home'
+	$loc_arg = 'bathroom'
+	$locM = 'pavlov_home'
+	$locM_arg ='bathroom'
+	$location_type = 'bathroom'
+	$bathtype = 'bathtub shower'
+	*clr & cla
+	menu_off = 0
+	minut += 1
+	gs 'stat'
+	'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/bathroom.jpg"></center>'
+	'The bathroom has seen better days. It looks like it hasn''t been cleaned for quite some time, with mold growing in the corners of the walls and floor.'
+	'The toilet sits along the far wall. There''s also a bathtub with an old plastic shower curtain hanging from a rod above it. It also seems that the latch on the door is broken.'
+	'You can do your hair and makeup in the <a href="exec:gt ''mirror'', ''start''">mirror</a> above the sink.'
+	*nl
+	if pirsA + pirsB + pirsC + pirsD + pirsE + pirsF + pirsN + pirsG + pirsGL > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	act 'Leave the bathroom': gt 'pavlov_home','hallway'
+	act 'Take a shower':
+		*clr & cla
+		menu_off = 1
+		minut += 10
+		dynamic $showerdin
+		gs 'stat'
+		'<center><h4><font color="maroon">Bathroom</font></h4></center>'
+		'<center><video autoplay loop src="images/shared/home/bathroom/dush.mp4"></video></center>'
+		'You take a quick shower.'
+		act 'Take a selfie':
+			gs 'telefon', 'Phone_selfie_image_bathing', 'shower'
+		end
+		act 'Get out of the shower': gt 'pavlov_home','bathroom'
+		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
+		killvar 'temp'
+	end
+	dynamic $bath
+	dynamic $bteeth
+	dynamic $tampon
+	dynamic $basin
+	gs 'din_van', 'prvt_pee'
+end
+
+if $ARGS[0] = 'second_bedroom':	
+	$loc = 'pavlov_home'
+	$loc_arg = 'second_bedroom'
+	$location_type = 'private'
+	$locclass = 'bedr'
+	*clr & cla
+	minut += 1
+	gs'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/pavlovhome/spareroom.jpg"></center>'
+	'text'
+	
+	act 'Hallway':gt 'pavlov_home', 'hallway'
+end	
+
+
+--- pavlov_home ---------------------------------

+ 2 - 2
locations/pet_dog.qsrc

@@ -72,9 +72,9 @@ if $ARGS[0] = 'activities_normal':
 	else
 		if rex['count_walk'] > 0 and hour > (rex['timer_walk'] + 3):
 			act 'Go for a walk with him '+iif(daystage = 5 or sunWeather = 0, '(0:10)', '(0:15)')+' ': gt 'pet_dog', 'exercise', 'walk'
-			if rex['count_run'] = 0 and $clothingworntype = 'danilovich' and $shoeworntype = 'danilovich' and daystage ! 5:
+			if rex['count_run'] = 0 and $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and hour > 6 and hour < 22:
 				act 'Go for a run with him (1:00)': gt 'pet_dog', 'exercise', 'run'
-			elseif rex['count_run'] = 0 and $clothingworntype = 'exercise' and $shoeworntype = 'trainers' and hour > 6 and hour < 22:
+			elseif rex['count_run'] = 0 and $clothingworntype = 'danilovich_outfits' and $shoeworntype = 'danilovich' and (hour < 7 or hour > 22):	
 				'<br>It''s too '+iif(hour < 7, 'early', 'late')+' to go for a run with him.'
 			end
 		end

+ 2 - 0
locations/placer_house.qsrc

@@ -142,6 +142,7 @@ elseif kol_man = 3:
 				KatjaQW['slut'] += 10
 				KatjaQW['horny'] = 0
 				if katjaQW['park_sex'] < 2: katjaQW['park_sex'] = 2
+				if katjaQW['simultanous_boys'] < 2: katjaQW['simultanous_boys'] = 2
 				if dick > npc_throat['A14']: npc_throat['A14'] += 1
 				if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 				if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1
@@ -398,6 +399,7 @@ elseif kol_man >= 4:
 			KatjaQW['slut'] += 10
 			KatjaQW['horny'] = 0
 			if katjaQW['park_sex'] < 3: katjaQW['park_sex'] = 3
+			if katjaQW['simultanous_boys'] < 2: katjaQW['simultanous_boys'] = 2
 			if dick > npc_throat['A14']: npc_throat['A14'] += 1
 			if npc_vag['A14'] < dick: npc_vag['A14'] += 1
 			if npc_vag['A14']*2 < dick: npc_vag['A14'] += 1

+ 21 - 4
locations/salon.qsrc

@@ -155,7 +155,7 @@ if $ARGS[0] = 'services':
 	act 'See the eyelash specialist':gt'salon','eyelashes'
 	
 	gs 'salon', 'discount', 5000
-	if money >= salon_rate or karta + bankDebtLimit >= salon_rate:
+	if (money >= salon_rate or karta + bankDebtLimit >= salon_rate) and salon['skin_care_day'] < max(daystart - 7,1):
 		act 'Skin care <<salon_rate>> <b>₽</b>':
 			if masseuse['jobtype'] > 0:  
 				epayments['value'] = 2500
@@ -167,9 +167,13 @@ if $ARGS[0] = 'services':
 			$epayments['description'] = 'skin care pampering'
 			gs 'shortgs', 'payments'
 		end	
-	else
+	elseif salon['skin_care_day'] < max(daystart - 7,1):
 		act 'Skin care (<font color="red"> <<salon_rate>> <b>₽</b> </font>)':
 			msg'You don''t have enough money for this!'
+		end	
+	else
+		act 'Skin care (<font color="red"> <<salon_rate>> <b>₽</b> </font>)':
+			msg'You need to wait a week since you last skin care treatment for a new to have any effect.'
 		end
 	end
 	
@@ -1757,11 +1761,24 @@ if $ARGS[0] = 'skin_care':
 	cla & *clr
 	minut += 60
 	inhib_exp += rand(1,5)
-	pcs_skin += 20
+	salon['skin_care_day'] = daystart
+	if pcs_skin < 200:
+		pcs_skin += 50
+	elseif pcs_skin <= 400: 
+		pcs_skin += 25
+	elseif pcs_skin <= 600:
+		pcs_skin += 15
+	elseif pcs_skin <= 800:
+		pcs_skin += 10
+	elseif pcs_skin <=995: 
+		pcs_skin += 5
+	else
+		pcs_skin = 1000
+	end
 	gs 'AppearanceSystem', 'UpdateBaseAppearnce'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/mall/salon/facialmask.jpg"></center>'
-	'You get a beauty mask treatment, afterwards your face feels smooth and your skin tight.'
+	'You get a beauty mask treatment, afterwards your face feels smooth and your skin tight. You are told that you should wait a week before getting a new treatment.'
 	act 'Leave':gt 'salon', 'start'
 end
 

+ 16 - 1
locations/shop.qsrc

@@ -485,7 +485,7 @@ if $shoplocation = 'clothing':
 
 		act 'View underwear': $shoplocation = 'underwear' & gt 'shop'
 
-		if konki!1:
+		if konki ! 1:
 			'A pair of ice-skates are available for 3000 <b>₽</b>.'
 			if money >= 3000:
 				act 'Buy ice skates (3000 <b>₽</b>)':
@@ -496,6 +496,21 @@ if $shoplocation = 'clothing':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/konki_shop.jpg"></center>'
 					'You buy a pair of ice skates.'
 
+					act 'Move away from the counter':gt'shop'
+				end
+			end
+		end
+		if pcs_ski_owned ! 1:
+			'A pair of skis and poles are available for 4000 <b>₽</b>.'
+			if money >= 4000:
+				act 'Buy skis (4000 <b>₽</b>)':
+					*clr & cla
+					money -= 4000
+					konki = 1
+
+					'<center><img <<$set_imgh>> src="images/pc/activities/ski_buy.jpg"></center>'
+					'You buy a pair of skis and poles.'
+
 					act 'Move away from the counter':gt'shop'
 				end
 			end

+ 6 - 1
locations/sleep.qsrc

@@ -524,6 +524,9 @@ if $ARGS[0] = 'wake':
 	menu_off = 1
 	InSleep = 1
 	gs 'stat'
+    if vomit['hangover'] = 1  or vomit['unlucky'] = 1 or vomit['morning_sick'] = 1:
+        gt 'home_activity', 'vomiting_check'
+    end
 	if MarishaQW["marisha_sleepover"] = 1: gs 'marisha_ev', 'morning'
 	if daystart < 10 and $start_type[1] = 'tg':'The first thing you think as you wake up is, "Damn! It''s is not a dream, I really am a woman now."'
 	if daystart >= 10 and daystart < 30 and $start_type[1] = 'tg':'Looking at your female body, you are still a little surprised it''s actually you.'
@@ -616,10 +619,12 @@ if $ARGS[0] = 'end':
 	slept_in = 0
 	strip_here = 0
 	SleepHorny = 0
-	if fullmorrout = 1 and $loc = 'bedrPar':
+    if fullmorrout = 1 and $loc = 'bedrPar':
 		gt 'vanrPar'
 	elseif fullmorrout = 1 and $loc = 'bedr':
 		gt 'vanr'
+    elseif vomit['morning_sick'] = 1 or vomit['hangover'] = 1 or vomit['unlucky'] = 1:
+        gt 'home_activity', 'vomiting_exit'
 	else
 		gt $loc, $loc_arg
 	end

+ 3 - 0
locations/sportShop.qsrc

@@ -54,6 +54,9 @@ if $ARGS[0] = 'start' or $ARGS[0] = '':
 	if konki = 0 and money >= 3000:
 		*p func ('$single_stock_item', 1, 'Ice Skates', 3000, 'konki', 'sportshop', 'start')
 	end
+	if pcs_ski_owned = 0 and money >= 4000:
+		*p func ('$single_stock_item', 1, 'Skis', 4000, 'pcs_ski_owned', 'sportshop', 'start')
+	end
 	if refillable_bottle = 0 and money >= 1000 and bag > 0: 
 		*p func ('$single_stock_item', 1, 'Refillable Water Bottle', 1000, 'refillable_bottle', 'sportshop', 'start')		
 	end

+ 14 - 7
locations/stat.qsrc

@@ -490,13 +490,20 @@ if minut >= 60:
 	end
 	
 	!! code to trigger vomitting based on morning sickness, hangovers, or just plain bad luck
-	if sleep = 1:
-		if alko > 4:
-			vomit['hangover'] = 1
-		elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
-			vomit['morning_sick'] = 1
-		elseif rand(1,100) = 100: 
-			vomit['unlucky'] = 1
+    if Insleep = 0:   
+            vomit['daily_check'] = 0
+    end
+
+	if Insleep = 1:
+        if vomit['daily_check'] = 0:
+            vomit['daily_check'] = 1
+	        if alko > 4:
+		    	vomit['hangover'] = 1
+		     elseif pregchem > 600 and pregchem < 2160 and rand(1,4) = 4:
+		    	 vomit['morning_sick'] = 1
+		     elseif rand(1,100) = 100: 
+		    	vomit['unlucky'] = 1
+            end
 		end
 	end
 	

+ 99 - 2
locations/street_event.qsrc

@@ -821,7 +821,7 @@ if $ARGS[1] = 'main':
 					*clr & cla
 					minut += 5
 					'<<$streetev_title>>'
-					'<center><video autoplay loop src="images/locations/shared/street/sharkdress.mp4"></video></center>'
+					'<center><video autoplay loop src="images/locations/shared/street/sharkdress'+ rand(1,2) +'.mp4"></video></center>'
 					'As you walk down the street, someone comes up behind you, grabs the top of your dress and yanks it down around your ankles, which leaves you standing stark naked. You quickly squat down and grab your dress, pulling it back up and into place. By that time, who ever did this is long gone.'
 					*p 'You look around and notice several people staring at you. You are sure they''ve seen everything. '
 					if exhibitionist_lvl = 1:
@@ -886,7 +886,8 @@ if $ARGS[1] = 'main':
 				gt $loc
 			end
 		elseif streetrand > 82:
-			if PCloSkirt > 0 and $pantyworntype ! 'none':
+		!! when sunny and wearing panties
+			if PCloSkirt > 0 and sunWeather = 1 and $pantyworntype ! 'none':
 				*clr & cla
 				menu_off = 1
 				minut += 5
@@ -908,6 +909,55 @@ if $ARGS[1] = 'main':
 				end
 				gs 'stat'
 				act 'Continue':gt $loc
+		!! when rainy and not wearing panties
+			elseif sunWeather = 0 and $pantyworntype = 'none':
+				*clr & cla
+				menu_off = 1
+				minut += 5
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/breeze_rainy.mp4"></video></center>'
+				'A strong windy breeze blows down the street which causes your skirt to blow up entirely, exposing all of your crotch to the people around. You struggle pushing it back down where it belongs, as the breeze continues to expose you.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You look around and notice several people staring at you. You are sure they''ve seen everything. You can''t help but smile, loving the attention even if it wasn''t your idea. You casually continue on your way, but with an extra bit of sway in your hips.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You look around and notice several people staring at you. <i>They have probably seen that I don''t wear underwear.</i> you think to yourself and continue on your way.'
+				else
+					pcs_mood -= 10
+					'You look around and notice several people staring at you. You are sure they''ve seen everything. You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			else
+				gt $loc
+			end
+		elseif streetrand > 81:
+			cla
+			if PCloSkirt > 0 and PCloOnePiece = 1 and hour >= 10 or hour < 2:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><img <<$set_imgh>> src="images/locations/shared/street/street_groped'+ rand(1,2) +'.jpg"></center>'
+				'As you walk down the street, someone comes up behind you and grabs your ass, sqeezing it tightly. You flinch while quickly turning around angrily but only seeing your perpetrator running away.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the ''extra'' attention even if it wasn''t your idea. You casually continue on your way, but with an extra bit of sway in your hips.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You swear loudly in his direction, checking your purse to see if he stole something. You continue on your way, albeit a little more annoyed than you were before.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
 			else
 				gt $loc
 			end
@@ -927,6 +977,53 @@ if $ARGS[1] = 'main':
 			else
 				gt $loc
 			end
+		elseif streetrand > 79:
+			cla
+			if $braworntype = 'none' and PCloThinness = 4:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra1.mp4"></video></center>'
+				'As you walk down the street you feel wobbling your breasts freely under your outfit, which can probably be seen by people walking by too.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a thin outfit.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			elseif $braworntype = 'none' and PCloThinness >= 5:
+				*clr & cla
+				menu_off = 1
+				gs 'stat'
+				'<<$streetev_title>>'
+				'<center><video autoplay loop src="images/locations/shared/street/street_no_bra'+ rand(2,4) +'.mp4"></video></center>'
+				'As you walk down the street you feel wobbling your breasts freely under your thin outfit, stretching it, emphasizing the outline of your tits, which can definitely be seen by people walking by too. As you look closely both men and women are staring at your jiggling tits.'
+				if exhibitionist_lvl = 1:
+					gs 'arousal', 'flash', -5
+					gs 'arousal', 'end'
+					pcs_mood += 10
+					'You can''t help but smile, loving the attention. You casually continue on your way, but with an extra bit of sway in your tits.'
+				elseif exhibitionist_lvl > 1:
+					pcs_mood -= 2
+					'You feel ashamed and blush bright red and hurry on your way, thinking it was a bad idea not wearing a bra today and such a thin outfit.'
+				else
+					pcs_mood -= 10
+					'You blush bright red and hurry on your way.'
+				end
+				gs 'stat'
+				act 'Continue':gt $loc
+			else
+				gt $loc
+			end
 		elseif streetrand > 78:
 			cla
 			if hour >= 9 or hour < 2:

+ 442 - 191
locations/stripclub.qsrc

@@ -8,18 +8,36 @@ if $ARGS[0] = 'start':
 	$menu_loc = 'stripclub'
 	$menu_arg = 'start'
 	menu_off = 0
+	if sound = 0:
+		if month >= 11 and month <= 12 or month >= 1 and month <= 3:
+			if hour >= 3 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/zima.mp3',30
+			if hour >= 18 or hour <= 2: PLAY 'sound/street_club.mp3',30
+		else
+			if hour >= 3 and hour <= 17: PLAY 'sound/street2.mp3',30 & PLAY 'sound/street7.mp3',30 & PLAY 'sound/street_leto.mp3',30
+			if hour >= 18 or hour <= 2: PLAY 'sound/street_club.mp3',30
+		end
+	end
 	gs 'stat'
 	gs 'themes', 'indoors'
-	'<center><b><font color="maroon">Strip Club</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub.jpg"></center>'
+	'<center><b><font color="maroon">Fuzzy Dice Strip Club</font></b></center>'
+	if month >= 11 and month <= 12 or month >= 1 and month <= 3:
+		if hour >= 19 or hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_winter.jpg"></center>'
+		if hour >= 6 and hour <= 18: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_winter.jpg"></center>'
+	else
+		if hour >= 20 and hour <= 23: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer_1.jpg"></center>'
+		if hour >= 0 and hour <= 5: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_night_summer_2.jpg"></center>'
+		if hour >= 6 and hour <= 19: '<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/club_day_summer.jpg"></center>'
+	end
 	*nl
 
 	act 'Leave': gt 'city_redlight', 'start'
 
-	if hour = 2:
+	'There are other strip clubs in the area, the <a href="exec:view''images/locations/city/redlight/stripclub/macho.jpg''">Macho</a>, the <a href="exec:view''images/locations/city/redlight/stripclub/maximus_night.jpg''">Maximus</a> and the <a href="exec:view''images/locations/city/redlight/stripclub/penthouse_night.jpg''">Penthouse</a>, but they are not as popular as the Fuzzy Dice.'
+
+	if hour = 3:
 		'The strip club is closing, and a security guard ushers everyone out.'
-	elseif hour > 2 and hour < 11:
-		'The strip club is closed. You notice a sign on the door: The business hours are between 18:00 - 02:00.'
+	elseif hour > 3 and hour < 18:
+		'The strip club is closed. You notice a sign on the door stating that business hours are between 18:00 and 03:00.'
 	else
 		if stripdolg > 0:
 			if money >= 50000:
@@ -30,24 +48,45 @@ if $ARGS[0] = 'start':
 				end
 			else
 				*nl
-				'You still owe a 50,000 <b>₽</b> fine for your illegal actions. You cannot return to the club until you have paid it off.'
+				'You still owe a 50,000 <b>₽</b> fine for your illegal actions. You can''t return to the club until you''ve paid it off.'
 			end
 		else
 			if age >= 18 or fakepassport = 1:
-				if stripwork = 1:
-					'"Welcome back <<$pcs_nickname>>, are you working tonight?" he asks.'
+				if ((day = 3 or day = 4) and stripwork = 1) or (day = 5 or day = 6) and stripwork1 = 1)):
+					'"Evening, <<$pcs_stagename>>. You working tonight?" he asks.'
+					'You give him a quick nod as you head for the employee entrance.'
 					act 'Use the employee''s entrance':frost = 0 & gt 'stwork', 'start'
+				elseif (stripwork = 1 or stripwork1 = 1) or (stripbarwork = 1 or stripbarwork1 = 1):
+					'Hey, <<$pcs_stagename>>. Paying us a visit on your night off?" he asks.'
+					'You nod and he stands aside to let you in. "I''m sure the patrons won''t recognize you with clothes on," he says with a smile.'
 				else
-					'The security guard stops you, looking you up and down, he asks to see your ID.'
-					'"OK, your ID checks out, you are free to enter." he tells you.'
+					'The security guard stops you and, looking you up and down, asks to see your ID.'
+					'He looks it over before nodding. "You''re free to enter," he says and stands aside to let you in.'
 				end
 				if stripdolg = 0:
-					if cfnm = 1 and money >= 500:
+					if cfnm = 1 and (stripwork = 1 or stripwork1 = 1) or (stripbarwork = 1 or stripbarwork1 = 1):
+						act 'Enter the club':
+							cla
+							minut += 5
+							frost = 0
+							'"As you know, it''s Ladies Night tonight. Enjoy," he says with a smile.'
+							gt 'stripclub', 'forwoman'
+						end
+					elseif cfnm = 0 and (stripwork = 1 or stripwork1 = 1) or (stripbarwork = 1 or stripbarwork1 = 1):
+							act 'Enter the club':
+							cla
+							minut += 5
+							frost = 0
+							'"Enjoy the girls tonight," he says with a smile.'
+							gt 'stripclub', 'forman'
+						end
+					elseif cfnm = 1 and money >= 500:
 						act 'Enter the club (500 <b>₽</b>)':
 							cla
 							money -= 500
 							minut += 5
 							frost = 0
+							'"It''s Ladies Night tonight. Enjoy," he says with a smile.'
 							gt 'stripclub', 'forwoman'
 						end
 					elseif cfnm = 0 and money >= 300:
@@ -56,6 +95,7 @@ if $ARGS[0] = 'start':
 							money -= 300
 							minut += 5
 							frost = 0
+							'"Enjoy the girls tonight," he says with a smile.'
 							gt 'stripclub', 'forman'
 						end
 					else
@@ -64,52 +104,150 @@ if $ARGS[0] = 'start':
 					end
 				end
 				if pcs_dancero > 0 and stripwork = 0 and pcs_inhib >= 50:
-					act 'See the manager for work': gt 'stripclub', 'manager'
+					act 'Ask the manager about working as a stripper': gt 'stripclub', 'manager_stripper'
 				elseif stripwork = 0 and pcs_inhib < 50:
 					'You could ask the manager for a job, but you don''t feel confident enough to be a stripper. You should get more used to showing off your body first.'
 				end
+				!!if pcs_inhib >= 60 and (stripbarwork = 0 or stripbarwork1 = 0):
+					!!act 'Ask the manager about working in the bar': gt 'stripclub', 'manager_bargirl'
+				!!elseif pcs_inhib < 60 and (stripbarwork = 0 or stripbarwork1 = 0):
+					!!'You could ask the manager for a job, but you don''t feel confident enough to work in a strip club, even if it is just in the bar.'
+				!!end
 			else
-				'The security guard stops you. Looking you up and down, he asks to see your ID.'
-				'You make a show of rummaging through your purse. "Sorry, I must have left my ID at home."'
-				'"You need to leave this establishment, be sure to come back when you are old enough," he tells you.'
+				'The security guard stops you and, looking you up and down, asks to see your ID.'
+				'You make a show of rummaging through your purse. "Sorry, I must have left it at home."'
+				'"You need to leave, but be sure to come back when you''re old enough," he replies.'
 			end
 		end
 	end
 end
 
-if $ARGS[0] = 'manager':
+if $ARGS[0] = 'manager_stripper':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/tryout.jpg"></center>'
 	minut += 15
 	gs 'stat'
-	'After you''ve introduced yourself, the manager observes you for a while and asks, "Are you really 18 years old? I had a visit from the police last week, and they found an under-aged girl working here. I was fortunate enough that the officers could be bribed."'
-	*nl
-
+	'You enter the manager''s office and he greets you with a smile. "Hello and welcome to the Fuzzy Dice. How can I help you?"'
+	'You return the smile. "Hi, I was wondering if I could get a job here as a stripper?"'
+	'The manager looks you over. "Are you at least 18 years old? I had a visit from the police last week, and they found an underage girl working here. I was fortunate enough that the officers could be bribed."'
+	
 	if age >= 18 or fakepassport = 1:
 		if age >= 18:
-			'"Yes I am," you answer him.'
+			'"Yes I am," you confidently reply and hand him your ID.'
 		else
 			'"Yes I am," you answer, handing him your fake passport.'
 			'You see him frown as he checks your passport with suspicion. "Well, I guess everything is in order."'
 		end
 		'He leads you to one of the private booths and points to the pole. "Show me what you can do."'
 		if pcs_dancero >= 40 and pcs_dancpol >= 30:
-			'You dance sensually, clearly he''s smitten by you. He asks you to sit down. "Our business hours are between 18:00 to 02:00. Some days there are only male strippers performing. We don''t pay strippers, but the customers tip generously. Think of it as an incentive, perform well and you''ll earn a tip."'
-			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per lap dance. The stripper gets 400 <b>₽</b>, and the rest belongs to the club. They may want further entertainment. As the club doesn''t operate as a brothel, we don''t really accept that kind of business, but we usually turn a blind eye to it."'
-			'"One last thing that I nearly forgot, dancing on stage involves a lot of work on the pole. Unless you do that, it is unlikely you will earn anything. There is no set schedule, the employees choose when they want to come to work. So what do you say, are you interested?"'
-			act 'Accept his offer':
+			'You dance sensually, and clearly he''s smitten by you as he asks you to sit down. "Our business hours are between 18:00 and 03:00. We don''t pay you, but the customers tip generously. Think of it as an incentive; perform well and you''ll earn a tip."'
+			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per dance. The stripper gets 400 <b>₽</b>, and the rest goes to the club. Some clients may want to pay extra for further ''entertainment'', but we are <i>not</i> a brothel. A quick blowjob is fine, but anything further will arouse suspicion. You''re not forced to do this by the way, so call for security if they start getting too pushy with you. You''re free to do whatever you want with them outside of business hours though."'
+			'"One last thing. Dancing on stage involves a lot of work on the pole, so unless you can do that, it''s unlikely you will earn anything. We have a set schedule, so you can choose whether you wish to work Wednesday and Thursday nights, or Friday and Saturday nights. Tuesday is Ladies Night and is for male strippers only, so it''s a night off for all the girls. So what do you say? Interested?"'
+			act 'Take the weekday shifts':
+				*clr & cla
+				stripwork = 1
+				gs 'stat'
+				'You think about it for a minute and smile at him as you accept his offer, choosing to work on Wednesday and Thursday nights.'
+				'The manager leads you to the dressing room and tells a woman responsible for the costumes that you''re going to join the club. He also introduces you to the chief of security, who takes your picture and makes you sign some documents.'
+				if $pcs_stagename = '':
+					'"Our girls don''t perform under their real name for obvious reasons. What would you like your stage name to be?"'
+						$pcs_stagename = input("What name would you like to use at the strip club? (Leave blank for Sapphire)")
+					if $pcs_stagename = '':$pcs_stagename = 'Sapphire'
+				end
+				'"<<$pcs_stagename>>. I like it," the manager says with a smile.'
+				'Once you''re done with the forms, you''re sent back to the manager''s office.'
+				'"Before you go on stage, I expect you to drop by my office so I can see if you''re up to our club standards. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about," he says before ushering you out of his office again.'
+
+				if cfnm = 0:act 'Head to the dressing room':gt 'stwork', 'start'
+					if cfnm = 1:
+					'There are only males performing tonight, so the room is full of guys getting ready to perform.'
+					act 'Leave':gt 'stripclub', 'work_leave'
+				end
+			end
+			
+			act 'Take the weekend shifts':
+				*clr & cla
+				stripwork1 = 1
+				gs 'stat'
+				'You think about it for a minute and smile at him as you accept his offer, choosing to work on Friday and Saturday nights.'
+				'The manager leads you to the dressing room and tells a woman responsible for the costumes that you''re going to join the club. He also introduces you to the chief of security, who takes your picture and makes you sign some documents.'
+				if $pcs_stagename = '':
+					'"Our girls don''t perform under their real name for obvious reasons. What would you like your stage name to be?"'
+						$pcs_stagename = input("What name would you like to use at the strip club? (Leave blank for Sapphire)")
+					if $pcs_stagename = '':$pcs_stagename = 'Sapphire'
+				end
+				'"<<$pcs_stagename>>. I like it," the manager says with a smile.'
+				'Once you''re done with the forms, you''re sent back to the manager''s office.'
+				'"Before you go on stage, I expect you to drop by my office so I can see if you''re up to our club standards. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about," he says before ushering you out of his office again.'
+
+				if cfnm = 0:act 'Head to the dressing room':gt 'stwork', 'start'
+					if cfnm = 1:
+					'There are only males performing tonight, so the room is full of guys getting ready to perform.'
+					act 'Leave':gt 'stripclub', 'work_leave'
+				end
+			end
+
+			act 'Reject his offer':
+				*clr & cla
+				gs 'stat'
+				'You thank him for the offer, but you''re not ready to commit to anything yet.'
+				'You can see on his face that he''s disappointed, but he can''t really do anything about your decision. He thanks you and tells you if you ever change your mind you''re welcome back.'
+				act 'Leave':gt 'stripclub', 'work_leave'
+			end
+		elseif pcs_dancero >= 40:
+			'After a minute, he stops you and shakes his head. "Your poledancing is still lacking <<$pcs_nickname>>. If you want this job, you''ll have to take some dance classes first. I believe you can do that at the gym."'
+			'"Come back when you can handle the pole, and I''ll give you another chance."'
+			act 'Leave':gt 'stripclub', 'work_leave'
+		else
+			'After a minute he stops you and shakes his head. "Your dancing is very lacking <<$pcs_nickname>>. If you want this job, you''ll have to take some dance classes first. I believe you can do that at the gym."'
+			'"Come back when you can dance on stage without me worrying you''ll fall off, and I''ll give you another chance."'
+			act 'Leave':gt 'stripclub', 'work_leave'
+		end
+	!!elseif stripbarwork = 1 or stripbarwork1 = 1:
+		'You enter the manager''s office and he greets you with a smile. "Hey there <<$pcs_nickname>>, how can I help you?"'
+		'You return the smile. "Hi, I was wondering if I could get a job as a stripper?"'
+		'The manager chuckles. "Bored of watching the action and wanting to get in on it?"'
+		'He leads you to one of the private booths and points to the pole. "Okay. Show me what you can do."'
+		if pcs_dancero >= 40 and pcs_dancpol >= 30:
+			'You dance sensually, and clearly he''s smitten by you as he asks you to sit down. "As you know, our business hours are between 18:00 and 03:00. We don''t pay you, but the customers tip generously. Think of it as an incentive; perform well and you''ll earn a tip."'
+			'"Strippers can perform lap dances for clients at their request for 1000 <b>₽</b> per dance. The stripper gets 400 <b>₽</b>, and the rest goes to the club. Some clients may want to pay extra for further ''entertainment'', but we are <i>not</i> a brothel. A quick blowjob is fine, but anything further will arouse suspicion. You''re not forced to do this by the way, so call for security if they start getting too pushy with you. You''re free to do whatever you want with them outside of business hours though."'
+			'"One last thing. Dancing on stage involves a lot of work on the pole, so unless you can do that, it''s unlikely you will earn anything. Coincidentally, my current schedule for strippers is the same for the bar, so you can choose when you want to work. You''ll remember that Tuesday night is Ladies Night and is for male strippers only. So what do you say? Interested?"'
+			act 'Take the weekday shifts':
 				*clr & cla
 				stripwork = 1
 				gs 'stat'
-				'You think about it for a minute and smile at him as you accept his offer.'
+				'You think about it for a minute and smile at him as you accept his offer, choosing to work on Wednesday and Thursday nights.'
+				'The manager leads you to the dressing room and tells a woman responsible for the costumes that you''re going to join the club. He also introduces you to the chief of security, who takes your picture and makes you sign some documents.'
+				if $pcs_stagename = '':
+					'"Our girls don''t perform under their real name for obvious reasons. What would you like your stage name to be?"'
+						$pcs_stagename = input("What name would you like to use at the strip club? (Leave blank for Sapphire)")
+					if $pcs_stagename = '':$pcs_stagename = 'Sapphire'
+				end
+				'"<<$pcs_stagename>>. I like it," the manager says with a smile.'
+				'Once you''re done with the forms, you''re sent back to the manager''s office.'
+				'"Before you go on stage, I expect you to drop by my office so I can see if you''re up to our club standards. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about," he says before ushering you out of his office again.'
+
+				if cfnm = 0:act 'Head to the dressing room':gt 'stwork', 'start'
+					if cfnm = 1:
+					'There are only males performing tonight, so the room is full of guys getting ready to perform.'
+					act 'Leave':gt 'stripclub', 'work_leave'
+				end
+			end
+			
+			act 'Take the weekend shifts':
+				*clr & cla
+				stripwork1 = 1
+				gs 'stat'
+				'You think about it for a minute and smile at him as you accept his offer, choosing to work on Friday and Saturday nights.'
 				'The manager leads you to the dressing room and tells a woman responsible for the costumes that you''re going to join the club. He also introduces you to the chief of security, who takes your picture and makes you sign some documents.'
 				if $pcs_stagename = '':
-					'Most of our girls don''t perform under their own name for obvious reasons. What would you like your stripper name to be?'
-						$pcs_stagename = input("Which name would you like to use at the strip club? (Leave blank for <<$pcs_nickname>>)")
-					if $pcs_stagename = '':$pcs_stagename = '<<$pcs_nickname>>'
+					'"Our girls don''t perform under their real name for obvious reasons. What would you like your stage name to be?"'
+						$pcs_stagename = input("What name would you like to use at the strip club? (Leave blank for Sapphire)")
+					if $pcs_stagename = '':$pcs_stagename = 'Sapphire'
 				end
-				'After you''re done with the forms, you are sent back to the manager''s office.'
-				'"Before you go on stage your first time, I expect you to drop by my office so that I can check if you are up to our club standards, <<$pcs_stagename>>. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about," he tells you before ushering you out of his office again.'
+				'"<<$pcs_stagename>>. I like it," the manager says with a smile.'
+				'Once you''re done with the forms, you''re sent back to the manager''s office.'
+				'"Before you go on stage, I expect you to drop by my office so I can see if you''re up to our club standards. It''s just a routine check to make sure that the club''s reputation stays intact. Nothing to worry about," he says before ushering you out of his office again.'
 
 				if cfnm = 0:act 'Head to the dressing room':gt 'stwork', 'start'
 					if cfnm = 1:
@@ -131,17 +269,86 @@ if $ARGS[0] = 'manager':
 			act 'Leave':gt 'stripclub', 'work_leave'
 		else
 			'After a minute he stops you and shakes his head. "Your dancing is very lacking <<$pcs_nickname>>. If you want this job, you''ll have to take some dance classes first. I believe you can do that at the gym."'
-			'"Come back when you can dance on stage without me having to worry you''ll fall off, and I''ll give you another chance."'
+			'"Come back when you can dance on stage without me worrying you''ll fall off, and I''ll give you another chance."'
 			act 'Leave':gt 'stripclub', 'work_leave'
 		end
+	
 	else
 		'"Nearly..." you say dejectedly.'
-		'"Right. You need to leave this establishment, be sure to come back when you are old enough," he tells you.'
+		'"Right. You need to leave, but be sure to come back when you''re old enough," he replies.'
 
 		act 'Leave':gt 'city_redlight', 'start'
 	end
 end
 
+!!if ARGS[0] = 'manager_bargirl'
+	!!*clr & cla
+	!!'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/tryout.jpg"></center>'
+	!!minut += 15
+	!!gs 'stat'
+	!!'You enter the manager''s office and he greets you with a smile. "Hello and welcome to the Fuzzy Dice. How can I help you?"'
+	!!'You return the smile. "Hi, I was wondering if I could get a job working in your bar?"' 
+	!!'The manager looks you over. "Are you at least 18 years old? I had a visit from the police last week, and they found an underage girl working here. I was fortunate enough that the officers could be bribed."'
+	!!*nl
+
+	!!if age >= 18 or fakepassport = 1:
+		!!if age >= 18:
+			!!'"Yes I am," you confidently reply and hand him your ID.'
+		!!else
+			!!'"Yes I am," you answer, handing him your fake passport.'
+			!!'You see him frown as he checks your passport with suspicion. "Well, I guess everything is in order."'
+		!!end
+		!!'He leads you to the bar and passes you over to who you assume to be the bar manager, a woman you would estimate to be around the same age as your mother.'
+		!!'"Got a potential recruit here, Nina," he says and motions for you to introduce yourself before heading back to his office.'
+		!!'The woman smiles at you and offers you her hand. "Nina."'
+		!!'You shake her hand. "<<$pcs_firstname>>, but most people just call me <<$pcs_nickname>>."'
+		!!*nl
+		!!'"Okay, <<$pcs_nickname>>. Do you have any experience working in a bar?"'
+			!!if Worked in the Roadhouse and such
+				!!'"Somewhat," you reply. "I used to work in a diner."'
+				!!'"So you would have no issues running drinks to patrons, but you''ll need training before you can work behind the bar."'
+				!!'"Is that a problem?" you ask.'
+				!!'"Not at all," she replies. "As you can see, this is a fast paced work environment. Our patrons get thristy, and not just for drinks. If you can run drinks without any trouble, then I''ll find the time to train you to work the bar."'
+			!!else
+				!!'You shake your head. "No, I''ve never had a job like this before. Is that a problem?"'
+				!!'She frowns. "It''s not ideal. I can''t let you work in such a fast paced bar with zero experience. You would have to settle for running drinks on the floor until I can find the time to train you. Our patrons get very thirsty, and not just for drinks, so it would be some very intense on the job learning for you."'
+			!!end
+		!!'"We''ll deal with these hurdles when we reach them. Did you have any questions for me?"'
+		!!'"A few," you reply. "When do I work, what do I get paid and what type of alcohol do you sell?"'
+		!!'She smiles. "The obvious ones I see. The club operates between 18:00 and 03:00 and I currently have two shift patterns open. Wednesday and Thursday nights, or weekend work on Friday and Saturday. You get paid monthly plus tips. As for what we sell, it''s mostly spirits, cocktails and bottled beer. You can worry about that when you get your training. So, are you interested?"'
+			
+			!! act 'Take the job'
+				!!*clr & cla
+				!!gs 'stat'
+				
+				!!'"I''ll take it," you say with a smile.'
+				!!"Excellent," she replies. "Which shift pattern suits you?"'
+					
+					!!act 'Take the weekday shifts'
+					!!stripbarwork = 1
+					!!'"Great. Come see me next week for your first shift and I''ll get you set up."'
+					!!act 'Leave': gt 'stripclub', 'work_leave'
+					
+					!!act 'Take the weekend shifts'
+					!!stripbarwork1 = 1
+					!!'"Great. Come see me next week for your first shift and I''ll get you set up."'
+					!!act 'Leave': gt 'stripclub', 'work_leave'
+			!!end
+
+			!!act 'Reject her offer'
+				!!*clr & cla
+				!!gs 'stat'
+				!!'"Sorry, but I don''t feel like I''m quite ready for a job like this yet," you say and she smiles.'
+				!!"That''s fine," she replies. "Come back when you are."'
+				!!act 'Leave': gt 'stripclub', 'work_leave'
+			!!end
+	!!else
+		!!'"Nearly..." you say dejectedly.'
+		!!'"Right. You need to leave, but be sure to come back when you''re old enough," he replies.'
+
+		!!act 'Leave':gt 'city_redlight', 'start'
+	!!end
+!!end	
 if $ARGS[0] = 'work_leave':
 	if cfnm = 0:
 		gt 'stripclub', 'forman'
@@ -158,24 +365,15 @@ if $ARGS[0] = 'forman':
 	gs 'stat'
 	'<center><b><font color="maroon">Strip Club</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub1.jpg"></center>'
-	'There are some girls on the stage, dancing to the music. You notice a sign offering private dances, costing 1000 <b>₽</b> per dance.'
+	'There are some girls on the stage dancing to the music. You notice a sign offering private dances, costing 1000 <b>₽</b> per dance.'
 
 	act 'Leave': minut += 5 & gt 'stripclub', 'start'
-	if hour ! 2:
+	if hour < 2:
 		act 'Watch a striptease':gt 'stripclub', 'stol'
-
 		if money >= 1000: act 'Order a private dance (1,000 <b>₽</b>)':gt 'stripclub', 'privat'
-
-		if money >= 5000:
-			act 'Order a special show (5,000 <b>₽</b>)':
-				stprrand = rand(0, 1)
-				money -= 5000
-
-				if stprrand = 0:gt 'stripclub', 'stpr1'
-				if stprrand = 1:gt 'stripclub', 'stpr2'
-			end
-		end
+		!! if money >= 1000 and AlbinaQW['stripper'] = 1 and (day = 5 or day = 6): act 'Order a private dance from Albina (1,000 <b>₽</b>)':gt 'stripclub', 'albina_dance'
 	end
+	!!if hour < 2 and minut < 30: act 'Get a drink at the bar': gt 'stripclub', 'bar' 
 end
 
 if $ARGS[0] = 'privat':
@@ -189,14 +387,14 @@ if $ARGS[0] = 'privat':
 
 	if privrand = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/priv2.jpg"></center>'
-		'During the striptease, the girls seem to be enjoying the female company and begin to caress you openly, making the male customers a bit jealous as they don''t get to enjoy the same attention as you''re getting.'
-
-		act 'Finish':gt 'stripclub', 'forman'
-		act 'Let them continue on':gt 'stripclub', 'privsex'
+		'You order a private dance and one of the dancers leads you to a private room, where you''re joined by another girl. They seem to enjoy the female company as they give you a double dance and you can feel your pussy growing slightly wet.'
+		'When they finish their dance, one of them climbs onto your lap and whispers in your ear. "2000 <b>₽</b> and I''ll eat your pussy, right here, right now..."'
+		if money >= 2000: act 'Accept':gt 'stripclub', 'privsex'
+		act 'Leave':gt 'stripclub', 'forman'
 
 	elseif privrand > 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/privat.jpg"></center>'
-		'There are some very hot girls dancing around you. You feel your pulse rise. Their movements are just like an aphrodisiac.'
+		'You order a private dance and two very hot girls lead you to a private room. They push you down into the chair and start dancing around you in a very erotic manner as they strip each other. You feel your heart starting to race and your pussy growing slightly wet.'
 
 		act 'Finish':gt 'stripclub', 'forman'
 		if money >= 1000: act 'Order another dance (1,000 <b>₽</b>)':gt 'stripclub', 'privat'
@@ -207,39 +405,81 @@ if $ARGS[0] = 'stol':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub2.jpg"></center>'
-	'The stage is lit up as a girl is dancing and undressing erotically before a strenuous male audience.'
+	'The stage is lit up as a girl walks out before a strenuous male audience.'
 
 	act 'Watch the striptease':
-		*clr & cla
-		gs 'stat'
-		minut += 15
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub4.jpg"></center>'
-		'The girl dances in front of you, clearly hoping you''ll give her a tip.'
-
-		if money >= 50:
+		!!if rand (0,3) = 0:
+			!!if (year = 2017 and month > 8) and AlbinaQW['stripper'] = 0 and (day = 5 or day = 6):
+				!!*clr & cla
+				!!gs 'stat'
+				!!pcs_horny += 5
+				!!minut += 15
+				!!AlbinaQW['stripper'] = 1:
+				!!'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub4.jpg"></center>'
+				!!'As you look at the girl on stage, you can''t help but think that she looks familiar. You then look closer and notice that it''s Albina!'
+				!!if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
+					!!'She smiles when she sees you and dances up close to you as she strips, wiggling her bubble butt in your face.'
+					!!if money >= 50: 'You throw 50 <b>₽</b> onto the stage in front of her and she gives you a wink before moving back into the middle of the stage.'
+					!!'She teasingly tugs at her skimpy thong before slowly peeling it off, much to the delight of the patrons around you who oggle at her naked body. Her show soon ends and she gathers her clothes and tips up before strutting off the stage as men hoot and holler.'
+				!!else 
+					!!'You make eye contact and notice a flash of recognition in her eyes, but other than that she doesn''t acknowledge you in the slightest, continuing her performance and stripping down.'
+					!!if money >= 50: 'You throw 50 <b>₽</b> onto the stage in front of her, but she just rolls her eyes and moves over to dance in front of a group of men offering her far more generous tips.'
+					!!'She finishes her show by teasingly tugging off her thong, much to the delight of the patrons around you who oggle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+				!!end
+				!!'A few minutes later, Albina walks out onto the floor wearing her skimpy outfit and immediately grabs your arm before dragging you into a private room.'
+				!!gt 'stripclub', 'albina_confront'
+			!!elseif AlbinaQW['stripper'] = 1 and (day = 5 or day = 6):
+				!!*clr & cla
+				!!gs 'stat'
+				!!pcs_horny += 5
+				!!minut += 15
+				!!AlbinaQW['stripper'] = 1:
+				!!'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub4.jpg"></center>'
+				!!'You smile when you see Albina strutting up to start her show.'
+				!!if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
+					!!'She smiles when she sees you and dances up close to you as she strips, wiggling her bubble butt in your face.'
+					!!if money >= 50: 'You throw 50 <b>₽</b> onto the stage in front of her and she gives you a wink before moving back into the middle of the stage.'
+					!!'She teasingly tugs at her skimpy thong before slowly peeling it off, much to the delight of the patrons around you who oggle at her naked body. Her show soon ends and she gathers her clothes and tips up before strutting off the stage as men hoot and holler.'
+				!!else 
+					!!'She doesn''t return your smile when she sees you, however, and barely acknowledges you as she starts stripping down and dancing on the pole.' 
+					!!if money >= 50: 'You throw 50 <b>₽</b> onto the stage in front of her, but she just rolls her eyes and moves over to dance in front of a group of men offering her far more generous tips.'
+					!!'She finishes her show by teasingly tugging off her thong, much to the delight of the patrons around you who oggle at her naked body as she gathers her clothing and tips before strutting off stage without even looking in your direction.'
+				!!end
+				!!gt 'stripclub', 'forman'
+		!!else
+			'The girl on stage starts her performance, slowly stripping down as she dances on the pole. The men in the crowd throw fistfuls of rubles on the stage while hooting and hollering.'
+			
+			if money >= 50:
 			act 'Give her 50 <b>₽</b>':
 				*clr & cla
 				pcs_horny += 5
 				minut += 10
 				money -= 50
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub6.jpg"></center>'
-				'You stick 50 <b>₽</b> in the strippers panties, and she invitingly starts wagging her hips and shaking her tits in front of you. You feel yourself slowly getting excited.'
-
-				act 'Further':gt 'stripclub', 'stol'
+				'You stick 50 <b>₽</b> in her panties and she invitingly starts wiggling her hips and shaking her tits in front of you. You feel yourself slowly getting excited.'
+				'The girl soon finishes her show and gathers up her clothing and tips before walking off stage as the men cheer at her.'
+				act 'Move away':gt 'stripclub', 'forman'
 			end
-		end
+			
+			act 'Watch the show'
+				*clr & cla
+				pcs_horny += 5
+				minut += 10
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub6.jpg"></center>'
+				'You feel yourself slowly getting excited as you watch the girl perform until she finally peels off her thong before gathering up her clothing and tips and walking off stage as the men cheer at her.'
 
-		act 'Downcast eyes':
+				act 'Move away':gt 'stripclub', 'forman'
+			end
+			
+			act 'Look away':
 			*clr & cla
 			pcs_horny -= 5
 			minut += 15
-			'You decide not to give any money to the stripper and look away from her. You feel a little ashamed as your arousal goes down a bit.'
+			'You decide not to give any money to the stripper and look away from her. You feel a little ashamed as your arousal goes down.'
 
-			act 'Further':gt 'stripclub', 'stol'
+			act 'Move away':gt 'stripclub', 'forman'
 		end
 	end
-
-	act 'Move away':gt 'stripclub', 'forman'
 end
 
 if $ARGS[0] = 'forwoman':
@@ -257,7 +497,7 @@ if $ARGS[0] = 'forwoman':
 	if hour ! 2 and zenit > 0 and minifoto = 0:
 		act 'Photograph':
 			minut += 10
-			'As soon as you take the camera out, you are immediately approached by a security guard that informs you that there is no photography allowed. You apologize and put the camera back in your purse.'
+			'As soon as you take your camera out, you are immediately approached by a security guard who informs you that there is no photography allowed. You apologize and put the camera back in your purse.'
 		end
 
 	elseif hour ! 2 and minifoto > 0:
@@ -270,7 +510,7 @@ if $ARGS[0] = 'forwoman':
 			if stripfotorand < 2:
 				minifoto = 0
 				stripdolg = 1
-				'You fail to hide the camera well enough and get spotted out by the security guard. He grabs you by the hand and leads you to his office. Already waiting there for you is the owner. He takes your camera and says that you owe him 50,000 <b>₽</b> for snooping around and until you pay up you are barred from the club.'
+				'You fail to hide the camera well enough and are spotted by the security guard. He grabs you by the hand and leads you to his office, where the owner is already waiting. He takes your camera and says that you owe him 50,000 <b>₽</b> for snooping around and that you''re barred from the club until you pay up.'
 
 				act 'Leave':gt 'stripclub', 'start'
 			elseif stripfotorand >= 2 and stripfotorand < 6:
@@ -286,12 +526,18 @@ if $ARGS[0] = 'forwoman':
 		end
 	end
 
-	if hour ! 2: act 'Watch a striptease': gt 'stripclub', 'stolW'
-	if pcs_dancero > 0 and stripwork = 0 and pcs_inhib >= 60:
-		act 'See the manager for work': gt 'stripclub', 'manager'
-	elseif stripwork = 0 and pcs_inhib < 60:
+	if hour < 2: act 'Watch a striptease': gt 'stripclub', 'stolW'
+	!!if hour < 2 and minut < 30: act 'Get a drink at the bar': gt 'stripclub', 'bar' 
+	if pcs_dancero > 0 and stripwork = 0 and pcs_inhib >= 50:
+		act 'Ask the manager about working as a stripper': gt 'stripclub', 'manager_stripper'
+	elseif stripwork = 0 and pcs_inhib < 50:
 		'You could ask the manager for a job, but you don''t feel confident enough to be a stripper. You should get more used to showing off your body first.'
 	end
+	!!if pcs_inhib >= 60 and (stripbarwork = 0 or stripbarwork1 = 0):
+		!!act 'Ask the manager about working in the bar': gt 'stripclub', 'manager_bargirl'
+	!!elseif pcs_inhib < 60 and (stripbarwork = 0 or stripbarwork1 = 0):
+		!!'You could ask the manager for a job, but you don''t feel confident enough to work in a strip club, even if it is just in the bar.'
+	!!end
 end
 
 if $ARGS[0] = 'stolW':
@@ -301,7 +547,7 @@ if $ARGS[0] = 'stolW':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripw.jpg"></center>'
 	'There are some athletic guys performing on the stage. The women are all excited, squealing and shoving money down their pants.'
 
-	if hour < 23:
+	if hour < 2:
 		act 'Watch a striptease':
 			*clr & cla
 			minut += 15
@@ -317,21 +563,20 @@ if $ARGS[0] = 'stolW':
 					money -= 50
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripw2.jpg"></center>'
-					'You shove 50 <b>₽</b> down his pants, and he leads you over to sit on a chair and starts dancing in front of you. Before you know it, he is completely naked, and you have a great view of his cock. The stripper gropes your chest, trying to get your breasts out from under your blouse.'
-
-					act 'Stop':gt 'stripclub', 'stolW'
-					!!act 'Touch his hand member':gt 'cfnm', 'start'
-					act 'Let him expose your breasts':gs 'npcgeneratec', 0, 'Stripper', rand(18,28) & gs 'boyStat', $npclastgenerated & gt 'cfnm', 'start'
+					'You shove 50 <b>₽</b> down his pants, and he leads you over to sit on a chair and starts dancing in front of you. Before you know it, he is completely naked, and you have a great view of his cock as he dances in front of you. You feel your pussy growing slightly wet.'
+					'He soon finishes his dance and you''re left feeling a little aroused by his show.'
+					act 'Continue':gt 'stripclub', 'stolW'
+					
 				end
 			end
 
-			act 'Downcast eyes':
+			act 'Look away':
 				cla
 				pcs_horny -= 5
 				minut += 15
-				'You decide not to give any money to the stripper and look away from him. You feel a little ashamed as your arousal goes down a bit.'
+				'You decide not to give any money to the stripper and look away from him. You feel a little ashamed as your arousal goes down.'
 
-				act 'Further':gt 'stripclub', 'stolW'
+				act 'Move away':gt 'stripclub', 'stolW'
 			end
 		end
 	end
@@ -343,11 +588,12 @@ if $ARGS[0] = 'privsex':
 	*clr & cla
 	girl += 2
 	lesbian += 1
+	money -= 2000
 	gs 'arousal', 'cuni', 15, 'lesbian', 'group'
 	$orgasm_or = 'yes'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/priv3.jpg"></center>'
-	'The girls lead you away from the center stage into a private booth. Before you know it, they''ve taken off your clothes and have you widely spreading your legs as one of them licks your pussy, bringing you to orgasm, while the other girl continues to caress your body.'
+	'The girls lead you away from the center stage into a private booth. Before you know it, they''ve taken off your clothes and have you widely spreading your legs as one of them licks your pussy, bringing you to orgasm while the other girl continues to caress your body.'
 
 	act 'Finish':gt 'stripclub', 'forman'
 	act 'More':gt 'stripclub', 'privsex1'
@@ -363,126 +609,131 @@ if $ARGS[0] = 'privsex1':
 	gs 'arousal', 'end'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/priv<<privpicrand>>.jpg"></center>'
-	'The other girl lets out a sigh, "You''ve already made her orgasm... I don''t care I also want in on the action..." as she gently pushes her friend away and begins eating you out. It doesn''t take long before you reach an orgasm once again. As you manage to calm down, you notice that you''re all alone in the booth.'
+	'The other girl lets out a sigh and gently pushes her friend away. "You''ve already made her cum. I want in on the action now," she says and starts eating you out. It doesn''t take long before you have another orgasm. When you recover, you notice that you''re now alone in the booth.'
 
 	act 'Finish':gt 'stripclub', 'forman'
 end
 
-if $ARGS[0] = 'stpr1':
-	*clr & cla
-	gs 'arousal', 'voyeur_sex', 5, 'lesbian', 'group'
-	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex1.jpg"></center>'
-	'You wait for a moment before the security guard walks up to you and tells you to follow him.'
-	'He leads you to a room, and as you enter, you notice a girl fucking another one with a strap-on. You sit down and enjoy the moans coming from the girl getting fucked for a moment.'
-
-	act 'Leave':gt 'stripclub', 'forman'
-
-	act 'Join them':
-		*clr & cla
-		girl += 2
-		lesbian += 1
-		gs 'arousal', 'bj', 10, 'lesbian', 'sub', 'group'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex2.jpg"></center>'
-		'Wanting in on the action, you start to undress and tell the other girl to put on a strap-on. As the girl finishes, you kneel in front of them as they stand beside you and rest their strap-ons against your face. You start greedily sucking, licking the remnants of one of the girl''s juices while lubing the other cock.'
-
-		act 'Doggy-Style':
-			*clr & cla
-			gs 'arousal', 'bj', 10, 'lesbian', 'sub', 'group'
-			gs 'arousal', 'vaginal_strap', 10, 'lesbian', 'sub', 'group'
-			minut -= 10
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex3.jpg"></center>'
-			'The girls chuckle a little as they see you this submissive, and after they deem you''ve sucked enough, they push you onto your hands and knees as one of them stands behind you and enters your moist pussy while you continue to suck the other.'
-
-			act 'Two Smoking Barrels':
-				*clr & cla
-				gs 'arousal', 'anal_strap', 10, 'lesbian', 'sub', 'group'
-				gs 'arousal', 'vaginal_strap', 10, 'lesbian', 'sub', 'group'
-				minut -= 10
-				$orgasm_or = 'yes'
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex4.jpg"></center>'
-				'You look up at the girl in front of you and lustily plead, "I want both of you inside me." It appears they were thinking the same thing as one of the girls quickly slides underneath you, while the other girl standing behind you eases her way into your ass.'
-				'They begin to fuck you in full force, and it doesn''t take long before they bring you to orgasm.'
-
-				act 'Further':
-					*clr & cla
-					gs 'cum_call', 'mouth', 'strippers'
-					gs 'cum_call', 'face', 'strippers'
-					gs 'cum_call', 'breasts', 'strippers'
-					gs 'arousal', 'end'
-					gs 'stat'
-					'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex5.jpg"></center>'
-					'As you finish, the girls pull out, stand over you and jerk their strap-ons until a liquid pours out that tastes much like sperm. The liquid covers your mouth, face and chest.'
-
-					act 'Finish':gt 'stripclub', 'forman'
-				end
-			end
-		end
-	end
-end
+!!if $ARGS[0] = 'bar'
+!!!!!!!!!!!!!!!!!!!!!
 
-if $ARGS[0] = 'stpr2':
+if $ARGS[0] = 'albina_confront'
 	*clr & cla
-	girl += 2
-	lesbian += 1
-	gs 'arousal', 'foreplay', 5, 'lesbian', 'group'
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex6.jpg"></center>'
-	'You wait for a moment before the security guard walks up to you and tells you to follow him.'
-	'He leads you to a room, and as you enter, you notice two girls, each holding a strap-on in their hands. Without any hesitation, they walk over to you, strip you down and await further instructions.'
-	gs 'willpower', 'sex', 'force', 'medium'
-	if will_cost <= pcs_willpwr:
-		act 'Have them suck you off (<<will_cost>> Willpower)':
-			*clr & cla
-			gs 'willpower', 'pay', 'force'
-			gs 'arousal', 'foreplay', 10, 'lesbian', 'dom', 'group'
-			gs 'stat'
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex7.jpg"></center>'
-			'You tell one of the girls to hand over her strap-on, which you put on. You command the girls to kneel and stick the cock in front of their faces. Not needing a cue, they start sucking on it, lubing it up the best they can.'
-
-			act 'Fuck them':
-				*clr & cla
-				gs 'arousal', 'vaginal_strap_give', 30, 'lesbian', 'dom', 'group'
-				$orgasm_or = 'yes'
-				gs 'arousal', 'end'
-				gs 'stat'
-				prsexrand = rand(9, 13)
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex<<prsexrand>>.jpg"></center>'
-				'After a while, you get a bit bored of this and, smirking, tell them that you want to fuck them. They eagerly position themselves, ready for your fake cock. You fuck them as your heart desires, eventually stopping after you have your first orgasm. As for them, hmm... you''ve lost count, and all you hear is panting.'
-
-				act 'Finish':gt 'stripclub', 'forman'
+	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/.jpg"></center>'
+	if npc_rel['A23'] > 70 or AlbinaQW['Friends'] = 2:
+		'"What are you doing here, <<$pcs_nickname>>?" she asks.' 
+		'"Me? What are <i>you</i> doing here?" you retort and she smiles.'
+		'"My job, <<$pcs_nickname>>! Stripping is easy money, you know?" A sly grin then appears on her face. "Maybe I can interest you in a private dance?"'
+		if money >= 1000:
+			act 'Yes'
+				minut += 10
+				pcs_horny += 5
+				'"Yes!" you reply a little too enthusiastically. "1000 <b>₽</b>, right?"'
+				'She waves her hand. "It''s on the house, this one time anyway. You want my services in the future, then you have to pay like everyone else. Also, no telling anyone I work here."'
+				'You nod and Albina pushes you into the chair before music starts playing and she starts her show. She seductively dances while slowly peeling her clothes off, all while giving you a teasing smile.'
+				'Once down to her thong, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong.'
+				'The song then ends and a naked Albina smiles before sitting in your lap.'
+				if hour < 2:
+					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
+					'You nod and she gets dressed again before she walks you back out onto the floor.'
+					act 'Return to the floor' gt 'stripclub', 'forman'
+				else
+					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too. My shift is almost over, so why don''t you walk me home?"'
+					act 'Sure'
+						'"Sure," you nod and she starts getting dressed again before walking you back out onto the floor.'
+						'"Just wait for me out here. I won''t be long," Albina says before disappearing backstage. You take a seat and scroll through your phone until she returns and you head out together.'
+						act 'Wait for Albina': gt 'albina_uni', 'walk_home'
+					end
+					
+					act 'No thanks'
+						'"Sorry, but I need to get going," you reply and she just shrugs.'
+						'"Suit yourself, but remember; no more free shows."'
+						'She gathers up her clothes and gets dressed before heading back out onto the floor.'
+						act 'Return to the floor' gt 'stripclub', 'forman'
+					end
+			    end
+			end
+		else	
+			act 'No money'
+				minut += 10
+				pcs_horny += 5
+				'"I don''t have any money," you reply.'
+				'"Then why are you here?" she asks with a puzzled stare. "Never mind, this is on the house this one time. You want my services in the future, then you have to pay like everyone else. Also, no telling anyone I work here."'
+				'You nod and Albina pushes you into the chair before music starts playing and she starts her show. She seductively dances while slowly peeling her clothes off, all while giving you a teasing smile.'
+				'Once down to her thong, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong.'
+				'The song ends and a naked Albina smiles before sitting in your lap.'
+				if hour < 2:
+					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too, but I need to get back to work."'
+					'You nod and she gets dressed again before she walks you back out onto the floor.'
+					gt 'stripclub', 'forman'
+				else
+					'"I can tell you enjoyed that <<$pcs_nickname>>, and I did too. My shift is almost over, so why don''t you walk me home?"'
+					act 'Sure'
+						'"Sure," you nod and she starts getting dressed again before walking you back out onto the floor.'
+						'"Just wait for me out here. I won''t be long," Albina says before disappearing backstage. You take a seat and scroll through your phone until she returns and you head out together.'
+						act 'Wait for Albina': gt 'albina_uni', 'walk_home'
+					end
+					act 'No thanks'
+						'"Sorry, but I need to get going," you reply and she just shrugs.'
+						'"Suit yourself, but remember; no more free shows."'
+						'She gathers up her clothes and gets dressed before heading back out onto the floor.'
+						act 'Return to the floor': gt 'stripclub', 'forman'
+					end
+				end	
 			end
 		end
-	else
-		act 'Have them suck you off (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
-	end	
-	act 'Suck them off':
-		*clr & cla
-		gs 'arousal', 'bj', 10, 'lesbian', 'sub', 'group'
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex8.jpg"></center>'
-		'You want to get used today, so you order them to put on the strap-ons as you get on your knees and joyfully begin sucking them off.'
-
-		act 'Have them fuck you':
-			*clr & cla
-			gs 'arousal', 'vaginal_strap', 30, 'lesbian', 'sub', 'group'
-			gs 'arousal', 'anal_strap', 30, 'lesbian', 'sub', 'group'
-			minut -= 30
-			$orgasm_or = 'yes'
-			gs 'arousal', 'end'
-			gs 'stat'
-			prsexrand = rand(14, 19)
-			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/sex/prsex<<prsexrand>>.jpg"></center>'
-			'You yearn to have your holes filled as you stop sucking them and order them to fill your orifices. The girls quickly position themselves and start fucking you.'
-			'Losing yourselves to the moment, it is no longer clear who is the customer and who isn''t. As they fuck you in different positions and orifices, you lose count of how many times you orgasm. In the end, you are all quite satisfied.'
 
-			act 'Finish':gt 'stripclub', 'forman'
+		act 'No thanks'
+			'"No thanks," you reply. "I need to get going."'
+			if hour < 2:
+				'She just shrugs. "Your loss. I need to get back to work."'
+				'She walks you back out onto the floor, leaving you behind in the room.'
+				gt 'stripclub', 'forman'
+			else
+				'"Your loss. My shift is almost over, so why don''t you walk me home?"'
+				act 'Sure'
+					'"Sure," you nod and she walks you back out onto the floor.'
+					'"Just wait for me out here. I won''t be long," Albina says before disappearing backstage. You take a seat and scroll through your phone until she returns in her normal clothes and you head out together.'
+					act 'Wait for Albina': gt 'albina_uni', 'walk_home'
+				end
+				
+				act 'No thanks'
+					'"Sorry, but I need to get going," you reply and she just shrugs.'
+					'"Suit yourself, but remember; no more free shows."'
+					'She gathers up her clothes and gets dressed before heading back out onto the floor.'
+					act 'Return to the floor': gt 'stripclub', 'forman'
+				end
 		end
+
+	else
+		'"What the fuck are you doing here, <<$pcs_nickname>>?!" she asks sternly.'
+		'"What are <i>you</i> doing here?" you retort and she rolls her eyes.'
+		'"Me? I''m their new cleaner, but they asked me to fill in for one of the girls tonight. What does it look like I''m doing, you fucking idiot?! I don''t know or care why you came here, but don''t expect a private dance from me."'
+		'"I wasn-" you start to reply, but she cuts you off.'
+		'"I need to get back to work," she says before leaving the room and heading back out to the floor.'
+		act 'Return to the floor': gt 'stripclub', 'forman'
 	end
+end   
+
+if $ARGS[0] = 'albina_dance'
+'You hand over the money and are taken to one of the private rooms, where you take a seat and wait for Albina to arrive.'
+if npc_rel['A23'] >= 70 or AlbinaQW['Friends'] = 2:
+	minut += 10
+	pcs_horny += 5
+	'Her face lights up when she walks into the room. "<<$pcs_nickname>>! I should take it as a compliment if you want a dance from me."'
+	'All you can do is grin and nod as she seductively walks over to you. "Well then, we better get this show started..."'
+	'Music starts playing and she starts her show. She seductively dances and twerks while slowly peeling her clothes off, all while giving you a teasing smile.'
+	'Once down to her thong, she climbs into your lap and starts grinding against you as her perky breasts jiggle in your face. You''re feeling rather aroused by the time she finishes by bending over in front of you and tugging off her thong. You notice her pussy is a little wet; it seems she''s enjoying this as much as you.'
+	'The song ends and a naked Albina smiles at you.'
+	if npc_sex['A23'] >= 1: 'She proceeds to climb into your lap and starts passionately making out with you while grinding her naked body against you. Once she''s done, she climbs off you and turns to wiggle her naked ass at you.'
+	'She gathers up her clothes and starts getting dressed before walking back out to the main floor with you.'
+	act 'Return to the floor' :gt 'stripclub', 'forman'
+else
+	'A few minutes later, Albina walks in and rolls her eyes when she sees you. "I''m not giving you of all people a fucking lapdance!" She throws your money on the floor. "Here''s your refund. Now fuck off before I call security."'
+	'She crosses her arms and glares at you intently until you leave the room.'
+	act 'Return to the floor': gt 'stripclub', 'forman'
 end
 
---- stripclub ---------------------------------
 
+--- stripclub ---------------------------------

+ 41 - 41
locations/stwork.qsrc

@@ -16,17 +16,18 @@ if $ARGS[0] = 'start':
 	gs 'stat'
 	gs 'themes', 'indoors'
 	killvar '$sexloc'
+	CLOSE 'sound/street_club.mp3'
 	'<center><b><font color="maroon">Dressing room for strippers</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/backstage' + rand(1,7) + '.jpg"></center>'
 	''
 	'There are several <a href="exec:gt ''mirror'', ''start''">mirrors</a> hanging on the wall, where you can <a href="exec:gt ''mirror'', ''brush''">brush</a> your hair, and a selection of <a href="exec:gt ''wardrobe'', ''start''">clothes</a> hanging on rails for the girls to dress in.'
 	'There are some stairs leading to the <a href="exec:gt ''stwork'', ''stripgirl''">stage</a> where you can head out to perform.'
 	if $clothingworntype = 'nude':
-		'To the side, there''s a steel door which overlooks the back yard and the staff uses as an entrance to save them from meeting scummy customers. Standing by this entrance, there''s always <a href="exec:gt ''stwork'', ''guard''">security</a> keeping the talent safe and not going to let you walk outside unless you put some clothes on.'
+		'To the side is a door which overlooks the back yard, used as a staff entrance to save girls from having to deal with scummy customers. Always standing by this entrance is a <a href="exec:gt ''stwork'', ''guard''">security guard</a>, who isn''t going to let you walk outside unless you put some clothes on.'
 	else
-		'To the side, there''s a <a href="exec:stripMir = 0 & gt ''stripclub'', ''start''">steel door</a> which overlooks the back yard and the staff uses as an entrance to save them from meeting scummy customers. Standing by this entrance, there''s always <a href="exec:gt ''stwork'', ''guard''">security</a> keeping the talent safe.'
+		'To the side is a <a href="exec:stripMir = 0 & gt ''stripclub'', ''start''">door</a> which overlooks the back yard, used as a staff entrance to save girls from meeting scummy customers. Always standing by this entrance is a <a href="exec:gt ''stwork'', ''guard''">security guard</a> keeping the girls safe.'
 	end
-	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a>, which is heavily used by staff after coming off stage'
+	'Near the exit door is a vending machine selling '+iif(money >= 100,'<a href="exec:money -= 100 & gt ''food'', ''snack''">snacks</a>','snacks')+' and a <a href="exec:gt ''beverage'', ''bev_wat''">water cooler</a> which is used heavily by girls coming off stage.'
 	'A wooden door leads to the <a href="exec:gt ''stwork'', ''toilet''">staff bathroom</a>.'
 
 	! Tattoos increase your desireability as a stripper
@@ -67,7 +68,7 @@ if $ARGS[0] = 'start':
 		if stpriv > rand (0, 100):
 		*nl
 			'One of the bouncers walks up to you, telling you that a customer is waiting for you in one of the private rooms.'
-			act '<b>Go perform a private dance</b>':
+			act 'Perform a private dance':
 				stprivatechance = 0
 				gt 'stwork2', 'privatdance'
 			end
@@ -75,7 +76,7 @@ if $ARGS[0] = 'start':
 	end
 
 	if (kosmetica >= 3 or pcs_makeup >= 4) and (hour >= 11 or hour <= 2):
-		act '<b>Prepare for your show</b>':
+		act 'Prepare for your show':
 			*clr & cla
 			if pcs_sweat >= 20 or (pcs_leghair > 3 or ((pcs_pubes > 3 and pubestyle = 1) or (pubestyle >= 2 and pubestyle <=7) and pcs_pubes > 11)):
 				dynamic $showerdin
@@ -85,7 +86,7 @@ if $ARGS[0] = 'start':
 				'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
 				dynamic $brit
 				*nl
-				'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly.'
+				'After stripping from your clothes, you gather up your towel, washcloth and soap and head to the shower, where you thoroughly wash yourself.'
 				if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 			end
 			if pcs_makeup < 4:
@@ -102,13 +103,13 @@ if $ARGS[0] = 'start':
 			if pcs_leghair <= 3:
 				if fingal <= 0:
 					if strippermission = 0:
-						act 'Go see the manager':
+						act 'Go to the manager':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripinspection.jpg"></center>'
-							'Before going on stage, you go see the manager in his office for your inspection.'
+							'Before going on stage, you head to the manager''s office for your inspection.'
 							if $clothingworntype ! 'nude':
-								'"Take off your clothes," he tells you matter of factly.'
-								'When you''re done undressing, he walks up to you and inspects you closely.'
+								'"Take off your clothes," he sternly demands.'
+								'Once you''re done undressing, he walks up to you and inspects you closely.'
 								if pcs_sweat < 20:
 									'"Good, you have a clean scent. That is very important in this business."'
 									'He briefly runs his hand over your legs.'
@@ -116,26 +117,25 @@ if $ARGS[0] = 'start':
 										'"Smooth legs. Very good."'
 										'He walks around you, looking you up and down from every side.'
 										if fingal <= 0:
-											'"No bruises. Good. The better you look, the easier it is to make money once you are on that stage."'
+											'"No bruises. Good. The better you look, the easier it is to make money once you''re on that stage."'
 											'"And the last thing. I need to check if you''ve rid yourself of all your pubic hair."'
-											'"I suppose that''s a reasonable thing to check," you think to yourself as you show him your naked pussy.'
-											'He puts his hand right above your pussy lips and slowly rubs the skin there, taking a bit longer than he did on your legs.'
-											'You feel your pussy get a bit wet from his touch and hope that he doesn''t notice.'
+											'He places his hand on your mound and slowly starts rubbing it, taking a little longer than he did on your legs.'
+											'You feel your pussy get a little wet from his touch and hope that he doesn''t notice.'
 											gs 'arousal', 'foreplay', 2
 											gs 'stat'
-	!! This allows different pubic styles but anything from small bush up is still not permitted.
+											!! This allows different pubic styles but anything from small bush up is still not permitted.
 											if (pubestyle = 1 and pcs_pubes <= 3) or lashair = 1:
 												strippermission = 1
-												'"That''s very smooth. Looks like you are ready to get on the stage. You can get to work," he says and ushers you out of his office.'
+												'"Very smooth. Good. Looks like you''re ready to get on the stage. You can get to work," he says and ushers you out of his office.'
 												stpredmet = 3
 												act 'Go back stage': gt 'stwork2', 'strip'
 											elseif ((pubestyle >= 2 and pubestyle <=7) or (pubestyle >= 12 and pubestyle <=14)) and pcs_pubes <= 25:
 												strippermission = 1
-												'"Very cute pubic hair, I''m sure the customers will appreciate it, now get on stage. You can work," he says and ushers you out of his office.'
+												'"Very cute pubic hair, I''m sure the customers will appreciate it. Now get on stage. You can work," he says and ushers you out of his office.'
 												stpredmet = 3
 												act 'Go back stage': gt 'stwork2', 'strip'
 											else
-												'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the butt as he says, "Go take care of that and then come back here."'
+												'"You need to shave everything off <<$pcs_stagename>>, although a small and cute pubic style is popular at the moment if you feel creative." He smiles and pats you on the ass as he says "Go take care of that and then come back."'
 												act 'Go to the dressing room': gt 'stwork', 'start'
 											end
 										else
@@ -143,11 +143,11 @@ if $ARGS[0] = 'start':
 											act 'Go to the dressing room': gt 'stwork', 'start'
 										end
 									else
-										'"Shave your legs, a customer doesn''t want to feel any stubble during a lapdance. Go take care of that and then come back here."'
+										'"Shave your legs! A customer doesn''t want to feel any stubble during a lap dance. Go take care of that and then come back."'
 										act 'Go to the dressing room': gt 'stwork', 'start'
 									end
 								else
-									'"Damn it <<$pcs_stagename>>, you stink. Grab a shower. We can''t have the club smelling like a locker room."'
+									'"Damn it <<$pcs_stagename>>, you stink! Go and take a shower. We can''t have the club smelling like a locker room."'
 									act 'Go to the dressing room': gt 'stwork', 'start'
 								end
 							else
@@ -182,22 +182,22 @@ if $ARGS[0] = 'start':
 	!							if fingal <= 0:
 	!								stpredmet = 3 & gt 'stwork2', 'strip'
 	!							else
-	!								'You aren''t allowed on stage, because of the black eye.'
+	!								'You aren''t allowed on stage due to your black eye.'
 	!							end
 	!						else
 	!							'Nobody wants to see a stripper with hairy legs and untrimmed pubes. Have a shave before you go on stage!'
 	!						end
 	!					else
-	!						'Damn, you stink like a pigsty, take a shower before going on stage.'
+	!						'Damn, you stink like a pigsty! Take a shower before going on stage.'
 	!					end
 	!				else
-	!					'The least you can do is brush your hair.'
+	!					'The least you can do is brush your hair!'
 	!				end
 	!			else
 	!				'You need to put on very thick makeup if you want people to be impressed by your beauty.'
 	!			end
 	!		else
-	!			'There is some visible semen on your body. Wash yourself off before going on stage.'
+	!			'There is some visible semen on your body. Wash yourself before going on stage.'
 	!		end
 	!	else
 	!		'You''re done for today. Time to head home.'
@@ -236,7 +236,7 @@ if $ARGS[0] = 'tipcalculator':
 			money += paymoneyrand
 			pcs_mood += rand(3,10)
 			gs 'stat'
-		'The customers followed your movements between their conversations. After counting out your tips, it amounts to <<paymoneyrand>> <b>₽</b>.'
+			'The customers followed your movements between their conversations. After counting out your tips, it amounts to <<paymoneyrand>> <b>₽</b>.'
 		end
 	else
 		paymoneyrand = rand(20,striptip)
@@ -252,18 +252,18 @@ if $ARGS[0] = 'stripgirl':
 	gs 'stat'
 	striptalkrand = rand(0, 10)
 
-	if striptalkrand = 0:$striptalk = 'Have you heard about that new girl? She''s really good-looking and all, but she got booed off-stage. Apparently, she was worthless.'
-	if striptalkrand = 1:$striptalk = 'I''m telling you, girls with tattoos are a huge turn-on to men.'
-	if striptalkrand = 2:$striptalk = 'Working the pole is much more profitable than just dancing. It''s easier to excite the customer, but it also demands more from the person doing it.'
-	if striptalkrand = 3:$striptalk = 'Phew, you really have to leave it all out on the stage, getting back all sweaty, with disheveled hair and makeup ruined. The cost in cosmetics is enough to bankrupt you.'
-	if striptalkrand = 4:$striptalk = 'You know what, those private dances might be guaranteed money, but the real cash is in the extras.'
-	if striptalkrand = 5:$striptalk = 'Remember that ugly girl? She got on stage and got booed hard by the customers, but as soon as she started working the pole, their jaws dropped, and she made a fortune in tips.'
-	if striptalkrand = 6:$striptalk = 'Why doesn''t the manager ever says if it''s a male or female day? I recently rushed to work, even broke a nail, then I get here and there''s these bears up on stage. Had to turn around and head back home.'
-	if striptalkrand = 7:$striptalk = 'That cute security guard was telling me about the problems the girls face with this job. Half of them become whores in the end, the money is better.'
-	if striptalkrand = 8:$striptalk = 'There was a fat woman trying to dance on the pole, she fell face first on the floor. I thought she had knocked herself out, you should have seen the black eye she got.'
-	if striptalkrand = 9:$striptalk = 'Recently, we had a comedian working here. She was a pretty little thing, and she danced well, but it''s not with jokes you earn tips here.'
-	if striptalkrand = 10:$striptalk = 'I heard about clubs abroad where the tips are so good that the strippers pay for the right to work there.'
-
+	if striptalkrand = 0:$striptalk = '"Have you heard about that new girl? She''s really good-looking and all, but she got booed off-stage. Apparently, she was worthless."'
+	if striptalkrand = 1:$striptalk = '"I''m telling you, girls with tattoos are a huge turn-on to men."'
+	if striptalkrand = 2:$striptalk = '"Working the pole is much more profitable than just dancing. It''s easier to excite the customer, but it also demands more from the person doing it."'
+	if striptalkrand = 3:$striptalk = '"Phew, you really have to leave it all out on the stage, getting back all sweaty, with disheveled hair and makeup ruined. The cost in cosmetics is enough to bankrupt you."'
+	if striptalkrand = 4:$striptalk = '"Private dances might be guaranteed money, but the real cash is in the ''extras''."'
+	if striptalkrand = 5:$striptalk = '"Remember that ugly girl? She got on stage and got booed hard by the customers, but as soon as she started working the pole, their jaws dropped and she made a fortune in tips."'
+	if striptalkrand = 6:$striptalk = '"Did I tell you about the time I forgot it was male night? I rushed about getting ready, even broke a nail, only get here and see those bears up on stage!"'
+	if striptalkrand = 7:$striptalk = '"That cute security guard was telling me about the problems the girls face with this job. Half of them become whores in the end because the money is better."'
+	if striptalkrand = 8:$striptalk = '"There was a fat woman trying to dance on the pole who fell face first on the floor. I thought she''d knocked herself out! You should have seen the black eye she got!"'
+	if striptalkrand = 9:$striptalk = '"We had a comedian work here one time. She was a pretty little thing, and she danced well, but jokes don''t earn you any tips here."'
+	if striptalkrand = 10:$striptalk = '"I heard about clubs abroad where the tips are so good that the strippers pay for the right to work there."'
+	if striptalkrand = 11:$striptalk = '"I''m telling you, doing the occasional porn shoot on one of your days off is a great way to top up your income."'
 	'The girls are doing their makeup and hair in the mirror, laughing and gossiping.'
 	'<<$striptalk>>'
 
@@ -275,9 +275,9 @@ if $ARGS[0] = 'guard':
 	gs 'stat'
 	if $clothingworntype = 'nude':
 		'The bored security guard perks up when you approach him. "Looking good there, <<$pcs_nickname>>."'
-		'He doesn''t really have anything much to say and the conversation just becomes an awkward silence.'
+		'He doesn''t really have much to say and the conversation quickly turns into an awkward silence.'
 	else
-		'A bored looking security guard stands by the door. Seeing you, he lazily nods. "Hello <<$pcs_nickname>>."'
+		'A bored looking security guard stands by the door. Seeing you, he lazily nods. "Hey <<$pcs_nickname>>."'
 	end
 
 	act 'Move away':gt 'stwork', 'start'
@@ -312,7 +312,7 @@ if $ARGS[0] = 'toilet':
 !			'<h5>Shower</h5>'
 !			'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
 !			*nl
-!			'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly, brush your hair, and put on heavy you makeup for the customers.'
+!			'You strip from your clothes and gather up your towel, washcloth and soap before heading to the shower. You wash yourself thoroughly, brush your hair and put on heavy makeup for the customers.'
 !			act 'Get out and dry off':gt $loc, $loc_arg
 !			dynamic $brit
 !		end
@@ -326,7 +326,7 @@ if $ARGS[0] = 'toilet':
 		'<h5>Shower</h5>'
 		'<center><img <<$set_imgh>> src="images/locations/shared/brothel/brothelshower.jpg"></center>'
 		*nl
-		'After taking off all of your clothes, you gather up your towel, washcloth and soap, then head to the shower. You wash yourself thoroughly to be as clean as possible for potential customers.'
+		'After stripping from your clothes, you gather up your towel, washcloth and soap and head to the shower. You thoroughly wash yourself to be as clean as possible for potential customers.'
 		if deodorant_on = 1: gs 'sweat', 'remove_deo' & '<br>Your deodorant gets washed away in the shower.'
 		act 'Get out and dry off':gt $loc, $loc_arg
 		dynamic $brit

+ 158 - 230
locations/stwork2.qsrc

@@ -16,14 +16,14 @@ if $ARGS[0] = 'strip_hub':
 	gs 'stat'
 	'<center><b><font color="maroon">Stage</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclub1.jpg"></center>'
-	if striptip < 10:$pubhot = 'booing you, you hear someone shout, "Get this stupid cow off the stage."'
+	if striptip < 10:$pubhot = 'booing you. "Get this stupid cow off the stage!" you hear someone shout.'
 	if striptip >= 10 and striptip < 20:$pubhot = 'clearly showing discontent with your dancing. They want you off the stage as quickly as possible.'
-	if striptip >= 20 and striptip < 30:$pubhot = 'clearly looking bored, drinking and talking among themselves, ignoring you.'
-	if striptip >= 30 and striptip < 60:$pubhot = 'sometimes looking at you, smiling and enjoy the performance.'
-	if striptip >= 60 and striptip < 70:$pubhot = 'watching you with genuine interest while conversing with each other over their beers.'
-	if striptip >= 70 and striptip < 80:$pubhot = 'having their attention focused on you.'
-	if striptip >= 80 and striptip < 90:$pubhot = 'with strained faces, sweat beading on their foreheads, their arousal clearly showing.'
-	if striptip >= 90:$pubhot = 'completely indulged in you. They''re clapping and waving money at you trying to get you attention.'
+	if striptip >= 20 and striptip < 30:$pubhot = 'clearly looking bored. They drink and talk among themselves while ignoring you.'
+	if striptip >= 30 and striptip < 60:$pubhot = 'who sometimes look at you, smiling and enjoying the performance.'
+	if striptip >= 60 and striptip < 70:$pubhot = 'watching you with genuine interest while conversing with each other over their drinks.'
+	if striptip >= 70 and striptip < 80:$pubhot = 'with their attention focused entirely on you.'
+	if striptip >= 80 and striptip < 90:$pubhot = 'with strained faces and sweat beading on their foreheads, their arousal clearly showing.'
+	if striptip >= 90:$pubhot = 'who are completely indulged in you, cheering and waving money at you trying to get your attention.'
 
 	'There are men sitting in front of the stage <<$pubhot>>.'
 	
@@ -37,14 +37,14 @@ if $ARGS[0] = 'strip_hub2':
 		elseif fame['city_stripping'] < 200:
 			'There are men sitting in front of the stage, some chatting and some watching to see you dance.'
 		elseif fame['city_stripping'] < 500:
-			'There are men sitting in front of the stage, most are waiting to see you dance.'
+			'There are men sitting in front of the stage waiting to see you dance.'
 		elseif fame['city_stripping'] < 1000:
 			'There are men sitting in front of the stage, eagerly waiting for your show to start.'
 		else
-			'There are men sitting in front of the stage, cheering as soon as your name is announced. Some stand to applaud chanting your name and whistling'
+			'There are men sitting in front of the stage, cheering as soon as your name is announced. Some stand to applaud while chanting your name and whistling.'
 		end
 	end
-	if hour >= 11 or hour <= 2:
+	if hour >= 18 or hour <= 2:
 		if stpredmet = 3:lapdance = 0
 		if stpredmet > 0:
 			if $clothingworntype ! 'nude':
@@ -81,12 +81,12 @@ if $ARGS[0] = 'strip_hub2':
 				privatrand = rand(0, 100)
 				if privatrand >= 50:
 					*nl
-					'As you enter the back stage area a security guard approaches you and tells you that you have a customer requesting a private show.'
-					act '<b>Go perform a private dance</b>': 
+					'As you enter the back stage area, a security guard approaches you and tells you that you have a customer requesting a private show.'
+					act 'Perform a private dance': 
 						stprivatechance = 0
 						gt 'stwork2', 'privatdance'
 					end
-					act 'turn the request down': gt 'stwork', 'start'
+					act 'Turn the request down': gt 'stwork', 'start'
 				end
 			end
 		end
@@ -112,7 +112,7 @@ if $ARGS[0] = 'dance_clothed':
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
 	'You dance seductively around the pole in the center of the stage.'
 	gs 'stwork2', 'custboo'
-	'The men are starting to call for you to strip, you''d better give them what they want.'
+	'The men are starting to call for you to strip, so you''d better give them what they want.'
 	act 'Strip out of your outfit': gt 'stwork2', 'strip_clothes'
 end
 
@@ -124,13 +124,10 @@ if $ARGS[0] = 'strip_clothes':
 	gs 'exp_gain', 'dancero', rand(1, 2)
 	inhib_exp += rand(1,2)
 	gs 'fame', 'city', 'stripping', rand(1,2)
-
 	striptip = (rand(pcs_dancero,(pcs_dancero*5)))/7
-
 	gs 'stat'
-	
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(1,3) + '.jpg"></center>'
-	'You start moving seductively around the pole in the center of the stage...'
+	'You start moving seductively around the pole in the center of the stage.'
 	gs 'stwork2', 'custboo'
 	act 'Take off your top':
 		*clr & cla
@@ -155,7 +152,7 @@ if $ARGS[0] = 'strip_clothes':
 			'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripclo' + rand(6,7) + '.jpg"></center>'
 			if custboo = 0:
 				pcs_mood += 5
-				'The positive responses make you smile even broader as you unzip your <<$i>> and let <<$i[1]>> drop to your ankles before kicking <<$i[1]>> off and lying down on the stage, rolling around and looking several customers straight in the eyes. Some of them throw some bills your way, and you take care to pay them some extra attention.'
+				'The positive responses make you smile as you unzip your <<$i>> and let <<$i[1]>> drop to your ankles before kicking <<$i[1]>> off and lying down on the stage, rolling around and looking several customers straight in the eyes. Some of them throw some bills your way, and you take care to pay them some extra attention.'
 			else
 				pcs_mood -= 5
 				'The negative comments make you feel a bit uncomfortable as you unzip your <<$i>> and let <<$i[1]>> drop to your ankles before kicking <<$i[1]>> off and lying down on the stage, rolling around and looking several customers straight in the eyes.'
@@ -180,7 +177,7 @@ if $ARGS[0] = 'strip_bra':
 
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(1,3) + '.jpg"></center>'
-	'You start moving seductively around the pole in the center of the stage wearing just your underwear...'
+	'You start moving seductively around the pole in the center of the stage wearing just your underwear.'
 	gs 'stwork2', 'custboo'
 	act 'Take off your bra':
 		gs 'bras', 'remove'
@@ -188,12 +185,12 @@ if $ARGS[0] = 'strip_bra':
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(4,6) + '.jpg"></center>'
 		if custboo = 0:
 			pcs_mood += 5
-			'Urged on by the audience, you slowly take off your bra and let it drop to the stage while you keep teasing them.'
-			'The men in the first row go wild when you take off your bra, shouting "Show your pussy! Show your pussy!"'
+			'Urged on by the audience, you slowly take off your bra and let it drop to the stage as you keep teasing them.'
+			'The men in the first row go wild, shouting "Show your pussy! Show your pussy!"'
 		else
 			pcs_mood -= 5
 			'Ignoring the comments from the audience, you slowly take off your bra and let it drop to the stage while you keep teasing them.'
-			'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however, and soon you are close to tears.'
+			'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however, and you''re soon close to tears.'
 		end
 		gs 'arousal', 'flash', -10
 		gs 'stat'
@@ -251,7 +248,7 @@ if $ARGS[0] = 'dance_nude':
 		pcs_mood += 5
 		'The men in the first row go wild seeing you dance nude, shouting out their approval. Several of them are tipping generously.'
 		'You dance as seductively as you can, trying to spread your attention over the audience, but paying extra attention to the ones who give you more money.'
-		'When the music starts winding down, you collect your tips and pick up your clothes, blowing a few kisses to your audience before going backstage again.'
+		'When the music starts winding down, you collect your tips and pick up your clothes, blowing a few kisses to your audience before going backstage.'
 		
 		gs 'arousal', 'flash', -20
 		gs 'arousal', 'end'
@@ -264,7 +261,7 @@ if $ARGS[0] = 'dance_nude':
 		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/stripund' + rand(13,14) + '.jpg"></center>'
 		pcs_mood -= 5
 		'Even being completely naked doesn''t seem to get any positive responses.'
-		'All you can hear is mockery as you try to ignore them and continue your act. The cutting remarks keep coming however, and soon you are close to tears.'
+		'All you can hear is mockery as you try to continue your act. The cutting remarks keep coming however, and you''re soon close to tears.'
 		'Before the music stops, you start collecting your meager tips and clothes and flee backstage.'
 		gs 'arousal', 'flash', -20
 		gs 'arousal', 'end'
@@ -297,18 +294,18 @@ if $ARGS[0] = 'pole_underwear':
 		vesrand = rand(0, 100)
 
 		if vesrand >= 75:
-			'Performing another trick on the pole, you can not support your weight and fall flat on your face. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
+			'Performing another trick on the pole, you can''t support your weight and fall flat on your face as the crowd laughs. "Hey hippopotamus, stomp back to the swamp where you came from."'
 			striptip -= 40
 			fingalrand = rand(0, 100)
 			if fingalrand >= 75:
 				fingal += rand(2, 5)
 				gs 'pain', 4, 'cheeks', 'Slam'
 				gs 'stat'
-				'As you fall, you hit the floor really hard, and you can feel a bruise forming on your face.'
+				'As you fall, you hit the floor hard and you feel a bruise forming on your face.'
 			end
 		elseif vesrand >= 50:
 			striptip -= rand(15, 30)
-			'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
+			'You overhear some of the customers sitting next to the stage. "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 		end
 	end
 
@@ -337,7 +334,7 @@ if $ARGS[0] = 'pole_panties':
 		vesrand = rand(0, 100)
 
 		if vesrand >= 75:
-			'Performing another trick on the pole, you can not support your weight and fall flat on your face. The crowd laughs, "Hey, hippopotamus, stomp back to the swamp where you came from."'
+			'Performing another trick on the pole, you can''t support your weight and fall flat on your face as the crowd laughs. "Hey hippopotamus, stomp back to the swamp where you came from."'
 			custbooing += 1
 			striptip -= 40
 			fingalrand = rand(0, 100)
@@ -345,12 +342,12 @@ if $ARGS[0] = 'pole_panties':
 				fingal += rand(2, 5)
 				gs 'pain', 4, 'cheeks', 'Slam'
 				gs 'stat'
-				'As you fall, you hit the floor really hard, and you can feel a bruise forming on your face.'
+				'As you fall, you hit the floor hard and you feel a bruise forming on your face.'
 			end
 		elseif vesrand >= 50:
 			custbooing += 1
 			striptip -= rand(15, 30)
-			'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
+			'You overhear some of the customers sitting next to the stage. "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 		end
 	end
 
@@ -366,21 +363,21 @@ if $ARGS[0] = 'custboo':
 			custbooing += 1
 			resprand = rand(0,3)
 			if resprand = 0:
-				'You overhear some of the customers right next to the stage, "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
+				'You overhear some of the customers sitting next to the stage. "Look at her fat hanging out. Her gut and ass are shaking like jelly."'
 			elseif resprand = 1:
-				'You overhear some of the customers right next to the stage, "What a cow. Someone should roll her off the stage."'
+				'You overhear some of the customers sitting next to the stage. "What a cow. Someone should roll her off the stage."'
 			elseif resprand = 2:
-				'You overhear some of the customers right next to the stage, "They should get that fat bitch off the stage and bring on a better looking stripper."'
+				'You overhear some of the customers sitting next to the stage. "They should get this fat bitch off the stage and bring on a better looking stripper."'
 			elseif resprand = 3:
-				'You overhear some of the customers right next to the stage, "Looks like they cater to your tastes too. What was that last fat bitch called again? She weighed more than you, and this girl weighs as much as you two combined."'
+				'You overhear some of the customers sitting next to the stage. "Looks like they cater to your tastes too. What was that last fat bitch called again? She weighed more than you, and this girl weighs as much as you two combined!"'
 			end
 		else
 			custboo = 0
 			resprand = rand(0,1)
 			if resprand = 0:
-				'A few customers are catcalling. "Get those fat titties out!" You hear one of them yell.'
+				'A few customers are catcalling. "Get those fat titties out!" one of them yells out.'
 			elseif resprand = 1:
-				'A few customers are catcalling. "Show us some flesh!" You hear one of them yell.'
+				'A few customers are catcalling. "Show us some flesh!" one of them yells out.'
 			end
 		end
 	else
@@ -389,7 +386,7 @@ if $ARGS[0] = 'custboo':
 		if resprand = 0:
 			'Several customers are catcalling. They want to see more.'
 		elseif resprand = 1:
-			'Most of the crowd seems to like what they are seeing. "Show us some more flesh!" You hear one of them yell.'
+			'Most of the crowd seems to like what they''re seeing. "Show us some more flesh!" one of them yells out.'
 		end
 	end
 end
@@ -427,7 +424,7 @@ if $ARGS[0] = 'privatdance':
 	end
 
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/privatstrip.jpg"></center>'
-	'You walk over to a smaller private room where you put on some music before the customer walks in. As the customer walks in, you tell him to sit down and enjoy the show. You spend half an hour showing off your dancing skills, and every time you grind against him, you can feel his rock hard cock.'
+	'You walk over to a smaller private room where you put on some music before the customer walks in and you tell him to sit down and enjoy the show. You spend half an hour showing off your dancing skills, and every time you grind against him, you can feel his rock hard cock.'
 
 	act 'Return to the locker room':gt 'stwork', 'start'
 end
@@ -435,154 +432,74 @@ end
 if $ARGS[0] = 'pr1':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1.jpg"></center>'
-		'Just as you start to dance, you hear a knock at the door. Your client''s very drunk friends are all waiting outside and are asking if they can join in on the private show.'
-		'Feeling a bit backed into a corner, you reluctantly agree, letting them inside. You do your best to focus on your original paying client, while still incorporating his lecherous friends into the show the best you can. Suddenly, one of them approaches, grabs your arm and says: "Listen, it''s my buddy''s bachelor party tonight. How about we pay you 4000 ₽ and you give us a real show?"'
-		'The predatory look in the mens'' eyes tell you exactly what they want to do to you.'
-
-	act 'Reject them and return to the locker room':gt 'stwork', 'start'
-
-	act 'Agree':
+	'You''re dancing for a bachelor party that are set up in one of the private rooms. They''re all quite drunk and rowdy, one of the men slapping the waitress on the ass as she places their drinks on the table. She takes the wad of cash he hands her and quickly scurries out of the room.'
+	'The men cheer when they see you. "Hey Vlad, your stripper is here!" The groom to be looks at you with a drunken smile. "Show us what you''ve got, girl!" Music starts playing as the lights dim and you seductively walk over to the pole in the room.'
+	
+	act 'Dance on the pole':
 		*clr & cla
-		gang += 1
-		guy += 4
-		killvar '$boy'
-		i=rand(18,40)
-		gs 'npcgeneratec', 0, 'Private dance client', i
-		gs 'boyStat', $npclastgenerated
-		gs 'npcgeneratec', 0, '1st Friend of client', i
-		gs 'boyStat', $npclastgenerated, '1'
-		gs 'npcgeneratec', 0, '2nd Friend of client', i
-		gs 'boyStat', $npclastgenerated, '2'
-		gs 'npcgeneratec', 0, '3rd Friend of client', i
-		gs 'boyStat', $npclastgenerated, '3'
-		money += 4000
-		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1a.jpg"></center>'
-		'You agree to the deal and almost instantly the men have tugged their cocks out of their pants. You''re pushed back onto the stage, and 2 cocks are pushed towards your mouth, one straight inside and one waiting for its turn.'
-        'As your mouth begins doing it''s job, the third man guides your right hand to his swelling member and as you begin to stroke it, the final guy starts pulling down your pants, exposing your slit to the entire group.'
-        'Fortunately you are already pretty aroused from your earlier performance and your pussy easily accepts his cock as he slowly penetrates you. You gasp around the cock in your mouth as a wave of pleasure shoots up your thighs. Maybe this was a good idea after all!'
-        '"God damn, this bitch is nice!" one of the men proclaims with a grunt as he presses further into your pussy.'
-		'"Yeah, she''s so much hotter than your fiance, too! I mean, no offense, man..." the man getting a handjob stammers to the client fucking your mouth.'
-		'"Nah, you''re right bro, this whore almost makes me want to cancel the wedding!" he laughs, slapping his cock against your tongue before pushing back inside.'
-		gs 'boystat', $boy1
-		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-		gs 'boystat', $boy2
-		gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-		gs 'boystat', $boy3
-		gs 'arousal', 'hj', -5, 'gangbang', 'sub'
-		gs 'boystat', $boy4
-		gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+		minut += 10
 		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1a.jpg"></center>'
+		'You climb onto the pole and start acrobatically swinging around it, his friends drunkenly hollering and catcalling as you smile at them.'
 		act 'Continue':
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/shared/sex/vag12.jpg"></center>'
-			'Now warned up you remove your top as the men take turns fucking you senseless, switching positions fluidly, but seemingly at random. As you take the barrage of cocks using your body in tandem, you can''t help but wonder how many other girls they''ve done this to over the years. You are only able to hang on
-			for the ride at this point, as you are being completely manhandled.'
-			'"I''m so glad I let you guys talk me into coming to the city tonight! This is the perfect last night of freedom!" your original client says, gliding his cock in and out of your glistening slit.'
-			'"Fuck yeah man, it was the least we could do! Gotta remind you of what you''ll be giving up with that ''ol ball and chain around your leg!" his friend cackles, shoving his cock into your mouth.'
-			gs 'boystat', $boy1
-			gs 'arousal', 'vaginal', 5, 'gangbang', 'sub'
-			gs 'boystat', $boy2
-			gs 'arousal', 'vaginal', 5, 'gangbang', 'sub'
-			gs 'boystat', $boy3
-			gs 'arousal', 'bj', -5, 'gangbang', 'sub'
-			gs 'boystat', $boy4
-			gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+			minut += 10
 			gs 'stat'
-			act 'Endure':
+			'<center><img <<$set_imgh>> src="images/locations/shared/sex/vag12.jpg"></center>'
+			'Now warmed up, you slowly remove your top and expose your breasts as you continue dancing on the pole. You''re soon stripped down to just your panties as you smile at the groom.'
+			
+			
+			act 'Give him a lap dance':
 				*clr & cla
-				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1b.jpg"></center>'
-				'Finally stripping you naked the guys lift you up before you are pushed onto your back on top of one of the guys. Cocks surround you in a flurry as you land on top of him. Laying there on top of one of the strangers, you feel wet, lubricated fingers probing around your asshole, followed by a quick pressure as the man''s cock enters your behind with a quiet pop. His still partially dressed friend straddles your cunt, shoving himself inside of your pussy at almost the same time your ass is being filled down below. Your mouth is also quickly filled by your original client, and your empty hand is filled with another throbbing cock. You are unable to do anything but take cock in your holes, focusing on catching as many gasps of oxygen as you are allowed.'
-				'"I think we''re already wearing this bitch out," the guy who''s cock you''re holding proclaims in a frustrated huff. "Come on, fucking stroke it!" he barks, thrusting his hips into your hand. His 
-				friends all laugh at you as you struggle to find a rhythm stroking him while your throat, pussy, and ass are all being drilled by the other 3 men.'
-				'"Relax bud, we''ve got time. We''ll get our money''s worth out of this whore. Hell, we probably already did. This bitch is way underpriced!" '
-				'The men continue to banter crudely about your body and degrade your worth as if you weren''t even there, occasionally taking swigs out of a bottle they''re passing around amongst themselves.'
-				'Their insults and thrusts get much more aggressive as they continue to drink, using you as nothing more than a vessel to please their cocks. '
-				'The man fucking your ass underneath you just groans, reaching up and grabbing at your tits with rough, calloused fingers.'
-				gs 'boystat', $boy1
-				gs 'arousal', 'hj', 5, 'gangbang', 'sub'
-				gs 'boystat', $boy2
-				gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-				gs 'boystat', $boy3
-				gs 'arousal', 'anal', -5, 'gangbang', 'sub'
-				gs 'boystat', $boy4
-				gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
+				minut += 10
 				gs 'stat'
-				act 'Hang on in there':
+				'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr1b.jpg"></center>'
+				'You climb off the pole and seductively walk over to the groom, his friends cheering as you climb into his lap. You can feel his rock hard cock bulging beneath you.'
+				'You spend a few minutes rocking your hips and grinding against him before you stand and wiggle your ass in his face. It takes all his willpower for him not to spank you before you slowly bend over and teasingly tug at your panties before you wiggle out of them, the room erupting in cheers as your panties drop to your ankles.'
+				'After this, you climb back into his lap and start grinding your naked body against him, the bulge in his crotch now at straining point as sweat beads on his forehead.'
+				
+				act 'Finish':
 					*clr & cla
-					'<center><img <<$set_imgh>> src="images/locations/shared/sex/vag12.jpg"></center>'
-					'You continue to do your best to please your customers, but more and more you are feeling like this was a job you should have turned down. The conversation between the men, when not hurling
-					insults down at you, is disgusting, and if you weren''t entirely stuffed with cocks, you would definitely not hang around.'
-					'"Man, I can''t believe you''re finally getting hitched, Sergi! You can''t say we didn''t try to warn you though, being married fucking sucks!" the guy underneath you says, pushing his cock back
-					up into your ass without a moment for you to re-adjust.'
-					'"Yeah man, all that matters in life is a good buzz and some young pussy like this. I wish I would have never gotten married, either. That god damn, nagging bitch..." his friend grumbles,
-					watching his cock spread your pussy wide to accommodate his girth. It''s then that you notice the wedding band on his finger as he reaches up and squeezes your tits.'
-					'"Fuck yeah, and this is some good pussy we got here tonight boys, so let''s enjoy it!"'
-					'Your original client stands in front of you with an expectant look, as if he was getting annoyed at waiting. You open your mouth obediently and he nods, shoving his cock back inside.
-					He continues to glare at you until you begin sucking it, but once you do, he breaks eye contact and joins in the conversation with his friends.'
-					'"Well, what can I say? I knocked my old lady up, the least I can do is marry the slut, right?" he explains, casually rocking his hips back and forth, fucking your mouth as he chats on with his friends. "But don''t worry, we can still get our nights out together!'
-					'Hey, you guys remember that one bitch we fucked after the championship game? The one who''s ass we all fucked in Igor''s old pick-up truck behind the school?"'
-					'The men all laugh and pass the bottle around, reminiscing about old conquests as they continue violating your body, comparing it to other women who they''ve worked over together.'
-					'"Yeah, her tits were bigger than this slut''s, but I think this one''s got a better ass for sure."'
-					'"Nice ass, but her pussy could be a bit tighter, honestly. What can you expect out of a stripper, though? She can suck pretty good cock though, I''m sure she makes her family real proud!"'
-					'You decide right then and there that you definitely need to start charging more for this kind of treatment moving forward...'
-					gs 'boystat', $boy1
-					gs 'arousal', 'vaginal', 5, 'gangbang', 'sub'
-					gs 'boystat', $boy2
-					gs 'arousal', 'bj', 5, 'gangbang', 'sub'
-					gs 'boystat', $boy3
-					gs 'arousal', 'anal', -5, 'gangbang', 'sub'
-					gs 'boystat', $boy4
-					gs 'arousal', 'hj', -5, 'gangbang', 'sub'
+					minut += 5
 					gs 'stat'
-					act 'They have to be close by now':
+					'<center><img <<$set_imgh>> src="images/locations/shared/sex/vag12.jpg"></center>'
+					'You continue to rock your hips and grind against him while shaking your breasts in his face until the music stops and you settle in his lap, his friends giving him approving, if somewhat jealous, nods and smiles.'
+					'"I''m so glad I let you guys talk me into coming to the city tonight! This is the perfect last night of freedom!" he says with a huge grin.'
+					'"Fuck yeah man, it was the least we could do! Gotta remind you of what you''ll be giving up with that ball and chain going around your leg next week!" his friend cackles.'
+					
+					act 'Time to leave':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/shared/sex/dp12.jpg"></center>'
-						'You''re spun back around and again double penetrated, your mouth once more stuffed with dick. You are now riding your original client, hoping that they are starting to get close to finishing
-						so you can get out of there. Your entire body aches and tears run down your cheek, the result of a combination of being forced to gag on cocks for the last 40 minutes as well as being verbally
-						and physically humiliated.'
-						'"This bitch is going to be fuckin'' loose as hell in a few years, glad we nabbed her now!" your client says, looking up at you. But not really "at" you, more like "through" you, like one would
-						look at an object. He leans forward and takes your left nipple into his mouth, sucking and biting hard at it, causing you to squirm. "She''s a sensitive one too, god damn. I should bring her home and teach my old lady some tricks!"'
-						'The other men laugh and continue to slap, grope, and fuck your body, but you can tell they''re getting close to climax and are talking less and grunting more. Their thrusts are almost violent
-						as they hammer into you, over and over and over again.'
-						'"I think it''s time to send this one home, boys..." the man who''s cock you were stroking says, looking down at you with a wicked grin. He stands over you, stroking his red-tipped glans
-						furiously at your face as you prepare for the finale of this seriously underpaid endeavor.'
-						gs 'boystat', $boy1
-						gs 'arousal', 'anal', 5, 'gangbang', 'sub'
-						gs 'boystat', $boy2
-						gs 'arousal', 'hj', 5, 'gangbang', 'sub'
-						gs 'boystat', $boy3
-						gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
-						gs 'boystat', $boy4
-						gs 'arousal', 'bj', -5, 'gangbang', 'sub'
-						gs 'stat'
-						act 'Finally':
+						'One of the men looks at his watch and tells the others that their time is up. As you climb off your client''s lap and gather your clothes, the man approaches you.'
+						'"Great show, girl. So great in fact, that you left our friend rather ''tensed up''. If we pay you an extra 2000 <b>₽</b>, would you give him a ''happy end'' to his night?" he asks loud enough for everyone to hear. The groom gives you a drunk smile.'
+						
+						act 'Agree':
 							*clr & cla
+							minut += 2
+							money += 2000
 							'<center><img <<$set_imgh>> src="images/locations/shared/sex/cum12.jpg"></center>'
-							'Suddenly, a massive torrent of hot, thick cum erupts from your client''s cock, spraying straight into your mouth and onto your chin. He grunts and smears his load all over your face as you feel another hot rope of jizz land on the side of your cheek and into your mouth, as well.'
-							'"Fuckin'' take those loads, you stupid bitch! Swallow it down, don''t you dare waste it, make your daddy proud!" the client''s inebriated friend blathers down at you, still laughing.
-							He leans forward, squeezing the remaining cum up from the root of his cock to the tip and cleans it on your tongue. You instinctively swallow it all, "There you go, not a drop wasted! Good girl.".'
-							'The other two men continue to piston in and out of your holes down below, tearing your pussy and ass open wildly as they buck up into you. Your tunnels are numb from the friction, but you can still feel the heat of the cocks buried inside of you as they both begin to tense and seize.'
-							'"Ahhh, fuck! I hope you''re on birth control, baby!" the man inside of your pussy groans, grabbing your hips as he unloads inside of you.'
-							'The man inside of your ass doesn''t say anything as he cums, but moans and collapses on top of you, his weight pressing the cock inside of your pussy even deeper up against your cervix. 
-							Cum pours from your pussy and ass as the men finish milking their cocks with your holes until they pull out one after another, leaving you in a semen-covered heap on the couch.'
-							'A while later, you collect the few meager rubles sitting on the table, along with your clothing, and stumble back to the break room to clean yourself up.'
-							gs 'boystat', $boy1
-							gs 'arousal', 'anal', 5, 'gangbang', 'sub'
-							gs 'boystat', $boy2
-							gs 'arousal', 'hj', 5, 'gangbang', 'sub'
-							gs 'boystat', $boy3
-							gs 'arousal', 'vaginal', -5, 'gangbang', 'sub'
-							gs 'boystat', $boy4
-							gs 'arousal', 'bj', -5, 'gangbang', 'sub'
-							gs 'cum_call', 'anus', 'Private dance client', 0, 0, 10000, 40
-							gs 'cum_call', 'face', '1st Friend of client', 0, 0, 10000, 40
-							gs 'cum_call', 'face', '2nd Friend of client', 0, 0, 5000, 40
-							gs 'cum_call', 'vagina', '3rd Friend of client', 0, 0, 5000, 40
-							gs 'cum_call', 'mouth_swallow', '2nd Friend of client', 0, 0, 5000, 40
-							gs 'cum_call', 'mouth_swallow', '3rd Friend of client', 0, 0, 5000, 40
+							'You agree and the groom''s friends all leave while giving him fist bumps and knowing smiles.'
+							'Once they''re gone, you approach the man and smile. "Let''s see what I''m dealing with here..." you whisper seductively as you run your hand over his crotch.'
+							'You unbutton his pants and pull his rock hard cock out before slowly jerking it in your hand. "My, my. Someone enjoyed the show," you giggle as you get on your knees in front of him.'
+							*nl
+							'You take his shaft into your mouth and start sucking while bobbing your head up and down. He''s so close that it only takes a few minutes of this for him to climax. He holds your head down and lets out a loud grunt as his cum spurts into your throat, forcing you to swallow it before he lets you go.'
+							'You sit up and choke down the last of his cum as he stands up and pats you on the head. "That was amazing! Shame I won''t feel those lips wrapped around my cock again."'
+							'He heads out of the room as you collect the rubles sitting on the table, along with your clothing, and head to the dressing room to clean yourself up.'
+							gs 'arousal', 'hj', 5
+							gs 'arousal', 'bj', 5
+							gs 'cum_call', 'mouth_swallow', 'Private dance client', 0, 0, 10000, 40
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Return to the locker room':gt 'stwork', 'start'
+							act 'Return to the dressing room':gt 'stwork', 'start'
+						end
+						
+						act 'Refuse'
+							*clr & cla
+							gs 'stat'
+							'<center><img <<$set_imgh>> src="images/locations/shared/sex/cum12.jpg"></center>'
+							'You shake your head. "This is a strip club, not a fucking brothel! Go rent him a whore off the corner if he needs his dick sucked!"'
+							'The men huff, but leave in peace as you collect your clothing and head to the dressing room to clean yourself up.'
+							act 'Return to the dressing room':gt 'stwork', 'start'
 						end
 					end
 				end
@@ -594,52 +511,60 @@ end
 if $ARGS[0] = 'pr2':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr2.jpg"></center>'
-	'The man you''re dancing for is mesmerized by you and can''t stop touching himself. After a while, he asks you if he can fuck you for 2000 <b>₽</b>.'
+	'The man you''re dancing for is mesmerized by you and can''t stop touching himself. After a while, he asks you if he can cum on your face for 2000 <b>₽</b>.'
 	
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:
-		act 'Reject him (<<will_cost>> Willpower)':
+		act 'Refuse (<<will_cost>> Willpower)':
+			'You refuse and kick him out before heading back to the main floor.'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			gt 'stwork', 'start'
 		end
 	else
-		act 'Reject him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		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 'Agree':
 		gs 'npcgeneratec', 0, 'Private dance client', rand(20,55)
-		guy += 1
-		picrand = 39
+		'<center><video autoplay loop src="images/shared/sex/cum/facial/facial0,3.mp4"></video></center>'
+		'You nod and get on your knees as the client pulls his cock out and starts jerking it. After a few seconds, he loudly grunts that he''s close and you close your eyes as warm spurts of cum start splattering across your face. It drips down your chin as he squeezes the last few drops onto your forehead.'
+		'You wipe the cum from your eyes as he puts his cock away and leaves your payment on the table before leaving. You gather up your clothes and wipe your face as best as you can as you hurry to the dressing room to clean up.'
+		gs 'cum_call', 'face', 'Private dance client', 0, 0, 10000, 40
 		money += 2000
-		$sexloc = 'stwork'
-		xgt 'sex', 'var'
+		gs 'stat'
+		act 'Return to the dressing room':gt 'stwork', 'start'
 	end
 end
 
 if $ARGS[0] = 'pr3':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/redlight/stripclub/pr3.jpg"></center>'
-	'It''s a bit different dancing for a woman. It''s not often you have the pleasure of doing that, so you''re feeling a bit more frisky than usual. As you finish the dance, she gives you a kiss, and you start making out. She stops and offers you 1000 <b>₽</b> to continue on.'
+	'It''s a bit different dancing for a woman. It''s not often you have the pleasure of doing it, so you''re feeling a bit more frisky than usual. As you finish the dance, she gives you a kiss, and you start making out. She stops and offers you 1000 <b>₽</b> to eat her out.'
 
 	gs 'willpower', 'sex', 'resist', 'hard'
 	if will_cost <= pcs_willpwr:	
-		act 'Reject her (<<will_cost>> Willpower)':
+		act 'Refuse (<<will_cost>> Willpower)':
+			'You refuse and kick her out before heading back to the main floor.'
 			gs 'willpower', 'pay', 'resist'
 			gs 'stat'
 			gt 'stwork', 'start'
 		end
 	else
-		act 'Reject her (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+		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 'Agree':
 		girl += 1
 		lesbian += 1
-		picrand = 18
 		money += 1000
-		$sexloc = 'stwork'
-		xgt 'lezbsex', 'var'
+		gs 'stat'
+		'<center><img <<$set_imgh>> src="images/shared/sex/lesbian/ukuni11.jpg"></center>'
+		'You nod and get on your knees in front of the woman as she undresses her lower half and sits back in the chair before spreading her legs. You move in and start tracing your tongue along her pussy lips before moving up to her clit.'
+		'You spend a few minutes teasing her sensitive bud before she clamps her hand over her mouth and lets out a muffled cry as she climaxes and a small amount of her juices squirting over your face.'
+		'Once she recovers, she dresses herself and leaves your payment on the table before walking out. You gather up your clothes and head to the dressing room to clean up.'
+		
+		act 'Return to the dressing room':gt 'stwork', 'start'
 	end
 end
 
@@ -647,77 +572,79 @@ if $ARGS[0] = 'pr4':
 	*clr & cla
 	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie1.mp4"></video></center>'
 
-	'You enter one of the private back rooms where your customer is waiting. He looks extremely nervous, fidgeting in his chair. You give him a little smile and approach him, asking him in your most seductive voice:
-	"Any special requests, hon?"'
+	'You enter one of the private rooms where your customer is waiting. He looks extremely nervous, fidgeting in his chair.' 
+	'You smile and approach him. "Any special requests?" you ask in your most seductive voice.'
 	'The man looks at you as you start to strip, struggling to get his words out. "N-no, please. P-please keep your clothes o-on..." he stammers.'
-	'You''re taken aback for a moment, but he continues, his courage seemingly building as he presents a handful of rubles in his clenched fist.'
+	'You''re taken aback for a second, but he continues, his courage seemingly building as he presents a handful of rubles in his clenched fist.'
 	'"C-could you just...g-grind on me? With your clothes on?" he inquires, a bead of sweat rolling down his forehead.'
-	'"Not a problem, sweetie. Sit back and try to relax", you understandingly reply. It''s a simple enough request, albeit keeping your clothes on is a bit strange for a ''strip'' club. But ultimately it just means less work for you, right?'
-	'The next 15 minutes go by rather quickly for your customer, as your simple grinding seemingly make your him climax in his pants at least 2 or 3 times. He groans and vibrates under you, but he obeys the club rules and never lays a
-	hand on your body as you rock your hips and grind your pelvis against his bulge the best you can. As the dance ends, you place a soft kiss on his cheek and stand before him, noticing the huge wet spot on the front of his pants.
-	He gives you every last bill from his wallet and thanks your profusely, telling you multiple times that he''ll never forget you.'
+	'"Not a problem, sweetie. Sit back and try to relax," you understandingly reply. It''s a simple enough request, albeit keeping your clothes on is a bit strange for a ''strip'' club.'
+	'The next 15 minutes go by rather quickly for your customer, as your simple grinding seemingly makes him climax in his pants at least 2 or 3 times. He groans and vibrates under you, but he obeys the club rules and never lays a hand on your body as you rock your hips and grind your pelvis against his bulge.' 
+	'As the dance ends, you place a soft kiss on his cheek and stand before him, noticing the huge wet spot on the front of his pants.'
+	'He gives you every last bill from his wallet and thanks you profusely, telling you multiple times that he''ll never forget you.'
 
-	act 'Return to the locker room':gt 'stwork', 'start'
+	act 'Return to the dressing room':gt 'stwork', 'start'
 end
 
 
 if $ARGS[0] = 'pr5':
 	*clr & cla
 	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie2.mp4"></video></center>'
-
-	'You enter the backroom where your client is supposedly waiting and hear two voices already talking from behind the door. As you enter, a fellow dancer named Katia greets you at the door with a forced smile. '
-	'"We''ve got our hands full with with this one..." she whispers to you as you step inside. Behind her, a greasy looking, overweight patron claps and wrings his hands excitedly, proclaiming, "Ah! She''s here! Now we can really
-	get the party started!"'
-	'Katia rolls her eyes subtlety to you before turning back to the man, pushing her large, fake breasts in his face. "You think you can handle both of us?" she asks, trying to remain professional around a guy she clearly
-	finds unattractive.'
-	'"Oh, I can, and so can my wallet! I am very rich, you know!" he bellows, tucking a few bills into your g-string with a hearty laugh.'
-	'The next few songs go by as you try to look sexy and alluring for the paying customer, all while touching him as little as possible. He smells like body odor and booze, and makes continuous lewd comments about your bodies.
-	A security guard steps in multiple times during the dance to remind him that he''s not allowed to touch the dancers without permission. Sometimes this job feels really gross...'
-
-	act 'Return to the locker room':gt 'stwork', 'start'
+	!!if rand (0,5) = 0 and (day = 5 or day = 6) and AlbinaQW['stripper'] = 1:
+	 !!'You approach the private room where your client is waiting and hear two voices talking from behind the door. As you enter, Albina greets you at the door with a forced smile.'
+	 !!'"This guy''s going to be a pain in the ass," she whispers to you as you step inside. Behind her, a greasy looking, overweight patron claps and wrings his hands excitedly. "Ah! She''s here! Now we can really get the party started!"'
+	 !!'Albina subtlety rolls her eyes at you before strutting over to the man and seductively shaking her bubble butt in his face. "You think you can handle both of us?" she asks, making barely any effort to hide the the fact that she clearly finds him unattractive.'
+	 !!'"Oh, I can! My wallet is fatter than that juicy ass of yours, girl!" he bellows, tucking a few bills into her g-string with a hearty laugh as she silently scoffs in disgust.'
+	 !!'The next few songs go by as you try to look sexy and alluring for the paying customer, all while touching him as little as possible. He smells like body odor and booze, and makes continuous lewd comments about your bodies. A security guard steps in multiple times during the dance to remind him that he''s not allowed to touch the dancers without permission. Sometimes this job feels really gross...'
+	
+	 !!act 'Return to the dressing room':gt 'stwork', 'start'
+	
+	else
+	 'You approach the private room where your client is waiting and hear two voices talking from behind the door. As you enter, a fellow dancer named ''Jade'' greets you at the door with a forced smile.'
+	 '"We''ve got our hands full with with this one..." she whispers to you as you step inside. Behind her, a greasy looking, overweight patron claps and wrings his hands excitedly. "Ah! She''s here! Now we can really get the party started!"'
+	 'Jade subtlety rolls her eyes at you before turning back to the man, pushing her large, fake breasts in his face. "You think you can handle both of us?" she asks, trying to remain professional around a guy she clearly finds unattractive.'
+	 '"Oh, I can! And so can my wallet! It''s bigger than those huge tits of yours!" he bellows, tucking a few bills into her g-string with a hearty laugh.'
+	 'The next few songs go by as you try to look sexy and alluring for the paying customer, all while touching him as little as possible. He smells like body odor and booze, and makes continuous lewd comments about your bodies. A security guard steps in multiple times during the dance to remind him that he''s not allowed to touch the dancers without permission. Sometimes this job feels really gross...'
+	
+	 act 'Return to the dressing room':gt 'stwork', 'start'	
+	end
 end
 
 if $ARGS[0] = 'pr6':
 	*clr & cla
 	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie3.mp4"></video></center>'
+	
+	'Your client is sitting alone in the largest of the private rooms, a room where private group parties are normally held. Instead, it''s just you and him in a big empty space tonight, an echo chamber full of nothing but loud music, club lighting and a bit of shared loneliness between two strangers.'
+	'The patron doesn''t say much as you grind your nude body against him, but he watches you intently. With no special requests given, you run through a typical dance routine, slinking and sliding your body over his as alluringly as possible. Once your time is up, he gives you a big smile, politely thanks you for your time, and stands up, leaving the room.' 
+	'After he closes the door behind him and you gather your things, a security guard cracks open the door and hands you a wad of cash. "This is from your client. You must have made a good impression since he wouldn''t shut up about you. Nice work."'
+	'Despite working in such a dark and sometimes depraved place, you walk back to the dressing room with your head up a little higher than before, feeling good about a job well done.'
 
-	'Your client is sitting alone in the largest of the private rooms, a room where private group parties are normally held. Instead, it''s just you and him in a big empty space tonight, an echo chamber full of nothing but loud music,
-	club lighting, and a bit of shared loneliness between two strangers.'
-	'The patron doesn''t say much as you grind your nude body against him, but he watches you intently. With no special requests given, you run through a typical dance routine, slinking and sliding your body over his as alluringly as 
-	possible. Once your time is up he gives you a big smile, politely thanks you for your time, and stands up, leaving the room. After he closes the door behind him and you gather your things, a security guard cracks open the door
-	and hands you a wad of cash. "This is from your client, you must have made a good impression. He wouldn''t shut up about you.  Nice work."'
-	'espite working in such a dark and sometimes depraved place, you walk back to the dressing room with your head up a little higher than before, feeling good about a job well done.'
-
-	act 'Return to the locker room':gt 'stwork', 'start'
+	act 'Return to the dressing room':gt 'stwork', 'start'
 end
 
 if $ARGS[0] = 'pr7':
 	*clr & cla
 	'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4.mp4"></video></center>'
 
-	'You meet your patron in one of the back rooms with a more lush setting than many of the others. Crushed red velvet curtains and mirrors line the walls, and multiple poles surround the outskirts of the room, allowing for many girls
-	to serve many customers at once. But tonight, it''s just you and one other man. You feel relatively safe knowing there a security guard right outside the door, but even still, the way the man''s eyes pierce your own makes your heart race a bit. There''s definitely more than meets the eye with this guy.'
-	'Still, you are there to do a job, and you begin to dance for him as seductively as possible. After a few minutes, he tosses a handful of bills at you and exclaims, "Let''s see some skin, girl."'
+	'You meet your patron in one of the back rooms with a more lush setting than many of the others. Crushed red velvet curtains and mirrors line the walls, and multiple poles surround the outskirts of the room, allowing for many girls to serve many customers at once. Tonight though, it''s just you and one other man. You feel relatively safe knowing there''s a security guard right outside the door, but the way the man''s eyes pierce your own makes your heart race. There''s definitely more than meets the eye with this guy.'
+	'Still, you''re here to do a job, and you start dancing for him as seductively as possible. After a few minutes, he tosses a handful of bills at you. "Let''s see some skin, girl!" he exclaims.'
 
 	act 'Show him some skin':
 		*clr & cla
 		'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
 
-		'You peel open your shirt at the customer''s request, exposing your breasts in his direction. You sway and rock seductively around the pole, occasionally giving him a small smile and leaning in his direction. You arch your back,
-		giving him a full view of your ass.'
-		'"You like what you see, honey?" you coo in his direction. His bulge is clearly visible now, even more so as he lewdly rubs it while watching you.'
+		'You peel open your shirt at the customer''s request, exposing your breasts in his direction. You sway and rock seductively around the pole, occasionally giving him a small smile and leaning in his direction. You then arch your back, giving him a full view of your ass.'
+		'"You like what you see?" you coo in his direction. His bulge is clearly visible now, even more so as he lewdly rubs it while watching you.'
 		'"I do, and I want more. How much to get you over here to take care of this with that pretty little mouth of yours?"'
 		
 		act 'Decline':
 			*clr & cla
 			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4a.mp4"></video></center>'
 
-			'"Sorry, no touching, hon. House rules, you know how it goes..."
-			Your customer huffs and nods, tossing a few more bills at your feet and downs the remainder of his drink.
-			"Yeah yeah, I get it. Time to get out of here and find me a whore. See ya, girl."
-			You fix your outfit and collect your earnings from the floor, watching from the corner of your eye as the man stumbles out of the door. A few minutes later, the security guard peeks in,  gives you the "all clear" 
-			sign, and you head back to the dressing room.'
-			act 'Return to the locker room':gt 'stwork', 'start'
+			'"Sorry, no touching. House rules."'
+			'Your customer huffs and nods, tossing a few more bills at your feet and downs the remainder of his drink.'
+			'"Yeah yeah, I get it. Time to get out of here and find me a whore. See you around, girl."'
+			'You fix your outfit and collect your earnings from the floor, watching from the corner of your eye as the man stumbles out of the door. A few minutes later, the security guard peeks in and gives you the "all clear" sign, and you head back to the dressing room.'
+			act 'Return to the dressing room':gt 'stwork', 'start'
 		end
 
 		act 'Accept':
@@ -728,15 +655,16 @@ if $ARGS[0] = 'pr7':
 			gs 'boyStat', $npclastgenerated
 			gs 'arousal', 'bj', 5, 'sub', 'deepthroat'
 			gs 'cum_call', 'mouth_swallow', '$boy'
+			money += 2000
 			gs 'stat'
 			'<center><video autoplay loop src="images/locations/city/redlight/stripclub/private_movie4b.mp4"></video></center>'
 
-			'You look at the customer, deciding if the risk is worth it. He''s a bit older, but seems decent enough. And he smells washed, unlike some of the guys who roll through the club.'
-			'"For you hon, 200₽. But only a quick blowjob, we don''t have a ton of time."'
-			'"Fine by me, get to work!" he says, tossing the money at you. He quickly stands, tugging his massively thick cock from his pants and dropping them to the floor. He''s already rock hard from your striptease, and per your agreement, it''s inside of your mouth within seconds. His fat cock fills every inch of space between your lips, and just taking it inside causes the swollen tip to press into the entrance of your windpipe.'
-			'After just a few minutes, the man''s entire body tenses and without warning, he unloads his cum down your throat, not even giving you a chance to spit or dodge out of the way. The man grunts as he holds your head in place, unloading every single drop of his hot, viscous cum into your mouth. When he finally releases you, you sputter and choke his thick load down your esophagus the best you can, gasping for breath. But before you can even yell at him for not giving you warning, he''s re-dressed himself and ducked out of the door.
-			"Could have warned me, asshole..." you whisper to yourself, gathering your things and heading back to the dressing room.'
-			act 'Return to the locker room':gt 'stwork', 'start'
+			'You look at the customer. He''s a bit older, but seems decent enough. And he smells washed, unlike some of the guys who roll through the club.'
+			'"2000 <b>₽</b>," you reply and bite your lip seductively.'
+			'"This better be one hell of a blowjob!" he says before tossing the money at you. He quickly stands, tugging his massively thick cock from his pants and dropping them to the floor. He''s already rock hard from your striptease, and per your agreement, it''s inside of your mouth within seconds. His fat cock fills every inch of space between your lips, and just taking it inside causes the swollen tip to press into the entrance of your windpipe as you start sucking and bobbing your head up and down.'
+			'After just a few minutes, the man''s entire body tenses and without warning, he unloads his cum down your throat, not even giving you a chance to spit or dodge out of the way. The man grunts as he holds your head in place, unloading every single drop of his hot, viscous cum into your mouth. When he finally releases you, you sputter and choke his thick load down your throat the best you can while gasping for breath. Before you can even yell at him for not giving you any warning, he''s re-dressed himself and ducked out of the door.
+			"Could have warned me, asshole..." you whisper to yourself while gathering your things and heading back to the dressing room.'
+			act 'Return to the dressing room':gt 'stwork', 'start'
 		end
 	end
 end

+ 2 - 5
locations/tatiana_missions.qsrc

@@ -695,13 +695,11 @@ if $ARGS[0] = 'mission2sex':
 			'"What the hell does that mean?"'
 			'"<<$pcs_nickname>>, please! I''m not going to hurt you! Just enjoy it like all the other girls!"'
 			'Tatiana momentarily stops her assault and looks at you, a little confused. This is your opportunity!'
-
-			gs 'willpower', 'kiss', 'force', 'hard'
-			gs 'willpower', 'misc', 'resist', 'hard'
 			gs 'willpower', 'pay', 'resist'
 			minut += 1
 			gs 'stat'
-
+			
+			gs 'willpower', 'kiss', 'force', 'hard'
 			if will_cost <= pcs_willpwr:
 				act 'Counterattack! (<<will_cost>> Willpower)':
 					*clr & cla
@@ -714,7 +712,6 @@ if $ARGS[0] = 'mission2sex':
 					'"Please, <<$pcs_nickname>>! Don''t do that! I''m not supposed to work like this! I... don''t know what will happen if you continue! Please..."'
 					'You stop at her pleading, and as Tatiana grows restless, you somehow know that this is her last bullet. Beyond this she will be yours... but maybe this isn''t a good idea. She seems utterly terrified by your actions.'
 					'Do you want to continue?'
-					gs 'willpower', 'kiss', 'force', 'hard'
 					gs 'willpower', 'pay', 'force'
 					minut += 1
 					gs 'stat'

+ 1 - 1
locations/vasilyhome.qsrc

@@ -1248,6 +1248,7 @@ if $ARGS[0] = 'sergey_room':
 	'<center><b><font color = maroon>Uncle Sergey''s bedroom</font></b></center>'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/shulginhome/smroom.jpg"></center>'
 	'Sergey''s bedroom looks just like any other bedroom. There''s a large bed, a television with a VCR connected to it, and a large cabinet to store clothes in. A random amount of junk is deposited on one of the nightstands.'
+	act 'Return to the hallway': gt 'vasilyhome', 'hallway'
 	if hour < 7 or hour >= 23:
 		'When you come in, you see that<<$serg_obr>> <a href="exec: gt ''Serge_Shulgin'',''sleep''">Sergey</a> is currently on his bed, sound asleep.'
 	elseif hour < 18 or hour >= 21:
@@ -1257,7 +1258,6 @@ if $ARGS[0] = 'sergey_room':
 			'When you come in, you see that<<$serg_obr>> <a href="exec: gt ''Serge_Shulgin'',''tv''">Sergey</a> is relaxing on his bed, watching TV.'
 		end
 	end
-	act 'Return to the hallway': gt 'vasilyhome', 'hallway'
 end
 
 !sleep when the bed is empty

+ 2 - 2
locations/zaprFWash.qsrc

@@ -817,10 +817,10 @@ if $ARGS[0] = 'runback':
 		act 'Endure his punishment':gt 'zaprFWash', 'punish'
 		! gave doms the choice to fight back as long as they have some energy related stat with something left even if they lost the roll for runSuccess
 		! these values are based off of the cheat menu values for players who turn off these stats as they can never go below 35
-		gs 'willpower', 'skill', 'force', 'stren_lvl'
+		gs 'willpower', 'skill', 'resist', 'stren_lvl'
 		will_cost = (will_cost * 3) / 2
 		if will_cost <= pcs_willpwr:
-			act 'Push him off of you and escape (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'force' & gt 'zaprFWash', 'fight'
+			act 'Push him off of you and escape (<<will_cost>> Willpower)': gs 'willpower', 'pay', 'resist' & gt 'zaprFWash', 'fight'
 		else
 			act 'Push him off of you and escape (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end