59 Revize e370645725 ... 2ad6a70225

Autor SHA1 Zpráva Datum
  Kevin_Smarts 2ad6a70225 Merge remote-tracking branch 'Derryth_Love/master' před 2 roky
  netuttki 4c5a55e392 Fixed the checks to be in synch. před 2 roky
  netuttki 178e8e76b3 Fixed a bug that prevented mods from registering new locations. před 2 roky
  netuttki ac3c49f594 There were some situations where not every restriction cleared. Fixed. před 2 roky
  Derryth_Love 21a7ab100b Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife před 2 roky
  Derryth_Love b89b05fbef Updating skin improvement via Tatiana před 2 roky
  netuttki 1a3f436ba7 Merge remote-tracking branch 'upstream/master' před 2 roky
  Kevin_Smarts 9ad0805c1c [Fixed] missing code trap in shortgs, missing loc/loc_arg and some typography errors in fit. před 2 roky
  Kevin_Smarts 858a2adf00 Merge remote-tracking branch 'hornguy6/master' před 2 roky
  Kevin_Smarts b81d3dc6d3 [added] New therapist events but the impact not coded yet, from Friendly Neighbourhood Therapist před 2 roky
  Kevin_Smarts d1bbb7a141 [Fixed] Deeper Park dead end, missing act, from Hooded Silence před 2 roky
  Kevin_Smarts 586fe54eda Merge remote-tracking branch 'Anya/master' před 2 roky
  Kevin_Smarts 33770d3fb1 Merge remote-tracking branch 'hornguy6/master' před 2 roky
  hornguy6 3299d51f64 Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife před 2 roky
  Anya 2ba47c860f [fixed] case sensitivity was probably the issue před 2 roky
  Anya 74afdc05eb [fixed] Albina chat goofs (maybe) před 2 roky
  Vengeance11 6d4d9876a6 Small text edits před 2 roky
  hornguy6 d5a02685dc [fixed] took away the 1 před 2 roky
  hornguy6 9421de45e6 [fixed] text corrections před 2 roky
  hornguy6 626bd72645 [fixed] double full stop před 2 roky
  hornguy6 0f0a58df8a [fixed] disabled something incorrect před 2 roky
  netuttki 507e7d160c Short activities now land in the music menu, don't quit to location. před 2 roky
  netuttki b8085acf54 At some point some fixes got lost. Now I put them back. před 2 roky
  netuttki 76c47d91a2 Moved the call to set the icons after `subkid`; that removed the icon. před 2 roky
  netuttki 23eec57715 `anushka_walkhome` now checks if Sveta has been kicked out. před 2 roky
  netuttki 1471c4e750 Checking if Sveta is kicked out when Sonja walks her home. před 2 roky
  netuttki 95f83dbbb0 Katja now can walk Sveta home if Sveta is not kicked out. před 2 roky
  netuttki 9dde3f281b Fixed the Matryona Mansion construction bug. před 2 roky
  netuttki 1f5b7fc9c8 Moved the rest of the home/internet update code to be with their friends před 2 roky
  netuttki a32948098c Hotel payment back to normal, no `shortgs` call před 2 roky
  netuttki 951da16891 Hotel payments rolled back to original, no `shortgs` call. před 2 roky
  hornguy6 91835449c1 [fixed] blank screen actions and disabled unfinished content před 2 roky
  netuttki bc7c56c409 Merge remote-tracking branch 'upstream/master' před 2 roky
  Kevin_Smarts 4e105188f1 [fixed] Saveupdater fixes for recent entries placed incorrectly and older entries not version locked. Changed game to 0.8.8.4 před 2 roky
  Kevin_Smarts 73e214af37 [fixed] $loc and $menu_loc set incorrectly před 2 roky
  Kevin_Smarts 25800d93bb Merge remote-tracking branch 'hornguy6/master' před 2 roky
  hornguy6 e9f2104709 [fixed] i think i found the model reset problem před 2 roky
  netuttki 6505bf97be Merge remote-tracking branch 'upstream/master' před 2 roky
  Kevin_Smarts 44a2ef6a62 [text edit] Minor edit by nutluck před 2 roky
  Kevin_Smarts 4f6d8543b1 Revert "A quiet version of the payment. In the end, probably pointless" před 2 roky
  hornguy6 3633c2d371 [fixed] bad goto calls před 2 roky
  Vengeance11 fb26e7b651 proofreading was reversed in previous commit před 2 roky
  Kevin_Smarts 286f144789 [fixed] "Sonia's file is fixed now just a bunch of missing code I didn't see." from Hooded Silence před 2 roky
  Kevin_Smarts 0e21f472bd Merge branch 'master' of https://git.tfgames.site/Kevin_Smarts/glife před 2 roky
  Kevin_Smarts 86ff0ceb75 [fixed] Wrong return args před 2 roky
  Kevin_Smarts 3d4484bfc8 [change] Update for version number for the feature lock release před 2 roky
  Vengeance11 5ae74eb9fa Stealing Lydia's job před 2 roky
  Kevin_Smarts 8cfa0b7576 Merge branch 'master' of pikdum/glife into master před 2 roky
  pikdum 92279e828e fix: filename case sensitivity před 2 roky
  Kevin_Smarts cc253be85f [added] bare bones Sonia home for her prefall content by nutluck with some code from Hooded Silence před 2 roky
  bgkjdgbizgblzdgbr 9aaf0cdff8 [added] An other trying clothes with Katja in the mall scene. Need proof reading před 2 roky
  Kevin_Smarts 33fb4ad6aa [fixed] Typo fixed by Hooded Silence před 2 roky
  hornguy6 14e4e2b4e0 [fixed] missing fuckbuddy flag před 2 roky
  hornguy6 cdcd5ab91f [fixed] loop protection před 2 roky
  hornguy6 a54766cc09 [added] catch all reaction před 2 roky
  hornguy6 7c39047639 [fixed] clear screen, not line break před 2 roky
  hornguy6 cea041a340 [added] new facial reaction před 2 roky
  hornguy6 b8084cccbe [added] stat tracking for broken condoms před 2 roky
  netuttki 97c3d43310 Merge remote-tracking branch 'upstream/master' před 2 roky
46 změnil soubory, kde provedl 1489 přidání a 516 odebrání
  1. 1 0
      glife.qproj
  2. 2 1
      locations/Cum_Manage.qsrc
  3. 1 1
      locations/JuliaMilHome.qsrc
  4. 25 31
      locations/albina_chat.qsrc
  5. 1 2
      locations/bedr.qsrc
  6. 1 1
      locations/bedr2x.qsrc
  7. 5 3
      locations/bedrPar.qsrc
  8. 23 10
      locations/booty_call_cum.qsrc
  9. 1 1
      locations/booty_call_shower.qsrc
  10. 1 1
      locations/booty_call_start.qsrc
  11. 179 5
      locations/booty_call_talk.qsrc
  12. 74 71
      locations/city_coffee_hole.qsrc
  13. 48 37
      locations/city_hotel.qsrc
  14. 6 6
      locations/city_kafe.qsrc
  15. 1 1
      locations/city_mansion_residence_2.qsrc
  16. 1 1
      locations/exhibitionistshop.qsrc
  17. 3 5
      locations/fit.qsrc
  18. 1 1
      locations/foto_models2.qsrc
  19. 17 17
      locations/gschool_break.qsrc
  20. 24 1
      locations/gschool_coolkid_chats.qsrc
  21. 9 5
      locations/homes_properties.qsrc
  22. 9 9
      locations/homes_properties_attr.qsrc
  23. 2 0
      locations/hookup_after.qsrc
  24. 7 7
      locations/hookup_morning.qsrc
  25. 1 1
      locations/hunter_ambient.qsrc
  26. 2 3
      locations/internet_mobile.qsrc
  27. 223 9
      locations/katja_city.qsrc
  28. 3 3
      locations/model_mari.qsrc
  29. 15 11
      locations/music_actions.qsrc
  30. 4 4
      locations/music_bedroompractice.qsrc
  31. 4 4
      locations/music_onlinemusic.qsrc
  32. 18 3
      locations/pav_disco_coolkids.qsrc
  33. 8 1
      locations/pav_disco_gopniks.qsrc
  34. 33 14
      locations/pav_hotelReception.qsrc
  35. 3 3
      locations/pav_park.qsrc
  36. 2 0
      locations/pav_parkev.qsrc
  37. 3 1
      locations/pav_residential.qsrc
  38. 1 0
      locations/pav_shared_apt.qsrc
  39. 1 1
      locations/saveg.qsrc
  40. 100 56
      locations/saveupdater.qsrc
  41. 31 107
      locations/shortgs.qsrc
  42. 2 0
      locations/sitr.qsrc
  43. 2 0
      locations/sitr2x.qsrc
  44. 454 0
      locations/soniahome.qsrc
  45. 1 1
      locations/tatiana_lab.qsrc
  46. 136 77
      locations/therapist.qsrc

+ 1 - 0
glife.qproj

@@ -537,6 +537,7 @@
 	</Folder>
 	<Folder name="Sonia">
 		<Location name="soniadisco"/>
+		<Location name="soniahome"/>
 	</Folder>
 	<Folder name="Generator">
 		<Location name="placer"/>

+ 2 - 1
locations/Cum_Manage.qsrc

@@ -233,6 +233,7 @@ if $ARGS[0] = '':
 						cumsumbod += sexvolume
 						cumsumvag += sexvolume
 						condom_break = 1
+						stat['broken_condoms'] += 1
 
 						sparridt[sparrtemp] = cumarrkno[cumarrtemp]
 						sparrslc[sparrtemp] = 0
@@ -331,7 +332,7 @@ if $ARGS[0] = '':
 				!!STD checks
 				if cumnostd = 0: gs 'dinSex', 'std_trigger'
 				!! safe creampie (if cycle > 3 or on pill or succubus):
-				if cycle > 3 or pillcon2 > 1000 or succubusflag = 1:
+				if cycle > 3 or birth_control['safe'] = 1 or succubusflag = 1:
 					if sexunaware = 1 or sexcontra = 6:
 						pcs_cp_safe_unknown += 1
 					else

+ 1 - 1
locations/JuliaMilHome.qsrc

@@ -611,7 +611,7 @@ if $ARGS[0] = 'julia_chat':
 
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big12.jpg"></center>'
-			'You talk with Julia about a variety of things, mostly about his friends and the other Gopniks. He doesn''t ask about your life at all.'
+			'You talk with Julia about a variety of things, mostly about your common friends, school and some recent movies you have both seen.'
 
 			act 'Keep talking': gt 'JuliaMilHome', 'julia_chat'
 			act 'Stop talking': gt 'JuliaMilHome','julia_room'

+ 25 - 31
locations/albina_chat.qsrc

@@ -434,7 +434,6 @@ if $ARGS[0] = 'sex_talk_start':
 end
 
 if $ARGS[0] = 'sex_talk':
-	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Stop talking': gt 'albinahome', 'bedroom'
 	act 'Change the subject': gt 'albina_chat', 'chat'
 	act 'Ask her about her sex life instead': gt 'albina_chat', 'anal'
@@ -448,11 +447,9 @@ if $ARGS[0] = 'sex_talk2':
 		AlbinaQW['chat_rand'] = rand(1,3)
 		if AlbinaQW['chat_rand'] = 1:
 			'"So what''s your favourite position?" she asks.'
-			act 'Missionary': gt 'albina_chat', 'Missionary'
-			act 'Doggystyle': gt 'albina_chat', 'Doggystyle'
-			act 'Cowgirl': gt 'albina_chat', 'Cowgirl'
-	elseif AlbinaQW['chat_rand'] = 2:
-			gs'albina_chat','sex_talk'
+			act 'Missionary': gt 'albina_chat', 'missionary'
+			act 'Doggystyle': gt 'albina_chat', 'doggystyle'
+			act 'Cowgirl': gt 'albina_chat', 'cowgirl'
 		else
 			gs'albina_chat','sex_talk'
 		end
@@ -472,14 +469,14 @@ if $ARGS[0] = 'missionary':
 		'"You''re trying to tell me that lying on your back doing nothing is ''nice''?" She rolls her eyes. "Nuh uh. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs 'albina_chat','missionary2'
 	end
-	
+
 	act 'It''s romantic':
 		cla & *nl
 		'"It''s romantic!" you protest. "You can look up into his eyes when you cum. Or kiss. It makes it so much better."'
 		'"Romance is for decrepit old fucks," she rolls her eyes. "Nuh uh. Give it to me <i>dirty</i>. Bend me over and spank me! Grab me by the hair and pound my ass! Doggystyle is the way to go!"'
 		gs 'albina_chat','missionary2'
 	end
-	
+
 	act 'It''s easy':
 		cla & *nl
 		'"It''s easy," you shrug. "I don''t have to do any work. Just lay there and get dicked."'
@@ -492,8 +489,7 @@ if $ARGS[0] = 'missionary2':
 	pcs_horny += 15
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -510,14 +506,14 @@ if $ARGS[0] = 'doggystyle':
 		'"I definitely get that," Albina says. "I love that about it too. All I want from a guy is for him to grab me by the hair, shove his cock up my ass, and spank me until I cum. Best night ever."'
 		gs 'albina_chat','doggystyle2'
 	end
-	
+
 	act 'It goes deeper':
 		cla & *nl
 		'"It goes deeper in doggy," you explain. "I feel like it <i>fills</i> me, hitting every part of my insides. It just feels the best in that position."'
 		'"Fuck yeah," Albina says. "Doggy is the only way to <i>really</i> get balls deep inside a girl. And then when you get grabbed by the hair and pulled back even harder? And when he shoves it up your ass and spanks you? Fuck me, I could cum just thinking about it."'
 		gs 'albina_chat','doggystyle2'
 	end
-	
+
 	act 'Easy spankings':
 		cla & *nl
 		'"I love getting spanked," you grin.'
@@ -530,8 +526,7 @@ if $ARGS[0] = 'doggystyle2':
 	pcs_horny += 15
 	gs'stat'
 	'You giggle at her answer, feeling warmth blossoming between your hips and wetness seeping from your pussy. With the "fuck me eyes" Albina is giving you think she''s probably feeling something similar.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -548,14 +543,14 @@ if $ARGS[0] = 'cowgirl':
 		'"I think it feels best in doggy," Albina says. "It goes way deeper and you can get surprise anal in that position, which is the <i>best</i> kind of anal. Plus spankings. If I can''t sit down after a fuck, it was a good fuck." She then gives you a sly grin. "But riding dick is a close second for me."'
 		gs 'albina_chat','cowgirl2'
 	end
-	
+
 	act 'I like being in control':
 		cla & *nl
 		'"I like being in control," you explain. "If I want to go slow, I can go slow. If I want to go fast, I can ride him as hard as I like. It makes me feel... powerful? Just knowing that I''m the one in charge is such a turn on for me."'
 		'"That kind of stuff doesn''t matter to me," Albina shrugs back. "I like it hard and rough every time. Don''t get all slow and gentle with me. If I''m gonna get fucked, I want to <i>feel</i> it. If I want my face forced into the sheets with a cock balls deep up my ass being spanked until my eyes water, I''m only going to get that in doggy." She grins at you, clearly imagining a cock stuffed up her ass right now, but a few seconds later, it melts into a concessionary smile. "I''ll admit though, a hard ride is pretty good too."'
 		gs 'albina_chat','cowgirl2'
 	end
-		
+
 	act 'I like it when he grabs my breasts':
 		cla & *nl
 		'"I like having my boobs grabbed," you grin. "If I''m on top, then his hands are free to grope me."'
@@ -568,8 +563,7 @@ if $ARGS[0] = 'cowgirl2':
 	pcs_horny += 15
 	gs'stat'
 	'You both agree to disagree, but find yourself a little turned on by her response. Judging by the way she''s rubbing her thighs together, you think she is too.'
-	act 'Change the subject': gt 'albina_chat', 'chat'
-	act 'Keep talking about sex':gt 'albina_chat', 'sex_talk'
+	gs'albina_chat','sex_talk'
 	act 'Ask her about her anal fetish': gt 'albina_chat', 'anal'
 end
 
@@ -601,10 +595,10 @@ if $ARGS[0] = 'anal':
 		act 'I want to try it (shy)':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
-			'"Well..." you stammer. I... I want to try it and..."'
+			'"Well..." you stammer. "I... I want to try it and..."'
 			'Albina gives you a hard stare. "And you thought to ask the school buttslut how to do it?"'
 			'You stutter trying to form an answer, and she breaks into laughter.'
-			'"Relax <<$pcs_nickname>>, I''m fucking with you. What do you want to know?"'
+			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
 			*nl
 			gs 'albina_chat','anal_questions_shy'
 		end
@@ -623,7 +617,7 @@ if $ARGS[0] = 'anal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"Well... I- I''ve tried it a few times..." you stammer. "But it''s always been... painful... So I thought could ask-"'
-			'"The class buttslut about it?" Albina asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
+			'"The class buttslut about it?" she asks, giving you a hard stare. You sputter, trying to come up with an answer that will get you out of this before she breaks into laughter.'
 			'"Relax <<$pcs_nickname>>, I''m just fucking with you. What do you want to know?"'
 			gs 'albina_chat','anal_questions_shy'
 		end
@@ -632,7 +626,7 @@ if $ARGS[0] = 'anal':
 			cla & *clr
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/albinatalk.jpg"></center>'
 			'"I''ve tried anal a few times, but it''s always painful and not very enjoyable," you explain. "So I thought-"'
-			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" Albina asks, glaring at you.'
+			'"You could ask the class buttslut about it and she''d tell you all about how to get your asshole ravaged by cock?" she asks, glaring at you.'
 			'"Well... Yeah," you grin. "Is there a better person to ask than you?"'
 			'Albina laughs heartily and grins back at you.'
 			'"No, you''re probably right about that. I''m the queen of buttfucking. So what is it you want to know?"'
@@ -646,28 +640,28 @@ if $ARGS[0] = 'anal_questions_shy':
 		act 'Where do I start?':
 			cla & *nl
 			'"Well..." you mumble. "Where do I even start?"'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			'She nods. "Humble question. Good. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'What position?':
 			cla & *nl
 			'"What... position should I have my first time in?" you ask shyly.'
-			'"You''re getting way too far ahead of yourself," Albina interrupts. "Here''s my advice: Start small."'
+			'"You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small," she replies.'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'Does it hurt?':
 			cla & *nl
 			'"Does it hurt?" you ask shyly.'
-			'"Oh man, if you''re asking that then you''re <i>definitely</i> not ready," Albina laughs. "Here''s my advice: Start small."'
+			'She smiles in reponse. "Oh man, if you''re asking that then you''re <i>definitely</i> not ready. Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
 		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you... enjoy it?" you ask, cringing at how badly you phrased it.'
-			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
 			gs 'albina_chat','anal_end2'
 		end
 	end
@@ -678,21 +672,21 @@ if $ARGS[0] = 'anal_questions_open':
 		act 'Where do I start?':
 			cla & *nl
 			'"Where do I even start?" you ask.'
-			'"Humble question. Good." Albina nods. "Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
+			'She nods. "Humble question. Too many girls try to get ahead of themselves with this kind of thing. My advice? Start small."'
 			gs 'albina_chat','anal2'
 		end
 		
 		act 'What''s the best position?':
 			cla & *nl
 			'"What''s the best position to try it in?" you ask excitedly. "Cowgirl seems hard, but doggy seems like it could be rough. I was won-"'
-			'"You''re getting way too far ahead of yourself," Albina interrupts, holding her hand up. "Here''s my advice: Start small."'
+			'She holds her hand up and interrupts you. "You''re getting way too far ahead of yourself, <<$pcs_nickname>>. Here''s my advice: Start small."'
 			gs 'albina_chat','anal2'
 		end
 	else
 		act 'How do you enjoy it?':
 			cla & *nl
 			'"How do you enjoy it?" you ask, cringing at the memories of your past experiences.'
-			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" Albina asks in return.'
+			'"You mean how do I manage to orgasm while my asshole is getting plowed like a field?" she asks in return.'
 			'"Yeah. It''s always too painful for me. I can''t even get wet."'
 			gs 'albina_chat','anal_end2'
 		end
@@ -707,12 +701,12 @@ end
 if $ARGS[0] = 'anal_end1':
 	*nl
 	'You thank her for her helpful advice and she continues answering your questions and giving you all the advice she feels you need to know.'
-	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," Albina says, shamelessly eye fucking you.'
+	'"And, if you need some <i>hands on</i> teaching... you know you can always come here," she says, shamelessly eye fucking you.'
 	gs 'albina_chat','sex_talk'
 end
 
 if $ARGS[0] = 'anal_end2':
-	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench your asscheeks on what''s inside of you, whether that be a dildo or a fat cock."'
+	'"One word," she says, holding up her finger. "Practice. Your mistake was going straight for a real dick. That''s a big no no. Practice with your fingers or a small dildo first to see what works for you. Some girls like it slow and gentle, others like it fast and rough. Just keep practicing and getting used to it. And relax. It will always be a little painful, but it will become more pleasurable the more you do it, especially when you get better at controlling the instinctive reflex to clench around what''s inside you, whether that be a dildo or a fat cock."'
 	'She grins at you. "If you ever want a <i>hands on</i> lesson, then I''m willing to ''teach'' you some things..."'
 	gs 'albina_chat','sex_talk'
 end

+ 1 - 2
locations/bedr.qsrc

@@ -217,7 +217,6 @@ end
 
 dynamic $palelady
 
-gs 'music_actions', 'music_icon'
 if pcs_horny >= 50: act 'Masturbate':gt 'selfplay', 'start'
 
 if pornMagazine > 0:
@@ -229,6 +228,6 @@ gs 'subkid'
 act 'Relax on your bed': gt 'bed', 'start'
 
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
-
+gs 'music_actions', 'music_icon'
 --- bedr ---------------------------------
 

+ 1 - 1
locations/bedr2x.qsrc

@@ -196,7 +196,6 @@ if sick >= 1:
 end
 
 dynamic $palelady
-gs 'music_actions', 'music_icon'
 
 if pcs_horny >= 50: act 'Masturbate': gt'selfplay', 'start'
 
@@ -209,6 +208,7 @@ gs 'subkid'
 
 act 'Relax on your bed': gt 'bed', 'start'
 gs 'prostitution_functions', 'prostitute_outfit_at_home'
+gs 'music_actions', 'music_icon'
 
 --- bedr2x ---------------------------------
 

+ 5 - 3
locations/bedrPar.qsrc

@@ -274,9 +274,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 			access['nocamshow'] = 1
 			$access['noporn-message'] = 'You shouldn''t watch porn with your sister in the room, she would notice for sure!'
 			$access['nocamshow-message'] ='You can''t do any webcam activities with your sister in the room!'
+		else
+			gs 'music_actions', 'clear_restrictions'
 		end
-		
-		gs 'music_actions', 'music_icon'
 
 		if locat['Anya_inroom'] = 0 and breastpump = 1 and bp_unbox <= 0:
 			'<a hlpf="exec: gt ''lact_bp'', ''bp_unbox_event''">Unbox</a> your breast pump'
@@ -292,7 +292,9 @@ if $ARGS[0] = '' or $ARGS[0] = 'start':
 		'</td><td width = "100" valign="top"></td><td>'
 		gs 'subkid'
 		'</td></tr></table>'
-		
+
+		!! NOTE: This has to go here, otherwise gs 'subkid' removes the icon. 
+		gs 'music_actions', 'music_icon'
 	end
 end
 

+ 23 - 10
locations/booty_call_cum.qsrc

@@ -292,11 +292,11 @@ if $ARGS[0] = 'fuck_cum':
 		end
 		
 		if booty_call['condom'] = 1 and booty_call['no_condom'] ! 1:
-			if booty_call['he_ask_creampie'] = 1:
-				act'Come together':gs 'booty_call_cum', 'cum_condom'
-			else
+		!!	if booty_call['he_ask_creampie'] = 1:
+		!!		act'Come together':gs 'booty_call_cum', 'cum_condom'
+		!!	else
 				act'Let him come in the condom':gt 'booty_call_cum', 'cum_condom'
-			end
+		!!	end
 		else
 			!!if booty_call['orgasm'] < orgasm or pcs_horny >= 85:
 			if booty_call['orgasm'] < orgasm:
@@ -712,6 +712,13 @@ if $ARGS[0] = 'facial_brace':
 		'The first shot of cum hits you directly in the eye, and you squeeze both of them shut as you to cringe in disgust. More and more spurts come out, spraying across your face and completely covering your eyes. By the time he''s finished orgasming, your visage is absolutely plastered with semen and your expression is stuck in an involuntary grimace.'
 		'"Oh my god! That''s so gross!" you cringe.'
 		'Carefully wiping the cum from your eyes, you blink them open, vision ringed with blurry white edges, and the first sight you''re greeted with is <<$npc_firstname[$boy]>> wearing a shit eating grin, looking at your plastered face.'
+		act'Why do boys like this?':
+			cla & *clr
+			'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial34.jpg"></center>'
+			'"Why do boys even like this?" you grimace, while <<$npc_firstname[$boy]>> keeps leering at you. "What on earth is so hot about plastering a girl''s face with <i>this</i>?"'
+			gs'booty_call_sex', 'sex_end'
+		end
+		
 		act'I hate you':
 			booty_call['mad'] = 1
 			cla & *clr
@@ -853,7 +860,7 @@ if $ARGS[0] = 'cum_mouth':
 		'You keep your lips wrapped tight around the tip of <<$npc_firstname[$boy]>>''s cock while he comes, sucking every last drop of spunk from it until it stops twitching and you think his orgasm if finished. Looking up at him, you stick out your tongue, showing him the entire load you gathered in your mouth.'
 		act'Spit':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['spit'] = 1
 			booty_call['spit_count'] += 1
 			$booty_call['last_cum'] = 'spit'
@@ -867,7 +874,7 @@ if $ARGS[0] = 'cum_mouth':
 		
 		act'Swallow':
 			$booty_call['cum_describe1'] = 'Thanks,'
-			$booty_call['cum_describe2'] = 'wiping your mouth.'
+			$booty_call['cum_describe2'] = 'wiping your mouth'
 			booty_call['swallow'] = 1
 			booty_call['swallow_count'] += 1
 			$booty_call['last_cum'] = 'swallow'
@@ -1453,8 +1460,8 @@ if $ARGS[0] = 'cum_pullout':
 	if booty_call['pullout_ask'] = 1:
 		!! differing descriptions based on position
 		if $booty_call['position'] = 'miss':
-			$booty_call['cum_choice'] = 'pullout'
 			booty_call['cum_stomach'] += 1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			gs'cum_call', 'stomach',$boy,1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			'"Pull out!"'
@@ -1464,22 +1471,24 @@ if $ARGS[0] = 'cum_pullout':
 			booty_call['cum_back'] += 1
 			gs'cum_call', 'butt',$boy,1
 			gs'cum_call', 'back',$boy,1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			'"Pull out!"'
 			*nl
 			'At your words, he yanks himself from your pussy and begins furiously jacking off over your ass. Moments later, you feel hot viscious liquid spatter all over it and across your back.'
 		elseif $booty_call['position'] = 'cowgirl':
-			$booty_call['cum_choice'] = 'ass'
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			gs'cum_call', 'butt',$boy,1
 			booty_call['cum_ass'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 			'"Pull out!"'
 			*nl
-			'At your words, you jump off his cock and reach behind you to grab it with your hand, furiously jerking it. Moments later, you feel hot viscious liquid spatter all over your ass.'
+			'You slip off his cock just in time, as not even a second later you feel hot liquid spatter all over your ass.'
 		end
 	else
 		if $booty_call['position'] = 'miss':
 			gs'cum_call', 'stomach',$boy,1
+			$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 			booty_call['cum_stomach'] += 1
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 			if booty_call['not_inside'] = 1:
@@ -1502,6 +1511,7 @@ if $ARGS[0] = 'cum_pullout':
 			gs'cum_call', 'back',$boy,1
 			booty_call['cum_back'] += 1
 			booty_call['cum_ass'] += 1
+			$booty_call['cum_describe2'] = 'looking back at the white liquid glazing your ass'
 			'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
 			if booty_call['not_inside'] = 1:
 				'"Not inside me!" you yelp frantically.'
@@ -1518,6 +1528,7 @@ if $ARGS[0] = 'cum_pullout':
 			if booty_call['not_inside'] = 1:
 				gs'cum_call', 'stomach',$boy,1
 				booty_call['cum_stomach'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/bellycum2.jpg"></center>'
 				'"Not inside me!" you yelp frantically.'
 				*nl
@@ -1527,11 +1538,11 @@ if $ARGS[0] = 'cum_pullout':
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. Moments later, he ejaculates, sending cum spattering across your belly.'
 				end
 			else
-				$booty_call['cum_choice'] = 'pullout'
 				gs'cum_call', 'butt',$boy,1
 				gs'cum_call', 'back',$boy,1
 				booty_call['cum_back'] += 1
 				booty_call['cum_ass'] += 1
+				$booty_call['cum_describe2'] = 'looking at the white liquid glazing your stomach'
 				'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum4.jpg"></center>'
 				if booty_call['condom'] = 1:
 					'<<$npc_firstname[$boy]>> suddenly pushes you backwards, eliciting a yelp as you fall onto your back, his cock popping out from your pussy along the way. He rips the condom off his cock and moments later, he ejaculates, sending cum spattering across your belly.'
@@ -1738,6 +1749,8 @@ if $ARGS[0] = 'cum_condom':
 	gs'cum_call', '',$boy,1,3
 	$booty_call['cum_choice'] = 'condom'
 	$booty_call['last_cum'] = 'condom'
+	!! remove later when reactions are written
+	booty_call['react'] = 1
 	if $booty_call['position'] = 'miss':
 		'<center><img <<$set_imgh>> src="images/shared/sex/cum/cum61.jpg"></center>'
 		$booty_call['cum_describe2'] = 'looking between your legs as he removes his cock, the rubber casing around it bulging with liquid.'

+ 1 - 1
locations/booty_call_shower.qsrc

@@ -385,7 +385,7 @@ if $ARGS[0] = 'before_shower_creampie_surprise':
 		*nl
 		'Finally, your orgasms subside and you untangle yourselves. As his cock leaves your pussy, something hot dribbles down your leg.'
 		act'That was nice':
-			cla & *nl
+			cla & *clr
 			'<center><video autoplay loop src="images/shared/sex/shower/after1.mp4"></video></center>'
 			'"That was nice," you pant, unable to say anything else.'
 			'"Yeah..." <<$npc_firstname[$boy]>> smiles back at you. "Bedroom?"'

+ 1 - 1
locations/booty_call_start.qsrc

@@ -1589,7 +1589,7 @@ end
 
 if $ARGS[0] = 'bj_sub_lets_fuck':
 	'After a couple minutes <<$npc_firstname[$boy]>> pushes your head away, your saliva trailing from his cock.'
-	if stat['think_virgin'] = 1:
+	if stat['think_virgin'] = 1 and booty_call['fuck_count'] = 0:
 		if know_virgin[$boy] = 1:
 			'"That was great," he smiles. "That was exactly what I wanted. But I want more now."'
 			act'I''m saving my virginity':gt'booty_call_virgin', 'wait'

+ 179 - 5
locations/booty_call_talk.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'cum_react':
 		act'React':
 			booty_call['react'] = 1
 			cla
+			gs'booty_call_talk', 'bask_satisfaction'
 			if booty_call['he_ask_creampie'] = 1 and $booty_call['last_cum'] ! 'creampie' and booty_call['condom'] ! 1:
 				gs 'booty_call_talk', 'no_cum_inside'
 			elseif booty_call['he_ask_mouth'] = 1 and $booty_call['last_cum'] ! 'swallow' and $booty_call['last_cum'] ! 'mouth'and $booty_call['last_cum'] ! 'face_mouth':
@@ -460,13 +461,21 @@ if $ARGS[0] = 'cum_together_no_bc':
 				if booty_call['risky_creampie'] = 1:
 					act'Danger day (stress)':
 						cla & *nl
-						'"Oh fuck," you pant. "This is really bad. Today is a dangerous day..."'
+						if booty_call['danger_day'] = 1:
+							'"I thought I told you," you pant nervously. "It''s a danger day... I could get pregnant..."'
+						else
+							'"Oh fuck," you pant. "This is really bad. Today is a dangerous day..."'
+						end
 						gs'booty_call_sex', 'sex_end'
 					end
 					
 					act'Danger day (not mad)':
 						cla & *nl
-						'"Well that''s not good," you pant, smiling wryly at <<$npc_firstname[$boy]>>. "Today is a dangerous day for me..."'
+						if booty_call['danger_day'] = 1:
+							'"Hey," you pant, smiling wryly at <<$npc_firstname[$boy]>>. "Didn''t I tell you something about today being a dangerous day for me...?"'
+						else
+							'"Well that''s not good," you pant, smiling wryly at <<$npc_firstname[$boy]>>. "Today is a dangerous day for me..."'
+						end
 						gs'booty_call_sex', 'sex_end'
 					end
 				end
@@ -736,6 +745,171 @@ if $ARGS[0] = 'cum_together_yeah':
 	end
 end
 
+if $ARGS[0] = 'bask_satisfaction':
+	if booty_call['orgasm'] < orgasm and booty_call['cum_together_fake'] ! 1:
+		!! if Sveta came
+		act'Quiet satisfaction':
+			cla & *clr
+			minut += rand(1,3)
+			gs 'stat'
+			booty_call['react'] = 1
+			if $booty_call['last_cum'] = 'creampie':
+				if booty_call['cock_remove'] = 1:
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/vagcreampie/miss1.jpg"></center>'
+					if booty_call['came_together'] > 0:
+						'You lay back, panting as you wind down from your simultaneous orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+					elseif orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, feeling <<$npc_firstname[$boy]>>''s cum seep from your pussy.'
+					end
+					*nl
+					'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+				else
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You lay back, panting as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You lay back, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						else
+							'You lay back, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You just lay there, panting from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You just lay there, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						else
+							'You just lay there, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard from your simultaneous orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your string of multiple orgasms, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+						else
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your recent orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock and his cum.'
+						end
+					end
+					*nl
+					if booty_call['speed'] <= 2:
+						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+					else
+						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+					end
+				end
+			elseif $booty_call['last_cum'] = 'condom':
+				if booty_call['cock_remove'] = 1:
+					'<center><img <<$set_imgh>> src="images/shared/after/pillow_talk1.jpg"></center>'
+					if booty_call['came_together'] > 0:
+						'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down from your simultaneous orgasm.'
+					elseif orgasm - booty_call['orgasm'] > 1:
+						'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down from your string of multiple orgasms.'
+					else
+						'You lay back, cuddled up against <<$npc_firstname[$boy]>>, panting as you wind down from your recent orgasm.'
+					end
+					*nl
+					'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+				else
+					if $booty_call['position'] = 'miss':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/miss/2.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You lay back, panting as you wind down from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You lay back, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						else
+							'You lay back, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>>, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/doggy/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You just lay there, panting from your simultaneous orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You just lay there, panting as you wind down from your string of multiple orgasms, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						else
+							'You just lay there, panting as you wind down from your recent orgasm, enjoying the moment and relaxing with <<$npc_firstname[$boy]>> on top of you, his cock still twitching inside you.'
+						end
+					elseif $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/vag/cowgirl/1.jpg"></center>'
+						if booty_call['came_together'] > 0:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard from your simultaneous orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock.'
+						elseif orgasm - booty_call['orgasm'] > 1:
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your string of multiple orgasms, your breasts pressing against his chest as you feel your body melt into his, filled with his cock.'
+						else
+							'You collapse onto <<$npc_firstname[$boy]>>, breathing hard as you wind down from your recent orgasm, your breasts pressing against his chest as you feel your body melt into his, filled with his cock.'
+						end
+					end
+					*nl
+					if booty_call['speed'] <= 2:
+						'The two of you just stay like that for a while, basking in the afterglow of your love-making.'
+					else
+						'The two of you just stay like that for a while, basking in the afterglow of your rough fucking.'
+					end
+				end
+			else
+				if $booty_call['last_cum'] = 'face_mouth':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face, its salty taste on your tongue.'
+					end
+				elseif $booty_call['last_cum'] = 'spit':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the salty taste of <<$npc_firstname[$boy]>>''s sperm on your tongue as it dribbles down your chin.'
+					end
+				elseif $booty_call['last_cum'] = 'swallow':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the salty taste of <<$npc_firstname[$boy]>>''s sperm still on your lips.'
+					end
+				elseif $booty_call['last_cum'] = 'facial':
+					'<center><img <<$set_imgh>> src="images/shared/sex/cum/facial/facial35.jpg"></center>'
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the warm mask of <<$npc_firstname[$boy]>>''s cum across your face already beginning to cool.'
+					end
+				elseif $booty_call['last_cum'] = 'tits':
+					$npc_apt_bedroom[$boy]
+					if orgasm - booty_call['orgasm'] > 1:
+						'You lay back, panting as you wind down from your string of multiple orgasms, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+					else
+						'You lay back, panting as you wind down from your recent orgasm, the warm glaze of <<$npc_firstname[$boy]>>''s cum across your chest already beginning to cool.'
+					end
+				elseif $booty_call['last_cum'] = 'pullout':
+					if $booty_call['position'] = 'miss' or $booty_call['position'] = 'cowgirl':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/stomach/sleep1.jpg"></center>'
+						if orgasm - booty_call['orgasm'] > 1:
+							'You lay back, panting  as you wind down from your string of multiple orgasms, feeling the warm cum on your belly already beginning to cool.'
+						else
+							'You lay back, panting as you wind down from your recent orgasm, feeling the warm cum on your belly already beginning to cool.'
+						end
+					elseif $booty_call['position'] = 'doggy':
+						'<center><img <<$set_imgh>> src="images/shared/sex/cum/back1.jpg"></center>'
+						if orgasm - booty_call['orgasm'] > 1:
+							'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, panting as you wind down from your string of multiple orgasms.'
+						else
+							'You just lay there, <<$npc_firstname[$boy]>>''s cum spattered across your ass, panting as you wind down from your recent orgasm.'
+						end
+					end				
+				end
+				*nl
+				'A few minutes pass and your breathing slowly calms, relaxing in a moment of quiet satisfaction.'
+			end
+			gs'booty_call_sex', 'sex_end'
+		end
+	end
+end
+
 if $ARGS[0] = 'creampie_felt_great':
 	act'That felt great':
 		cla & *clr
@@ -1820,7 +1994,7 @@ if $ARGS[0] = 'cheating_rules':
 			$npc_apt_bedroom[$boy]
 			'"No kissing," you say.'
 			'"That''s fine," <<$npc_firstname[$boy]>> nods.'
-			gs'booty_call_after', 'cheating_rules'
+			gs'booty_call_talk', 'cheating_rules'
 		end
 	end
 	
@@ -1844,7 +2018,7 @@ if $ARGS[0] = 'cheating_rules':
 			elseif $npc_cum_pref[$npclastgenerated] = 'pullout':
 				'"I prefer the pullout method anyways," <<$npc_firstname[$boy]>> grins.'
 			end
-			gs'booty_call_after', 'cheating_rules'
+			gs'booty_call_talk', 'cheating_rules'
 		end
 	end
 	
@@ -1864,7 +2038,7 @@ if $ARGS[0] = 'cheating_rules':
 			else
 				'"I guess that''s fair," <<$npc_firstname[$boy]>> says.'
 			end
-			gs'booty_call_after', 'cheating_rules'
+			gs'booty_call_talk', 'cheating_rules'
 		end
 	end
 end

+ 74 - 71
locations/city_coffee_hole.qsrc

@@ -11,7 +11,7 @@ if $args[0]= 'start':
 	menu_off = 0
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/street_sign.jpg"></center>'
-	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Open hours are between 07:00 to 23:00.'
+	'Along the street is a sign advertising a cafe called the "Coffee Hole". Following the direction of the sign, you find the door to the cafe in a little nook between two buildings. It would have been hard to see from the street without the sign. Opening hours are 07:00 to 23:00.'
 	act 'Return to the city': gt 'city_island'
 	if hour >= 7 and hour < 23: act 'Enter the cafe': gt 'city_coffee_hole', 'inner'
 end
@@ -25,7 +25,7 @@ if $args[0]= 'inner':
 	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>'
-	'The inside of the place looks like it was once some type of industrial building. It has tall ceilings, exposed pipes, ductwork, and lights. It has that hipster look to the place. Across from the door in the far corner is the counter. In the middle of the room are several tables and chairs for people to sit at. Along the wall opposite the counter is an area with several couches for people to sit and relax. The menu board shows a wide range of flavoured coffees, teas, espressos, and pastries, among other things.'
+	'The cafe looks like it was once some type of industrial building, with tall ceilings, exposed pipes, ductwork and lights. The counter is in the far corner, while the middle of the room contains several tables and chairs. Along the wall opposite the counter is an area with several couches for people to sit and relax. The menu board shows a wide range of flavoured coffees, teas, espressos and pastries, among other things.'
 	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
@@ -46,7 +46,7 @@ if $args[0]= 'inner':
 			elseif kendraslave >= 1:
 				'You see a familiar face sitting at one of the tables, your mistress <a href="exec:gt''city_coffee_hole','kendra''">Kendra.</a>'
 			elseif hotcat >= 5:
-				'As you look around, you see a beautiful young <a href="exec:gt''city_coffee_hole','kendra''">black woman</a> sitting at one of the tables. She notices you and gives you a quick once-over before smiling and leaning back. Now she seems to be watching you with an inviting smile to join her.'
+				'As you look around, you see a beautiful young <a href="exec:gt''city_coffee_hole','kendra''">black woman</a> sitting at one of the tables. She notices you and gives you a quick once-over before smiling and leaning back. She seems to be watching you with an inviting smile to join her.'
 			else
 				'As you look around, you see a beautiful young black woman sitting at one of the tables. She notices you and gives you a quick once-over before returning to what she was doing. After a few minutes, she finishes her drink before getting up and leaving.'
 			end
@@ -54,7 +54,7 @@ if $args[0]= 'inner':
 			if DjibrilQW['meet'] = 1:
 				'You see a familiar face sitting at one of the tables, Olu''s nephew <a href="exec:gt''city_coffee_hole','djibril''">Djibril.</a>'
 			elseif hotcat >= 5:
-				'As you look around, you see an attractive young <a href="exec:gt''city_coffee_hole','djibril''">black man</a> sitting at one of the tables. When he notices you looking at him, he gives you a friendly smile and wave. It seems he is the friendly sort and has now interested in you as well.'
+				'As you look around, you see an attractive young <a href="exec:gt''city_coffee_hole','djibril''">black man</a> sitting at one of the tables. When he notices you looking at him, he gives you a friendly smile and a wave. It seems he is the friendly sort and seems to be interested in you.'
 			else
 				'As you look around, you see an attractive young black man sitting at one of the tables. He notices you and gives you a quick once-over before returning to what he is doing. After a few minutes, he finishes his drink before getting up and leaving.'
 			end
@@ -81,10 +81,10 @@ if $ARGS[0] = 'eat':
 		minut += 10
 		mood += 5
 		gs 'stat'
-		'You take your order and find an empty table and sit down. You quietly enjoy your order as you look around at the other people.	You feel your mood brighten as you enjoy the ambience of the place.'
+		'You take your order and find an empty table. You quietly enjoy your order as you look around at the other people.	You feel your mood brighten as you enjoy the ambience of the place.'
 	else
 		gs 'stat'
-		'You are sitting at a table in the cafe, it''s nice here.'
+		'You''re sitting at a table in the cafe. It''s nice here.'
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Get up from table': gt 'city_coffee_hole', 'inner'
@@ -101,7 +101,7 @@ if $ARGS[0] = 'post_komp':
 	mood += 2
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/shared/date/cafequiet.jpg"></center>'
-	'You are sitting at a table in the coffee shop. You could use your laptop if you wanted but should buy something more to eat or drink first. It is very calm here.'
+	'You''re sitting at a table in the coffee shop. You could use your laptop if you wanted, but should buy something more to eat or drink first.'
 	act 'Get up from table': gt 'city_coffee_hole', 'inner'
 end
 
@@ -113,7 +113,7 @@ if $ARGS[0] = 'toilet':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/restroom.jpg"></center>'
-	'The first thing you notice about the restroom is there seems to be only one, and it''s co-ed. The second thing you notice when walking in is. The walls are covered in what could only describe as graffiti art, yet it is nice and clean. Several stalls are along one wall, and a row of sinks with mirrors.'
+	'The first thing you notice about the restroom is there seems to be only one, and it''s co-ed. The walls are covered in what you can only describe as graffiti art, but it''s otherwise nice and clean. Several stalls are along one wall, and a row of sinks with mirrors line the other.'
 	dynamic $tampon
     dynamic $quickwash
     dynamic $basin
@@ -135,14 +135,14 @@ if $args[0]= 'counter':
 		if temprand = 1:
 			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/worker1.jpg"></center>'
-			'As you approach, the woman behind the counter looks up at you. She appears to be in her late twenties or maybe early thirties. She has dark hair with purple streaks, and her arms are covered in tattoos. "Welcome to the Coffee Hole. What can I get you?" She asks in a friendly and welcoming way. You notice she has a familiar accent. You are not sure where, but it reminds you a little bit of Marcus'' accent.'
+			'As you approach, the woman behind the counter looks up at you. She appears to be in her late twenties or maybe early thirties. She has dark hair with purple streaks, and her arms are covered in tattoos. "Welcome to the Coffee Hole. What can I get you?" she asks in a friendly and welcoming tone. You notice she has a familiar accent; it reminds you a little bit of Marcus'' accent.'
 			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'
 		else
 			'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 			'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/worker2.jpg"></center>'
-			'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 sounds bored and like she is reciting something she is forced to say.'
+			'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'
@@ -162,46 +162,46 @@ if $args[0]= 'anushka_work':
 	'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/nush_counter.jpg"></center>'
 	if anushkaQW[coffee_hole] = 1:
 		if npc_rel['A144'] >= 60:
-			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. Need your holes filled with something hot and black again?" She says with a wink, making even ordering coffee sound dirty.'
+			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. Need your holes filled with something hot and black again?" she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "You are so bad."'
 			if anushkaQW['photoshoot'] >= 1 and hour = 22:
-				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chit-chat a little about the University and here job here. After talking for a bit, you notice it is close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you.'
-				act 'Lets do a photo shoot':
+				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job. After talking for a bit, you notice that it''s close to closing, and the place is almost empty. Maybe she would be up for a little after-hours photo shoot for you?'
+				act 'Let''s do a photo shoot':
 					*clr & cla
 					'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 					'<center><img <<$set_imgh>> src="images/locations/city/island/coffee_hole/npcs/nush_counter.jpg"></center>'
 					'You grin at her. "We should totally do a photo shoot here."'
 					'She gives you a slightly surprised look. "What? Now?"'
-					'You find that amusing. "Well, we could, but I thought after you closed up. So what do you say?"'
-					'She bites her lower lip for a moment. "Fuck, okay, why not? Just hang around till I close up."'
-					act 'Wait till she closes up.': gt 'city_coffee_hole', 'photo_shoot'
+					'You find her reaction amusing. "Well, we could, but I was thinking after you closed up. So what do you say?"'
+					'She bites her lower lip for a moment. "Fuck, okay, why not? Just hang around until I close up."'
+					act 'Wait': gt 'city_coffee_hole', 'photo_shoot'
 				end
 			else
-				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chit-chat a little about the University and her job before there starts to be a line behind you. Then, you start looking at the menu on the wall to see if you want to order something.'
+				'She shrugs a little. "And you love it. It''s why you love hanging out with me." You chat about the university and her job before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
 			end
 		elseif npc_rel['A144'] <= 20:
 			'As you approach the counter, you see your classmate Anushka working again. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
 			'You smile at her. "So, do you like the job?"'
-			'She doesn''t return your smile. "It''s a job, so do you want something or not? I got work to do and can''t just chit-chat." You sigh. It seems she still doesn''t like you. So you look up at the menu on the wall to see if you might want to order something.'
+			'She doesn''t return your smile. "It''s a job. Do you want something or not? I''ve got work to do and can''t stand around chatting." You sigh. It seems she still doesn''t like you. You look up at the menu on the wall to see if you might want to order something.'
 		else
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. What can I get you?"'
 			'You smile at her. "So you like working here?"'
-			'She shrugs a little. "Yeah, it''s alright. As I said, it''s pretty easy, close to my place, and I can study when it is slow. Plus, the owner, Joanna, is pretty cool and chill about what I do at work. As long as I don''t leave a mess or ignore customers, she doesn''t really care what I do." You chit-chat a little about the University and Anushka''s job before there starts to be a line behind you. Then, you start looking at the menu on the wall to see if you want to order something.'
+			'She shrugs a little. "Yeah, it''s alright. As I said, it''s pretty easy, close to my place, and I can study when it''s slow. Plus, the owner, Joanna, is pretty cool and chill about what I do at work. As long as I don''t leave a mess or ignore customers, she doesn''t really care what I do." You chat about the university and her job when you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
 		end
 	else
 		anushkaQW[coffee_hole] = 1
 		if npc_rel['A144'] >= 60:
-			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole, where we can fill your holes with something hot and black, but maybe not in the way you would like." She says with a wink, making even ordering coffee sound dirty.'
+			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole, where we can fill your holes with something hot and black, but maybe not in the way you would like..." she says with a wink, even making ordering coffee sound dirty.'
 			'You smile at her. "Oh my god, you''re terrible. I didn''t know you worked here."'
-			'She shrugs a little. "Yeah, need some extra money coming in to help pay for stuff. But, this is pretty easy, close to my place, and I can study when it is slow." You chit-chat a little about the University before there starts to be a line behind you. Then, you start looking at the menu on the wall to see if you want to order something.'
+			'She shrugs. "I need some extra money coming in to help pay for stuff. This is pretty easy, close to my place, and I can study when it''s slow." You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
 		elseif npc_rel['A144'] <= 20:
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she sighs, and you think she rolls her eyes. "Welcome to the Coffee Hole. What can I get you?"'
 			'You smile at her. "I didn''t know you worked here."'
-			'She doesn''t return your smile. "Well, now you do, so do you want something or not? I got work to do and can''t just chit-chat." You sigh. It seems she still doesn''t like you. So you look up at the menu on the wall to see if you might want to order something.'
+			'She doesn''t return your smile. "Well, now you do, so do you want something or not? I''ve got work to do and can''t stand around chatting." You sigh. It seems she still doesn''t like you. You look up at the menu on the wall to see if you might want to order something.'
 		else
 			'As you approach the counter, you see your classmate Anushka working behind it. When she sees you, she gives you a friendly smile. "Welcome to the Coffee Hole. What can I get you?"'
 			'You smile at her. "I didn''t know you worked here."'
-			'She shrugs a little. "Yeah, need some extra money coming in to help pay for stuff. But, this is pretty easy, close to my place, and I can study when it is slow." You chit-chat a little about the University before there starts to be a line behind you. Then, you start looking at the menu on the wall to see if you want to order something.'
+			'She shrugs. "I need some extra money coming in to help pay for stuff. This is pretty easy, close to my place, and I can study when it''s slow." You chat about the university before you notice the line forming behind you. You start looking at the menu on the wall to see if you want to order something.'
 		end
 	end
 	act 'Exit the cafe': gt 'city_island'
@@ -217,7 +217,7 @@ if $ARGS[0] = 'photo_shoot':
 	gs 'npc_relationship', 'modify', 'A144', 'like', 1, 'coffee_hole_photo'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose1.jpg"></center>'
-	'Once the last of the customers are gone, Anushka locks the doors. You pull your camera out and have her stand in front of the counter. You start snapping photos of her standing in different poses as you direct her. You ask her to hold various items for you as you snap pictures.'
+	'Once the last of the customers are gone, Anushka locks the doors before you pull your camera out and have her stand in front of the counter. You start snapping photos of her standing in different poses as you direct her, asking her to hold various items for you as you snap pictures.'
 	act 'Spice this up':
 		minut += 5
 		*clr & cla
@@ -227,32 +227,33 @@ if $ARGS[0] = 'photo_shoot':
 		'You want more, and you know she loves showing off. "Come on, famous model, let''s do something a little more risque!" Anushka reaches up and pulls down her top enough to expose her bra underneath as she poses while holding a coffee pot in her other hand.'
 		gs 'arousal', 'voyeur', 5
 		gs 'stat'
-		act 'Lets see that butt':
+		act 'Let''s see that butt':
 			minut += 5
 			*clr & cla
 			gs 'exp_gain', 'photoskl', rand(1,2)
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose3.jpg"></center>'
-			'"Let''s see that tight little butt you love getting fucked in." She turns around to show off her butt covered in tight little booty shorts. "Okay, lose the bra now," you tell her. She takes off her bra and pulls down her shirt while still keeping her ass pointed towards you. "Okay, turn around, so we can see those firm little titties of yours," you tell her.'
+			'"Let''s see that tight little butt you love getting fucked in." She turns around to show off her butt covered in tight little booty shorts. "Okay, lose the bra now," you tell her. She takes off her bra and pulls down her shirt while still keeping her ass pointed towards you. "Okay, turn around, so we can see those firm little titties of yours."'
 			act 'She turns':
 				minut += 5
 				*clr & cla
 				gs 'exp_gain', 'photoskl', rand(1,2)
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose4.jpg"></center>'
-				'She turns around, her top around her waist, and she pulls her apron aside so you get a few of her firm little breasts. You snap a few more photos. "Lose the apron." She tosses it aside, and you take a couple more snaps of her. "Now the top." She pulls off the top and throws it on a nearby table. "Now, the shorts." You tell her.'
+				'She turns around, her top around her waist, and pulls her apron aside so you get a view of her firm little breasts. You snap a few more photos. "Lose the apron."' 
+				'She tosses it aside, and you take a few more snaps of her. "Now the top." She pulls off the top and throws it on a nearby table. "Now the shorts."'
 				act 'Keep taking photos':
 					*clr & cla
 					gs 'exp_gain', 'photoskl', rand(1,2)
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose5.jpg"></center>'
-					'She slips her shorts off and kicks them at you, making you have to duck, to avoid being hit in the face by them. You snap a few more photos while she hooks her thumbs into her panties to pull them this way and that. Teasing you by almost showing off her pussy at times but stopping just short. "That''s it, work the camera for me, Nush!"'
+					'She slips her shorts off and kicks them at you, forcing you to duck to avoid being hit in the face by them. You snap a few more photos while she hooks her thumbs into her panties to pull them this way and that, teasing you by almost showing off her pussy at times but stopping just short. "That''s it, work the camera for me, Nush!"'
 					gs 'arousal', 'voyeur', 5
 					gs 'stat'
 					act 'Stop teasing':
 						*clr & cla
 						gs 'exp_gain', 'photoskl', rand(1,2)
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose6.jpg"></center>'
-						'She finally stops teasing and pulls her panties down just enough to give you glimpses of her pussy, until she finally pulls them about mid-way down her thighs, providing a much clearer view of her clean-shaven pussy. "Okay, lose them completely now." You tell her as you change spots and direct her into different poses for you.'
+						'She finally stops teasing and pulls her panties down just enough to give you glimpses of her pussy, until she finally pulls them about mid-way down her thighs, providing a much clearer view of her clean-shaven pussy. "Okay, lose them completely now," you tell her as you change spots and direct her into different poses for you.'
 						gs 'arousal', 'voyeur', 5
 						gs 'stat'
 						act 'Completely naked':
@@ -274,7 +275,7 @@ if $ARGS[0] = 'photo_shoot':
 									gs 'exp_gain', 'photoskl', rand(1,2)
 									gs 'stat'
 									'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose9.jpg"></center>'
-									'She turns and sits on her side, with one arm supporting her and reaching back to grab her butt cheek with the other. Spreading her thighs to better view her pussy and her pink little asshole.'
+									'She turns and sits on her side, with one arm supporting her while reaching back to grab her butt cheek with the other. She spreads her thighs to give you a better view of her pussy and asshole.'
 									gs 'arousal', 'voyeur', 5
 									gs 'stat'
 									act 'Final photos':
@@ -284,10 +285,11 @@ if $ARGS[0] = 'photo_shoot':
 										!!I commented this out as I don''t know how to add another photo set to the portfolio and even if we want to add a second for nush
 										gs 'stat'
 										'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/anushka/nush_model/sveta_photographer/coffee_hole/pose9.jpg"></center>'
-										'She sits in various poses, some fully exposed and others not, before you finally think you have the perfect final image. She''s leaning back on her elbows with her legs together, pointing up in the air. The angle you pick doesn''t show off much of her naked body, yet it is still erotic. Yet she looks so happy and alive. It seems especially fitting with the Coffee Hole sign behind her; it''s the perfect image to end this photo session.'
+										'She sits in various poses, some fully exposed and others not, before you finally think you have the perfect final image. She''s leaning back on her elbows with her legs together, pointing up in the air. The angle you pick doesn''t show off much of her naked body, yet is still erotic, and she looks so happy and alive. It seems especially fitting with the Coffee Hole sign behind her; it''s the perfect image to end this photo session.'
 										*nl
 										'With the image taken, you lower the camera. "Thanks, Nush, that was amazing. This place made for an amazing place to take photos in. You can get dressed now."'
-										'She gets off the counter and grabs her panties off the floor, pulling them back up. "My pleasure. I love modelling almost as much as I love my music." You review the photos on your camera as she gets dressed again. "Well, I should really finish cleaning up so I can go home and get some sleep before classes tomorrow."'
+										'She gets off the counter and grabs her panties off the floor before pulling them back on. "My pleasure. I love modelling almost as much as I love my music."' 
+										'You review the photos on your camera as she gets dressed again. "Well, I should really finish cleaning up so I can go home and get some sleep before classes tomorrow."'
 										gs 'arousal', 'voyeur', 5
 										gs 'arousal', 'end'
 										gs 'stat'
@@ -296,12 +298,12 @@ if $ARGS[0] = 'photo_shoot':
 											minut +=5
 											gs 'stat'
 											'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big144.jpg"></center>'
-											'You nod to her. "Sure thing, I should get going anyways. Thanks again, and I will see you around campus, hopefully. If not, I will stop by sometime, and we can hang out." As she escorts you to the door so she can lock it again after you leave, you as;. "Which room do you have over at the dorms?"'
-											'She stops at the door without unlocking it. "I''m not. I was going to. But the boys wanted to get a place in the city, so we rented an apartment close to campus. Costs me less to pay only a quarter of the bills than the dorm was going to cost. But living with three boys is a nightmare, so I only regret it constantly." She says with a laugh.'
+											'You nod at her. "Sure thing, I should get going anyways. Thanks again. I''ll see you around campus, hopefully. If not, I''ll stop by sometime, and we can hang out." As she escorts you to the door, you ask; "Which room do you have over at the dorms?"'
+											'She stops at the door without unlocking it. "I''m not. I was going to, but the boys wanted to get a place in the city, so we rented an apartment close to campus. Costs me less as I only have to pay a quarter of the bills than the dorm was going to cost. Living with three boys is a nightmare though, so I only regret it constantly," she says with a laugh.'
 											*nl
-											'"You should stop by sometime." She tells you where to find the place.'
-											'You write it down on your phone. "Thanks, I will, night. See you later." With that, she unlocks the door, and you head out while she relocks the door behind you and sets about cleaning up for the night.'
-											act 'Walk off': gt 'city_island'
+											'"You should stop by sometime," she says and tells you where to find the place.'
+											'You write it down on your phone. "Thanks, I will. See you later." With that, she unlocks the door, and you head out while she relocks the door behind you and sets about cleaning up for the night.'
+											act 'Walk away': gt 'city_island'
 										end
 									end
 								end
@@ -325,22 +327,23 @@ if $args[0]= 'lazar':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big149.jpg"></center>'
 	if fame['pav_slut'] > 300:
-		'You notice Lazar sitting at a table. As you approach, he says. "Well, look who it is; The Queen of Cocks." You sit down and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun." How he says, it leaves no doubt about what he means by fun. You seem to be moving to a new city and can''t get away from your rep as a slut. Then he tells you where they live. After that, he walks outside and walks away.'
+		'You notice Lazar sitting at a table. As you approach, he says "Well, look who it is; The Queen of Cocks." You sit and talk to him for a few minutes, but all he does is talk about how easy you were back in school. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should come sometime and hang out, so we can have some fun."' 
+		'How he says it leaves no doubt about what he means by fun. Even moving to a new city won''t let get away from your reputation as a slut. He tells you where they live before he heads outside and walks away.'
 	else
 		if npc_rel['A149'] >= 60:
 			lazarQW[city_invite] = 1
 			if hotcat >= 6:
-				'You notice Lazar sitting at a table. As you approach, he says. "What''s up, hottie? You enjoying the city?" You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." Then he tells you where they live. After that, he walks outside and walks away.'
+				'You notice Lazar sitting at a table. As you approach, he says "What''s up, hottie? You enjoying the city?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime. We would love to have you over." He tells you where they live before he heads outside and walks away.'
 			else
-				'You notice Lazar sitting at a table. As you approach, he says. "Hey, <<$pcs_nickname>>, how have you been?" You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." Then he tells you where they live. After that, he walks outside and walks away.'
+				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Marcus, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
 			end
 		elseif npc_rel['A149'] <= 20:
-			'You notice Lazar sitting at a table. As you approach, he says. "Hey." You sit down and talk to him for a few minutes. He doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
+			'You notice Lazar sitting at a table. As you approach, all he says is "Hey." You sit and talk to him for a few minutes, but he doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." He heads outside and walks away.'
 		else
 			if hotcat >= 6:
-				'You notice Lazar sitting at a table. As you approach, he says. "Hey, good looking. What have you been up to?" You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Hey, I need to get going. But give me your number, and I will give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him. After that, he walks outside and walks away.'
+				'You notice Lazar sitting at a table. As you approach, he says "Hey, good looking. What have you been up to?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going. Give me your number, and I''ll give you a call sometime. We can go out and have some fun or something sometime." You exchange phone numbers with him before he heads outside and walks away.'
 			else
-				'You notice Lazar sitting at a table. As you approach, he says. "Hey, <<$pcs_nickname>>, how have you been?" You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Hey, I need to get going. It was nice catching up. Maybe I will see you around sometime." After that, he walks outside and walks away.'
+				'You notice Lazar sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "I need to get going, but it was nice catching up. Maybe I''ll see you around sometime?" he says before heading outside and walking away.'
 			end
 		end
 	end
@@ -359,21 +362,21 @@ if $args[0]= 'dimka':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big1.jpg"></center>'
 	if fame['pav_slut'] > 225:
-		'You notice Dimka sitting at a table. As you approach, he says. "Get away from me, you disgusting slut. I don''t want any of the diseases you have." From there, he ignores you, so you turn and walk away.'
+		'You notice Dimka sitting at a table. As you approach, he says "Get away from me, you disgusting slut! I don''t want any of the diseases you have." He starts ignoring you, so you turn and walk away.'
 	else
 		if npc_rel['A1'] >= 60:
 			if grupTipe = 1:
-				'You notice Dimka sitting at a table. As you approach, he says. "Well, well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit down and talk to him for a few minutes. He is relatively nice to you, even asking about what you have been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I will see you around, and if you are good, I will introduce you to the cool crowd at the Uni." He says in a haughty tone, like he is already the King of the University. Then he gets up and walks out, walking away.'
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around me did you good. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as always." You sit and talk to him for a few minutes. He is relatively nice to you, even asking about what you''ve been up to until he finishes his drink. "I know you love thinking this is like the old days when we could hang out all the time, but now things are different. Maybe I''ll see you around, and if you''re good, I''ll introduce you to the cool crowd at the uni," he says in a haughty tone, as if he''s already the King of the university. He then stands and walks away.'
 			else
-				'You notice Dimka sitting at a table. As you approach, he says. "Well, well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit down and talk to him for a few minutes, but all he does is back-handed compliments about you until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I will see you around." Then he gets up and walks out, walking away.'
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I always thought you had it in you to make it out of Pavlovsk before you got knocked up and married to some loser. Seems my judgment was as correct as usual." You sit and talk to him for a few minutes, but all he does is give you back-handed compliments until he finishes his drink. "I know you love being seen with me, but I have better things to do. Maybe I''ll see you around?" he says before getting up and walking away.'
 			end
 		elseif npc_rel['A1'] <= 20:
-			'You notice Dimka sitting at a table. As you approach, he says. "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." From there, he ignores you, so you turn and walk away.'
+			'You notice Dimka sitting at a table. As you approach, he says "What the fuck do you want, loser? Never mind, I don''t want to know. Just go away." He starts ignoring you, so you turn and walk away.'
 		else
 			if grupTipe = 1:
-				'You notice Dimka sitting at a table. As you approach, he says. "Well, well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks to you until he finishes his drink. "I know you love being seen with me, but we are not in Pavlovsk anymore and no longer run in the same social circles." Then he gets up and walks out, walking away.'
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. It seems spending some time around on me did you good. You managed to make it out of Pavlovsk before you got knocked up  by some loser." You sit down and talk to him for a few minutes, but all he does is make snide remarks until he finishes his drink. "I know you love being seen with me, but we''re not in Pavlovsk anymore and no longer run in the same social circles." He gets up and walks away, leaving you alone in the cafe.'
 			else
-				'You notice Dimka sitting at a table. As you approach, he says. "Well, well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit down and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do." Then he gets up and walks out, walking away.'
+				'You notice Dimka sitting at a table. As you approach, he says "Well well, look who it is. I honestly never thought you would make it out of Pavlovsk. I figured you would be knocked up and married to some loser by now." You sit and talk to him for a few minutes, but all he does is berate you until he finishes his drink. "I know you love being seen with me, but I have better things to do." he says before getting up and walking away.'
 			end
 		end
 	end
@@ -393,15 +396,15 @@ if $args[0] = 'marcus':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big146.jpg"></center>'
 	if fame['pav_slut'] > 250:
 		marcusQW[city_invite] = 1
-		'You notice Marcus sitting at a table. As you approach, he says. "Hey, you." You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together, you should come by sometime and hang out, so we can have some fun." How he says, it leaves no doubt about what he means by fun. Seems that even moving to a new city and you can''t get away from your rep as a slut. Then he tells you where they live. After that, he walks outside and walks away.'
+		'You notice Marcus sitting at a table. As you approach, he says "Hey you." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together, you should come by sometime and hang out, so we can have some fun." How he says it leaves no doubt about what he means by fun. Seems that even moving to a new city can''t get you away from your reputation as a slut. He tells you where they live before he heads outside and walks away.'
 	else
 		if npc_rel['A146'] >= 50:
 			marcusQW[city_invite] = 1
-			'You notice Marcus sitting at a table. As you approach, he says. "Hey, <<$pcs_nickname>>, how have you been?" You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." Then he tells you where they live. After that, he walks outside and walks away.'
+			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. Lazar, Andrey and I are renting a place together. You should really come by sometime and hang out." He tells you where they live before he heads outside and walks away.'
 		elseif npc_rel['A146'] <= 20:
-			'You notice Marcus sitting at a table. As you approach, he says. "Hey." You sit down and talk to him for a few minutes. He doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
+			'You notice Marcus sitting at a table. As you approach, he says "Hey." You sit down and talk to him for a few minutes. He doesn''t say much to you before he checks his phone and finishes his drink. "Sorry, but I need to go." After that, he walks outside and walks away.'
 		else
-			'You notice Marcus sitting at a table. As you approach, he says. "Hey, <<$pcs_nickname>>, how have you been?" You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I will see you around." After that, he walks outside and walks away.'
+			'You notice Marcus sitting at a table. As you approach, he says "Hey <<$pcs_nickname>>, how have you been?" You sit and talk to him for a few minutes before his phone buzzes. He looks at it and finishes his drink. "Sorry, but I need to go. It was nice catching up. Maybe I''ll see you around?" he asks before he heads outside and walks away.'
 		end
 	end
 	act 'Exit the cafe': gt 'city_island'
@@ -418,7 +421,7 @@ if $args[0]= 'kendra':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 	if meet_kendra = 1:
-		'As you come over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you, "You change your mind about serving me?"'
+		'As you walk  over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you "You change your mind about serving me?"'
 		act 'No':
 			*clr & cla
 			kendrano = 1
@@ -426,7 +429,7 @@ if $args[0]= 'kendra':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			'You smile at her. "Sorry, no. I still don''t belong to anyone."'
-			'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again, and you''ll change your mind. I go to the University, so you should stop by sometime." She gives you directions to her dorm room before she returns to browsing.'
+			'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again, and you''ll change your mind. I go to the university, so you should stop by sometime." She gives you directions to her dorm room before she returns to browsing.'
 			act 'Exit the cafe': gt 'city_island'
 			act 'Leave her be': gt 'city_coffee_hole', 'inner'
 		end
@@ -436,15 +439,15 @@ if $args[0]= 'kendra':
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big84.jpg"></center>'
 			'You look down a little to show your submission to her. "Yes, Mistress Kendra."'
-			'She smiles widely. "I think you''re going to make a great little slave. We''re going to have a lot of fun together. I wish I had time to start your training now, but I have things I need to do. But come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+			'She smiles widely. "I think you''re going to make a great little slave. We''re going to have a lot of fun together. I wish I had time to start your training now, but I have things I need to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
 			act 'Exit the cafe': gt 'city_island'
 			act 'Leave the table': gt 'city_coffee_hole', 'inner'
 		end
 	elseif kendraslave >= 1:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
-		'As you come over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you, "Who do we have here? My favourite little white bitch. Come and service me? I wish I had time for a training session, but unfortunately, I have things to do. But come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+		'As you walk over to her, she invites you to sit down. You talk for a few minutes before she seems to get bored of the idle chit-chat and just bluntly asks you, "Who do we have here? My favourite little white bitch. Come to service me? I wish I had time for a training session, but unfortunately, I have things to do. Come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
 	elseif hotcat >= 5:
-		'As you come over to her, she invites you to sit down. You take a seat opposite her as she says. "You''re a pretty little thing. What''s your name?"'
+		'As you walk over to her, she invites you to sit down. You take a seat opposite her as she says. "You''re a pretty little thing. What''s your name?"'
 		'"<<$pcs_firstname>>, but most people call me <<$pcs_nickname>>. What''s your name?" you reply.'
 		'She smiles. "<<$pcs_nickname>>, what a pretty name. I''m Kendra, but you can call me Mistress Kendra," she says confidently.'
 		'"Oh..." you reply. She''s one of those people.'
@@ -467,7 +470,7 @@ if $args[0]= 'kendra':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend.jpg"></center>'
 				'You smile at her. "Sorry, but I don''t belong to anyone."'
-				'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again, and you''ll change your mind?" She gives you directions to her dorm room, and you both return to shopping.'
+				'She sighs softly. "Such a waste. Oh well, there are plenty of pretty little white Russian bitches that love being owned by an ebony Mistress. Perhaps we''ll meet again, and you''ll change your mind?" She gives you directions to her dorm room, and she returns to browsing.'
 				act 'Exit the cafe': gt 'city_island'
 				act 'Leave the table': gt 'city_coffee_hole', 'inner'
 			end
@@ -477,18 +480,18 @@ if $args[0]= 'kendra':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/locations/city/redlight/erotomaniac/sex/shkend.jpg"></center>'
 				'You look down a little to show your submission to her. "Yes, Mistress Kendra."'
-				'She smiles widely. "I think you''re going to make a great little slave. We''re going to have a lot of fun together. I wish I had time to start your training now, but I have things I need to do. But do come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
+				'She smiles widely. "I think you''re going to make a great little slave. We''re going to have a lot of fun together. I wish I had time to start your training now, but I have things I need to do. Do come by my dorm room as soon as you can." With that, she finishes her drink, gets up, and walks out.'
 				act 'Exit the cafe': gt 'city_island'
 				act 'Leave the table': gt 'city_coffee_hole', 'inner'
 			end
 		end
 	elseif npc_rel['A84'] < 40:
 		gs 'npc_relationship', 'modify', 'A84', 'like', 1, 'coffee_hole'
-		'You go over to her table and stand next to it. "Hi." You smile at her as you greet her.'
-		'She looks up at you with an annoyed look. "I don''t have time for games, and I''m tired of yours. Now get lost." Then she proceeds to ignore you.'
+		'You walk over to her table and stand next to it. "Hi," you smile at her as you greet her.'
+		'She looks up at you with an annoyed look. "I don''t have time for games, and I''m tired of yours. Now get lost." She proceeds to ignore you, so you turn and leave.'
 	end
 	act 'Exit the cafe': gt 'city_island'
-	act 'Leave him be': gt 'city_coffee_hole', 'inner'
+	act 'Leave her be': gt 'city_coffee_hole', 'inner'
 end
 
 if $args[0]= 'djibril':
@@ -504,21 +507,21 @@ if $args[0]= 'djibril':
 	'<center><h4><font color="maroon">Cafe "Coffee Hole"</font></h4></center>'
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	if DjibrilQW['invite'] = 1:
-		'You notice Djibril sitting at a table. As you approach, he says. "Hello again, Sveta. I didn''t expect to see you here." You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." Then he reminds you which dorm room is his. After that, he walks outside and walks away.'	
+		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. You should really stop by my dorm room. We could hang out and have some fun." He reminds you which dorm room is his before he heads outside and walks away.'	
 	elseif DjibrilQW['meet'] = 1 and DjibrilQW['invite'] = 0:
 		'<center><img <<$set_imgh>> src="images/locations/city/centralpark/cafe/djibril_talk.jpg"></center>'
-		'You notice Djibril sitting at a table. As you approach, he says. "Hello again, Sveta. I didn''t expect to see you here." You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." Then he tells you which building it is and which room is his. After that, he walks outside and walks away.'
+		'You notice Djibril sitting at a table. As you approach, he says "Hello again, <<$pcs_nickname>>. I didn''t expect to see you here." You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
 		
 	elseif hotcat >= 5:
 		DjibrilQW['meet'] = 1
 		'As you approach him, the young African man sitting at the table introduces himself. "I am Djibril Maina. What''s your name?"'
-		'You smile at him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people call me <<$pcs_nickname>>."'
-		'He looks surprised for a moment. "Are you from Pavlovsk?" Then, when you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
-		'Now it is your turn to look surprised. "Yes, how did you know that?"'
+		'You smile at him. "<<$pcs_firstname>> <<$pcs_lastname>>, but most people just call me <<$pcs_nickname>>."'
+		'He looks surprised for a moment. "Are you from Pavlovsk?" When you nod your head, he looks even more surprised. "Do you have an Aunt Luda dating a man named Olu?"'
+		'Now it''s your turn to look surprised. "Yes, how did you know that?"'
 		*nl
-		'He shakes his head with a slight laugh. "He is my uncle. They have told me about you. Small world, huh?"'
-		'You giggle as well. Small world indeed. "Yeah, it really is."'
-		'You sit down and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." Then he tells you which building it is and which room is his. After that, he walks outside and walks away.'
+		'He shakes his head with a slight laugh. "He is my uncle. They''ve told me about you. Small world, huh?"'
+		'You giggle as well. "Yeah, it really is."'
+		'You sit and talk to him for a few minutes before his phone buzzes. He looks at it and then finishes his drink. "Sorry, but I need to go. If you like, you should stop by my dorm room sometime, and we can hang out and talk more." He tells you which building it is and which room is his before he heads outside and walks away.'
 	end
 	act 'Exit the cafe': gt 'city_island'
 	act 'Leave him be': gt 'city_coffee_hole', 'inner'

+ 48 - 37
locations/city_hotel.qsrc

@@ -112,15 +112,10 @@ if $ARGS[0] = 'reception':
 				act'Standard room':
 					cla
 					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
-					totalCost = hotelRoomDays['city_hotel'] * 500
 					if hotelRoomDays['city_hotel'] > 0 : 
-						$temp_desc = 'standard room for <<hotelRoomDays[''city_hotel'']>> days'
-						$temp_question = '"A standard room for <<hotelRoomDays[''city_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with _cash_ or with _card_?"'
-						$temp_nomoney = '"You can''t afford to stay in this hotel for that long.'
-						$temp_cancel = 'Change your mind and step away from the reception desk'
-						$temp_cancel_nomoney = 'Step away from the reception desk'
-						hotelRoom['city_hotel'] = 1 
-						gs 'shortgs', 'silent_payment', totalCost, '', $temp_desc, 'city_hotel', 'complete_payment', $temp_question, $temp_nomoney, $temp_cancel
+						totalCost = hotelRoomDays['city_hotel'] * 500
+						'"A standard room for <<hotelRoomDays[''city_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'city_hotel', 'pay_the_room', 1
 					else
 						gt'city_hotel'					
 					end
@@ -128,15 +123,11 @@ if $ARGS[0] = 'reception':
 				act 'Luxury room':
 					cla
 					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
-					totalCost = hotelRoomDays['city_hotel'] * 1500
 					if hotelRoomDays['city_hotel'] > 0:
-						$temp_desc = 'luxury room for <<hotelRoomDays[''city_hotel'']>> days'
-						$temp_question = '"A luxury room for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with _cash_ or with _card_?"'
+						totalCost = hotelRoomDays['city_hotel'] * 1500
+						'"A luxury room for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
 						$temp_nomoney = '"You can''t afford to stay in a luxury room at this hotel for that long.'
-						$temp_cancel = 'Change your mind and step away from the reception desk'
-						$temp_cancel_nomoney = 'Step away from the reception desk'
-						hotelRoom['city_hotel'] = 2 
-						gs 'shortgs', 'silent_payment', totalCost, '', $temp_desc, 'city_hotel', 'complete_payment', $temp_question, $temp_nomoney, $temp_cancel
+						gs 'city_hotel', 'pay_the_room', 2
 					else
 						gt'city_hotel'
 					end
@@ -145,15 +136,10 @@ if $ARGS[0] = 'reception':
 				act'Royal Suite':
 					cla
 					hotelRoomDays['city_hotel'] = input ("For how long would you like to stay?")
-					totalCost = hotelRoomDays['city_hotel'] * 10000
 					if hotelRoomDays['city_hotel'] > 0: 
-						$temp_desc = 'Royal Suite for <<hotelRoomDays[''city_hotel'']>> days'
-						$temp_question = '"The royal suite for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with _cash_ or with _card_?"'
-						$temp_nomoney = '"You can''t afford the Royal Suite that long.'
-						$temp_cancel = 'Change your mind and step away from the reception desk'
-						$temp_cancel_nomoney = 'Step away from the reception desk'
-						hotelRoom['city_hotel'] = 3
-						gs 'shortgs', 'silent_payment', totalCost, '', $temp_desc, 'city_hotel', 'complete_payment', $temp_question, $temp_nomoney, $temp_cancel
+						totalCost = hotelRoomDays['city_hotel'] * 10000
+						'"The royal suite for <<hotelRoomDays[''city_hotel'']>> days, that would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'city_hotel', 'pay_the_room', 3
 					else	
 						gt'city_hotel'
 					end
@@ -166,22 +152,47 @@ if $ARGS[0] = 'reception':
 	end
 end
 
-if $ARGS[0] = 'complete_payment':
-	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/hotel/receptionist.jpg"></center>'
-	if $ARGS[3] = 'failed':
-		hotelRoom['city_hotel'] = 0
-		hotelRoomDays['city_hotel'] = 0
-	elseif $ARGS[3] = 'cash' or $ARGS[3] = 'card':
-		hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
-		if $ARGS[3] = 'cash' :'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you miss, I hope you enjoy your stay!"'
-		if $ARGS[3] = 'card' :'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you miss, I hope you enjoy your stay!" she says with a smile.'
+if $ARGS[0] = 'pay_the_room':
+	hotel_room_id = ARGS[1]
+	if totalCost<=money:		
+		act 'Pay with cash':
+			cla
+			money-=totalCost
+			hotelRoom['city_hotel'] = hotel_room_id
+			hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
+			act 'Step away from the reception desk': gt 'city_hotel'
+			killvar 'totalCost'
+			killvar 'hotel_room_id'
+		end
+	end
+	if totalCost<=karta+bankDebtLimit:
+		act 'Pay with card':
+			cla
+			karta-=totalCost
+			'hotel_room_id: <<hotel_room_id>>'
+			hotelRoom['city_hotel'] = hotel_room_id
+			hotelRoomDays['city_hotel'] = daystart + hotelRoomDays['city_hotel']
+			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
+			act 'Step away from the reception desk': gt 'city_hotel'
+			killvar 'totalCost'
+			killvar 'hotel_room_id'
+		end
+	end
+
+	if totalCost > karta+bankDebtLimit and totalCost > money:
+		if ARGS[1] = 1: act 'You can''t afford to stay in the hotel for that long.': gt 'city_hotel'
+		if ARGS[1] = 2: act 'You can''t afford to stay in a luxury room at this hotel for that long.': gt 'city_hotel'
+		if ARGS[1] = 3: act 'You can''t afford to stay in the Royal Suite at this hotel for that long.': gt 'city_hotel'
+		killvar 'totalCost'
+		killvar 'hotel_room_id'
 	end
-	act 'Step away from the reception desk': gt 'city_hotel'
 
-	killvar 'totalCost'
-	killvar 'temp_desc'
-	killvar 'temp_question'
-	killvar 'temp_nomoney'
+	act 'You change your mind': 
+		killvar 'totalCost' 
+		killvar 'hotel_room_id'
+		gt 'city_hotel'
+	end
 end
 
 --- city_hotel ---------------------------------

+ 6 - 6
locations/city_kafe.qsrc

@@ -332,7 +332,7 @@ if $ARGS[0] = 'lunch_ashot':
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/ashot/ASH-001.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Ashot/ASH-001.jpg"></center>'
 	'Most of your break is spent in the kitchen chatting with Ashot, whose irrepressible good mood and constant smile seem as much a part of him as north and south are parts of the compass. He tells you stories about his family, many of which revolve around him doing something crazy and being a disappointment to his parents, something he doesn''t seem too bothered about. "They''ll be proud of me yet!" he vows cheerfully.'
 	if city_cafe['lunch'] ! daystart:
 		act 'Eat lunch': gt 'city_kafe', 'lunch'
@@ -348,7 +348,7 @@ if $ARGS[0] = 'lunch_marisha':
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/marisha/MAR-001.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Marisha/MAR-001.jpg"></center>'
 	'Marisha has some quiet time when you''re on break and you two spend it chatting as much as her duties permit. Honestly, you do most of the talking, as she is as guarded and reserved as she always is at work, but she listens with interest and makes comments and asks questions that make you think about things in new ways. She''s a smart girl, even if she usually chooses not to show it, and you can''t help but wonder if waitressing in a diner is really the best use of her talents.'
 	if city_cafe['lunch'] ! daystart:
 		act 'Eat lunch': gt 'city_kafe', 'lunch'
@@ -364,7 +364,7 @@ if $ARGS[0] = 'lunch_nika':
 	*clr & cla
 	gs 'stat'
 	'<center><b><font color="maroon">The Roadhouse</font></b></center>'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/nika/NIK-001.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Nika/NIK-001.jpg"></center>'
 	'You eat your lunch in the kitchen, spending the time talking to Nika as she washes dishes. She''s bright, bubbly, and energetic as always, talking about partying and clubbing – she''s especially fond of the nightclub over in the City Center – and how much fun St. Petersburg can be if you don''t have a steady guy to tie you down. She definitely seems to be enjoying her life, and she tells you tales of prowling the streets until dawn and shutting down every fun bar in town.'
 	if city_cafe['lunch'] ! daystart:
 		act 'Eat lunch': gt 'city_kafe', 'lunch'
@@ -400,7 +400,7 @@ if ARGS[0] = 0:
 	minut += 10
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/marisha/MAR-002.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Marisha/MAR-002.jpg"></center>'
 	'During a lull, you find yourself chatting with the other waitress, Marisha. She''s a tall, pretty girl who always seems to be smiling, but who also always seems to be holding something back. You get to talking about the job, and the subject of tips comes up. "Tips are what let you make a living from this job," she tells you. "You definitely want to do everything you can to maximize them."'
 
 	'"How do I do that?" you ask.'
@@ -444,7 +444,7 @@ elseif ARGS[0] = 2:
 	minut += 10
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/nika/NIK-002.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Nika/NIK-002.jpg"></center>'
 	'With things quiet for the moment, you wind up talking with Nika, the dishwasher, as she takes a break. She''s a pretty woman in her mid-20s, and she''s reading a book at a table as you approach. "Hey, mind if I join you?"'
 
 	'"Please do," she says with a smile as she sets her book down. "How do you like working here?"'
@@ -468,7 +468,7 @@ elseif ARGS[0] = 3:
 	minut += 10
 	*clr & cla
 	gs 'stat'
-	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/ashot/ASH-002.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/locations/city/residential/cafe/Ashot/ASH-002.jpg"></center>'
 	'You''re killing time in the kitchen during a slow period when you start chatting with Ashot, the fry cook. He''s a good-looking guy, funny and relaxed, and he''s enjoyable to talk to. You''re curious about him, because he looks like he''s from the Caucasus but he sounds like a native of St. Petersburg, so you tactfully raise the topic.'
 
 	'"Oh, my great-grandfather was a civil engineer," he tells you. "After the Great Patriotic War, Leningrad was trashed, so the state sent him up here to help rebuild, and we''ve been here ever since. I''ve never even been to Armenia. Nobody in my family goes there except to find a wife or husband, but then we come back. We''re Russian now."'

+ 1 - 1
locations/city_mansion_residence_2.qsrc

@@ -21,13 +21,13 @@ if $ARGS[0] = 'yliving':
 	else
 		'<center><img <<$set_imgh>> src="images/locations/city/suburb/mansion/i_unfinished.jpg"></center>'
 	end
-	gs 'music_actions', 'music_icon'
 	act 'Leave the room': gt 'city_mansion_residence_1', 'yfoyer'
 
 	if ymanrem[7] = 2:
 		'A large room where you can watch <a href="exec:gt ''TV'',''start''">TV</a>, or relax on your luxury <a href="exec:gt ''divan'', ''start''">leather sofa</a>.'
 		if $ml_guitar['location'] = $loc: 'Your guitar rests on its stand next to the sofa.'
 		gs 'subkid'
+		gs 'music_actions', 'music_icon'
 	end
 end
 

+ 1 - 1
locations/exhibitionistshop.qsrc

@@ -221,7 +221,7 @@ if $ARGS[0] = 'bodysuit':
 	*clr & cla
 	gs'stat'
 
-	act 'Return': minut += 1 & gt 'exhibitionistshop', 'changingroom'
+	act 'Return': minut += 1 & gt 'exhibitionistshop', 'start'
 
 	i = 1
 

+ 3 - 5
locations/fit.qsrc

@@ -3,6 +3,8 @@
 CLOSE ALL
 if $ARGS[0] = 'start':
 	*clr & cla
+	$loc = 'fit'
+	$loc_arg = 'start'
 	$menu_loc = 'fit'
 	$menu_arg = 'start'
 	killvar '$locclass'
@@ -46,7 +48,7 @@ if $ARGS[0] = 'start':
 		end
 	end
 
-! Pay cash or card - Hooded Silence.
+!! Pay cash or card - Hooded Silence.
 
 	*nl
 	if abonement = 0:
@@ -88,16 +90,12 @@ if $ARGS[0] = 'dressing room':
 	'Recruiting girls for local track team, the winners will receive cash prizes.'
 	'Attention, visitors to the sports section must wear sports outfits and shoes when using the facilities.'
 	*nl
- 	'There is a <a href="exec: gt ''food'', ''watercooler''">drinking fountain</a> near the doors to the bathrooms.'
-	*nl
 	if abonement > 0:'Your existing subscription package is valid for <<abonement>> more classes.'
 	*nl
 	if nichTanyaKnown = 0 and (rand(1,100) <= 20 or nichDebug = 1):
 		'In the locker room you notice <a href="exec:gt ''fit'', ''fitgirl''">a cute girl</a>.'
 	end
 
-	
-
 	act 'Exit the locker room':
         if $clothingworntype ! 'nude' and PCloswimwear = 0:
             if Fit['FMR'] = 0 and vidage <= 40 and hotcat >=6 and fame['city_sport'] >=10:

+ 1 - 1
locations/foto_models2.qsrc

@@ -824,7 +824,7 @@ if $ARGS[0] = 'jeff_modelling':
 	act'Continue':
 		if jeff['model'] = 1:
 			*clr & cla
-			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy1.jpg"></center>'
+			'<center><img <<$set_imgh>> src="images/locations/city/citycenter/photo/portraits/jeff_m/talking/busy.jpg"></center>'
 			'"Whooo! Yipee!"'
 			'You find her in the middle of a photoshoot and she''s jumping up and down on the bed kicking her legs and striking poses mid air.'
 			'The photographer seems really excited saying, "Yes! I love that Jeff! Do you think you can do that again but get your leg higher so we can get a better look at your pussy?"'

+ 17 - 17
locations/gschool_break.qsrc

@@ -153,7 +153,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/occupied.jpg"></center>'
 		'You head into the girls bathroom and find the gopnik girls hanging out. One is in each of the stalls, standing on the toilets so they can look over the top of the doors. You can tell they are being bitches and blocking any of the other girls from using the toilets. Luckily you just need to wash your hands, so you''re not bothered by it. Lera spots you and says "Occupied, you will just have to wait."'
-		'You know it is pointless to reply, so you just shrug, finish washing your hands, and head back outside.'
+		'You know it''s pointless to reply, so you just shrug, finish washing your hands, and head back outside.'
 		act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 	elseif girls_event_rand = 3:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/lunch/pose.jpg"></center>'
@@ -168,21 +168,21 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand <= 10:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlsgossip'+rand(1,2)+'.jpg"></center>'
-		'As you enter the restroom, there is a group of girls clustered together chatting about the latest gossip or whatever has caught their interest of late. As you go about your business, you over hear them saying;'
+		'When you enter the restroom, you find a group of girls clustered together chatting about the latest gossip or whatever has caught their interest of late. As you go about your business, you overhear them saying;'
 		gs 'gschool_gossip', 'mixed'
 
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 11:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose'+rand(1,2)+'.jpg"></center>'
-		'As you enter the restroom, there is a group of girls clustered together. They are taking turns posing as a group while one girl takes their picture. They do this over and over until every girl has her picture taken in a group and they all like the pictures.'
+		'When you enter the restroom, you see a group of girls clustered together taking turns posing as a group while one girl takes their picture. They do this over and over until every girl has her picture taken in a group and they all like the pictures.'
 		
 		gs 'gschool_break', 'restroom_actions'
 	elseif girls_event_rand = 12:
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/gopniks.jpg"></center>'
 		if grupTipe = 4:
-			'As you enter the restroom, you see Paulina, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. You exchange smiles and with them as you go about your business.'
+			'As you enter the restroom, you see Pauline, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. You exchange smiles with them as you go about your business.'
 		else
-			'As you enter the restroom, you see Paulina, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. As you go about your business, they start taunting you as well, but you know better than to start something back at 3-to-1 odds. You do your best to ignore them as you go about your business.'
+			'As you enter the restroom, you see Pauline, Lena and Lera hanging around the stalls, chatting and tormenting some of the other girls. As you go about your business, they start taunting you as well, but you know better than to say something back. You do your best to ignore them as you go about your business.'
 		end
 
 		gs 'gschool_break', 'restroom_actions'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'girls_restroom_events':
 					'You shake your head. "What? No I''m not going to eat your pussy."'
 					'She takes a step towards you. "You better, if you know what''s good for you."'
 					'You know these gopnik girls are dangerous. Most of them like to fight for fun, and many of them carry knives. Not sure how serious she is about this, you know you''re far enough away that you can just dash out of the restroom, but she might come after you later. You could also just do what she says and lick her pussy.'
-!!ToDo: Add in a option to fight once we revamp fighting (nutluck)
+!!ToDo: Add in an option to fight once we revamp fighting (nutluck)
 					gs 'willpower', 'cuni', 'resist', 'easy'
 					if will_cost <= pcs_willpwr:
 						act 'Make a run for it (<<will_cost>> Willpower)':
@@ -296,7 +296,7 @@ if $ARGS[0] = 'girls_restroom_events':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 		if grupTipe = 4:
-			'As you walk in, you see a group of gopnik girls standing around chatting. You know who Lena, Lera, Paulina and Ekaterina are, but the others are from your brother''s class. They exchange causal greetings with you, but seem engrossed in their conversation.'
+			'As you walk in, you see a group of gopnik girls standing around chatting. You know who Lena, Lera, Pauline and Ekaterina are, but the others are from your brother''s class. They exchange causal greetings with you, but seem engrossed in their conversation.'
 			act 'Listen in':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
@@ -308,14 +308,14 @@ if $ARGS[0] = 'girls_restroom_events':
 !!					*clr & cla
 !!					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 !!					'You speak up. "Can I join in on this fight night? It sounds fun."'
-!!					'They stop and look at you, Paulina and Ekaterina sizing you up before Ekaterina grabs you roughly by the arm, squeezes your bicep and snorts. "I don''t know, we''ll think about it and let you know." Not sure what more you can do, you just nod and go about your business.'
+!!					'They stop and look at you, Pauline and Ekaterina sizing you up before Ekaterina grabs you roughly by the arm, squeezes your bicep and snorts. "I don''t know, we''ll think about it and let you know." Not sure what more you can do, you just nod and go about your business.'
 !!					*nl
 !!					gs 'gschool_break', 'restroom_actions'
 !!				end
 			end
 			gs 'gschool_break', 'restroom_actions'
 		else
-			'As you walk in, you see a group of gopnik girls standing around chatting. It''s obvious they are up to something as they turn as one to glare at you. A chill run down your spine - you picked the wrong time to come to the bathroom. You know who Lena, Lera, Paulina and Ekaterina are, but the other ones are from your brother''s class. Paulina takes a step towards you and in a menacing tone says "Leave. Now!" You know you should leave since you are no match for these girls. If they decide to kick your ass, or worse, you won''t be able to prevent it or escape, but you are also tired of the gopniks acting like they run the school and the rules don''t apply to them.'
+			'As you walk in, you see a group of gopnik girls standing around chatting. It''s obvious they are up to something as they turn as one to glare at you. A chill run down your spine - you picked the wrong time to come to the bathroom. You know who Lena, Lera, Pauline and Ekaterina are, but the other ones are from your brother''s class. Pauline takes a step towards you and in a menacing tone says "Leave. Now!" You know you should leave since you are no match for these girls. If they decide to kick your ass, or worse, you won''t be able to prevent it or escape, but you are also tired of the gopniks acting like they run the school and the rules don''t apply to them.'
 			act 'Leave the restroom': gt 'gschool_lessons', 'short_break'
 			gs 'willpower', 'misc', 'resist', 'medium'
 			if will_cost < pcs_willpwr:
@@ -327,13 +327,13 @@ if $ARGS[0] = 'girls_restroom_events':
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/girlspose1.jpg"></center>'
 					if fame['pav_slut'] > 200:
 						'You decide to stand up to them. "No! I have as much right to be in this bathroom as you do. If you don''t like it, then you leave."'
-						'Paulina gives you a dangerous smile. "Well, looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
+						'Pauline gives you a dangerous smile. "Well, looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
 						'Hearing that, you take a step back, but the other girls quickly surround you, giving you nowhere to go. As you start to look for a way to escape, Lena speaks up. "No, we can''t do it now. We''ll have to wait for her after school. If we give her the beating she deserves, the teachers will see the blood and marks on her face. It''s better to wait, so no one asks questions."'
 						*nl
 						'The other girls seem none to happy about waiting, but they understand the logic. For just a brief moment you think you might have got a reprieve, even if only a temporary one. Then Lera steps up and grabs you by the hair and says "Or we can teach her a lesson right now, and not leave any marks on her. At least none she will show anyone. She needs to see what happens to little sluts that don''t know their place. I''ve got all the toys we need in my backpack."'
 						*nl
 						'Ekaterina just shakes her head. "God, you''re such a fucking dyke, Lera."'
-						'Lera lets go of you and steps towards Ekaterina. "Fuck you bitch!" As Ekaterina steps towards Lera, Paulina gets between the two of them, dashing your hopes they might start fighting amongst themselves and allow you to escape. "Enough, both of you! Lera makes a good point though..." She looks at the rest of the girls. "So do we wait or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
+						'Lera lets go of you and steps towards Ekaterina. "Fuck you bitch!" As Ekaterina steps towards Lera, Pauline gets between the two of them, dashing your hopes they might start fighting amongst themselves and allow you to escape. "Enough, both of you! Lera makes a good point though..." She looks at the rest of the girls. "So do we wait or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
 						act 'Try to resist':
 							*clr & cla
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully1.jpg"></center>'
@@ -376,14 +376,14 @@ if $ARGS[0] = 'girls_restroom_events':
 											act 'Continue':
 												*clr & cla
 												'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully6.jpg"></center>'
-												'Paulina puts on the other harness and then takes takes the dildo from Lera, making her pull it out of your ass, much to your relief. "Give me that! If we are going to do this, then we should at least fuck the slut right." Mounting the dildo to the harness, she kneels down behind you and shoves it back up your ass. It feels like the <<dick>>cm <<$dick_girth>> dildo is ripping your ass as both dildos are hammered into your holes.'
+												'Pauline puts on the other harness and then takes takes the dildo from Lera, making her pull it out of your ass, much to your relief. "Give me that! If we are going to do this, then we should at least fuck the slut right." Mounting the dildo to the harness, she kneels down behind you and shoves it back up your ass. It feels like the <<dick>>cm <<$dick_girth>> dildo is ripping your ass as both dildos are hammered into your holes.'
 												gs 'arousal', 'vaginal_strap', 3, 'humiliation', 'maso', 'gangbang', 'lesbian'
 												gs 'arousal', 'anal_strap', -3, 'humiliation', 'maso', 'gangbang', 'lesbian'
 												gs 'stat'
 												act 'Continue':
 													*clr & cla
 													'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully7.jpg"></center>'
-													'The girl on the bottom finally has enough and pushes you off her dildo. Paulina keeps fucking your ass while the other one slides out from under you. The other girls soon demand a turn, although none seem to want to use your pussy anymore. They take turns wearing a strapon and fucking your ass.'
+													'The girl on the bottom finally has enough and pushes you off her dildo. Pauline keeps fucking your ass while the other one slides out from under you. The other girls soon demand a turn, although none seem to want to use your pussy anymore. They take turns wearing a strapon and fucking your ass.'
 													gs 'arousal', 'anal_strap', 10, 'humiliation', 'maso', 'gangbang', 'lesbian'
 													gs 'arousal', 'end'
 													gs 'stat'
@@ -392,7 +392,7 @@ if $ARGS[0] = 'girls_restroom_events':
 														gs 'clothing', 'strip_all'
 														gs 'stat'
 														'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/girls/gbully8.jpg"></center>'
-														'Your ass has been pounded so hard and so much it feels like it''s on fire. They finally seem to get bored and the last one pulls the dildo out of your ass. Paulina reaches down, grabs you by the chin and says "Next time we fucking tell you to leave, you better listen." With that the girls leave, laughing and talking about you, but you''re not paying attention. You crawl over into one of the stalls and curl up, waiting until you can no longer hear them. Maybe next time you will do what Paulina says and leave when you can. Once you are sure they are gone, you do your best to clean up, but that''s when you notice they have also stolen your clothes.'
+														'Your ass has been pounded so hard and so much it feels like it''s on fire. They finally seem to get bored and the last one pulls the dildo out of your ass. Pauline reaches down, grabs you by the chin and says "Next time we fucking tell you to leave, you better listen." With that the girls leave, laughing and talking about you, but you''re not paying attention. You crawl over into one of the stalls and curl up, waiting until you can no longer hear them. Maybe next time you will do what Pauline says and leave when you can. Once you''re sure they''re gone, you do your best to clean up, but that''s when you notice they have also stolen your clothes.'
 														act 'Continue': gt 'gschool_break', 'naked_bathroom'
 													end
 												end
@@ -404,12 +404,12 @@ if $ARGS[0] = 'girls_restroom_events':
 						end
 					else
 						'You decide to stand up to them. "No! I have as much right to be in this bathroom as you do. If you don''t like it, then you leave."'
-						'Paulina gives you a dangerous smile. "Well looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
+						'Pauline gives you a dangerous smile. "Well looks like this bitch needs to be taught a lesson. I say we beat the shit out of her, here and now!"'
 						'Hearing that, you take a step back, but the other girls quickly surround you, giving you nowhere to go. As you start to look for a way to escape, Lena speaks up. "No, we can''t do it now. We''ll have to wait for her after school. If we give her the beating she deserves, the teachers will see the blood and marks on her face. Better to wait, so no one asks questions."'
 						*nl
 						'The other girls don''t seem happy about waiting, but they understand the logic. For just a brief moment you think you might have got a reprieve, even if only a temporary one. Then Lera steps up and grabs you by your hair and says "Or we can teach her a lesson right now."'
 						*nl
-						'Paulina looks at the rest of the girls. "So do we wait, or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
+						'Pauline looks at the rest of the girls. "So do we wait, or teach her a lesson now?" After a brief exchange, they decide to do it now since they can always kick your ass later as well. They all start grabbing you.'
 						act 'Try to resist':
 							*clr & cla
 							gs 'clothing', 'strip_all'
@@ -925,7 +925,7 @@ if $ARGS[0] = 'boys_restroom_events':
 									act 'Take his load':
 										*clr & cla
 										'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/bathroom/sex/boys/alylav5.jpg"></center>'
-										'He quickly pulls out of you and pushes you down, your ass barely hits the toilet seat before hot steams of cum splatter your tits. Once the last spurts splash onto your tits, he pulls up his pants and steps out of the stall. "Not bad, but I''m not sure if you''re better than Alyona though. I might need a few more ''demonstrations'' to make up my mind. Perhaps a side by side comparison would be best."' 
+										'He quickly pulls out of you and pushes you down, your ass barely hitting the toilet seat before hot steams of cum splatter your tits. Once the last spurts splash onto your tits, he pulls up his pants and steps out of the stall. "Not bad, but I''m not sure if you''re better than Alyona though. I might need a few more ''demonstrations'' to make up my mind. Perhaps a side by side comparison would be best."' 
 										'It takes you a few minutes to straighten out your clothes and by the time you do and step out, he is gone.'
 										gs 'cum_call', 'breasts', 'A155', 1
 										gs 'arousal', 'foreplay', 2

+ 24 - 1
locations/gschool_coolkid_chats.qsrc

@@ -1489,7 +1489,7 @@ if $ARGS[0] = 'sonia':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
 	if fame['pav_slut'] > 200:
 		if npc_rel['A139'] >= 50:
-			'"Hey Sonia!" you greet her with a smile and she gives you a friendly smile.'
+			'"Hey Sonia!" you greet her with a smile and she gives you a friendly smile in return.'
 			'"Hey..." Her smile fades as she notices the looks everyone else is giving you. You try talking to her and at times she is very animated, only to catch herself and be a lot more reserved. You can tell she is worried about being seen talking to you, but at least she''s nice about it.'
 		elseif npc_rel['A139'] <= 20:
 			'"Hey Sonia!" you greet her with a smile.'
@@ -1503,6 +1503,12 @@ if $ARGS[0] = 'sonia':
 			'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
 			'"What''s wrong?" you ask.'
 			'Sonia sighs and looks around. "Just tired of... all this. I just want to have some fun. Is that too much to ask?" The two of you start talking about some of your recent nights out and it seems like Sonia really wants to just cut loose.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class, Sonia says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+				'She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading, which is a bit disappointing, but at least she stuck around.'
 		else
@@ -1515,6 +1521,12 @@ if $ARGS[0] = 'sonia':
 			'"Oh man!" Sonia groans and stretches. "I can''t WAIT for this day to be over!"'
 			'"What''s wrong?" You ask her.'
 			'Sonia sighs and looks around. "Just tired of... all this. I just want to have some fun. Is that too much to ask?" The two of you start talking about some of your recent nights out and it seems like Sonia really wants to just cut loose.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class, Sonia says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+				'She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'"Have you seen the new clothes they''re selling at the garment factory in town?" you ask Sonia, trying to catch her interest, but you manage to do the exact opposite.'
 			'"Garment factory?" she asks with a hurt and slightly annoyed look. "What makes you think I shop at that place?"'
@@ -1528,6 +1540,11 @@ if $ARGS[0] = 'sonia':
 		if npc_rel['A139'] >= 50:
 			'"Hey Sonia!" you greet her with a smile and she gives you a friendly little wave.'
 			'"What''s up neeeeerd?" she asks with a giggle and you tell her you just wanted to hang out for a bit. With Sonia being so friendly, you slip into an easygoing banter with her for the rest of break.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class Sonia says. "Hey why don''t you come by my house sometime and we can hang out." She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading, which is a bit disappointing, but at least she stuck around.'
 		else
@@ -1539,6 +1556,12 @@ if $ARGS[0] = 'sonia':
 		if npc_rel['A139'] >= 50:
 			'"Hey Sonia!" you greet her with a smile and she gives you a friendly little wave.'
 			'"What''s up? Mind if I ask you some questions?" she asks and you shrug. She launches into a barrage of questions about partying with your fellow gopniks. What they''re like, what it''s like to run wild, etc. She seems very interested in what you and the other gopniks do for fun and you talk for a while, mostly sharing some of your favorite stories.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+			if soniaQW['homeinvite'] = 0:
+				soniaQW['homeinvite'] = 1
+				'As you start to head to class, Sonia says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+				'She quickly tells you her address and you assure her you will stop by sometime.'
+			end
 		elseif npc_rel['A139'] <= 20:
 			'You spend some time talking with Sonia, but she ends up focusing more on the magazine she''s reading, which is a bit disappointing, but at least she stuck around.'
 		else

+ 9 - 5
locations/homes_properties.qsrc

@@ -840,7 +840,7 @@ if $ARGS[0] = 'get_property_sales_price':
 		result = accessible_property['<<$ARGS[1]>>-sales-price']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
-		result = $property['price']
+		result = property['price']
 		killvar 'property'
 	end
 end
@@ -940,7 +940,7 @@ if $ARGS[0] = 'get_rent_amount':
 		result = accessible_property['<<$ARGS[1]>>-rent']
 	else
 		gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
-		result = $property['rent']
+		result = property['rent']
 		killvar 'property'
 	end
 end
@@ -991,8 +991,12 @@ end
 !! Call: `func('homes_properties', 'progress_construction_status', $ARGS[1])`
 !! $ARGS[1] - the property code or location, if empty it will use $loc
 if $ARGS[0] = 'progress_construction_status':
-	$constrstatpropcode = iif($ARGS[1] = '', $loc, $ARGS[2])
-	if accessible_property['<<$constrstatpropcode>>-construction-status'] < 2: owned_property['<<$constrstatpropcode>>-construction-status'] += 1
+	'$ARGS[1]: <<$ARGS[1]>>'
+	$constrstatpropcode = iif($ARGS[1] = '', $loc, $ARGS[1])
+	'$constrstatpropcode: <<$constrstatpropcode>>'
+	'accessible_property[''<<$constrstatpropcode>>-construction-status'']: <<accessible_property[''<<$constrstatpropcode>>-construction-status'']>>'
+	if accessible_property['<<$constrstatpropcode>>-construction-status'] < 2: accessible_property['<<$constrstatpropcode>>-construction-status'] += 1
+	'accessible_property[''<<$constrstatpropcode>>-construction-status'']: <<accessible_property[''<<$constrstatpropcode>>-construction-status'']>>'
 	killvar 'constrstatpropcode'
 end
 
@@ -1043,7 +1047,7 @@ end
 !!			- empty string - in this case the actual $loc value will be used 	
 if $ARGS[0] = 'free_internet_available':
 	gs 'homes_properties_attr', 'get_property_attr', iif($ARGS[1] = '', $home_name[$loc], $home_name[$ARGS[1]])
-	result = $property['free_internet'] = 1
+	result = property['free_internet'] = 1
 	killvar 'property'
 end
 

+ 9 - 9
locations/homes_properties_attr.qsrc

@@ -204,7 +204,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
 		
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'village_cottage':
 		property['id'] = 3
 		$property['code'] = $ARGS[1]
@@ -264,7 +264,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = ''
 		$property['type'] = 'temporary_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'maid_bedroom':
 		property['id'] = 7
 		$property['code'] = $ARGS[1]
@@ -277,7 +277,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['type'] = 'permanent_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'niko_apartment':
 		property['id'] = 8
 		$property['code'] = $ARGS[1]
@@ -301,7 +301,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'hallway'
 		$property['type'] = 'temporary_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'lyceum_dorm':
 		property['id'] = 10
 		$property['code'] = $ARGS[1]	
@@ -314,7 +314,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'pos40'
 		$property['type'] = 'permanent_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'university_dorm':
 		property['id'] = 11
 		$property['code'] = $ARGS[1]
@@ -327,7 +327,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'dorm_room'
 		$property['type'] = 'permanent_residence'
 
-		$property['free_internet'] = 1		
+		property['free_internet'] = 1		
 	elseif $ARGS[1] = 'hunters_lodge':
 		property['id'] = 12
 		$property['code'] = $ARGS[1]
@@ -351,7 +351,7 @@ if $ARGS[0] = 'get_property_attr':
 		$property['entrance_arg'] = 'start'
 		$property['type'] = 'temporary_residence'
 
-		$property['free_internet'] = 1	
+		property['free_internet'] = 1	
 	elseif $ARGS[1] = 'grandparents_house':
 		property['id'] = 14
 		$property['code'] = $ARGS[1]
@@ -430,10 +430,10 @@ if $ARGS[0] = 'add_new_home_location':
 	elseif $ARGS[2] = '' and $ARGS[3] = '':
 		!! WARNING: Either $ARGS[2] or $ARGS[3] must have a value, otherwise no mapping will be created
 		$home_name[$ARGS[1]] = ''
-	elseif $ARGS[2] = '':
+	elseif $ARGS[2] ! '':
 		$home_name[$ARGS[1]] = $home_name[$ARGS[2]]
 	else
-		$home_name[$ARGS[1]] = $ARGS[3]
+		$home_name[$ARGS[1]] = $home_name[$ARGS[3]]
 	end
 end
 --- homes_properties_attr ---------------------------------

+ 2 - 0
locations/hookup_after.qsrc

@@ -1813,6 +1813,7 @@ if $ARGS[0] = 'npc_date_request':
 			'"I won''t," you promise.'
 		end
 		'Your little exchange done, you wave him goodbye and head out the door.'
+		act'Leave':gt 'hookup_after', 'exit'
 	end
 	act'I''m not up for anything serious':
 		cla & *clr
@@ -1861,6 +1862,7 @@ if $ARGS[0] = 'npc_date_request':
 end
 
 if $ARGS[0] = 'fuckbuddy_text':
+	hookup['fuckbuddy'] = 1
 	hookup['text_message'] = rand(1,2)
 	if hookup['text_message'] = 1:
 		'	<b><font color="blue">hey fuck buddy</font></b>'

+ 7 - 7
locations/hookup_morning.qsrc

@@ -163,7 +163,7 @@ if $ARGS[0] = 'confused':
 	'What happened last night...? You blink blearily, looking around, trying to get your bearings. You''re in someone else''s room that isn''t your own.'
 	*nl
 	'That''s right! You hooked up with a guy last night and accidentally fell asleep in his bed...'
-	if npc_earlyriser[$boy] = 1:
+!!	if npc_earlyriser[$boy] = 1:
 		act'... <i>his</i> bed...?':
 			cla & *clr
 			'<center><video autoplay loop src="images/shared/romance/misc/wakeup2.mp4"></video></center>'
@@ -173,7 +173,7 @@ if $ARGS[0] = 'confused':
 			'"Yeah," you mumble back.'
 			gs'hookup_morning','wakeup'
 		end
-	elseif npc_latesleeper[$boy] = 1:
+!!{	elseif npc_latesleeper[$boy] = 1:
 		act'What was his name?':
 			cla & *clr
 			$npc_apt_bedroom[$boy]
@@ -186,7 +186,7 @@ if $ARGS[0] = 'confused':
 		end
 	else
 		
-	end
+	end}
 	if mid($start_type,1,2) = 'sg':
 		act'Mom!':gt'hookup_morning','mom'
 	end
@@ -241,7 +241,7 @@ end
 
 if $ARGS[0] = 'guilt2':
 	'<center><video autoplay loop src="images/shared/sex/after/wakeup_shock2.mp4"></video></center>'
-	if npc_earlyriser[$boy] = 1:
+!!{	if npc_earlyriser[$boy] = 1:
 		!! for later: create option for him to burst in with breakfast in bed
 		if npc_apt_type[$boy] = 2:
 			'The bed next to you is empty and the bathroom door is closed. You can hear the water running behind it.'
@@ -252,7 +252,7 @@ if $ARGS[0] = 'guilt2':
 		end
 	elseif npc_latesleeper[$boy] = 1:
 		'<<$npc_firstname[$boy]>>, the guy from last night, is still asleep next to you, completely ignorant to your internal strife, snoring softly.'
-	else
+	else}
 		'<<$npc_firstname[$boy]>> stirs next to you.'
 		if npc_selfish[$boy] ! 1 and npc_abusive[$boy] ! 1 and rand(1,3) = 3:
 			'"Hey," he mumbles, looking over. "What''s up? Something wrong?"'
@@ -271,7 +271,7 @@ if $ARGS[0] = 'guilt2':
 				gs'hookup_morning','wakeup'
 			end
 		end
-	end
+!!	end
 end
 
 if $ARGS[0] = 'mom':
@@ -660,7 +660,7 @@ end
 	if npc_apt_type[$boy] > 2:
 !!		act'Put your underwear on':
 
-		act'Go explore his place':gt'hookup_morning','explore'
+!!		act'Go explore his place':gt'hookup_morning','explore'
 
 		act'Find the kitchen':
 

+ 1 - 1
locations/hunter_ambient.qsrc

@@ -27,7 +27,7 @@ if $ARGS[0] = 'pornstar_convo':
 	hunter_sexual_comfort += 7
 	hunter_collective_opinion -= 5
 
-	'"I recently downloaded some porn, and guess who was getting fucked in the video. Trust me, it was <<<$pcs_firstname>>." you overhear Andrei.'
+	'"I recently downloaded some porn, and guess who was getting fucked in the video. Trust me, it was <<$pcs_firstname>>." you overhear Andrei.'
 	'As soon as they notice you, the men stop talking and change the subject to another topic.'
 end
 

+ 2 - 3
locations/internet_mobile.qsrc

@@ -187,7 +187,7 @@ end
 !! 
 if $ARGS[0] = 'check_allowed_location':
     gs 'homes_properties_attr', 'get_property_attr', $ARGS[1]
-    result = $property['internet_enabled'] = 1
+    result = property['internet_enabled'] = 1
     killvar 'property'
 end
 
@@ -195,15 +195,14 @@ end
 !! $ARGS[2] - Limitation code: : 'noporn', 'nocamshow'
 !! and on...can be up to 10 arguments.
 if $ARGS[0] = 'get_access':
+    killvar 'access'
     $subsname = iif($ARGS[1] = '', func('homes_properties', 'get_property_code'), func('homes_properties', 'get_property_code', $ARGS[1]))
-    
     if func('homes_properties', 'free_internet_available', $subsname) ! 0:
         $access['subscription'] = 'free'
     elseif $ARGS[1] = 'free':
         $access['subscription'] = 'free'
     elseif subscription[$subsname] = 1:
         $access['subscription'] = $subsname
-        killvar 'subsname'
     elseif subscription['mobile'] = 1:
         $access['subscription'] = 'mobile'
     elseif subscription['metered_mobile'] > 0:

+ 223 - 9
locations/katja_city.qsrc

@@ -197,7 +197,7 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"That''s so great!" she says, looking really happy.'
 								money -= price
 								gs 'clothing', 'quick_buy', 'cats_dress', numrand, 3000, 'money'							
-								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						end
 						if karta > price:
@@ -206,21 +206,21 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
 								'"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,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						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.' 
-							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+							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':
 						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."'
-						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 					end
 				else
 					jump 'tryclotheswithkatja_pussy_cats'
@@ -260,7 +260,7 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
 								'"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,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						end
 						if card >= price:
@@ -269,21 +269,21 @@ if $ARGS[0] = 'Pussy-Cats':
 								'"I''m going to buy this dress after you try on what I picked for you," you tell Katja.'
 								'"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,1)>>'
+								act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 							end
 						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.'  
-							act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+							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':
 						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."'
-						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,1)>>'
+						act 'Katja''s turn': gt 'katja_city', 'pussy_cat_outfit<<rand(1,2)>>'
 					end
 				else
 					jump 'tryclotheswithkatja_pussy_cats'
@@ -325,7 +325,7 @@ if $ARGS[0] = 'pussy_cat_outfit1':
 			'"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."'
-			act 'Leave': gt $loc, $loc_arg
+			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.'
@@ -521,5 +521,219 @@ if $ARGS[0] = 'pussy_cat_outfit1_play':
 	end
 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.'
+	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."'
+	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.'
+	end
+	act 'Katja starts to change':
+		*clr & cla
+		minut += 2
+		gs 'stat'	
+		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_2.jpg"></center>'
+		'As Katja gets ready to change, she lets the shirt hang loose and it falls around her bra, emphasizing her breasts.' 
+		act 'Ask if her panties match her bra':
+			*clr & cla
+			minut += 3
+			gs 'stat'	
+			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.'
+				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')
+				'"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.'
+				if katjaQW['pantiesQWstage'] >= 5:
+					'"See? My panties always match my bra," she says. "No need for them to match when you don''t wear any."' 
+				else 
+					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.'
+				end
+				'"Well, this was fun but I should change back," Katja 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.'
+					act 'Enjoy the striptease': gt 'katja_city', 'pussy_cat_outfit2_strip'
+				else
+					if katjaQW['QWstage'] > 2:
+						if katjaQW['slut'] > 60:
+							act 'Ask Katja to put on a show': gt 'katja_city', 'pussy_cat_outfit2_strip'
+						else
+							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 'stat'
+									gt 'katja_city', 'pussy_cat_outfit2_strip'					
+								end
+							else
+								act 'Ask Katja to put on a show (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+							end
+						end
+					end
+					act 'Let Katja change clothes in peace':
+						*clr & cla
+						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.'
+						act 'Leave': minut += 2 & gt $loc, $loc_arg
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'pussy_cat_outfit2_strip':
+	gs 'arousal', 'erotic_nudity', 5
+	katjaQW['horny'] += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_4.jpg"></center>'
+	'Katja starts by moving in a more sensual way while she slowly lets the shirt fall down, still holding up the skirt so you have a full view of her pussy.'
+	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_outfit2_play'
+		else
+			gs 'willpower', 'mast', 'force'
+			if will_cost <= pcs_willpwr:
+				act 'Ask Katja to touch herself (<<will_cost>> Willpower)':
+					gs 'willpower', 'pay'
+					gs 'stat'
+					gt 'katja_city', 'pussy_cat_outfit2_play'					
+				end
+			else
+				act 'Ask Katja to touch herself (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			end
+			act 'Let Katja finish the show': gt 'katja_city', 'pussy_cat_outfit2_strip2' 
+		end
+	else
+		act 'Let Katja finish the show': gt 'katja_city', 'pussy_cat_outfit2_strip2'
+	end
+end
+
+if $ARGS[0] = 'pussy_cat_outfit1_strip2':
+	gs 'arousal', 'erotic_nudity', 3
+	gs 'arousal', 'end'
+	katjaQW['horny'] += 5
+	katjaQW['slut'] += 2
+	gs 'stat'
+	'<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.'
+	act 'Leave': minut += 2 & gt $loc, $loc_arg
+end
+
+if $ARGS[0] = 'pussy_cat_outfit2_play':
+	gs 'arousal', 'foreplay', 3
+	katjaQW['horny'] += 10
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_5b.jpg"></center>'
+	'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.'
+		'"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.'
+		if katjaQW['masturbates'] + npc_ass['A14'] = 0:
+			'"I''ve never used any of them," Katja 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.'
+		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
+	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 her the butt plug.'
+	end
+	act 'Watch Katja insert the butt plug':
+		*clr & cla
+		gs 'arousal', 'foreplay', 5
+		katjaQW['horny'] += 10
+		gs 'stat'
+		'<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."'
+			'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.'
+		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.')
+		end
+		act 'Watch Katja''s reaction':
+			*clr & cla
+			gs 'arousal', 'foreplay', 2
+			katjaQW['horny'] += 10
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_7.jpg"></center>'		
+			'Katja breathes in and out heavily and opens her eyes to look at you. She then puts the fingers of her right hand to her pussy lips, and starts to gently play with her pussy.'
+			act 'Give her the vibrator':
+				*clr & cla
+				gs 'arousal', 'foreplay', 2
+				katjaQW['horny'] += 10
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_8.jpg"></center>'		
+				'"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 uses one hand to spread her pussy lips, puts the vibrator to her clit with the other 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 uses one hand to spread her pussy lips and puts the vibrator to her clit with the other, letting 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_2_9.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, 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'
+					if katjaQW['know_butt_plug'] = 0: katjaQW['know_butt_plug'] = 1
+					katjaQW['horny'] = 0
+					katjaQW['slut'] += 4
+					gs 'stat'
+					*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.'
+					'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		
+				end
+				act 'Just watch Katja':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/uni/mall/cats_2_9.jpg"></center>'		
+					'You intensely watch Katja as she starts really getting into it. She seems to have a hard time keeping her voice down and 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
+					katjaQW['horny'] = 0
+					katjaQW['slut'] += 4
+					gs 'stat'
+					*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.'
+					'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.'
+					act 'Leave': minut += 2 & gt $loc, $loc_arg		
+				end
+			end
+		end
+	end
+end
+
 --- katja_city ---------------------------------
 

+ 3 - 3
locations/model_mari.qsrc

@@ -49,7 +49,7 @@ if $ARGS[0] = 'mari_1':
 							'"Me? Not really," she says, crossing her legs. "I guess when they asked me to strip down during the initial audition I was a little nervous, but that was for a different reason."'
 							'<i>Hmm? What does that mean?</i>'
 							'"But other than that, I don''t mind really. I''ve always been pretty comfortable being naked." And indeed, as the two of you chat, Mari doesn''t appear to be bothered in the slightest that her breasts are completely on display.'
-							act'How long have you been working here?':gs'model_mari','mari1.1'
+							act'How long have you been working here?':gs'model_mari','mari_1.1'
 						end
 					end
 				end
@@ -80,7 +80,7 @@ if $ARGS[0] = 'mari_1':
 						'"Me? Not really," she says, crossing her legs. "I guess when they asked me to strip down during the initial audition I was a little nervous, but that was for a different reason."'
 						'<i>Hmm? What does that mean?</i>'
 						'"But other than that, I don''t mind really. I''ve always been pretty comfortable being naked." And indeed, as the two of you chat, Mari doesn''t appear to be bothered in the slightest that her breasts are completely on display.'
-						act'How long have you been working here?':gs'model_mari','mari1.1'
+						act'How long have you been working here?':gs'model_mari','mari_1.1'
 					end
 				end
 			end
@@ -305,8 +305,8 @@ end
 if $ARGS[0] = 'mari_4':
 	*clr & cla
 	mari['busy'] = rand(1,3)
+	mari['status'] =  rand(3,4)
 	if mari['busy'] = 1:
-		mari['status'] =  rand(3,4)
 		'<center><img <<$set_imgh>> src="images/characters/city/models/mari/talking/busy.jpg"></center>'
 		'You''re looking for Mari when you hear her name called out from a set.'
 		'Peeking from the shadows, you see her holding up her hair with a smirk on her face while the camera flashes in front of her. The more you look at her, the more you feel like the smile is unconscious and just a byproduct of her genuinely enjoying her job.'

+ 15 - 11
locations/music_actions.qsrc

@@ -9,15 +9,14 @@ if $ARGS[0] = 'music_icon':
     elseif $location_type = 'private' or ($location_type = 'public_outdoors' and sunWeather = 1 and temper > 15) and ml_no_music = 0:        
         if hour < 8: 
             'It''s too early to do anything noisy like playing the guitar or singing.'
-            gs 'music_actions', 'put_down_pick_up'
         elseif hour > 22:
             'It''s too late to do anything noisy like playing the guitar or singing.'
-            gs 'music_actions', 'put_down_pick_up'
         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>'
         end
+        if ml_guitar['hasguitar'] = 1 and $location_type = 'private': gs 'music_actions', 'put_down_pick_up'
     end
 end
 
@@ -32,16 +31,15 @@ if $ARGS[0] = 'start':
         killvar 'access'
     end
     
-    if ml_not_alone = 0: gs 'music_actions', 'willpower_cost'
+    if ml_not_alone ! 0: gs 'music_actions', 'willpower_cost'
     if $access = '': gs 'internet_mobile', 'get_access'
 
     !! $location_type = ''private'' = these are usually homes. ''indoors'' usually an office, shop or an NPC''s home. Same for ''public_indoors'' For those locations
     !! anything music related should be part of a storyline/quest, or some prewritten scene, like in the room of Anushka
     gs 'music_actions', 'play_something'
     gs 'music_actions', 'practice_guitar'
-    gs 'music_actions', 'play_something'
     
-    gs 'music_actions', 'busking'
+    if $location_type = 'public_outdoors': gs 'music_actions', 'busking'
     gs 'music_actions', 'record_music'
     gs 'music_actions', 'stream_music'
 
@@ -66,13 +64,13 @@ if $ARGS[0] = 'put_down_pick_up':
         act 'Place the guitar next to your desk': 
             ml_guitar['carried'] = 0
             $ml_guitar['location'] = $loc
-            gt 'music_actions', 'start'
+            gt $loc, $loc_arg
         end
     elseif $ml_guitar['location'] = $loc:
         act 'Pick up the guitar':
             ml_guitar['carried'] = 1
             $ml_guitar['location'] = 'carried'
-            gs 'music_actions', 'finish'
+            gt $loc, $loc_arg
         end
     end
 end
@@ -89,7 +87,7 @@ if $ARGS[0] = 'play_something':
                 '<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
                 'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
                 'You hum along to the tune, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-                act 'Finish': gs 'music_actions', 'finish'
+                act 'Finish': gs 'music_actions', 'start' 
             end
         elseif ml_willcost  <= pcs_willpwr:
             act 'Play something on the guitar (10 minutes) (<<will_cost>> Willpower - you are not alone)':
@@ -103,7 +101,7 @@ if $ARGS[0] = 'play_something':
                 '<center><img <<$set_imgh>> src="images/pc/activities/music/guitarpractice_1.jpg"></center>'
                 'You pick up your guitar and start to play some songs you know, just for your own entertainment.'
                 'You hum along to the tune, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-                act 'Finish': gs 'music_actions', 'finish'
+                act 'Finish': gs 'music_actions', 'start' 
             end
         else
             act 'Practice guitar (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to pick up your guitar in front of people</font>'
@@ -117,7 +115,7 @@ if $ARGS[0] = 'play_something':
             gs 'stat'
             'You hum a few notes to warm up your throat and start to some some songs you know, just for your own entertainment.'
             'You sway and move your had to keep the temp, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-            act 'Finish': gs 'music_actions', 'finish'        
+            act 'Finish': gs 'music_actions', 'start'
         end
     elseif ml_willcost  <= pcs_willpwr:
         act 'Sing something (10 minutes) (<<will_cost>> Willpower - you are not alone)':
@@ -131,7 +129,7 @@ if $ARGS[0] = 'play_something':
             gs 'stat'
             'You hum a few notes to warm up your throat and start to some some songs you know, just for your own entertainment.'
             'You sway and move your had to keep the temp, relaxing into the music and enjoying it. When you look up, 10 minutes has passed and you are in a much better mood.'
-            act 'Finish': gs 'music_actions', 'finish' 
+            act 'Finish': gs 'music_actions', 'start'
         end
     else
         act 'Sing something (<font color="red"><<will_cost>> Willpower - you are not alone</font>)': '<br><font color="red">You feel too embarrassed to sing in front of people</font>'
@@ -325,6 +323,12 @@ if $ARGS[0] = 'willpower_cost':
     end
 end
 
+if $ARGS[0] = 'clear_restrictions':
+    killvar 'ml_willcost'
+    killvar 'ml_not_alone'
+    killvar 'ml_no_music'
+end
+
 if $ARGS[0] = 'finish':
     killvar 'ml_willcost'
     killvar 'ml_not_alone'

+ 4 - 4
locations/music_bedroompractice.qsrc

@@ -16,14 +16,14 @@ if $ARGS[0] = 'guitar':
 		'You open the book you got from Jimmy and start to practice the chords and basic techniques on the guitar.'
 		'It goes slowly, your fingers get in the way and they start to hurt after a short time as the strings dig into them, but you soldier on until.'
 		'The strings still either buzz, or don''t ring but by the end you start to get a feel for how to do it better. '				
-	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and instrmusic_lvl > 10 and instrmusic_lvl < 25 and $access = 'denied':
+	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and instrmusic_lvl > 15 and $access = 'denied':
 		'You open the chordbook you got from Jimmy and start to practice, but you feel that you don''t really improve that much.'
 		gs 'exp_gain', 'instrmusic', rand(1,2)	
 	elseif ml_guitarlesson['lessoncount'] = 0 and ml_guitar['chordbook'] = 1 and instrmusic > 15 and $access ! 'denied':
 		'<center><video autoplay loop src="images/pc/activities/music/onlineguitarlesson.mp4"></video></center>'
 		'You look at the book you got from Jimmy, then decide to turn to the internet for new lessons.'
 		gs 'exp_gain', 'instrmusic', rand(1,3)	
-	elseif ml_guitarlesson['lessoncount'] > 0 and instrmusic_lvl >= 25 and $access ! 'denied':
+	elseif ml_guitarlesson['lessoncount'] > 0 and instrmusic_lvl >= 15 and $access ! 'denied':
 		gs 'exp_gain', 'instrmusic', rand(2,3)
 		'<center><video autoplay loop src="images/pc/activities/music/onlineguitarlesson.mp4"></video></center>'
 		'You work through the practices from your guitarlesson then turn to the internet to learn some more new songs.'
@@ -31,7 +31,7 @@ if $ARGS[0] = 'guitar':
 		'You pick up you guitar and the lessons from the guitar teacher and start to practice.'
 		gs 'exp_gain', 'instrmusic', rand(2,3)
 	end
-	act 'Finish practice': gs 'music_actions', 'finish'
+	act 'Finish practice': gs 'music_actions', 'start'
 end
 
 !! TODO: Tie in with the vocal coach at the Industrial Region Community Centre
@@ -69,7 +69,7 @@ if $ARGS[0] = 'rehearse':
 	ml_performance['set_quality'] += rand(1,(pcs_instrmusic + pcs_vokal + pcs_perform)/10)
 	ml_performance['set_lastpracticeday'] = daystart 
 		
-	act 'Finish practice': gs 'music_actions', 'finish'
+	act 'Finish practice': gs 'music_actions', 'start'
 end
 
 

+ 4 - 4
locations/music_onlinemusic.qsrc

@@ -7,7 +7,7 @@ if $ARGS[0] = 'set_up_account':
 	gs 'stat'	
 	'You log into Youtube to set up a channel for your music. You can upload videos or live stream, but you will need to open a bank account if you want to receive any tips from viewers of your stream.'	
 !!	TODO: Ask for a screen name? 
-	act 'Leave': gs 'music_actions', 'finish'
+	act 'Leave': gs 'music_actions', 'start'
 end
 
 
@@ -173,7 +173,7 @@ if $ARGS[0] = 'uploadmusic':
 	if $ARGS[1] = 'recording': 
 		act 'Leave': gs 'music_onlinemusic', 'finish', 'recording'
 	else
-		act 'Leave': gs 'music_actions', 'finish'
+		act 'Leave': gs 'music_actions', 'start'
 	end
 end
 
@@ -204,14 +204,14 @@ if $ARGS[0] = 'uploadallmusic':
 	if i < ml_onlinesongcount:jump 'uploadallmusic'
 	killvar 'will_cost'
 
-	act 'Leave': gs 'music_actions', 'finish'
+	act 'Leave': gs 'music_actions', 'start'
 end
 
 if $ARGS[0] = 'deleteoldmusic':
 	'You go through your recorded musics and delete all the old ones where your playing doesn''t really reflect what you can do these days'
 	gs 'music_onlinemusic', 'deleting'
 
-	act 'Leave': gs 'music_actions', 'finish'
+	act 'Leave': gs 'music_actions', 'start'
 end
 
 !!----------------------------------------------------------------------------------------------------------------------------

+ 18 - 3
locations/pav_disco_coolkids.qsrc

@@ -1377,7 +1377,7 @@ if $ARGS[0] = 'katja_walkhome':
 	katjaQW['drunk_help'] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_katja.jpg"></center>'
-	if func('homes_properties', 'has_access', 'parents_home'):
+	if func('homes_properties', 'can_live_here', 'parents_home') ! 0:
 		'Katja takes you by the arm and helps you get home.'
 		act 'Go home': gt 'korrPar'
 	else
@@ -1516,6 +1516,14 @@ if $ARGS[0] = 'sonia_dance':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/sonia_sveta_dance.jpg"></center>'
 	'You and Sonia move out onto the dance floor and start dancing together. She seems to be really enjoying herself, laughing and dancing with lots of energy and doesn''t seem to care what anyone thinks. She just wants to have fun.'
+!!want to add this so it triggers once the first time Sonias rel hits 50
+	if npc_rel['A139'] >= 50:
+		if soniaQW['homeinvite'] = 0:
+			soniaQW['homeinvite'] = 1
+			'As you dance together, she leans in and says "Hey, why don''t you come by my house sometime and we can hang out?"' 
+			'She quickly tells you her address and you assure her you will stop by sometime before the two of you go back to dancing together.'
+		end
+	end
 	act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 	if hour >= 20:
 		act 'Keep dancing': gt 'pav_disco_coolkids', 'sonia_dance'
@@ -1699,6 +1707,7 @@ if $ARGS[0] = 'sonia_outcast_dance':
 								'You pull back from her to create space as you stop kissing. "Sorry not tonight..."'
 								'You don''t get time to finish your thought, she looks hurt and angry at your words. "Fine!" Then turns and walks away from you.'
 								!!can we code this so if this happens she leave the disco for the night
+								 discobloc['A139'] = daystart
 								act 'Do something else': gt 'pav_disco_classmates', 'classmates'
 							end
 						else
@@ -1716,8 +1725,14 @@ if $ARGS[0] = 'sonia_walkhome':
 	minut += 15
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_sonia.jpg"></center>'
-	'Sonia takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about some fashion magazine she has recently read, but you don''t really remember most of what she said - in fact most of the walk home is a blur. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, well I hope you don''t feel too bad tomorrow." She gives you a quick hug and starts walking back down the stairs.'
-	act 'Go inside': gt 'korrPar'
+	if func('homes_properties', 'can_live_here', 'parents_home') ! 0: 
+		'Sonia takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about some fashion magazine she has recently read, but you don''t really remember most of what she said - in fact most of the walk home is a blur. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, well I hope you don''t feel too bad tomorrow." She gives you a quick hug and starts walking back down the stairs.'
+		act 'Go inside': gt 'korrPar'
+	else
+		!! NOTE: This is a temporary thing, I think if Sveta has been kicked out then Sonja either invites her over for the night or she takes Sveta to the current home, not the appartment
+		'Sonia takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about some fashion magazine she has recently read, but you don''t really remember most of what she said - in fact most of the walk home is a blur. Once you get to the apartment complex, she hugs you ""Okay, well I hope you don''t feel too bad tomorrow." She squeezes you gently and starts walking back home.'
+		act 'Continue': gt 'pav_complex', 'start'
+	end 
 end
 
 if $ARGS[0] = 'natasha':

+ 8 - 1
locations/pav_disco_gopniks.qsrc

@@ -1653,7 +1653,14 @@ if $ARGS[0] = 'anushka_walkhome':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/school_kids/walkhome_anushka.jpg"></center>'
 	'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, here we are. Maybe try not to over do it next time?" She gives you a quick hug and starts walking back down the stairs.'
-	act 'Go inside': gt 'korrPar'
+	if func('homes_properties', 'can_live_here', 'parents_home') ! 0: 
+		'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she helps you up the stairs to your floor and even helps you with your keys to unlock the door. "Okay, here we are. Maybe try not to over do it next time?" She gives you a quick hug and starts walking back down the stairs.'
+		act 'Go inside': gt 'korrPar'
+	else
+		!! NOTE: Same as with `sonja_walkhome` this is a temporary thing, I think if Sveta has been kicked out then leaving her in front of the building is just awkward. Should be taken to her current home if that is in Pavlovsk, or Anushka probably would invite her to sleep at their place.`
+		'Anushka takes you by the hand and the two of you walk the streets heading towards the apartment complex. She chats about the band, but you don''t really remember most of what she said, in fact most of the walk home is a blur to you. Once you get to the apartment complex, she hugs you ""Okay, well I hope you don''t feel too bad tomorrow." She squeezes you gently before releasing you, and starting to walk home.'
+		act 'Continue': gt 'pav_complex', 'start'
+	end	
 end
 
 if $ARGS[0] = 'alyona':

+ 33 - 14
locations/pav_hotelReception.qsrc

@@ -134,21 +134,25 @@ if $ARGS[0] = '':
 				act'Normal room':
 					cla 
 					hotelRoomDays['pav_hotel'] = input ("For how long would you like to stay?")
-					'You asked for <<hotelRoomDays[''pav_hotel'']>> days'
-					totalCost = hotelRoomDays['pav_hotel'] * 500
-					if hotelRoomDays['pav_hotel'] <= 0 : '<h2>You need to enter 0 or more days</h2>' & gt'pav_hotel'
-					'"A normal room for <<hotelRoomDays[''pav_hotel'']>> days, that would be <<totalCost>><b>₽</b> in total." says the receptionist, "would you like to pay with cash or with card?"'
-					gs 'pav_hotelReception', 'pay_the_room', 1
+					if hotelRoomDays['pav_hotel'] > 0 : 
+						totalCost = hotelRoomDays['pav_hotel'] * 500
+						'"A normal room for <<hotelRoomDays[''pav_hotel'']>> days, that would be <<totalCost>><b>₽</b> in total." says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'pav_hotelReception', 'pay_the_room', 1
+					else
+						gt'pav_hotel'
+					end
 				end
 
 				act'Luxury room':
 					cla
 					hotelRoomDays['pav_hotel'] = input ("For how long would you like to stay?")
-					'You asked for <<hotelRoomDays[''pav_hotel'']>> days'
-					totalCost = hotelRoomDays['pav_hotel'] * 1500
-					if hotelRoomDays['pav_hotel'] <= 0 : gt'pav_hotel'
-					'"That would be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
-					gs 'pav_hotelReception', 'pay_the_room', 2
+					if hotelRoomDays['pav_hotel'] > 0 : 
+						totalCost = hotelRoomDays['pav_hotel'] * 1500
+						'"A luxury room for <<hotelRoomDays[''pav_hotel'']>> days, that will be <<totalCost>><b>₽</b>" says the receptionist, "would you like to pay with cash or with card?"'
+						gs 'pav_hotelReception', 'pay_the_room', 2
+					else
+						gt'pav_hotel'
+					end
 				end
 
 				act 'Step away from the reception desk': gt'pav_hotel'
@@ -159,30 +163,45 @@ if $ARGS[0] = '':
 end
 
 if $ARGS[0] = 'pay_the_room':
+	hotel_room_id = ARGS[1]
 	if totalCost<=money:
 		act 'Pay with cash':
 			cla
 			money-=totalCost
-			hotelRoom['pav_hotel'] = ARGS[1]
+			hotelRoom['pav_hotel'] = hotel_room_id
 			hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
 			'You count the money and give it to her. She gives you the key to your room in return. She says happily: "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!"'
 			act 'Step away from the reception desk': gt 'pav_hotel'
 			killvar 'totalCost'
+			killvar 'hotel_room_id'
 		end
 	end
 	if totalCost<=karta+bankDebtLimit:
 		act 'Pay with card':
 			cla
 			karta-=totalCost
-			hotelRoom['pav_hotel'] = ARGS[1]
+			hotelRoom['pav_hotel'] = hotel_room_id
 			hotelRoomDays['pav_hotel'] = daystart + hotelRoomDays['pav_hotel']
 			'You swipe your card and wait a moment for ''APPROVED'' to appear on the tiny screen. As soon as the receipt is printed, she hands it to you with the key to your room. "Thank you ' + iif(pavHotelMaid = 0, 'miss', $pcs_nickname) +', I hope you enjoy your stay!" she says with a smile.'
 			act 'Step away from the reception desk': gt 'pav_hotel'
 			killvar 'totalCost'
+			killvar 'hotel_room_id'
 		end
 	end
-	if totalCost > karta+bankDebtLimit and totalCost > money: act 'You can''t afford to stay in the hotel for that long.': killvar 'totalCost' & gt 'pav_hotel'
-	act 'You change your mind': killvar 'totalCost' & gt 'pav_hotel'
+
+	if totalCost > karta+bankDebtLimit and totalCost > money: 
+		act 'You can''t afford to stay in the hotel for that long.': 
+			killvar 'totalCost' 
+			killvar 'hotel_room_id'
+			gt 'pav_hotel'
+		end
+	end
+
+	act 'You change your mind': 
+		killvar 'totalCost' 
+		killvar 'hotel_room_id'
+		gt 'pav_hotel'
+	end
 end
 
 

+ 3 - 3
locations/pav_park.qsrc

@@ -537,11 +537,11 @@ end
 
 if $ARGS[0] = 'deeper_park':
 	*clr & cla
-	$loc = 'deeper_park'
+	$loc = 'pav_park'
 	$region = 'pav_park'
 	$loc_arg = 'deeper_park'
 	$location_type = 'public_outdoors'
-	$menu_loc = 'deeper_park'
+	$menu_loc = 'pav_park'
 	$menu_arg = 'deeper_park'
 !!I don''t know if I did the above correct or not, please check it
 	menu_off = 0
@@ -722,7 +722,7 @@ if $ARGS[0] = 'deeper_park':
 			gs 'stat'
 
 			act 'Continue': gt 'pav_park', 'deeper_park'
-	end
+		end
 	end
 
 	if exhibitionist_lvl > 0:

+ 2 - 0
locations/pav_parkev.qsrc

@@ -337,6 +337,8 @@ if $ARGS[0] = 'go_for_walk2':
 		end
 		'You walk along one of the trails deep in the park, and there are few people around. You know the more secluded area of the park has a reputation for being dangerous. It is popular with couples seeking privacy, Gopnik, prostitutes plying their trade, and worse, criminals. The darkness from the night makes everything creepier. There are few light sources in this area. You occasionally hear the sounds of animals or even what seems like people''s voices. Still, the darkness makes it impossible to really see.'
 	end
+	
+	act 'Continue': gt 'pav_park', 'deeper_park'
 end
 
 if $ARGS[0] = 'walk2':

+ 3 - 1
locations/pav_residential.qsrc

@@ -128,7 +128,8 @@ if Enable_tablemap = 0:
 	if LariskaQW['story'] >= 6: '<a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''">Lariska</a> lives about 10 minutes away from here.'
 	if christinaQW['subpath'] >= 5: '<br><a href="exec: gt ''Zvereva_house'', ''front_door''">Christina</a> lives in an expensive house near here.'
 	if AlbinaQW['KnowsHouse'] = 1:'<a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina</a> lives in one of the few luxurious mansions Pavlovsk has to offer.'
-else
+	if soniaQW['homeinvite'] = 1: '<a href="exec:minut += 10 & gt ''soniahome'',''home''">Sonia''s</a> house is up through a garden pathway to a well cared for grey, wooden-clad house.'
+
 	st_count=0 & $show_table=''
 	if DimaBeHomeOnce = 1 and DimaRudeBlock = 0: gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''dimaHome'', ''home''">Dimka Nosov</a>','3'
 	if (igor_history = 1 or IgorLoverQW > 0 or IgorQW['house_open'] = 1) and IdorBlock = 0: gs'show_table','Fancier house of <a href="exec:minut += 10 & gt ''IgorHome'', ''home''">Igor Kruglov</a>', '3'
@@ -136,6 +137,7 @@ else
 	if LariskaQW['story'] >= 6: gs'show_table','House of <a href="exec:minut += 10 & gt ''LariskaHome'', ''front_door''" >Lariska Gruzdev</a> in the richer part of town','3'
 	if christinaQW['subpath'] >= 5: gs'show_table','<br><a href="exec: gt ''Zvereva_house'', ''front_door''">Christina</a> lives in an expensive house near here.','3'
 	if AlbinaQW['KnowsHouse'] = 1: gs'show_table','A luxurious mansion that''s home to <a href="exec:minut += 10 & gt ''albinahome'',''gate''">Albina Barlovskaya</a>','3'
+	if AlbinaQW['KnowsHouse'] = 1: gs'show_table','A grey wooden-clad house that''s home to <a href="exec:minut += 10 & gt ''soniahome'',''home''">Sonia Ivanko</a>','3'
 	if st_count > 0 :'<TABLE BORDER=1><<$show_table>></TR></TABLE>'
 end
 !!end of code changes.

+ 1 - 0
locations/pav_shared_apt.qsrc

@@ -820,6 +820,7 @@ if $ARGS[0] = 'pcsRoom':
 
 	act 'Relax on your bed': gt 'bed', 'start'
 	gs 'prostitution_functions', 'prostitute_outfit_at_home'
+	gs 'music_actions', 'music_icon'
 end
 	
 if $ARGS[0] = 'sofabed':

+ 1 - 1
locations/saveg.qsrc

@@ -16,6 +16,6 @@
 version_major = 0
 version_minor = 8
 version_revision = 8
-version_patch = 2
+version_patch = 4
 --- saveg ---------------------------------
 

+ 100 - 56
locations/saveupdater.qsrc

@@ -272,6 +272,7 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch
 	!!--------0.8.0.1---school social group adjustment
 end
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080100:
 	!!--------0.8.1--- Music variable names changed
 	if ml_update_1 = 0:
 		ml_guitar['hasguitar'] = ml_guitar
@@ -325,7 +326,7 @@ end
 	!!---------------------------------------------------------------
 
 	!!model variable updates
-	if anastasia > 0 and anastasia['saveupdate'] = 0:
+	if anastasia > 0 and anastasia['status'] = 0 and anastasia['saveupdate'] = 0:
 		anastasia['status'] = anastasia
 		anastasia['escort_ask'] = anastasia_escort_ask
 		anastasia['model_exp'] = anastasia_mode_exp
@@ -333,14 +334,14 @@ end
 		anastasia['saveupdate'] = 1
 	end
 	
-	if foto_models['emily'] > 0 and emily['saveupdate'] = 0:
+	if foto_models['emily'] > 0 and emily['status'] = 0 and emily['saveupdate'] = 0:
 		emily['status'] = foto_models['emily']
 		emily['hate'] = emily_hate
 		emily['model_exp'] = emily_model_exp
 		emily['saveupdate'] = 1
 	end
 	
-	if jeff > 0 and jeff['saveupdate'] = 0:
+	if jeff > 0 and jeff['status'] = 0 and jeff['saveupdate'] = 0:
 		jeff['status'] = jeff
 		jeff['grope'] = jeff_grope
 		jeff['movies'] = jeff_movies
@@ -348,13 +349,13 @@ end
 		jeff['saveupdate'] = 1
 	end
 	
-	if krystal > 0 and krystal['saveupdate'] = 0:
+	if krystal > 0 and krystal['status'] = 0 and krystal['saveupdate'] = 0:
 		krystal['status'] = krystal['talk']
 		
 		krystal['saveupdate'] = 1
 	end
 		
-	if mari > 0 and mari['saveupdate'] = 0:
+	if mari > 0 and mari['status'] = 0 and mari['saveupdate'] = 0:
 		mari['status'] = mari
 		mari['busy'] = mari_busy
 		mari['farm_shoot'] = mari_farm_shoot
@@ -410,7 +411,10 @@ end
 		end
 		shave_update = 1
 	end
+end
+
 
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch  < 00080200:
 	!! 0.8.2 clothing package for old saves ---------------------------------------
 
 	if ARRSIZE('cheapH') > 0 or ARRSIZE('averageH') > 0 or ARRSIZE('expensiveH') > 0 or ARRSIZE('formalH') > 0 or ARRSIZE('officeH') > 0 or ARRSIZE('schoolH') > 0 or ARRSIZE('exerciseH') > 0 or ARRSIZE('uniformH') > 0 or ARRSIZE('exhibitH') > 0 or ARRSIZE('alternativeH') > 0 or ARRSIZE('fetishH') > 0 or ARRSIZE('burlesqueH') > 0:
@@ -557,20 +561,21 @@ end
 		gm_outfits_b[50] = pcs_hips
 		gs 'clothing', 'wear', 'gm_outfits', 50
 	end
-!! Shave updater
-if shave_update ! 1:
-	if pubestyle = 1:
-		shave_length = 2
-		shave_trigger = 4
-	elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
-		shave_length = 16
-		shave_trigger = 21
-	elseif pubestyle = 10:
-		shave_length = 26
-		shave_trigger = 31
-	elseif pubestyle = 11:
-		shave_length = 2
-		shave_trigger = 8
+	!! Shave updater
+	if shave_update ! 1:
+		if pubestyle = 1:
+			shave_length = 2
+			shave_trigger = 4
+		elseif (pubestyle >= 2 and pubestyle <= 9) or pubestyle >= 12:
+			shave_length = 16
+			shave_trigger = 21
+		elseif pubestyle = 10:
+			shave_length = 26
+			shave_trigger = 31
+		elseif pubestyle = 11:
+			shave_length = 2
+			shave_trigger = 8
+		end
 	end
 end
 
@@ -1295,10 +1300,51 @@ end
 
 if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080802:
 
+	!!--------------------------------------------------------------------
+	!! Prostitution related changes
+	!!--------------------------------------------------------------------
+
+	!! Gadukino prostitution
+	gs 'prostitution_functions', 'set_gadukion_prostitute'
+
+	!! Anuahka''s variables put in an array.
+
+	if anushkaFirstvisit > 0: anushkaQW['first_visit'] = anushkaFirstvisit & killvar 'anushkaFirstvisit'
+	if Anush_lunch > 0:  anushkaQW['lunch'] = Anush_lunch & killvar 'Anush_lunch'
+	if nush_model > 0: anushka['model'] = nush_model & killvar 'nush_model'
+	if foto_anush_referral > 0:  anushka['model_referral'] = foto_anush_referral & killvar 'foto_anush_referral'
+	if AnushkaCompUse > 0: anushkaQW['computer_use'] = AnushkaCompUse & killvar 'AnushkaCompUse'
+	if marspyknow > 0: anushkaQW['marspyknow'] = marspyknow & killvar 'marspyknow'
+	if nushstrapanalpain > 0: anushkaQW['strapon_anal_pain'] = nushstrapanalpain & killvar 'nushstrapanalpain'
+	if nushstrapon > 0: anushkaQW['strapon'] = nushstrapon & killvar 'nushstrapon'
+	if domnush > 0: anushkaQW['dom_nush'] = domnush & killvar 'domnush'
+	if seenEd > 0: anushkaQw['seen_ed'] = seenEd & killvar 'seenEd'
+	if valeriaIntroduced > 0: anushkaQw['valeria_introduced'] = valeriaIntroduced & killvar 'valeriaIntroduced'
+	if showerphotos > 0: anushkaQW['shower_photos'] = showerphotos & killvar 'showerphotos'
+	if anushka_tv_day > 0: anushkaQW['tv_day'] =  anushka_tv_day & killvar 'anushka_tv_day'
+	if anushka_shower_day > 0: anushkaQW['shower_day'] = anushka_shower_day & killvar 'anushka_shower_day'
+	if AnushkaHomeDay > 0: anushkaQW['home_day'] = AnushkaHomeDay & killvar 'AnushkaHomeDay'
+	if nush_photoshoot > 0: anushkaQW['photoshoot'] = nush_photoshoot & killvar 'nush_photoshoot'
+	if NushVsNiko > 0: anushka['vs_niko'] =  NushVsNiko & killvar 'NushVsNiko'
+	if nushaboutalyona > 0: anushkaQW['about_alyona'] = nushaboutalyona & killvar 'nushaboutalyona'
+	if valspy > 0: anushkaQW['valspy'] =  valspy & killvar 'valspy'
+	if radnushdate > 0: anushkaQW['rad_date'] = radnushdate & killvar 'radnushdate'
+	if radspy > 0: anushkaQW['radspy'] =  radspy & killvar ' radspy'
+	if nushfedor3s > 0: anushkaQW['fedor_3some'] =  nushfedor3s & killvar 'nushfedor3s'
+	if Anush_sex > 0: anushkaQW['sex'] = Anush_sex & killvar 'Anush_sex'
+	if Anush_dolls > 0: anushkaQW['dolls'] = Anush_dolls & killvar 'Anush_dolls'
+	if anushka_toilet > 0: anushkaQW['toilet'] = anushka_toilet & killvar 'anushka_toilet'
+	if marspy > 0: anushkaQW['marspy'] = marspy & killvar 'marspy'
+	if bandpracticeinvite > 0: gopnikbandQW['practice_invite'] = bandpracticeinvite  & killvar 'bandpracticeinvite'
+
+end
+
+if ((100*version_major +version_minor)*100+version_revision)*100+version_patch < 00080804:
+
 	!!--------------------------------------------------------------------
 	!! Homes, Properties and Internet Update
 	!!--------------------------------------------------------------------
-	
+
 	!! Transferring the owned, rented, accessible properties
 	! city apartment
 	if home_owned[1] = 1 or owned_property['city_apartment'] = 1: 
@@ -1420,45 +1466,43 @@ if ((100*version_major +version_minor)*100+version_revision)*100+version_patch <
 		killvar 'balans' & killvar 'temp_phone_rem' & killvar 'temp_phone_mult' & killvar 'new_balans'
 	end
 
-	!!--------------------------------------------------------------------
-	!! Prostitution related changes
-	!!--------------------------------------------------------------------
-
-	!! Gadukino prostitution
-	gs 'prostitution_functions', 'set_gadukion_prostitute'
-
-	!! Anuahka''s variables put in an array.
-
-	if anushkaFirstvisit > 0: anushkaQW['first_visit'] = anushkaFirstvisit & killvar 'anushkaFirstvisit'
-	if Anush_lunch > 0:  anushkaQW['lunch'] = Anush_lunch & killvar 'Anush_lunch'
-	if nush_model > 0: anushka['model'] = nush_model & killvar 'nush_model'
-	if foto_anush_referral > 0:  anushka['model_referral'] = foto_anush_referral & killvar 'foto_anush_referral'
-	if AnushkaCompUse > 0: anushkaQW['computer_use'] = AnushkaCompUse & killvar 'AnushkaCompUse'
-	if marspyknow > 0: anushkaQW['marspyknow'] = marspyknow & killvar 'marspyknow'
-	if nushstrapanalpain > 0: anushkaQW['strapon_anal_pain'] = nushstrapanalpain & killvar 'nushstrapanalpain'
-	if nushstrapon > 0: anushkaQW['strapon'] = nushstrapon & killvar 'nushstrapon'
-	if domnush > 0: anushkaQW['dom_nush'] = domnush & killvar 'domnush'
-	if seenEd > 0: anushkaQw['seen_ed'] = seenEd & killvar 'seenEd'
-	if valeriaIntroduced > 0: anushkaQw['valeria_introduced'] = valeriaIntroduced & killvar 'valeriaIntroduced'
-	if showerphotos > 0: anushkaQW['shower_photos'] = showerphotos & killvar 'showerphotos'
-	if anushka_tv_day > 0: anushkaQW['tv_day'] =  anushka_tv_day & killvar 'anushka_tv_day'
-	if anushka_shower_day > 0: anushkaQW['shower_day'] = anushka_shower_day & killvar 'anushka_shower_day'
-	if AnushkaHomeDay > 0: anushkaQW['home_day'] = AnushkaHomeDay & killvar 'AnushkaHomeDay'
-	if nush_photoshoot > 0: anushkaQW['photoshoot'] = nush_photoshoot & killvar 'nush_photoshoot'
-	if NushVsNiko > 0: anushka['vs_niko'] =  NushVsNiko & killvar 'NushVsNiko'
-	if nushaboutalyona > 0: anushkaQW['about_alyona'] = nushaboutalyona & killvar 'nushaboutalyona'
-	if valspy > 0: anushkaQW['valspy'] =  valspy & killvar 'valspy'
-	if radnushdate > 0: anushkaQW['rad_date'] = radnushdate & killvar 'radnushdate'
-	if radspy > 0: anushkaQW['radspy'] =  radspy & killvar ' radspy'
-	if nushfedor3s > 0: anushkaQW['fedor_3some'] =  nushfedor3s & killvar 'nushfedor3s'
-	if Anush_sex > 0: anushkaQW['sex'] = Anush_sex & killvar 'Anush_sex'
-	if Anush_dolls > 0: anushkaQW['dolls'] = Anush_dolls & killvar 'Anush_dolls'
-	if anushka_toilet > 0: anushkaQW['toilet'] = anushka_toilet & killvar 'anushka_toilet'
-	if marspy > 0: anushkaQW['marspy'] = marspy & killvar 'marspy'
-	if bandpracticeinvite > 0: gopnikbandQW['practice_invite'] = bandpracticeinvite  & killvar 'bandpracticeinvite'
 
+	!! ------------ NPC Stat Updater ------------------------
+
+	if $ARGS[0] = 'npc_stat_update':
+		if npc_start_free_time[$boy] = 0 or npc_day_off[$boy] = 0:
+			if npc_finance[$boy] = 0:
+				if rand(1,3) = 1:
+					npc_start_free_time[$boy] = 9
+					npc_end_free_time[$boy] = 12
+				elseif rand(1,2) = 1:
+					npc_start_free_time[$boy] = 16
+					npc_end_free_time[$boy] = 20
+				else
+					npc_start_free_time[$boy] = 20
+					npc_end_free_time[$boy] = 23
+				end
+			elseif npc_finance[$boy] = 1:
+				if rand(1,2) = 1:
+					npc_start_free_time[$boy] = 9
+					npc_end_free_time[$boy] = 12
+				else
+					npc_start_free_time[$boy] = 20
+					npc_end_free_time[$boy] = 23
+				end
+			elseif npc_finance[$npclastgenerated] = 2:
+				npc_apt_type[$npclastgenerated] = 5
+				!!npc_apt_type[$npclastgenerated] = rand(5,6)
+				!! apt_type 6 is disabled until pictures are added
+				npc_occupation[$npclastgenerated] = rand(14,18)
+				npc_car[$npclastgenerated] = rand(0,1)
+			end
+			npc_day_off = rand(1,7)
+		end
+	end
 end
 
+
 gs 'saveg'
 --- saveupdater ---------------------------------
 

+ 31 - 107
locations/shortgs.qsrc

@@ -755,25 +755,27 @@ if $ARGS[0] = 'clothing_state':
 end
 
 
-! Author - Hooded Silence
-! Date created - 26 Aug 22
-! Payment system - Used to pay for items in various game locations
-!
-! command syntax: gs 'shortgs', 'payments', value, 'method', 'item variable', item quantity, 'item description', 'return location', 'act'
-!
-! value = cost of goods. Required
-! method = how it''s to be paid cash or card. leave blank for both. Optional
-! Item Description - What''s been bought. Required
-! item variable = item variable to be purchased to be added to players inventory. Optional.
-! Item quantity = How many items to be added. Defaults to one - Optional.
-! Return Location - Where do you want the character to go to, it will be used in place of $loc, optional falls back to starting location.
-! Act - If there''s a specific act to return to, it will be used in place of $loc_arg. Optional
-!
-! Optional with no content are ignored.
-
-!Use stock image for the purchase screen?
+!! Author - Hooded Silence
+!! Date created - 26 Aug 22
+!! Payment system - Used to pay for items in various game locations
+!!
+!! command syntax: gs 'shortgs', 'payments', value, 'method', 'item variable', item quantity, 'item description', 'return location', 'act'
+!!
+!! value = cost of goods. Required
+!! method = how it''s to be paid cash or card. leave blank for both. Optional
+!! Item Description - What's been bought. Required
+!! item variable = item variable to be purchased to be added to players inventory. Optional.
+!! Item quantity = How many items to be added. Defaults to one - Optional.
+!! Return Location - Where do you want the character to go to, optional falls back to starting location.
+!! Act - If there's a specific act to return to. Optional
+!!
+!! Optional with no content are ignored.
+
+!! Use stock image for the purchase screen?
 
 if $ARGS[0] = 'payments':
+	*clr & cla
+	
 	if ARGS[1] = 0:
 		msg	'<b>Error, Cash Value not set.</b>'
 	end
@@ -790,7 +792,7 @@ if $ARGS[0] = 'payments':
 	$pay_section = iif ($ARGS[6] = '', $loc, $ARGS[6])
 	$pay_act = iif($ARGS[7] = '', $loc_arg, $ARGS[7])
 
-	! Construct payment call
+	!! Construct payment call
 	
 	if $pay_variable ! '':
 		$construct_cash = 'exec: gs ''shortgs'', ''paymentcomplete'', ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''cash'' & money -= <<pay_value>> & <<$pay_variable>> += <<pay_quantity>>'
@@ -800,16 +802,13 @@ if $ARGS[0] = 'payments':
 		$construct_card = 'exec: gs ''shortgs'', ''paymentcomplete'', ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''card'' & karta -= <<pay_value>>'
 	end
 
-
 	$pay_cash = '<a href="<<$construct_cash>>">Cash</a>'
 	$pay_card = '<a href="<<$construct_card>>">Card</a>'
 
-	*clr
-
 	!Use stock image for the purchase screen?
 	
 	if ($pay_method ! 'cash' and $pay_method ! 'card') and (pay_value <= money and pay_value <= karta + bankDebtLimit):
-		'How do you want to pay for  the <<$pay_desc>>? <<$pay_cash>> or <<$pay_card>>'
+		'How do you want to pay for the <<$pay_desc>>? <<$pay_cash>> or <<$pay_card>>'
 	elseif ($pay_method = 'cash' or $pay_method = '') and pay_value <= money:
 		'Pay for the <<$pay_desc>> with <<$pay_cash>>?'
 	elseif ($pay_method = 'card' or $pay_method = '') and pay_value <= karta + bankDebtLimit:
@@ -817,12 +816,11 @@ if $ARGS[0] = 'payments':
 	else
 		'You don''t have enough money in your purse or bank account for this item.'
 	end
-
-	! clean up all the variables
-
+	
 	act 'Cancel Payment' : gt $pay_section, $pay_act
 
-	
+	!! clean up all the variables
+
 	killvar 'pay_value'
 	killvar '$pay_method'
 	killvar '$pay_variable'
@@ -831,7 +829,7 @@ if $ARGS[0] = 'payments':
 	killvar '$pay_type'	
 end
 
-!payment complete
+!! Payment complete
 
 if $ARGS[0] = 'paymentcomplete':
 	*clr & cla
@@ -849,86 +847,12 @@ if $ARGS[0] = 'paymentcomplete':
 
 	gs 'stat'
 
-	act 'Finish payment' : gt $ARGS[1], $ARGS[2]
-end
-
-
-
-!! Based on 'payment', it is to be used when the scene around the payment needs a stricter control of what is displayed on the
-!! screen, what images are used, what happens when the payment fails, etc.
-!! Also can be used for purchases that are not items, like hotel rooms, sniper rifles, submarines or real estate.
-!!
-!! command syntax: gs 'shortgs', 'payments', value, 'method', 'item description', 'return location', 'act', 'custom question', 'custom no money', 'custom cancel'
-!!
-!! value = cost of goods. Required
-!! method = how it''s to be paid cash or card. leave blank for both. Optional
-!! Item Description - What''s been bought. Required
-!! item variable = item variable to be purchased to be added to players inventory. Optional.
-!! Item quantity = How many items to be added. Defaults to one - Optional.
-!! Return Location - Where do you want the character to go to, it will be used in place of $loc, optional falls back to starting location.
-!! Act - If there''s a specific act to return to, it will be used in place of $loc_arg. Optional
-!! Custom question - The text that will include the question about the payment method. Placeholders: '_card_' and '_cash_'
-!!    Example: "All right little lady, that's one Dragunov, will it be _cash_ or _card_? We don't accept bitcoin at the moment."
-!! Custom no money - the text that should be displayed after the custom question if the player doesn''t have enough money to pay.
-!!    Example: "You nervously realise that you don't have the money they've been asking for and start to think about some plausible excuse for wasting their time."
-!! Custom cancel - the text for the Cancel action when the player has enough money to pay
-!!    Example: "Shake your head and leave"
-
-if $ARGS[0] = 'silent_payment':
-	pay_value = ARGS[1]
-	$pay_method = $ARGS[2]
-	$pay_desc = $ARGS[3]
-	$pay_section = iif ($ARGS[4] = '', $loc, $ARGS[4])
-	$pay_act = iif($ARGS[5] = '', $loc_arg, $ARGS[5])
-	$pay_custom_question = $ARGS[6]
-	$pay_custom_nomoney = $ARGS[7]
-	$cancel_text = iif($ARGS[8] ! '', $ARGS[8], 'Cancel payment')
-	!!$cancel_text_no_money = iif($ARGS[9] ! '', $ARGS[9], iif($ARGS[8] ! '', $ARGS[8], 'Cancel payment'))
-
-	if $pay_variable ! '':
-		$construct_cash = 'exec: gt ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''cash'' & money -= <<pay_value>> & <<$pay_variable>> += <<pay_quantity>>'
-		$construct_card = 'exec: gt ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''card'' & karta -= <<pay_value>> & <<$pay_variable>> += <<pay_quantity>>'
-	else
-		$construct_cash = 'exec: gt ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''cash'' & money -= <<pay_value>>'
-		$construct_card = 'exec: gt ''<<$pay_section>>'', ''<<$pay_act>>'', <<pay_value>>, ''<<$pay_desc>>'', ''card'' & karta -= <<pay_value>>'
+	if $ARGS[1] ! '' :
+		$loc =  $ARGS[1]
+		$loc_arg = $ARGS[2]
 	end
-
-	$pay_cash = '<a href="<<$construct_cash>>">cash</a>'
-	$pay_card = '<a href="<<$construct_card>>">card</a>'
-
-	if ($pay_method ! 'cash' and $pay_method ! 'card') and (pay_value <= money and pay_value <= karta + bankDebtLimit):
-		'' + iif($pay_custom_question ! '', REPLACE(REPLACE($pay_custom_question,'_card_', $pay_card),'_cash_', $pay_cash), 'How do you want to pay for the <<$pay_desc>>? <<$pay_cash>> or <<$pay_card>>')
-	
-	elseif $pay_method ! 'cash' and pay_value <= karta + bankDebtLimit:
-		'' + iif($pay_custom_question ! '', REPLACE(REPLACE($pay_custom_question,'_card_', $pay_card),'_cash_', 'cash'), 'Pay for the <<$pay_desc>> with <<$pay_card>>?')
-	
-	elseif $pay_method !'card' and pay_value <= money:
-		'' + iif($pay_custom_question ! '', REPLACE(REPLACE($pay_custom_question,'_card_', 'card'),'_cash_', $pay_cash), 'Pay for the <<$pay_desc>> with <<$pay_cash>>?')
-	
-	elseif $pay_method = 'card' and pay_value > karta + bankDebtLimit:
-		if $pay_custom_question ! '': REPLACE(REPLACE($pay_custom_question,'_card_', 'card'),'_cash_', 'cash') & *nl
-		'' + iif($pay_custom_nomoney ! '', $pay_custom_nomoney, 'You don''t have enough money on your bank account to pay for the <<$pay_desc>>.')
-	
-	elseif $pay_method = 'cash' and pay_value > money:
-		if $pay_custom_question ! '': REPLACE(REPLACE($pay_custom_question,'_card_', 'card'),'_cash_', 'cash') & *nl
-		'' + iif($pay_custom_nomoney ! '', $pay_custom_nomoney, 'You don''t have enough cash on you to pay for the <<$pay_desc>>.')
-	
-	elseif pay_value > money and pay_value > karta + bankDebtLimit:
-		if $pay_custom_question ! '': REPLACE(REPLACE($pay_custom_question,'_card_', 'card'),'_cash_', 'cash') & *nl
-		'' + iif($pay_custom_nomoney ! '', $pay_custom_nomoney, 'You don''t have neither enough cash on you nor enough money in your bank account to pay for the <<$pay_desc>>.')
-	end
-
-	act '<<$cancel_text>>' : gt $pay_section, $pay_act, pay_value, $pay_desc, 'failed'
-	killvar 'pay_value'
-	killvar '$pay_method'
-	killvar '$pay_variable'
-	killvar 'pay_quantity'
-	killvar '$pay_desc'
-	killvar '$pay_type'	
-	killvar 'pay_custom_nomoney'
-	killvar 'pay_custom_question'
-	killvar 'cancel_text'
-	killvar 'cancel_text_no_money'
+	act 'Finish payment' : gt $loc, $loc_arg
 end
 
---- shortgs ---------------------------------
+--- shortgs ---------------------------------
+

+ 2 - 0
locations/sitr.qsrc

@@ -67,6 +67,8 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'<a href="exec:gt ''husb'', ''start''">Your husband sits on the couch and watches television.</a>'
 		gs 'music_actions', 'not_alone'
+	else
+		gs 'music_actions', 'clear_restrictions'
 	end
 end
 

+ 2 - 0
locations/sitr2x.qsrc

@@ -57,6 +57,8 @@ if husband > 0 and husbandrink ! 10 and husbandrinkday ! daystart:
 	if (week >= 6 and hour > 7 and hour < 17) or (hour > 17 and hour <= 22):
 		'<a href="exec: gt''husb'',''start'' ">Your husband is sitting on the couch watching TV.</a>'
 		gs 'music_actions', 'not_alone'
+	else
+		gs 'music_actions', 'clear_restrictions'
 	end
 end
 

+ 454 - 0
locations/soniahome.qsrc

@@ -0,0 +1,454 @@
+# soniahome
+
+!! Sonia Ivanko
+!! Parshikov Ivanko - father
+!! Shulyov Ivanko - older brother
+!! Tkachenko Ivanko - mother
+
+!! soniaQW['homeinvite'] = 1 - means been invited to her home, which unlocks it in the pav resident file
+!! soniaQS['tkachenko'] quest tracker
+!! soniaQS['parshikov'] quest tracker
+!! soniaQS['shulyov'] quest tracker
+
+if $ARGS[0] = 'home':
+	$menu_loc = 'soniahome'
+	$menu_arg = 'home'
+	menu_off = 0
+	$track_loop = ''
+	CLOSE ALL
+	if sound = 0:PLAY 'sound/korr.mp3',30
+	$locM_arg = 'home'
+	$locM = 'soniahome'
+	$loc_arg = 'home'
+	$loc = 'soniahome'
+	$location_type = 'private'
+	*clr & cla
+	gs 'stat'
+	gs 'themes', 'indoors'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/house_front.jpg"></center>'
+	'You approach Sonia''s house, walking up the pathway through a small well-cared garden with various flowers and shrubs towards a grey, wooden-clad house, which is equally well-cared for.'
+	if hour >= 22:
+		'It would be rude to even knock on the door at this time. Sonia is probably asleep, so you decide against it and lower your hand.'
+		act 'Move away from the door':gt 'pav_residential'
+	elseif hour < 8:
+		'It would be rude to even knock on the door at this time. Sonia is probably asleep, so you decide against it and lower your hand.'
+		act 'Move away from the door':gt 'pav_residential'
+	else
+		menu_off = 1
+		gs 'stat'
+		'You go to Sonia''s house and knock on the door.'
+!!During school or disco hours 0 happens, or after Sonia falls 0 will happen.(until I have time to write post fall home events, I want to block her home) the rest of the time it is a even chance of 1-3 happening
+!!for right now until I can write different versions after Sonia''s fall just going to always have her not home at the moment
+		DoorOpenedBy = rand(0,3)
+		if soniaPS > 0 or DoorOpenedBy = 0:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Sonia is not here, but she should be home later. You can call her then," she says before politely closing the door, not inviting you in.'
+			act 'Leave': gt 'pav_residential'
+		elseif DoorOpenedBy = 1:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/tkachenko.jpg"></center>'
+			if soniaQS['tkachenko'] = 0:
+				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello, can I help you?" she asks.'
+				'You smile at her. "Hi, I''m <<$pcs_nickname>>, one of Sonia''s classmates. Is she here?"'
+				'She frowns at you. It seems she doesn''t care for your casual attitude. "I am Tkachenko Ivanko, but you can call me Mrs Ivanko. Who are you exactly?"'
+				'You keep your smile. "Sorry, Mrs Ivanko. I''m <<$pcs_firstname>> <<$pcs_lastname>>."'
+				'She nods a little. "Better. Young ladies should have proper manners after all. Sonia is in her room." She stands aside to let you in before she closes the door.'
+				act 'Enter': gt 'soniahome','hallway'
+			else
+				'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by Sonia''s mother, who has an unfriendly, serious look on her face. "Hello again, <<$pcs_firstname>>. Sonia is in her room."'
+				'"Thank you, Mrs Ivanko," you politely reply to keep her happy, and she lets you in, closing the door behind you.'
+				soniaQS['tkachenko'] = 1
+				act 'Enter': gt 'soniahome','hallway'
+			end
+		elseif DoorOpenedBy = 2:
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/shulyov.jpg"></center>'
+			if soniaQS['shulyov'] = 0:
+				if hotcat >= 6:
+					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by a young, good-looking man about your sister''s age who has a friendly smile. "Hello. Can I help you?" he asks as he looks you over with hungry eyes.'
+					'You smile at him. "Hi, I''m <<$pcs_nickname>>, one of Sonia''s classmates. Is she here?"'
+					'He nods and stands aside. "I didn''t know my little sister had such beautiful friends. By all means, come in and welcome. My name is Shulyov. Sonia is in her room." Once you''re inside, he closes the door behind you. He stands there momentarily, checking you out before he finally walks away.'
+				else
+					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by a young, good-looking man about your sister''s age who has a friendly smile. "Hello. Can I help you?" he asks.'
+					'You smile at him. "Hi, I''m <<$pcs_nickname>>, one of Sonia''s classmates. Is she here?"'
+					'He nods and stands aside. "Yeah, she''s in her room." Once you enter, he closes the door behind you and walks away.'
+				end
+			else
+				if hotcat >= 6:
+					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by a young, good-looking man about your sister''s age who has a friendly smile. "Hello again <<$pcs_nickname>>, nice to see you," he says as he looks you over with hungry eyes.'
+					'You smile at him. "Hi. Is Sonia here?"'
+					'He nods and stands aside. "She''s in her room. By all means, come in and make yourself comfortable." Once you''re inside, he closes the door behind you. He stands there momentarily, checking you out before he finally walks away.'
+				else
+					'You stand outside the Ivanko household, knocking on the door. It''s quickly answered by a young, good-looking man about your sister''s age who has a friendly smile. "She''s in her room," he says while hooking his thumb back over his shoulder. He waits for you to walk in before closing the door and walking away.'
+				end
+				act 'Enter':gt 'soniahome','hallway'
+			end
+			soniaQS['shulyov'] = 1
+			act 'Enter': gt 'soniahome','hallway'
+		elseif DoorOpenedBy = 3:
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big25.jpg"></center>'
+			'You stand outside the Ivanko household, hoping that Sonia will be the one to come open the door.'
+			'To your relief, Sonia answers the door with a smile. "Hi <<$pcs_nickname>>. Come in." She closes the door and heads for her room as you walk inside.'
+			act 'Enter': gt 'soniahome','hallway'
+		end
+	end
+end
+
+if $ARGS[0] = 'hallway':	
+	$loc = 'soniahome'
+	$loc_arg = 'hallway'
+	$locM_arg = 'hallway'
+	$locM = 'soniahome'
+	$location_type = 'private'
+	$menu_arg = $ARGS[0]
+	menu_off = 0
+	killvar '$locclass'
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Hallway</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hall.jpg"></center>'
+	'You enter a small bright hallway with a door to the lounge on your right and a staircase at the end leading to the bedrooms and bathroom upstairs. There''s also a door to the kitchen in front of you.'
+	act 'Go to Sonia''s bedroom': gt 'soniahome','sonia_room'
+	act 'Go to the bathroom': gt 'soniahome','bathroom'
+	act 'Go to the kitchen': gt 'soniahome','kitchen'
+	act 'Living Room': gt 'soniahome','livingroom'
+	act 'Brother''s Room': gt 'soniahome','soniabrother'
+	act 'Parents Room': gt 'soniahome','soniaparents'
+	act 'Leave': gt 'pav_residential'
+end
+
+if $ARGS[0] = 'bathroom':
+	$loc = 'soniahome'
+	$loc_arg = 'bathroom'
+	$location_type = 'bathroom'
+	$menu_arg = $ARGS[0]
+	menu_off = 0
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Bathroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/bathroom.jpg"></center>'
+	'You enter the bathroom, which is fully tiled with a grey-and-white colour scheme. Whilst reasonably small, it''s very tastefully decorated. It''s a fairly typical bathroom, but this might be the cleanest one you''ve ever been in. It looks practically brand new and smells lovely.'
+	'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 > 0:'<a href="exec:dynamic $pirManage">Manage Piercings</a>'
+	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 'Dry off and get dressed':gt 'soniahome', 'bathroom'
+	end
+	dynamic $bath
+	dynamic $bteeth
+	dynamic $tampon
+	dynamic $basin
+	gs 'din_van', 'prvt_pee'
+	act 'Go to the hallway':gt 'soniahome','hallway'
+end
+
+if $ARGS[0] = 'kitchen':
+	$loc = 'soniahome'
+	$loc_arg = 'kitchen'
+	$locM_arg = 'kitchen'
+	$locM = 'soniahome'
+	$menu_arg = $ARGS[0]
+	menu_off = 0
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Kitchen</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/kitchen.jpg"></center>'
+	'As you enter the kitchen, you notice that whilst it isn''t large, it''s very tastefully done and has everything needed. It also has a dining table adjacent to it for family meals.'
+	act 'Go to the hallway':gt 'soniahome','hallway'
+	act 'Look in the fridge': gt 'soniahome', 'fridge'
+	dynamic $fill_bottle
+	dynamic $driwater
+end
+
+if $ARGS[0] = 'fridge':
+	menu_off = 1
+	*clr & cla
+	minut += 1
+	if ivankofood_day ! daystart:
+		ivankosup_count = 1
+		ivankolefto_count = 1
+		ivankowater_count = 1
+		ivankosanw_count = 1
+	end
+	gs 'stat'
+
+	if ivankolefto_count >= 1:
+		$ivanko_lefto = ' some left overs'
+	else
+		$ivanko_lefto = ''
+	end
+	if ivankosup_count >= 1:
+		$ivanko_sup = ' some soup'
+	else
+		$ivanko_sup = ''
+	end
+	if ivankowater_count >= 1:
+		$ivanko_water = ' some bottled water'
+	else
+		$ivanko_water = ''
+	end
+	if ivankosanw_count >= 1:
+		$ivanko_sanw = ' some stuff to make a sandwich'
+	else
+		$ivanko_sanw = ''
+	end
+	'<center><img <<$set_imgh>> src="images/shared/home/kitchen/fridge.jpg"></center>'
+	'You open the fridge and see:<<$Sonia_tea>><<$Sonia_water>><<$Sonia_sup>><<$Sonia_lefto>><<$Sonia_sanw>>'
+	act 'Close the refrigerator': gt 'soniahome','kitchen'
+	if ivankolefto_count > 0:
+		act 'Eat some left overs': 
+			*clr & cla
+			minut += 5
+			ivankofood_day = daystart
+			ivankolefto_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 last night''s dinner. Unfortunately, it isn''t very good, even for leftovers. You doubt it was much better when it was fresh.'
+			act 'Continue': gt 'soniahome','kitchen'
+		end
+	elseif ivankowater_count >= 0:
+		act 'Have some water': 
+			*clr & cla
+			minut += 5
+			ivankofood_day = daystart
+			ivankowater_count -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/shared/food/waterbottle1.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
+			'You drink some bottled water.'
+			act 'Continue': gt 'soniahome','kitchen'
+		end
+	elseif ivankosup_count >= 0:
+		act 'Have some soup': 
+			*clr & cla
+			minut += 5
+			ivankofood_day = daystart
+			ivankosup_count -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/shared/food/soup.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
+			'You find some soup in the fridge and spoon out a bowlful to eat. Unfortunately, it isn''t very good, and you feel that it was sitting there too long.'
+			act 'Continue': gt 'soniahome','kitchen'
+		end
+	elseif ivankosanw_count >= 0:
+		act 'Make a sandwich': 
+			*clr & cla
+			minut += 5
+			ivankofood_day = daystart
+			ivankosanw_count -= 1
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/shared/food/reuben.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
+			'You get all the stuff you need from the fridge, get some bread out of the cabinet and make yourself a sandwich.'
+			act 'Continue': gt 'soniahome','kitchen'
+		end
+	end
+end
+
+if $ARGS[0] = 'livingroom':
+	$loc = 'soniahome'
+	$loc_arg = 'livingroom'
+	$menu_loc = 'soniahome'
+	$menu_arg = 'livingroom'
+	$locM = 'soniahome'	
+	$locM_arg = 'livingroom'
+
+	menu_off = 0
+	CLOSE ALL
+	*clr & cla
+	if livingev_day ! daystart:
+		livingev = rand (1, 5)
+	else
+		livingev = 0
+	end
+	$locclass = 'livingr'
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Living room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/living_room.jpg"></center>'
+	'You walk into a small but comfortable lounge which is very clean and tidy. You see the TV in the corner and a cosy family settee on the opposite wall facing a fireplace, giving the room a warm and comfortable look.'
+
+	act 'Leave':gt 'soniahome','hallway'		
+end
+
+if $ARGS[0] = 'soniaparents':	
+	$loc = 'soniahome'	
+	$loc_arg = 'soniaparents'
+	$menu_loc = 'soniahome'
+	$menu_arg = 'soniaparents'
+	$locM_arg = 'soniaparents'
+	$locM = 'soniahome'
+	menu_off = 0
+	CLOSE ALL
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/parents_bedroom.jpg"></center>'
+	'You look into Sonia''s parents'' bedroom and see that, as with the rest of the house, it''s spotless, tidy, and tastefully decorated, making the most of the available space. There''s a wardrobe to your right and the bed on the left, with a chest of drawers and a beautiful fireplace.'
+	if hour < 6:
+		gt 'soniahome', 'timecheck'
+	elseif hour > 22:
+		gt 'soniahome', 'timecheck'
+	else
+		if hour < 7 or hour > 22:
+			'You look into the bedroom and see Sonia''s parents asleep. Not wanting to disturb them, you close the door and leave.'
+			act 'Leave':gt 'soniahome','hallway'
+		else
+			'Since nobody''s here, you should probably leave, or you could take a look around if you''re that curious.'
+			act 'Leave':gt 'soniahome','hallway'
+			act 'Look around':
+				*clr & cla
+				minut += 10
+				'<center><b><font color = maroon>Sonia''s parent''s room</font></b></center>'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/momsdrawer.jpg"></center>'
+				'You snoop around, opening drawers and looking in the closet. Even though you hope to find something, you don''t see anything interesting. The room is perfectly organized, with each drawer containing a type of clothing neatly folded up. Other than that, there seems to be nothing of interest.'
+				act 'Leave':gt 'soniahome','hallway'
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'soniabrother':	
+	$loc = 'soniahome'	
+	$loc_arg = 'soniabrother'
+	$menu_loc = 'soniahome'
+	$menu_arg = 'soniabrother'
+	$locM = 'soniahome'
+	$locM_arg = 'soniabrother'
+
+	menu_off = 0
+	CLOSE ALL
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Shulyov''s room</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/hall.jpg"></center>'
+	'You try the door but it is locked.'
+	act 'Leave':gt 'soniahome','hallway'
+end
+
+if $ARGS[0] = 'sonia_room':
+	$loc = 'soniahome'
+	$loc_arg = 'sonia_room'
+	$locM = 'soniahome'
+	$locM_arg = 'sonia_room'
+	$locclass = 'bedr'
+	$menu_arg = $ARGS[0]
+	menu_off = 0
+	*clr & cla
+	minut += 1
+	gs 'stat'
+	'<center><b><font color = maroon>Vitek''s bedroom</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_room.jpg"></center>'
+	'The first thing you notice about her room is it is spotless and orderly. Nothing is out of place in the room. There is a dresser against one wall with several things neatly placed on it, with pictures on the wall above it. The bed is near the centre of the room against one wall, and the bed is made with a body pillow leaning against the other pillows. Above the bed is a short string of lights. Along one of the other walls is a small makeup table that is clean, with all the makeup visibly lined up in a very orderly fashion.'
+	'<a href="exec:gt ''soniahome'', ''sonia_chat''">Sonia</a> is lying on her bed relaxing.'
+	act 'Go to the hallway':gt 'soniahome','hallway'
+	if $clothingworntype = 'nude': act 'Dress yourself': gs 'shortgs','dress' & gt 'soniahome','sonia_room'
+end
+
+if $ARGS[0] = 'sonia_chat':
+	menu_off = 1
+	*clr & cla
+	minut += 2
+	gs 'stat'
+	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+	'You sit on the bed next to Sonia and look around her room as she starts chatting about something she recently read in a magazine.'
+	act 'Stop talking': gt 'soniahome','sonia_room'
+	act 'Make small talk':
+		*clr & cla
+		minut += 5
+		gs 'npc_relationship', 'modify', 'A25', 'like'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'You talk with Sonia about various things, mostly about fashion, your mutual friends, or school in general.'
+		act 'Stop talking': gt 'soniahome','sonia_room'
+		act 'Keep talking': gt 'soniahome', 'sonia_chat'
+	end
+	act 'Ask about the future':
+		*clr & cla
+		gs 'npc_relationship', 'modify', 'A25', 'like'
+		minut += 5
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'"What do you plan to do after school?" you ask.'
+		'She looks at you with a huge smile. "I want to go to the university in the city. How about you?"'
+		'You shrug. "I haven''t decided yet. What do you plan to study?"'
+		'"Fashion. I want to become a fashion designer," she replies before she launches into a massive rant about what it''s like to be in the fashion industry and what it takes to make it. It seems she''s really researched this and is very passionate about it.'
+		act 'Stop talking': gt 'soniahome','sonia_room'
+		act 'Keep talking': gt 'soniahome', 'sonia_chat'
+	end
+	
+	act 'Ask what she''s been up to':
+		*clr & cla
+		gs 'npc_relationship', 'modify', 'A25', 'like'
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/soniahome/sonia_bedroom/sonia_bed.jpg"></center>'
+		'"So, what have you been up to lately?" you ask.'
+		'She sighs dramatically. "Mostly trying to find some fun and avoid my parents. I think I''ll hang myself if I hear one more speech about how a proper young lady has to act." She ends with a giggle.'
+		'You smile at her. "Well, don''t do that. You have too pretty of a neck to bruise." You both laugh at that. "But seriously, I understand. My mom is insanely overbearing as well."'
+		'The two of you are soon talking about how bad your mothers are. It seems you have a lot in common with overbearing mothers trying to control every aspect of your lives.'
+		act 'Stop talking': gt 'soniahome','sonia_room'
+		act 'Keep talking': gt 'soniahome', 'sonia_chat'
+	end
+end
+
+--- soniahome ---------------------------------
+

+ 1 - 1
locations/tatiana_lab.qsrc

@@ -328,7 +328,7 @@ if $ARGS[0] = 'Tatiana':
 		$LipTab =		func('tatiana_lab', 'ListBuilder', 'Lip Size',   300, 120,'$lipSize',   'i',		 'pcs_lip',	'lip',	'')
 		$BreastTab =	 func('tatiana_lab', 'ListBuilder', 'Breast Size',1000,240,'$breastSize','breastSize','nbsize',		'breasts','magicf2b=0')
 
-		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',100,'clear','Skin','chest',''"">Clear Skin</a>"
+		$SkinTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'pcs_skin',1000,'clear','Skin','chest',''"">Clear Skin</a>"
 		$VirginTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,120,'pcs_vag',0,'renewed','Virginity','vaginal',''"">Renew Virginity</a>"
 		$SiliconeTab = "<a href=""EXEC:gs 'tatiana_lab','BodyModActuate',1000,240,'fillimplant',0,'natural again','Boobs','breasts','brSurTemp = 0 & stringimplant = 0'"">Remove Silicone</a>"
 

+ 136 - 77
locations/therapist.qsrc

@@ -373,16 +373,16 @@ if $ARGS[0] = 'hypno':
 					if var2 = 1 :
 					$session = 'A charming woman understands her place in this world. A female must always show respect to men. She will put his needs before her own. This will make her feel more charming to the greater sex."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 2 :
+					elseif var2 = 2:
 					$session = 'A charming woman understands her place as a female. A charming woman understands to show respect and make herself sexually available to any male, especially those who are older than herself."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 3 :
+					elseif var2 = 3:
 					$session = 'A charming woman understands her place as a female. A charming female understands that her primary purpose in life is to bring pleasure to males and bear their children. Especially those who are much older than them."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 4 :
+					elseif var2 = 4:
 					$session = 'A charming woman understands her place as a female. A charming female understands that her primary purpose and duty in life is to bring pleasure to males, serve them in every way possible and bear their children. Especially those who are much older than them."'
 					willpowermax -= rand(8,10)
-					elseif var2 = 5 :
+					elseif var2 = 5:
 					$session = 'A charming woman understands her place as a female. A charming female understands that her primary purpose and duty in her life is to have many children as possible especially with men who are much older than them."'
 					willpowermax -= rand(8,10)
 					else
@@ -446,80 +446,122 @@ if $ARGS[0] = 'hypno':
 					'<center><video autoplay loop src="images/locations/pavlovsk/clinic/therapist/stripping<<rand(1,3)>>.mp4"></video></center>'
 					'<font color="<<$hypnocolour>>">'
 					'You get up from the couch and start to take off all of your clothing.'
-					if hypnoTime < 4:
-						randSuck = rand(1,4)
-						if randSuck = 1:
-							$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
-							act 'Continue':gt 'therapist', 'hypnoFuckThroat'
-						elseif randSuck = 2:
-							$hypnoact = 'you will suck my cock.'
-							act 'Continue':gt 'therapist', 'hypnoSitSuck'
-						elseif randSuck = 3:
-							$hypnoact = 'you will suck my cock.'
-							act 'Continue':gt 'therapist', 'hypnoForceSuck'
-						elseif randSuck = 4:
-							$hypnoact = 'you will suck my cock.'
-							act 'Continue':gt 'therapist', 'hypnoSuck'
+					if func('body_din','pregnancyVisibility') = 1 and HypnoPregNoticed = 0:
+						HypnoPregNoticed = 1
+						'After stripping off your clothes, the doctor takes a look at you and smiles at your pregnant stomach. He kneels before you and kisses your belly, sending a shiver up your spine. "Seeing you pregnant is a beautiful sight" he exclaims. "Is it mine?" he asks'
+						act 'Yes, <i>Master</i>':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+							'"Yes Master, It is yours" you say "Good, If anyone asks, you got raped and that''s how you think you got pregnant. One day you will learn that the child is mine, but for now, the child belongs to some random person on the street" he says and leads you to the couch to start the session.'
+							*nl
+							gs 'therapist', 'hypno2'
 						end
-					else
-						if hypnoTime < 10:
-							if rand(0,2) > 0:
-								$hypnoact = 'I will fuck your pussy.'
-								act 'Continue':gt 'therapist', 'hypnoFuck'
-							elseif rand(0,2) > 0:
-								randSuck = rand(1,4)
-								if randSuck = 1:
-									$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
-									act 'Continue':gt 'therapist', 'hypnoFuckThroat'
-								elseif randSuck = 2:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSitSuck'
-								elseif randSuck = 3:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoForceSuck'
-								elseif randSuck = 4:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSuck'
-								end
-							else
-								$hypnoact = 'I will fuck your ass.'
-								act 'Continue':gt 'therapist', 'hypnoAnal'
+						act 'No, <i>Master</i>':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+							'"No, Master, It belongs to (Brother/Fedor/Boyfriend) "Thats upsetting." he says. "Since you did allow someone else to get you pregnant, I must punish you" he says and bends you over his desk, takes off his belt and starts to whip your bare ass with it. "You will not feel this pain when you wake up, but you will feel that you shouldn''t let anyone else but me get you pregnant. Do you understand, Cunt"'
+							act 'Yes, <i>Master</i>':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+								'"All right, Now please lay on the couch so we can get started" he says putting his belt back on his pants but placing it unbuckled.'
+								*nl
+								gs 'therapist', 'hypno2'
 							end
-						!elseif rand(0,3) = 0:
-							!$hypnoact = 'I thought of something special for you.'
-							!act 'Continue':gt 'therapist', 'hypnoPerv'
-						else
-							if rand(0,2) > 0:
-								$hypnoact = 'I will fuck your pussy.'
-								act 'Continue':gt 'therapist', 'hypnoFuck'
-							elseif rand(0,2) > 0:
-								randSuck = rand(1,4)
-								if randSuck = 1:
-									$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
-									act 'Continue':gt 'therapist', 'hypnoFuckThroat'
-								elseif randSuck = 2:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSitSuck'
-								elseif randSuck = 3:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoForceSuck'
-								elseif randSuck = 4:
-									$hypnoact = 'you will suck my cock.'
-									act 'Continue':gt 'therapist', 'hypnoSuck'
+							act 'Yes, <i>Master</i>':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/waiting<<rand(1,2)>>.jpg"></center>'
+								gs 'willpower', 'misc', 'resist', 'easy'
+								will_cost += (hypnoSchedule * 10)
+								will_cost += (hypnoStage * 10)
+								will_cost += hypnoTime * 3
+								if will_cost <= pcs_willpwr:
+									'"I love the baby''s father too much" you say and he sighs. We will have to do some more theopy to break you of that. You must only love me. Get on the couch with me.'
+								else
+									'"I... Yes, sir" you say. "I will not have unprotected sex with anyone except you," you explain. "Good Girl" he gives you a kiss before having you sit on the couch to start the session.'
 								end
-							else
-								$hypnoact = 'I will fuck your ass.'
-								act 'Continue':gt 'therapist', 'hypnoAnal'
+								*nl
+								gs 'therapist', 'hypno2'
 							end
 						end
 					end
-					'While you do this, Dr. Pavlov opens up his pants and takes out his dick, slowly masturbating as he watches you. After a while, he stops and motions you closer to him.'
+					gs 'therapist', 'hypno2'
+				end
+			end
+		end
+	end
+end
 
-					'"Come here, <i>Cunt</i>, <<$hypnoact>>"</font>'
+if $ARGS[0] = 'hypno2':
+	if hypnoTime < 4:
+		randSuck = rand(1,4)
+		if randSuck = 1:
+			$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
+			act 'Continue':gt 'therapist', 'hypnoFuckThroat'
+		elseif randSuck = 2:
+			$hypnoact = 'you will suck my cock.'
+			act 'Continue':gt 'therapist', 'hypnoSitSuck'
+		elseif randSuck = 3:
+			$hypnoact = 'you will suck my cock.'
+			act 'Continue':gt 'therapist', 'hypnoForceSuck'
+		elseif randSuck = 4:
+			$hypnoact = 'you will suck my cock.'
+			act 'Continue':gt 'therapist', 'hypnoSuck'
+		end
+	else
+		if hypnoTime < 10:
+			if rand(0,2) > 0:
+				$hypnoact = 'I will fuck your pussy.'
+				act 'Continue':gt 'therapist', 'hypnoFuck'
+			elseif rand(0,2) > 0:
+				randSuck = rand(1,4)
+				if randSuck = 1:
+					$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
+					act 'Continue':gt 'therapist', 'hypnoFuckThroat'
+				elseif randSuck = 2:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSitSuck'
+				elseif randSuck = 3:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoForceSuck'
+				elseif randSuck = 4:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSuck'
+				end
+			else
+				$hypnoact = 'I will fuck your ass.'
+				act 'Continue':gt 'therapist', 'hypnoAnal'
+			end
+		!elseif rand(0,3) = 0:
+			!$hypnoact = 'I thought of something special for you.'
+			!act 'Continue':gt 'therapist', 'hypnoPerv'
+		else
+			if rand(0,2) > 0:
+				$hypnoact = 'I will fuck your pussy.'
+				act 'Continue':gt 'therapist', 'hypnoFuck'
+			elseif rand(0,2) > 0:
+				randSuck = rand(1,4)
+				if randSuck = 1:
+					$hypnoact = 'lay down with your head off the edge. I will fuck your throat.'
+					act 'Continue':gt 'therapist', 'hypnoFuckThroat'
+				elseif randSuck = 2:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSitSuck'
+				elseif randSuck = 3:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoForceSuck'
+				elseif randSuck = 4:
+					$hypnoact = 'you will suck my cock.'
+					act 'Continue':gt 'therapist', 'hypnoSuck'
 				end
+			else
+				$hypnoact = 'I will fuck your ass.'
+				act 'Continue':gt 'therapist', 'hypnoAnal'
 			end
 		end
 	end
+	'While you do this, Dr. Pavlov opens up his pants and takes out his dick, slowly masturbating as he watches you. After a while, he stops and motions you closer to him.'
+
+	'"Come here, <i>Cunt</i>, <<$hypnoact>>"</font>'
 end
 
 if $ARGS[0] = 'succubus':
@@ -1668,7 +1710,7 @@ if $ARGS[0] = 'hypnoRandom':
 		tabletkisug = 0
 		tabletkicheck = 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"Now lets make sure you start having my children... <font color="<<$hypnocolour>>">Although you won''t consciously know my cum is inside of you, you will subconsciously feel it. Everytime I cum inside of you, your body will crave my seed more. You will keep your pussy clenched so my cum doesn''t leak out."</font>'
 		'<font color="<<$hypnocolour>>">Also, take these." He hands you a package of pills. "You will take one every day. If you have any birth control pills, you will throw them away. You won''t think about buying more. You won''t notice anything wrong with this and you will think these are simply normal birth control pills. Understand, <i>Cunt</i>?"</font>'
 		'"Yes, <i>Master</i>."'
@@ -1739,7 +1781,7 @@ if $ARGS[0] = 'hypnoRandom':
 	elseif hypnoCheckPanties ! 1 and rand(1,2) = 1 and hypnoPanty = 1:
 		*clr & cla
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<br><font color="<<$hypnocolour>>">"From now on, when you come in for therapy you will feel that it is common courtesy to allow me to check if you are not wearing panties. You will think this is normal. In fact, if you are caught wearing panties, you will feel ashamed that you wore them. When I compliment you for not wearing panties, you will feel proud and grateful for the compliment.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'
@@ -1753,7 +1795,7 @@ if $ARGS[0] = 'hypnoRandom':
 		cla
 		*clr
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<br><font color="<<$hypnocolour>>">"From now on, when you come in for therapy you will feel that it is common courtesy to show me your bare pussy. You will think this is perfectly normal behavior. It is simply the polite thing to do. Any comments I make about your bare pussy you will be grateful for.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'
@@ -1762,6 +1804,26 @@ if $ARGS[0] = 'hypnoRandom':
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
+		!! Forced Clothing, Steva will want to wear exhibitionist clothing, failing that only clothing she finds "daring" or have a cost of willpower
+	elseif hypnoPanty = 1 & hypnoBra = 1:
+		hypnoClothes = 1
+		cla
+		*clr
+		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
+		*nl
+
+		'<br><font color="<<$hypnocolour>>">"Okay, cunt. "He begins, setting up a new command;'
+
+		'"The only clothing you will be allowed to wear from now on are see-throught items. If you do not already have any in your closet, you will need to buy some. My daughter works in promotions for a store in town. You can usually find her in the park whenever she is out." '
+
+		'He adjusts his shirt, then adds...'
+
+		'"Lastly, if they do not have any school clothes, wear an outfit that exposes the most skin," he smiles. "Wearing normal clothing makes you feel self-conscious -- like to much clothing restricts your movement. You need to wear the bare minimum, Understand cunt?"'
+		'"Yes, <i>Master</i>."'
+		'"Good ..."<br>'
+		act 'Continue':
+			gt 'therapist', 'hypnoEnd'
+		end
 	! sveta now thinks it''s normal for pavlov to touch her innapropriatly
 	elseif hypnoTouchWhenever ! 1 and rand(1,2) = 1:
 		cla
@@ -1769,10 +1831,9 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoTouchWhenever = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will find it perfectly acceptable for me to touch you on any place of your body. It''s common sense that I should be able to touch you where ever and whenever I please. Any vulgar comments I make are perfectly normal. You won''t notice anything out of the ordinary.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		''
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
@@ -1783,10 +1844,9 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoKissGoodbye = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, before you leave, you will feel that it is natural to kiss me before you leave as thanks for your therapy session. You won''t find anything wrong with this. Doing so will feel perfectly normal. When you kiss me, you will do so with enthusiasm. You will enjoy the kiss and you will prefer kissing with your tongue. When we are finished, you will thank me for the session.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		''
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
@@ -1797,10 +1857,9 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoHardToCum = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will have difficulty orgasming if I''m not the one making you cum.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
-		''
 		act 'Continue':
 			gt 'therapist', 'hypnoEnd'
 		end
@@ -1811,7 +1870,7 @@ if $ARGS[0] = 'hypnoRandom':
 		hypnoAskFuck = 1
 		hypnoRandomCounter = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/clinic/therapist/sittingClothed.jpg"></center>'
-		''
+		*nl
 		'<font color="<<$hypnocolour>>">"From now on, you will feel that it is perfectly normal for you to ask me to fuck you instead of asking for therapy sessions. In fact, you will think that taking my cock is simply a normal therapy session and that doing so is not sex at all. Also, anytime you see my cock, your mind will enter the black room.</font> Understand, <i>Cunt</i>?"'
 		'"Yes, <i>Master</i>."'
 		'"Good ..."<br>'