Browse Source

Merge branch 'master' into working

ADCSux 2 years ago
parent
commit
922d199aa8
43 changed files with 2125 additions and 1091 deletions
  1. 85 10
      locations/KatjaHomeTalk.qsrc
  2. 4 4
      locations/Komp.qsrc
  3. 7 7
      locations/_attributes_danilovich_outfits.qsrc
  4. 138 71
      locations/_attributes_scandalicious_outfits.qsrc
  5. 8 8
      locations/albina_chat.qsrc
  6. 1 1
      locations/arturRinok.qsrc
  7. 1 0
      locations/begin.qsrc
  8. 31 0
      locations/beverage.qsrc
  9. 0 8
      locations/city_apt_building.qsrc
  10. 1 1
      locations/clothing_QV.qsrc
  11. 10 2
      locations/ender.qsrc
  12. 2 2
      locations/gschool_gopnik_chats.qsrc
  13. 672 225
      locations/gschool_jock_chats.qsrc
  14. 1 1
      locations/gschool_nerd_chats.qsrc
  15. 8 6
      locations/hookup_talk.qsrc
  16. 5 7
      locations/intro_initialization.qsrc
  17. 7 11
      locations/intro_initialization_city.qsrc
  18. 26 21
      locations/intro_sg_select.qsrc
  19. 25 4
      locations/intro_sg_select_custom.qsrc
  20. 4 5
      locations/intro_sg_tg.qsrc
  21. 24 18
      locations/intro_uni.qsrc
  22. 520 2
      locations/intro_uni_tg.qsrc
  23. 1 1
      locations/katjaEvDin.qsrc
  24. 1 1
      locations/katja_sex.qsrc
  25. 263 366
      locations/lesbidomhouse.qsrc
  26. 203 251
      locations/lesbisubhouse.qsrc
  27. 3 3
      locations/natbelapt.qsrc
  28. 1 1
      locations/nerd_game_night.qsrc
  29. 1 1
      locations/obj_din.qsrc
  30. 2 2
      locations/pav_complexb2.qsrc
  31. 2 2
      locations/pav_complexb3.qsrc
  32. 15 16
      locations/pav_lake.qsrc
  33. 1 1
      locations/pav_park.qsrc
  34. 2 2
      locations/pod_ezd.qsrc
  35. 5 2
      locations/rex_party.qsrc
  36. 2 2
      locations/rex_party_sexEvents.qsrc
  37. 1 1
      locations/scandalicious.qsrc
  38. 4 0
      locations/stat.qsrc
  39. 15 8
      locations/stat_display.qsrc
  40. 11 5
      locations/talent_agency.qsrc
  41. 1 1
      locations/uni_grounds.qsrc
  42. 4 4
      locations/uni_lessons.qsrc
  43. 7 7
      locations/uni_programs.qsrc

+ 85 - 10
locations/KatjaHomeTalk.qsrc

@@ -130,6 +130,8 @@ if $ARGS[0] = '':
 		!!Friday and Sturday evening Katja goes to the disco, if the player is talking to when this happens she asks them to go with. Alternatively the can just leave.
 		'"Let''s go to the disco!" Katja suggests with a smile.'
 		if money >= 25:act 'Go to the disco':money -= 25 & minut += 10 & gt 'pav_disco'
+	elseif locat['katja'] = 9:
+		'Katja notices how late it is and politely asks you to leave.'
 	else
 		if pcs_sweat >= 20:
 			!katja doesn''t like stinky people so if the player is sveaty she will ask the player to take a bath. The player can leave instead.
@@ -876,16 +878,7 @@ if $ARGS[0] = 'Sextalk':
 		end
 
 		if stat['bj'] > 0:
-			act 'Talk about blowjobs':
-				cls
-				katjaQW['horny'] += 5
-				katjaQW['knows_BJ'] = 1
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja how you''ve sucked dick and what it feels like. She blushes and bites her lip.'
-
-				act 'Further':minut += 15 & gt 'KatjaHomeTalk'
-			end
+			gs'KatjaHomeTalk','bj_talk1'
 		else
 			act 'You''ve never given a blowjob':
 				cls
@@ -1073,6 +1066,88 @@ if $ARGS[0] = 'Sextalk':
 	end
 end
 
+if $ARGS[0] = 'bj_talk1':
+	if katjaQW['knows_BJ'] > 0:
+		'"<<$pcs_nickname>>!" she says, a sparkle in her eye. "Tell me what it''s like to suckiong dick again."'
+	elseif katjaQW['knows_BJ']= 0:
+		'"<<$pcs_nickname>>, have you ever given a guy a blowjob?"'
+	end
+
+	if stat['bj'] > 0:
+		if katjaQW['knows_BJ'] = 0:
+			act 'No (lie)':
+				cla & *clr
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"No," you shake your head before shamelessly lying through your teeth. "I''ve never given a blowjob before."'
+				'"Oh." She sits back, looking disappointed for some reason.'
+				act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+			end
+			act'Yes':
+				cla & *clr
+				katjaQW['horny'] += 5
+				katjaQW['knows_BJ'] = 1
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+				'"Yeah. I''ve given a few," you admit.'
+				'"What''s it like?" Katja asks, eyes wide with excitement.'
+				gs'KatjaHomeTalk','bj_talk2'
+			end
+		elseif stat['bj'] > 0:
+			katjaQW['horny'] += 5
+			gs'KatjaHomeTalk','bj_talk2'
+		end
+	else
+		act 'No':
+			cla & *clr
+			gs 'stat'
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
+			'"No," you shake your head. "I''ve never given a blowjob before."'
+			'"Oh." She sits back, looking disappointed for some reason. "Guess we''re both clueless then, huh?"'
+			act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+		end
+		!!act'I''ve given a few (lie)':
+	end
+end
+
+if $ARGS[0] = 'bj_talk2':
+	act'It tastes funny':
+		cla & *nl
+		'"It tastes funny," you wrinkle your nose. "It''s like, kinda salty? But also sort of... musty? I don''t think I mind the act itself that much, but dick has a weird flavor."'
+		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It''s fun':
+		cla & *nl
+		'"It''s fun!" you grin. "I''m not really sure what it is, but something about having a dick in your mouth is really entertaining. It''s like, totally alive! And you can feel it making all these tiny movements when it''s on your tongue. I really like giving head."'
+		'Katja hangs on your every word, nodding excitedly for you to keep describing your experiences with oral sex to her.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It''s whatever':
+		cla & *nl
+		'"I don''t mind doing it but I don''t love it either," you say. "Dick doesn''t really taste like anything if it''s clean. Kinda salty if it isn''t. I don''t know. It''s whatever I guess."'
+		'You shrug.'
+		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It''s boring':
+		cla & *nl
+		'"It''s boring," you roll your eyes. "You have to keep sucking the whole time and after a while my jaw just starts to ache with the motion. It''s a dick in your mouth, I don''t know what to tell you.'
+		'Katja seems taken aback, looking almost worried. You guess you just shattered some impressions she had about giving head.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end
+	
+	act'It turns me on':
+		cla & *nl
+		'"It turns me on so much," you admit, biting your lip in a lusty smile. "When someone''s in your mouth, you can make them feel <i>really</i> good. And they''ll respond to what you do. If you take their whole length, they''ll squirm. If you lick the head, it''ll twitch under your touch. Just knowing you can make someone else feel that way... Ugh, just <i>thinking</i> about it gets me wet!"'
+		'Katja hangs on your every word, nodding along with wide eyes as you describe what it is you love so much about giving head. A faint blush also comes to her cheeks and you notice her unconsciously rubbing her thighs together.'
+		act 'Continue':minut += 15 & gt 'KatjaHomeTalk'
+	end	
+end
+
 if $ARGS[0] = 'hornykiss':
 	'Katja brings her face so close to yours that you can feel her hot breath on your skin.'
 

+ 4 - 4
locations/Komp.qsrc

@@ -398,7 +398,7 @@ if $ARGS[0] = 'rabota':
 		'<center><img <<$set_imgh>> src="images/pc/items/accessories/computer/eror.jpg"></center>'
 		'You have no prepaid internet access remaining. You need to buy more, before you can go online again.'
 
-		act 'Close the browser':gt 'komp','start'
+		act 'Close the browser':gt 'komp','brows'
 	else
 		minut += 60
 		internet -= 1
@@ -1784,7 +1784,7 @@ if $ARGS[0] = 'bank':
 			act 'Continue': gt 'komp', 'bank'
 		end
 	end
-	act 'Close your browser':gt 'komp', 'start'
+	act 'Close your browser':gt 'komp', 'brows'
 end
 
 if $ARGS[0] = 'fuckornot':
@@ -1808,7 +1808,7 @@ if $ARGS[0] = 'fuckornot':
 		if $view_location = 'school':
 			gt 'gschool_lessons', 'short_break'
 		else
-			gt 'komp', 'start'
+			gt 'komp', 'brows'
 		end
 	end
 end
@@ -1834,7 +1834,7 @@ if $ARGS[0] = 'hotornot':
 		if $view_location = 'school':
 			gt 'gschool_lessons', 'short_break'
 		else
-			gt 'komp', 'start'
+			gt 'komp', 'brows'
 		end
 	end
 end

+ 7 - 7
locations/_attributes_danilovich_outfits.qsrc

@@ -1,5 +1,5 @@
 # $attributes_danilovich_outfits
-!!2022/01/11
+!!2022/02/28
 !!Quality range is 2-5. 3 for casual short-and-shorts, 4 for clothing specially designed for exercise, 5 is more designed for looks than exercise.
 
 if ARGS[1] = 1:
@@ -908,33 +908,33 @@ elseif ARGS[1] = 150:
 	CloPantsShortness = 1
 	
 elseif ARGS[1] = 151:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties =1
 	
 elseif ARGS[1] = 152:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloBra = 1
 	CloPanties =1
 	
 elseif ARGS[1] = 153:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 1
 	CloPantsShortness = 6
 	CloOnePiece = 1
 	
 elseif ARGS[1] = 154:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 1
 	CloOnePiece = 1
 	
 elseif ARGS[1] = 155:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 2
 	CloTopCut = 2
 	CloPantsShortness = 6
@@ -948,7 +948,7 @@ elseif ARGS[1] = 156:
 	CloOnePiece = 1
 	
 elseif ARGS[1] = 157:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 4
 	CloTopCut = 2
 	CloPantsShortness = 6

+ 138 - 71
locations/_attributes_scandalicious_outfits.qsrc

@@ -1,154 +1,221 @@
 # $attributes_scandalicious_outfits
-!2021/05/08
-!price range from 2 to 3, please avoid adding too many outside of that range
+!2022/02/28
+!price range from 2 to 5, please avoid adding too many 5''s
 
 if ARGS[1] = 1:
-	CloQuality = 2
+	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
+	CloTopCut = 4
 	CloPantsShortness = 1
-	CloStyle = 4
+	CloOnePiece = 1
 
 elseif ARGS[1] = 2:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 1
+	CloTopCut = 4
+	CloPantsShortness = 6
+	CloOnePiece = 1
 	CloBimbo = 1
-	CloStyle = 4
 	
 elseif ARGS[1] = 3:
-	CloQuality = 2
-	CloThinness = 5
-	CloBra = 1
-	CloPantsShortness = 1
-	CloBimbo = 1
+	CloQuality = 3
+	CloThinness = 6
+	CloTopCut = 3
+	CloPantsShortness = 6
+	CloOnePiece = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 4:
 	CloQuality = 3
-	CloThinness = 6
-	CloBra = 1
-	CloPantsShortness = 4
-	CloStyle = 4
+	CloThinness = 5
+	CloTopCut = 4
+	CloPantsShortness = 1
 	
 elseif ARGS[1] = 5:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 2
-	CloPantsShortness = 5
+	CloTopCut = 4
+	CloPantsShortness = 6
+	CloOnePiece = 1
 
 elseif ARGS[1] = 6:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 5
-	CloStyle = 4
+	CloTopCut = 4
+	CloPantsShortness = 6
+	CloOnePiece = 1
 	
 elseif ARGS[1] = 7:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 5
+	CloTopCut = 4
+	CloPantsShortness = 6
+	CloOnePiece = 1
+	CloBimbo = 1
 	
 elseif ARGS[1] = 8:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 5
-	CloStyle = 4
+	CloTopCut = 4
+	CloPantsShortness = 6
+	CloOnePiece = 1
+	CloBimbo = 1
 	
 elseif ARGS[1] = 9:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 5
-	CloBimbo = 1
+	CloBra = 1
+	CloPanties = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 10:
-	CloQuality = 3
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 5
+	CloBra = 1
+	CloPanties = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 11:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 3
-	CloPantsShortness = 5
-	CloDress = 1
-	CloBimbo = 1
+	CloQuality = 4
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 12:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 5
-	CloTopCut = 3
-	CloPantsShortness = 5
-	CloDress = 1
-	CloBimbo = 1
+	CloBra = 1
+	CloPanties = 1
+	CloStyle = 4
 	
 elseif ARGS[1] = 13:
-	CloQuality = 2
+	CloQuality = 4
 	CloThinness = 5
 	CloBra = 1
-	CloPantsShortness = 5
+	CloPanties = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 14:
-	CloQuality = 2
+	CloQuality = 3
 	CloThinness = 5
-	CloBra = 1
+	CloTopCut = 3
 	CloPantsShortness = 5
-	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 15:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 5
+	CloThinness = 5
 	CloTopCut = 4
 	CloPantsShortness = 5
+	CloOnePiece = 1
 	CloBimbo = 1
 	CloStyle = 4
 	
 elseif ARGS[1] = 16:
 	CloQuality = 3
-	CloThinness = 4
-	CloBra = 1
+	CloThinness = 5
+	CloTopCut = 3
 	CloPantsShortness = 5
 	CloStyle = 4
 	
 elseif ARGS[1] = 17:
-	CloQuality = 4
+	CloQuality = 5
 	CloThinness = 5
-	CloTopCut = 2
-	CloPantsShortness = 6
-	CloOnePiece = 1
+	CloTopCut = 4
+	CloPantsShortness = 5
 	CloStyle = 4
 	
 elseif ARGS[1] = 18:
-	CloQuality = 3
+	CloQuality = 5
 	CloThinness = 5
 	CloTopCut = 4
-	CloPantsShortness = 6
-	CloOnePiece = 1
+	CloPantsShortness = 5
 	CloStyle = 4
 	
 elseif ARGS[1] = 19:
-	CloQuality = 2
+	CloQuality = 5
 	CloThinness = 5
+	CloTopCut = 4
+	CloPantsShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 20:
+	CloQuality = 5
+	CloThinness = 5
+	CloTopCut = 4
+	CloPantsShortness = 5
+	CloBimbo = 1
+	CloStyle = 4
+
+elseif ARGS[1] = 21:
+	CloQuality = 5
+	CloThinness = 4
 	CloTopCut = 3
 	CloPantsShortness = 6
-	CloOnePiece = 1
+	
+elseif ARGS[1] = 22:
+	CloQuality = 3
+	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 5
 	CloStyle = 4
 	
-elseif ARGS[1] = 20:
+elseif ARGS[1] = 23:
 	CloQuality = 2
 	CloThinness = 5
+	CloTopCut = 3
+	CloPantsShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 24:
+	CloQuality = 4
+	CloThinness = 4
 	CloTopCut = 4
-	CloPantsShortness = 6
-	CloOnePiece = 1
+	CloPantsShortness = 5
+	
+elseif ARGS[1] = 25:
+	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 4
+	CloPantsShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 26:
+	CloQuality = 2
+	CloThinness = 5
+	CloTopCut = 4
+	CloPantsShortness = 5
+	CloStyle = 4
+	
+elseif ARGS[1] = 27:
+	CloQuality = 4
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 28:
+	CloQuality = 5
+	CloThinness = 5
+	CloBra = 1
+	CloPantsShortness = 5
+	CloBimbo = 1
+	CloStyle = 4
+	
+elseif ARGS[1] = 29:
+	CloQuality = 4
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+	CloStyle = 4
+	
+else
+	CloQuality = 4
+	CloThinness = 5
+	CloBra = 1
+	CloPanties = 1
+	CloBimbo = 1
 	CloStyle = 4
 	
 end

+ 8 - 8
locations/albina_chat.qsrc

@@ -285,14 +285,14 @@ if $ARGS[0] = 'Doggystyle':
 	act'It''s more intense':
 		cla & *nl
 		'"There''s something <i>intense</i> about it," you say. "Something primal. I can''t explain it, but when I get fucked from behind, it drives me wild."'
-		'"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 til I come. Best night ever."'
+		'"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 come just thinking about it."'
+		'"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
 	
@@ -329,14 +329,14 @@ if $ARGS[0] = 'Cowgirl':
 	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."'
-		'"I don''t think that kind of stuff matters 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. I''d rather get my face stuffed into the sheets with a cock balls deep up my ass and spanked until my eyes water. At the end of it, I want my makeup to look as fucked as I feel. Now <i>that''s</i> a good time!"'
+		'"I don''t think that kind of stuff matters 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. I''d rather have my face stuffed into the sheets with a cock balls deep up my ass being spanked until my eyes water. At the end of it, I want my makeup to look as fucked as I feel. Now <i>that''s</i> a good time!"'
 		gs'albina_chat','Cowgirl2'
 	end
 		
-	act'I like it when he grabs my boobs':
+	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."'
-		'"But he can still grab your tits from behind," Albina argues. "Plus, he can spank you til you''re red and wriggling. Why choose when you can have both?"'
+		'"But he can still grab your tits from behind," Albina argues. "Plus, he can spank you until you''re red and wriggling too. Why choose when you can have both?"'
 		gs'albina_chat','Cowgirl2'
 	end
 end
@@ -639,13 +639,13 @@ if $ARGS[0] = 'wine_chat2':
 		cla & *clr
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/albina/wine_talk.jpg"></center>'
 		'"So, spit or swallow?" you ask, looking down at Albina.'
-		'"Swallow, duh.'
+		'"Swallow, duh."'
 		act'Ew, gross':
 			cla & *nl
 			'"Ewww," you wrinkle your nose in disgust. "Thad''s fucking gross! I can''t believe you do that!"'
 			'"Waht else am I suppozed do?"'
 			'"Just spit it out!"'
-			'"But if he comes in your mouth, that means he wants you to swallow, right?" she says, looking genuinely confused that you''re suggesting there''s a choice.'
+			'"But if he cums in your mouth, that means he wants you to swallow, right?" she says, looking genuinely confused that you''re suggesting there''s a choice.'
 			act'Continue':gt'albina_chat','wine_chat1'
 		end
 
@@ -663,7 +663,7 @@ if $ARGS[0] = 'wine_chat2':
 				'"Yeah, it''s why I swallow. You don''t like it?"'
 				'"No! It fuckin'' tastes like shit!"'
 				'"Then why do you do it?"'
-				'"Cuz you''re supposed to? If he comes in my mouth, I can''t spit it out," she says, looking genuinely confused that you''re suggesting there''s a choice.'
+				'"Cuz you''re supposed to? If he cums in my mouth, I can''t spit it out," she says, looking genuinely confused that you''re suggesting there''s a choice.'
 				act'Continue':gt'albina_chat','wine_chat1'
 			end
 		end

+ 1 - 1
locations/arturRinok.qsrc

@@ -140,7 +140,7 @@ if $ARGS[0] = 'work_1':
 				gs 'stat'
 
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/arthur/arturqw_4.jpg"></center>'
-				'Arthur comes up behind you and firmly grabs a handful of your ass. "<<$pcs_nickname>>, here you go, you earned this." He hands you 5000 <b>₽</b>.'
+				'Arthur comes up behind you and firmly grabs a handful of your ass. "<<$pcs_nickname>>, here you go, you earned this." He hands you 1250 <b>₽</b>.'
 				'"I like helping you very much, thank you very much Arturik." You look at him with grateful eyes and take the money.'
 				'"Well, you know, the sight of your beautiful eyes nearly overwhelm me every time I see them. So does your tight ass." He says, smiling lecherously at you'
 				'You turn and give him a quick shake of your rump before departing.'

+ 1 - 0
locations/begin.qsrc

@@ -7,6 +7,7 @@ if $ARGS[0] = 'start':
 	timerEndM = 0
 	timer = 6
 	timerM = 30
+	settingmode = 0
 
 	gs 'Cheatmenu_din'
 	showstat 1

+ 31 - 0
locations/beverage.qsrc

@@ -181,6 +181,37 @@ if $ARGS[0] = 'bev_tea':
 	end
 end
 
+if $ARGS[0] = 'bev_energy_drink':
+	*clr & cla
+	frost = 1
+	if alko > 0: alko -= 1
+	minut += 5
+	money -= val($_drink['<<args[1]>>,price'])
+	pcs_health += 10
+	pcs_mood += 20
+	pcs_energy += 20
+	fat += 3
+	if pcs_hydra >= 100:
+		pcs_hydra += 25
+	else
+		pcs_hydra += 50
+	end
+	cumspclnt = 2
+	gs 'cum_cleanup'
+	pcs_breath = 0
+	gs 'beverage', 'afterdrink'
+	'<center><img <<$set_imgh>> src="images/shared/drinks/energy_drink.jpg"></center>'
+	'You enjoy an energy drink, and<<$mtxt>>'
+	gs 'stat'
+	killvar '$_drink'
+
+	if food_loc = 1:
+		act 'Finish': gt 'food_menu'
+	else
+		act 'Finish':gt $loc, $loc_arg
+	end
+end
+
 if $ARGS[0] = 'bev_vod':
 	if pcs_health > 20:
 		*clr & cla

+ 0 - 8
locations/city_apt_building.qsrc

@@ -323,14 +323,6 @@ if $ARGS[0] = 'lift':
 	killvar 'res_lift_ev'
 end
 
-if $ARGS[0] = 'elev_objava':
-		*clr & cla
-		minut += 1
-		gs 'stat'
-		'<center><img <<$set_imgh>> src="images/locations/city/residential/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'city_apt_building','lift'
-end
-
 if $ARGS[0] = 'pod_objava':
 		*clr & cla
 		minut += 1

+ 1 - 1
locations/clothing_QV.qsrc

@@ -1132,7 +1132,7 @@ if $ARGS[0] = 'clothing_list':
 			if (clothingfilter['quality'] = 0 and CloQuality = clo_i) or (clothingfilter['inhibition'] = 0 and CloInhibit = clo_i) or clothingfilter['number'] = 0:
 				if clothingfilter['inc'] = 1 and clothingfilter['only'] = 1 and clothingfilter['sport_only'] = 0:
 					if CloInhibit <= pcs_inhib:
-						if materinstvo_dress_s[i] = 0 and materinstvo_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''materinstvo_dress'', <<i>>"><img src="images/pc/items/materinstvo/<<i>>.jpg" 	height="250" /></a>'
+						if materinstvo_dress_s[i] = 0 and materinstvo_dress_h[i] > 0:*p '<a href="exec:gt ''clothing_QV'', ''change'', ''materinstvo_dress'', <<i>>"><img src="images/pc/items/mommy/<<i>>.jpg" 	height="250" /></a>'
 					end
 				end
 			end

+ 10 - 2
locations/ender.qsrc

@@ -19,7 +19,11 @@ if $ARGS[0] = 'loss':
 
 		'You fall to the floor and feel your consciousness slipping away.'
 
-		act 'Further': gt 'intro_city_tg', 'tatianaPRE'
+		if $start_type = 'uni_tg':
+			act 'Further': gt 'intro_uni_tg', 'tatianaPRE'
+		else
+			act 'Further': gt 'intro_city_tg', 'tatianaPRE'
+		end
 		exit
 	elseif fightEnding = 2:
 		if autocombat_surrender = 0 or pcs_health < 100: pcs_health = 100
@@ -777,7 +781,11 @@ if $ARGS[0] = 'surrender':
 		'He ignores your pleas and hits you with a huge upper cut.'
 		'You fall to the floor and feel your consciousness slipping away.'
 
-		act 'Further': gt 'intro_city_tg', 'tatianaPRE'
+		if $start_type = 'uni_tg':
+			act 'Further': gt 'intro_uni_tg', 'tatianaPRE'
+		else
+			act 'Further': gt 'intro_city_tg', 'tatianaPRE'
+		end
 		exit
 	elseif fightEnding = 2:
 		if pcs_health < 100: pcs_health = 100

+ 2 - 2
locations/gschool_gopnik_chats.qsrc

@@ -14,7 +14,7 @@ if $ARGS[0] = 'vitek':
 			npc_rel[$static_num] = 0
 			kotovLoveQW = -1
 			gs 'stat'
-			'You start yelling at Vitek that he has fucked other girls. Vitek starts yelling at you and suddenly, there is a ringing in your head and your vision goes blurry. You find you''re on the floor with Vitek standing over you. Your cheek burns with pain and it takes you a few moments to understand what happened. It seems he slapped you so hard it knocked you off your feet. "Stay away from me you fucking whore! It''s over between us!"'
+			'You start yelling at Vitek about him fucking other girls. Vitek starts yelling at you in return before there is a sudden ringing in your head and your vision goes blurry. You find you''re on the floor with Vitek standing over you. Your cheek burns with pain and it takes you a few seconds to understand what happened. It seems he slapped you so hard it knocked you off your feet. "Stay away from me, you fucking whore! It''s over between us!"'
 
 			act 'Continue': gt 'gschool_lessons', 'short_break'
 		end
@@ -27,7 +27,7 @@ if $ARGS[0] = 'vitek':
 				if fame['pav_sex'] > 75: gs 'fame', 'pav', 'sex', -75
 				if fame['pav_prostitute'] > 75: gs 'fame', 'pav', 'prostitute', -75
 				gs 'stat'
-				'It takes a bit, but you convince him that all this was just gossip and none of it was true. He frowns. "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry baby. I will shut their yapping mouths."'
+				'It takes a while, but you convince him that all this was just gossip and none of it was true. He frowns. "I''ll knock their teeth out if they whisper one more word about you then. Don''t worry baby. I will shut their yapping mouths."'
 
 				act 'Continue': gt 'gschool_lessons', 'short_break'
 			end

File diff suppressed because it is too large
+ 672 - 225
locations/gschool_jock_chats.qsrc


+ 1 - 1
locations/gschool_nerd_chats.qsrc

@@ -168,7 +168,7 @@ if $ARGS[0] = 'natasha':
 			'You approach Natasha and explain how you''re struggling in school and could really use her help studying. She thinks it over for a second, but happily agrees: "Sure <<$pcs_nickname>>, that could be fun!"'
 			act 'Time for the next class': gt 'gschool_lessons', 'short_break'
 		end
-	elseif NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] > 0:
+	elseif NatbelQW['QWstage'] >= 8 and NatbelQW['Debt'] > 0 and NatbelQW['DebtDay'] <= daystart:
 		act 'Come to the bathroom with me':
 			*clr & cla
 			minut += 5

+ 8 - 6
locations/hookup_talk.qsrc

@@ -279,12 +279,14 @@ if $ARGS[0] = 'sex_review':
 							gt'hookup_after','pre'
 						end
 						
-						act'If you''re offering...':
-							cla & *clr
-							$npc_apt_bedroom[$npclastsaved]
-							'"Well... if you''re seriously offering..."'
-							'<<$npc_firstname[$npclastsaved]>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.'
-							act'Get eaten out':gt'hookup','lick_pussy'
+						if hypnoHardToCum = 0:
+							act'If you''re offering...':
+								cla & *clr
+								$npc_apt_bedroom[$npclastsaved]
+								'"Well... if you''re seriously offering..."'
+								'<<$npc_firstname[$npclastsaved]>> smiles at you and slinks down the bed, pushing your legs open and dipping his head between them.'
+								act'Get eaten out':gt'hookup','lick_pussy'
+							end
 						end
 					else
 						act'It was just boring':

+ 5 - 7
locations/intro_initialization.qsrc

@@ -62,8 +62,6 @@ $month = $monthName[month]
 
 gs 'telefon', 'setup'
 
-VersionCheck = 5030
-
 pcs_dob = birthyear * 10000
 pcs_dob += (birthmonth * 100)
 pcs_dob += birthday
@@ -92,6 +90,11 @@ oldsavepcs_haircol = 1
 
 gs 'body', 'initial'
 
+!!re-initialize appearance to get correct values
+gs 'AppearanceSystem', 'UpdateBaseAppearnce'
+gs 'body', 'RegularUpdate'
+gs 'AppearanceSystem'
+
 !! Adding underwear and default shoes and assigning them
 
 if $ARGS[1] ! 'CSB' and goth_clothing ! 1:
@@ -465,11 +468,6 @@ else
 	cyccustom = 1
 end
 
-!!re-initialize appearance to get correct values
-gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-gs 'body', 'RegularUpdate'
-gs 'AppearanceSystem'
-
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'

+ 7 - 11
locations/intro_initialization_city.qsrc

@@ -3,14 +3,12 @@
 !!	Final Initializations
 !!	Top area for things that need to be done before setting the variables for either start
 
+hour = 13
 day = 21
+week = 1
 month = 8
 year = 2017
 
-birthyear = 1999
-birthmonth = 4
-birthday = 1
-	
 BDSMfilm = 0
 pornstudio = 0
 pfilmSTOP = 0
@@ -69,8 +67,6 @@ $month = $monthName[month]
 
 gs 'telefon', 'setup'
 
-VersionCheck = 5030
-
 pcs_dob = birthyear * 10000
 pcs_dob += (birthmonth * 100)
 pcs_dob += birthday
@@ -95,6 +91,11 @@ oldsavepcs_haircol = 1
 
 gs 'body', 'initial'
 
+!!re-initialize appearance to get correct values
+gs 'AppearanceSystem', 'UpdateBaseAppearnce'
+gs 'body', 'RegularUpdate'
+gs 'AppearanceSystem'
+
 !! Adding underwear and default shoes and assigning them
 
 cheap_panties[1] = 1
@@ -478,11 +479,6 @@ else
 	cyccustom = 1
 end
 
-!!re-initialize appearance to get correct values
-gs 'AppearanceSystem', 'UpdateBaseAppearnce'
-gs 'body', 'RegularUpdate'
-gs 'AppearanceSystem'
-
 pcs_horny = 0
 killvar 'opPRE'
 killvar 'tgs_skipinto'

+ 26 - 21
locations/intro_sg_select.qsrc

@@ -43,26 +43,28 @@ if $ARGS[0] = 'start':
 	brothersawpirsF = 0
 	dynamic $currentpursetype + '_purses[<<currentpursenumber>>] = 1'
 
-	!!Default Names
-	$pcs_firstname = 'Svetlana'
-	$pcs_lastname = 'Lebedev'
-	$pcs_nickname = 'Sveta'
-
-	!!Player names are set here
-	$temp_firstname = '<<$pcs_firstname>>'
-	$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
-	if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
-	killvar '$temp_firstname'
-
-	$temp_lastname = '<<$pcs_lastname>>'
-	$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
-	if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
-	killvar '$temp_lastname'
-
-	$temp_nickname = '<<$pcs_nickname>>'
-	$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
-	if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
-	killvar '$temp_nickname'
+	if $start_type[1] ! 'tg':
+		!!Default Names
+		$pcs_firstname = 'Svetlana'
+		$pcs_lastname = 'Lebedev'
+		$pcs_nickname = 'Sveta'
+
+		!!Player names are set here
+		$temp_firstname = '<<$pcs_firstname>>'
+		$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
+		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
+		killvar '$temp_firstname'
+
+		$temp_lastname = '<<$pcs_lastname>>'
+		$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
+		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
+		killvar '$temp_lastname'
+
+		$temp_nickname = '<<$pcs_nickname>>'
+		$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
+		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
+		killvar '$temp_nickname'
+	end
 
 	gs 'npcstatic1'
 	gs 'npcstatic2'
@@ -98,7 +100,9 @@ if $ARGS[0] = 'start':
 	'You also have a younger half-brother, <<$npc_firstname[''A34'']>>, who is really into sports, especially football, and is shaping up to be a fine athlete. He is a year younger than you and his father is your stepfather.'
 	'Your <<$npc_usedname[''A30'']>> lives in the same building as you do, though you rarely see her except when you pass her in the stairwell. She is your mother''s older sister. <<$npc_usedname[''A54'']>>, as everyone calls him, is best friends with your stepfather. <<$npc_firstname[''A11'']>> <<$npc_lastname[''A11'']>>, your childhood friend, is the same age as you and grew up living in the same apartment building on the floor above yours. His father, <<$npc_firstname[''A112'']>>, is an old friend of your mother.'
 
-	act 'Re-enter name(s)': gt 'intro_sg_select', 'start'
+	if $start_type[1] ! 'tg':
+		act 'Re-enter name(s)': gt 'intro_sg_select', 'start'
+	end
 	act 'Continue':	gt 'intro_sg_select', 'SGStart2'
 end
 
@@ -121,6 +125,7 @@ if $ARGS[0] = 'SGStart2':
 	'<a href="exec:gt ''intro_customization'', ''birthday''"><<$startdob>></a>.'
 
 	act 'Confirm':
+		if $start_type[1] = 'tg': gt 'intro_sg_select', 'charselect'
 		cls
 		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/pre_3.jpg"></center>'
 		*nl

+ 25 - 4
locations/intro_sg_select_custom.qsrc

@@ -100,33 +100,54 @@ if $ARGS[0] = 'modgrup':
 	act 'Nerd':
 		killvar 'grupvalue'
 		$soc_grup = 'Nerd'
-		grupvalue[3] = 600
+		grupvalue[1] = 200
+		grupvalue[2] = 100
+		grupvalue[3] = 800
+		grupvalue[4] = 100
+		grupvalue[6] = 600
 		grupTipe = 3
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Jock':
 		killvar 'grupvalue'
 		$soc_grup = 'Jock'
-		grupvalue[2] = 600
+		grupvalue[1] = 400
+		grupvalue[2] = 800
+		grupvalue[3] = 100
+		grupvalue[4] = 200
+		grupvalue[6] = 400
 		grupTipe = 2
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Popular':
 		killvar 'grupvalue'
 		$soc_grup = 'Cool'
-		grupvalue[1] = 600
+		grupvalue[1] = 800
+		grupvalue[2] = 400
+		grupvalue[3] = 200
+		grupvalue[4] = 100
+		grupvalue[6] = 400
 		grupTipe = 1
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Gopnik':
 		killvar 'grupvalue'
 		$soc_grup = 'Gopnik'
-		grupvalue[4] = 600
+		grupvalue[1] = 200
+		grupvalue[2] = 300
+		grupvalue[3] = 100
+		grupvalue[4] = 800
+		grupvalue[6] = 100
 		grupTipe = 4
 		gt 'intro_sg_select_custom','modgrup'
 	end
 	act 'Outcast':
 		killvar 'grupvalue'
+		grupvalue[1] = 200
+		grupvalue[2] = 200
+		grupvalue[3] = 200
+		grupvalue[4] = 200
+		grupvalue[6] = 200
 		$soc_grup = 'Outcast'
 		grupTipe = 5
 		gt 'intro_sg_select_custom','modgrup'

+ 4 - 5
locations/intro_sg_tg.qsrc

@@ -286,7 +286,7 @@ end
 
 if $ARGS[0] = 'intro_6_looks':
 	$loc = 'intro_sg_tg'
-	$loc_arg = 'intro_7'
+	$loc_arg = 'intro_6_looks'
 	*clr & cla
 	if player_avatar = 1:
 		'<center><img HEIGHT = 478 src="images/avatar.jpg"></center>'
@@ -302,15 +302,14 @@ if $ARGS[0] = 'intro_6_looks':
 
 	
 	act 'Meet her': gt 'intro_sg_tg', 'intro_7'
-	act 'Customise <<$pcs_firstname>>': $loc_arg = 'intro_7' & gt 'intro_customization', 'start'
+	act 'Customise <<$pcs_firstname>>': gt 'intro_customization', 'start'
 end
 
 
 if $ARGS[0] = 'intro_7':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="<<FUNC(''$face_image'')>>"></center>'
-	'She''s shorter than you, but rather tall for a girl, with a body that is neither too fat nor especially skinny. On her chest rest a pair of decently-sized breasts. Her <<$curly>><<$pcdesc_hairlength>> hair is <<$pcs_haircol>>.'
-	'She has <<$pcs_eyecol>> eyes with <<$pcs_lashes>>'+iif(glass > 0, ' hidden behind a pair of cheap glasses.', '.')
+	'You couldn''t tell from her photo, but although shorter than you, she is rather tall for a girl.' 
 	'She looks like she''s spent some time in front of the mirror trying to pretty herself up, and her clothes are very clean. Despite that, she still looks rather average. Like she is the type of girl that would be a background character in another person''s life.'
 
 	act 'Go for a walk':
@@ -650,7 +649,7 @@ end
 if $ARGS[0] = 'gad_start':
 	*clr & cla
 	'<center><h2>Gadukino</h2></center>'
-	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_pavlovsk.jpg"></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_gadukino.jpg"></center>'
 	*nl
 	'<center>A small farming village with just as many rickety wooden houses dot the landscape as ruins. The village has seen better days.</center>'
 

+ 24 - 18
locations/intro_uni.qsrc

@@ -147,23 +147,25 @@ if $ARGS[0] = 'mom_intro':
 	'"Yeah, <<$npc_nickname[''A29'']>>! There''s so much to do and see here."'
 	'"Well don''t forget to stay focused on your studies, and stay away from boys for now. There will be plenty of time after you''ve finished studying to think about that stuff."'
 	
-	act 'Tell her what she wants to hear':
-		gs 'npc_relationship', 'set', 'A29', '50'
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
-		'"Everything will be fine, <<$npc_nickname[''A29'']>>. You got me here, I will do the rest."'
-		'She gives you a hug before going to stand over at your pile of stuff to keep an eye on it.'
-		
-		act 'Go on tour': gt 'intro_uni', 'tour_intro'
-	end
-	act 'Snap at her':
-		gs 'npc_relationship', 'set', 'A29', '30'
-		*clr & cla
-		'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
-		'"Just stop <<$npc_nickname[''A29'']>>! I''m an adult now, and I''ll do whatever I want with whoever I want!"'
-		'Her eyes flash in anger, but she doesn''t say anything. She goes and stands next to your pile to keep an eye on it.'
-		
-		act 'Go on tour': gt 'intro_uni', 'tour_intro'
+	if $start_type[1] ! 'tg':
+		act 'Tell her what she wants to hear':
+			gs 'npc_relationship', 'set', 'A29', '50'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
+			'"Everything will be fine, <<$npc_nickname[''A29'']>>. You got me here, I will do the rest."'
+			'She gives you a hug before going to stand over at your pile of stuff to keep an eye on it.'
+			
+			act 'Go on tour': gt 'intro_uni', 'tour_intro'
+		end
+		act 'Snap at her':
+			gs 'npc_relationship', 'set', 'A29', '30'
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big29.jpg"></center>'
+			'"Just stop <<$npc_nickname[''A29'']>>! I''m an adult now, and I''ll do whatever I want with whoever I want!"'
+			'Her eyes flash in anger, but she doesn''t say anything. She goes and stands next to your pile to keep an eye on it.'
+			
+			act 'Go on tour': gt 'intro_uni', 'tour_intro'
+		end
 	end
 	act 'Appreciate her concern':
 		gs 'npc_relationship', 'set', 'A29', '70'
@@ -220,7 +222,11 @@ if $ARGS[0] = 'family_goodbye':
 	*nl
 	'They all wave at you before leaving. You spend some time putting the rest of your stuff away or stashing it under your bed before deciding to explore the grounds.'
 
-	act 'Head outside': gt 'intro_uni', 'welcome_intro'
+	if $start_type[1] = 'tg':
+		act 'Head outside': gt 'intro_uni_tg', 'welcome_intro'
+	else
+		act 'Head outside': gt 'intro_uni', 'welcome_intro'
+	end
 end
 
 if $ARGS[0] = 'welcome_intro':

+ 520 - 2
locations/intro_uni_tg.qsrc

@@ -1,13 +1,531 @@
 # intro_uni_tg
 
+!2022/01/09
+!!The TF Story Elements
 gs 'themes', 'indoors'
 killvar '$start_type'
 $start_type = 'uni_tg'
 $start_type[1] = 'tg'
 
-'Not yet available!!'
 
-act 'Return': gt 'begin', 'start'
+if $ARGS[0] = 'roomPRE':
+	menu_off = 1
+	'<center><b><font color="maroon">Apartment</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/1.jpg"></center>'
+	'You wake up to the sound of your alarm clock. You hear Luda, your wife, mumbling next to you, "Don''t want to, it''s too early." She pulls her blanket up and rolls over. You reach over and turn the clock off.'
+	*nl
+	'<i>There are days when I just want to keep on sleeping</i>, you think to yourself. <i>But I can''t, not today.</i>'
+	act 'Go to the bathroom':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/mikhail_2.jpg"></center>'
+		'Quietly, so that you don''t wake up your daughter, you go to the bathroom and take care of your morning routine.'
+		act 'Leave the apartment':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/3.jpg"></center>'
+			'In a parking lot near your house sits your car. You unlock it with the remote key and climb in.'
+			act 'Go to work':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/4.jpg"></center>'
+				'You turn the key and the engine roars to life. As you drive to work the roads are filled with traffic, but it''s the morning rush hour, so it''s no surprise. You drive for what feels like an eternity, give or take an hour, but you eventually reach the office. The music on the radio was pleasant, at least.'
+				act 'Park at the office':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/5.jpg"></center>'
+					'You pull into a parking lot near the building and manage to find a good spot. You greet the security guard on your way in to the building, and then go upstairs to your office. Shortly after you sit down at your desk and boot up your computer, your boss''s secretary comes in and hands you a folder with several travel documents.'
+					*nl
+					'"Am I going on a business trip or something?" you ask her.'
+					*nl
+					'"Yes, the director said it had something to do with a construction project, out in the middle of nowhere, but that''s pretty much all I know," Oksana says.'
+					*nl
+					'After she leaves, you read over the travel documents and fill them out. Time to go to the director.'
+					act 'Go and see your boss':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_roman.jpg"></center>'
+						'You head into the directors'' office, greet him and hand him the papers to sign. The director, Roman Gromov, scans through the text before signing off on it with a broad, sweeping stroke.'
+						*nl
+						'"Ms. Glavbukh is in her office. Go get some travel money while I make a few calls. We''ll discuss your trip when you get back."'
+						act 'Go to the chief accountant':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_marina.jpg"></center>'
+							'Marina is indeed already in her office. After filing your signed travel documents, she grumbles about antiquated systems as she counts out the money.'
+							act 'Return to the director':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_roman.jpg"></center>'
+								'Roman is busy talking on the phone when you re-enter the his office, he gestures for you to sit down on one of the chairs across from him.'
+								*nl
+								'"Yes, I understand... yes. I will send Mikhail over ASAP, he''ll represent me... Yes... Tell your men to work on some other parts of the project in the meantime. Have Igor guard the pit and let no one make any fuss, and make sure nobody gets wind of this and, you know, try to halt the construction... Okay, we''ll keep in touch."'
+								*nl
+								'Roman hangs up and turns to you.'
+								*nl
+								'"Last night, while excavating for the foundations, the workers stumbled upon something; one of the excavators dug into a hollow space of some sort. Luckily Igor was on site and he halted the excavation.'
+								*nl
+								'"It''s not clear what exactly it is, yet. Maybe an abandoned bunker or a cave. But in any case, if there are any more chambers under the foundation, we might not be able to build on the land. So what I want you to do, is to go to the construction site, figure out exactly what the problem is and solve this whole mess as quickly as possible."'
+								act 'Remind him of the correct procedures':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_roman.jpg"></center>'
+									'"Firstly we need to talk to..." you start to say, but are quickly interrupted by your boss.'
+									*nl
+									'"Mikhail, do you realize what''s at stake here? We''re near the end of our credit line, we still have unfinalized agreements on the project''s contract, and we already have guys digging the pit. If there is a too big hole under the foundation, and we can''t build on the site, that could bankrupt the company. So this mysterious structure must be addressed immediately and I have to hold the fort here and keep a lid on things."'
+									act 'Doesn''t look like you have a choice': gt 'intro_uni_tg', 'roadPRE'
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'roadPRE':
+	music_loop = 0
+	CLOSE ALL
+	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/4.jpg"></center>'
+	'You leave the office and from your car phone your wife Luda. You explain the situation to her and as soon as you finish the call, you drive off to the construction site.'
+	act 'Drive':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_working.jpg"></center>'
+		'You''ve been on the highway for hours before you arrive at the town near the site, leaving you feeling tired. But before you can check into a hotel and get some sleep, you need to get an understanding of the magnitude of the problem you''re dealing with. You follow the directions to the site. Igor calls on the way and tells you that you won''t have to go through a security check.'
+		*nl
+		'You arrive and park your car at the site. You see Igor waving at you from a distance and you walk up to him.'
+		act 'Greet Igor':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_igor.jpg"></center>'
+			'Igor greets you. He is obviously concerned about the situation and without delay leads you to the pit''s fenced-off entrance. It rained earlier so the ground is all muddy, you''re going to have to clean your shoes when you get back to the hotel.'
+			*nl
+			'"The ladder''s over there," Igor informs you, while pointing to your left.'
+			*nl
+			'You reach the hole in the ground and peek inside using the small flashlight from your keychain. "There seems to be a floor about 5 meters down."'
+			*nl
+			'"Well, what do you think Mikhail? Shall we go down?" Igor says with a faint glimmer of adventure in his eyes.'
+			act 'Descend':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_1.jpg"></center>'
+				'Igor hands you a powerful flashlight and tells the guard to get the ladder over here. Igor is the first one to go down, once he reaches the bottom, he holds the ladder so you can safely climb down as well.'
+				*nl
+				'The cave smells musty and looks all gloomy, but you can breathe freely and the light from your flashlight illuminates the walls. You shoot a beam of light into the corridor and in the distance see something that resembles a door.'
+				*nl
+				'"Damn. If any historians hear about this, they''ll be all over this construction site." Igor mutters.'
+				*nl
+				'You walk up to the door and see drawings on it. Most of them resemble people, but with other stick figures as well.'
+				act 'Open the door':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_3.jpg"></center>'
+					'You lean against the door, it''s stiff but you manage to push it open.'
+					*nl
+					'"Oh shit...! Take a look over there. Human bones." Igor says nervously.'
+					*nl
+					'You take a look at what Igor is pointing at and see a pile of human bones with a skull on top.'
+					*nl
+					'"A tomb, I suppose." Igor mutters looking apprehensive.'
+					*nl
+					'"Probably", you nod. "We can''t rule anything out just yet."'
+					act 'Go further':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_5.jpg"></center>'
+						'Further into the cave, you reach a room that resembles some kind of archive, filled with dozens of old, dusty scrolls inside of racks built into the walls.'
+						*nl
+						'Igor takes one of the scrolls and carefully unrolls it. "What the hell? Look at this, it must be some kind of ancient language," Igor says. "I''ll take one with me, and see what I can find out about these, maybe I can get it deciphered. So we''ll know what we are dealing with."'
+						*nl
+						'Looking around, you notice another door on the other side of the chamber, you walk over and open it.'
+						act 'Enter the room':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_altar.jpg"></center>'
+							'There''s an altar in the center of the room, on it there are various pots, several gold amulets and even some stone figures. You continue looking around the room curiously, trying to figure out what it''s purpose was.'
+							*nl
+							'Looking closely at the altar, you notice a strange little amulet placed at the very top.'
+							act 'Examine the amulet':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/item_amulet.jpg"></center>'
+								'You pick up the strange amulet and examine it. <i>This is clearly very old</i>, you think to yourself.'
+								*nl
+								'While holding the amulet, you realize that it''s getting warm, almost hot. Suddenly you feel heat coursing through your entire body. You feel a surge of strength inside you. It''s like you just finished a long jog, but without the fatigue.'
+								*nl
+								'Igor enters the room with one of the scrolls in his hands. "Huh. Interesting little room.", he says, glancing over the altar. "Well, we have to make a decision: either we fill the catacombs up to the brink with cement or we let someone into these rooms. Who knows what all this stuff is, maybe it''s worth more than it looks."'
+								act 'Consult you boss':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_cave_altar.jpg"></center>'
+									'"I''ve got to think about it and consult the director before we do anything." You reply and without thinking about it, you put the small amulet into your pocket.'
+									*nl
+									'"Well, one thing''s for sure, you won''t get reception down here. Let''s go outside." Igor tells you.'
+									act 'Go back to the surface':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/system/1_openings/shared/site_working.jpg"></center>'
+										'You walk together with Igor out of the strange chambers and up the ladder, back to the surface.'
+										*nl
+										'"We must have been down there longer than I thought, it''s already late. There will only be security on site now so there''s nothing we can do here until the morning, you should go to the hotel." Igor says.'
+										*nl
+										'With a hasty goodbye to Igor, you make your way back to your car.'
+										'<i>Damn</i>, you think, <i>tomorrow''s going to be a stressful day.</i>'
+										act 'Go to the hotel': gt 'intro_uni_tg', 'otelPRE'
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'otelPRE':
+	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/6.jpg"></center>'
+	'Your trip to the hotel is quite uneventful compared to your tomb raiding adventure.'
+	*nl
+	'You park your car and go to the receptionist to get a room. There are only double rooms available, but it''s going on the company card, so that just means you''ll get a bigger room. You swipe your company card and take your room key.'
+	act 'Head upstairs to your room':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
+		'Lying down on one of the beds, you start to wonder just who built that crypt and what it''s purpose was. Your thoughts drift to that amulet you found. The way that thing you touched half an hour ago is still making you feel wonderful baffles you.'
+		act 'Call the director':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
+			'You dial Romans'' number and after a few rings, he picks up. You report to him the details of what you found at the site with Igor: an ancient tomb, human bones, scrolls in a mysterious language and the altar in that room.'
+			*nl
+			'The director stays silent while you give your report. A few moments later, he decides that it would be best to stop the construction. He tells you to stay and keep watch over the site until further notice.'
+			*nl
+			'You put the phone away. <i>Looks like this trip is going to last longer than expected</i>, you think to yourself.'
+			act 'Go to bed':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
+				'It doesn''t take you long to drift off to sleep'
+				*nl
+				'Images begin to form in your mind and you soon find yourself in a middle of a dream. The amulet stands before you and out of it comes a ghost of some sort. Before you even realize what you are doing, you find yourself staring deep into the ghost''s eyes which then turn into two planet earths.'
+				*nl
+				'"Looking at the world most just see the mundane, but there is more to it, much more and now you see that too. You have the potential to shape it all, but first, you have company."'
+				*nl
+				'Suddenly your senses return and you are aware of the hotel room around you, you can tell you are not alone.'
+				act 'Open your eyes':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_reinhold.jpg"></center>'
+					'As you open your eyes, you see a man standing in your room. He is wearing a long black coat and his face looks weary; he is unshaven and reminds you of most police detectives in Hollywood films.'
+					*nl
+					'"Where is the amulet?" he approaches you.'
+					act 'Ask who he is':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_reinhold.jpg"></center>'
+						'"Who are you?" you ask puzzledly. The man''s sudden appearance and a sense you never knew you had tell you something about him, that he is not of the world you know.'
+						*nl
+						'"Listen, don''t cause any problems now. Give me the amulet, close the construction site, and all will be fine. After all that place belongs to us," he says in a firm voice.'
+						*nl
+						'<i>Belongs to us?</i> His response leaves you bewildered, wondering who he is and what this is all about.'
+						*nl
+						'"Well, how about I give you a small taste of my power." the man says, and out of nowhere comes a burning desire to give him the amulet.'
+						act 'Give him the amulet':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/7.jpg"></center>'
+							'You get out of the bed and give him the stone figure you had put in your pocket earlier. The man takes it, steps back, and without warning, something in his eyes begins to spin like a whirlwind, causing your own eyes to blur as if he was hypnotizing you. A few seconds later your vision clears with the man having somehow disappeared into thin air.'
+							*nl
+							'You rub your eyes, "What the hell is going on here? Was that a dream?. No, it can''t be. I wouldn''t walk around in a dream. I think." You say to no one in particular then check your pocket, the amulet is indeed gone. You sit down on the bed trying to make sense of what just happened.'
+							*nl
+							'While lost in thought, you hear a knock on the door. You get up to open the door, not even thinking why you would have visitors this late at night.'
+							'"...Who''s there?", you ask, still confused.'
+							*nl
+							'A woman''s voice responds that she''s the hotel receptionist and that she needs to talk to you on an urgent matter.'
+							act 'Answer the door':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+								'You open the door, but don''t recall the woman in front of you being at the reception desk; the woman from earlier didn''t have red hair and glasses. After entering the room she quickly examines the place, before locking her eyes on you.'
+								*nl
+								'"Mikhail, right?" You nod.'
+								*nl
+								'"Last night you went to a certain place and took out something very valuable and powerful." the woman speaks to you.'
+								act 'Another one?':
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+									'<i>Again?</i>'
+									*nl
+									'You sigh, irritated that not only have you been disturbed in the middle of the night, but these idiots apparently cannot even agree among themselves which one of them should disturb you.'
+									*nl
+									'"Listen, you''re starting to bother me. That other guy already showed up asking for the damn amulet."'
+									*nl
+									'She looks at you with surprise. "What? Someone already came here? Who was it?"'
+									act 'Tell her':
+										*clr & cla
+										'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+										'"It was some man in a navy cloak with ginger hair and a light beard, he didn''t tell me his name. He already took the amulet." You answer.'
+										*nl
+										'The girl''s face drops. "Damn it!" She looks into your eyes. "Okay... Mikhail, we have to go somewhere else, there are too many people that might get hurt here. Gustav, come here!" The girl calls out to the corridor.'
+										*nl
+										'A tall man enters the room'
+										StoryLine = 0
+										MagikDostup = 0
+										$pcs_firstname = 'Mikhail'
+										$pcs_lastname = 'Ivanov'
+										age = 33
+										vidage = 33
+										year = 2016
+										month = 5
+										week = 1
+										hour = 7
+										day = 25
+										!!body
+										pcs_hgt = 186
+										dick = 0
+										pcs_energy = 60
+										pcs_hydra = 60
+										pcs_sleep = 70
+										!!stats
+										pcs_stren = 160
+										pcs_agil = 50
+										pcs_vital = 160
+										pcs_intel = 50
+										pcs_sprt = 100
+										pcs_react = 50
+										pcs_kick = 20
+										pcs_punch = 20
+										pcs_jab = 20
+										pcs_health = pcs_vital * 10
+										pcs_willpwr = pcs_intel * 5 + pcs_sprt * 5
+										pcs_mana = (pcs_intel * pcs_magik) + pcs_vital * 5
+										birthday = 1
+										birthmonth = 4
+										birthyear = 1983
+										pcs_dob = 19830401
+										act 'Prepare to fight':
+											*clr & cla
+											'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_gustav.jpg"></center>'
+											'The man has a large tattoo across the left side of his face. He too has red hair'
+											$boy = 'Gustav'
+											gs 'fight','initFight',1
+
+											gs 'fight_npcdata', 'gustav'
+											fightEnding = 1
+
+											act 'Fight': gt 'fight', 'start'
+										end
+									end
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'tatianaPRE':
+	$pcs_firstname = '<<$temp_firstname>>'
+	$pcs_lastname = '<<$temp_lastname>>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+	'You wake up in an unfamiliar room. Standing near you is the same red-haired girl that entered your hotel room.'
+	*nl
+	'"Ah, you''re awake," she chirps. "I told this jerk he should have been more careful, but he never listens. As a result I had to use some magic to stabilize you, he almost knocked you out permanently."'
+	*nl
+	'"While you were unconscious I did some research on you. Turns out the Amulet of Power passed to you. Must have happened when you touched it. Unfortunately, Reinhold, the guy in your room, has probably realized by now that the amulet no longer has the power and now he''s out to hunt you down."'
+	act 'What''s going on?':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+		'"What the hell is going on?" you respond. You try to move your hands, but you''re tied to the bed.'
+		*nl
+		'"Um, okay, I''ll start from the beginning," the girl says. "Magic exists and is real. Ages ago the world was not the same, the fae creatures who possess natural magic lived in balance but the succubus were free to breed with whom ever they wished."'
+		*nl
+		'"They breed with humans with that human magicians were born. The Sidhe as the most powerful of the fae feared the increasing numbers of human magicians and cast a very powerful spell to bind the succubus to them, this prevented either from being able to reproduce without the other."'
+		*nl
+		'"All magicians have some of that original fae blood in there bodies and it is through that that they are able to connect with the world of magic."'
+		*nl
+		'The redhead adjusts her glasses. "Most of the world simply ignore magic or are protected from it by magic''s natural desire to remain hidden."'
+		*nl
+		'"But last night there was a powerful burst of magical energy, strong enough to be clearly seen by any with magical connections. Can you guess where this surge came from? Yeah, that cave you found. Apparently the surge occurred when you opened the seal to the archive. Anyway, that was when we started to search, that source of power is desired by many, but it is extremely dangerous and in the wrong hands could do untold horrors."'
+		*nl
+		'She stops for a few seconds for you process that information. It seems really far fetched.'
+		*nl
+		'"As you can figure out, Reinhold wanted to prevent the amulet being misused, but he wasn''t very thorough and didn''t check you over."'
+		act 'So, the whole world is just an illusion?':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+			'"So magic exists and is used by all these people and creatures, but the rest of us just don''t see it, or convince ourselves it didn''t happen?"'
+			*nl
+			'The girl nods. "Yes. You''re a quick study. Machines, apartments, television and the Internet, all this really does exist and is in the form in which people see it. But if I say, hurl a fireball, then people might see that I threw a grenade or shot from a flamethrower. The human mind can''t process magic, so it blocks it as a way to protect the person from going crazy."'
+			*nl
+			'"Hence such things as little green men, UFOs, poltergeists, spontaneous combustion, are when people encounter a difficult to hide phenomenon and the conclusion is flawed. In some cases, if someone''s mind can not cope with the spell they witness, they can be driven crazy and then no one believes them."'
+			act 'And who are you?':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+				'Trying to come to terms with your new reality, you ask "And who are you?"'
+				*nl
+				'The girl smiled. "Me? I''m Tatiana, a young mage with an keen interest in magical phenomenon. I specialize in the treatment of mutations, and magic relating to the body. I have little combat skill, so I rely on the services of Gustav to provide some muscle. He''s a Mutant, his mutation is due to magical exposure and it gives him unmatched physical strength and he is a great tracker."'
+				*nl
+				'"The two of us run a detective agency for cover and money, but our real objective is studying magic and its effects."'
+				act 'What do you want from me?':
+					*clr & cla
+					'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+					'"What do you want from me?"'
+					*nl
+					'"Hmm, well... the amulet obviously," Tatiana replies. "When I looked for you, I was hoping to get that object of power to study but Reinhold got to you first. The amulet will now be pretty much useless anyway, as its power passed on to you."'
+					*nl
+					'"This isn''t good for you, though. You may think since you have the amulets'' power that you can do anything. But in reality, you''re helpless without the skill to use it. Reinhold easily overpowered your will and forced you to obey, and Gustav beat you like a puppy."'
+					act 'What is this amulet? Where did it come from?':
+						*clr & cla
+						'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+						'"And what is this amulet? Where did it come from?" you ask.'
+						'Tatiana thinks about it for a few moments. "It was made by the trickster Rikudo, one of the most powerful ancient magicians. Before he died, he taunted the only living mage who could control its immense power by cursing him to be stuck in a female form and making it only activate for a male mage."'
+						*nl
+						'"Great. So I''ve been thrown into this mess by the dead owner of that ancient tomb." Still trying to absorb all this information, something occurs to you. "Hang on, I''m not a mage, how could the power be transferred to me?"'
+						*nl
+						'"It seems that its long time underground has caused it to malfunction and its power has entered your body. The bad news is it is far too powerful and will kill you." At this you are filled with fear and start to struggle against your bindings.'
+						*nl
+						'"You are lucky Reinhold didn''t realize this, he would have stopped you from accidentally wielding the power and killing yourself and who knows how many others by killing you in that hotel room. I have another way to save you, but you''re not going to like it."'
+						*nl
+						'You don''t say anything, so she continues, "I can feel the aura of power emanating from you, by drawing from that I can perform a powerful magic spell that will transform you into someone who is protected from the masculine alignment of the power."'
+						act 'Uh, I do not understand, what are you suggesting?':
+							*clr & cla
+							'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+							'"Uh, I do not understand, what are you suggesting?" you ask her.'
+							*nl
+							'Tatiana runs a hand through her hair and giggles. "I''ll turn you into a young girl and the power will lie dormant, saving you from blowing up a city or something."'
+							*nl
+							'Your eyes widen in shock.'
+							*nl
+							'"Well, there is another way, I can just stop your heart and let your power dissolve into nature, but you will die. I''m not Reinhold, I can take this risk and I don''t want to kill you. Maybe with more time and research I can work out another solution, but I cannot leave you like this."'
+							act 'What about your family?':
+								*clr & cla
+								'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+								'"Hey, I don''t want to be a woman. I have a family; a wife and a daughter," you tell her, afraid.'
+								*nl
+								'Tatiana smiles. "Well the choice is simple, either you die or live without a penis for the time being."'
+								*nl
+								'"As for your family, not to worry. I''ll arrange everything. We will fabricate your death to get Reinhold off your back. To make your transition easier I''ll cover your memory of the family, they will only be ghostly memories, you won''t even remember where you lived. Don''t worry, I won''t erase your entire memory and leave you a useless vegetable."'
+								act 'There must be another way!':
+									$loc = 'intro_uni_tg'
+									$loc_arg = 'custom'
+									*clr & cla
+									'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+									'Panicking, you yell out "There must be another way!" You tug at the restraints on the bed.'
+									*nl
+									'Tatiana''s face turns serious. "Do not argue. It''s the only way available to me. You''ll need to use a new name, so think it over in your dreams and tell me when you wake up, otherwise I''ll give you a pretty name. Now go to sleep." She puts her hand on your chest and your vision immediately fades. You dream about a girl you never knew and what she did at school...'
+									act 'Dream': gt 'intro_city_select', 'start'
+								end
+							end
+						end
+					end
+				end
+			end
+		end
+	end
+end
+
+if $ARGS[0] = 'custom':
+	$loc = 'intro_uni_tg'
+	$loc_arg = 'custom'
+!!	This is to bypass the next part if the avatar system was used
+!!	It will be changed to bypass the head options, once more body options are added
+
+!!	Just hair and eye color here for now; the dialog will be updated as more options are added
+	'<center><b><font color = maroon>CHARACTER CUSTOMIZATION</font></b></center>'
+	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/character_creation_2.jpg"></center>'
+	'As you drift in unconsciousness, an impression of a woman forms in your mind. Many aspects of her appearance are indistinct, but there are some things you can make out.'
+	'She is fairly tall.'
+	*nl
+	'<center>Customize your:</center>'
+	'<center><a href="exec:gs ''intro_customization'', ''hair''"><img src="images/system/1_openings/shared/icon_hair.png"></a> <a href="exec:gs ''intro_customization'', ''eyes''"><img src="images/system/1_openings/shared/icon_eye.png"></a></center>'
+	*nl
+	'Everything else about her is fuzzy...'
+
+	act 'Done': gt 'intro_uni_tg', 'sleepPRE'
+end
+
+if $ARGS[0] = 'sleepPRE':
+	killobj
+	'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_tatiana.jpg"></center>'
+	'"You''re awake?." Tatiana says looking into your eyes.'
+	act 'Look at yourself':
+		*clr & cla
+		'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/8.jpg"></center>'
+		'"Fuck," you say and immediately shut your mouth again. Your voice... it''s so feminine. Tatiana giggles.'
+
+		!!Default Names
+		$pcs_firstname = 'Svetlana'
+		$pcs_lastname = 'Lebedev'
+		$pcs_nickname = 'Sveta'
+
+		!!Player names are set here
+		if $temp_firstname = '':
+			$temp_firstname = 'Svetlana'
+		else
+			$temp_firstname = '<<$pcs_firstname>>'
+		end
+		$pcs_firstname = input("What is your first name? (Leave blank for Svetlana)")
+		if $pcs_firstname = '':$pcs_firstname = '<<$temp_firstname>>'
+		killvar '$temp_firstname'
+
+		
+		if $temp_lastname = '':
+			$temp_lastname = 'Lebedev'
+		else
+			$temp_lastname = '<<$pcs_lastname>>'
+		end
+		$pcs_lastname = input("What is your family name? (Leave blank for Lebedev)")
+		if $pcs_lastname = '':$pcs_lastname = '<<$temp_lastname>>'
+		killvar '$temp_lastname'
+
+		if $temp_nickname = '':
+			$temp_nickname = 'Sveta'
+		else
+			$temp_nickname = '<<$pcs_nickname>>'
+		end
+		$pcs_nickname = input("What is your nickname? (Leave blank for Sveta)")
+		if $pcs_nickname = '':$pcs_nickname = '<<$temp_nickname>>'
+		killvar '$temp_nickname'
+
+		'"This is the first time I changed the gender of a person, therefore I just HAD to see your reaction. Totally worth it. But you turned out exactly like her."'
+		'Puzzled, you ask "Like who?"'
+		'"<<$pcs_firstname>> <<$pcs_lastname>> of course. It''s the dead girl I swapped you with. I found her in the morgue, erased evidence of her death,  made her look like you, and you like her. You needed an alibi, and I needed to throw Reinhold off your trail. Today, Mikhail crashed his car into the pit and died, it''s on the news." With these words, Tatiana picked up the remote and turned on the TV.'
+		
+		act 'Watch TV':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/9.jpg"></center>'
+			'On TV there is a news report about a businessman, who drove his car into a hole at a construction site. The man died later in hospital without regaining consciousness.'
+			'You look at Tatiana, with a bewildered look. She has an enigmatic smile, "Well, I''m still a magician and that''s something that I can do. Reinhold has definitely lost the trail. The body that ''died'' behind the wheel of the BMW was a perfect copy of your old self, from your absorbed amulet energy down to the placement of every single hair."'
+			'"Anyways, here are her legal documents, including her passport. Starting today, you are <<$pcs_nickname>> <<$pcs_lastname>>, an 18 year old girl who lives in the city. Nobody knows you since she just moved here from Pavlovsk, but here is her journal in case you do run into someone she knew. You should study it, she was pretty detailed about the people in her life, including her family. Here are the keys to her dorm, she is enrolled at the University, her first year. You don''t have to attend if you don''t want to, it''s your life now."'
+			'"Some things to consider before you go. You are a girl now. That means you will get periods, and you can certainly get pregnant if you have unprotected sex."'
+			'"Just because you made me into a young girl doesn''t mean I''m not still 33 years old," you say, annoyed at her.'
+			'"Be careful, life as a girl is much harder than as a man. Protecting yourself means less about fighting and more about staying out of situations where guys can force you into things you won''t want to do."'
+			*nl
+			'"Now get up, you''ve got to go to your new home and start your new life."'
+			*nl
+			'Gustav, the redhead with a tattoo on his face enters the room. He looks at you and says, "I''ll take you."'
+
+			act 'Go with Gustav':
+				*clr & cla
+				'<center><img <<$set_imgh>> src="images/system/1_openings/shared/npc_gustav.jpg"></center>'
+				'Gustav silently takes you to the garage and you enter the black jeep. Gustav gets behind the wheel and drives you into the city. You silently speculate about what to do now.'
+				'After a few minutes, while keeping his eyes on the road, Gustav speaks. "I''m sorry I beat you up. I have trouble controlling myself during a fight. You had a large build and for a second I thought you might be dangerous for me, so I ended up hitting you with my full force."'
+				'You look at him. "Forget it. Listen Gustav... what do I do now?"'
+				'Gustav nods and says, "Well, I would advise you to start by buying food, laundry detergents and dishes should be covered by the university. Maybe get a job. Don''t forget to monitor your health, keep your mood up and have a clear mind."'
+				'"Right now your mind is very weak, if you don''t take care of yourself you will go crazy. You need to eat well, sleep regularly, have fun, do not generally become depressive or else you end up in a madhouse. Don''t go looking for Tatiana, you will not find her anyway, and secondly, if we need to contact you, we will find you."'
+				'You arrive at an old apartment block in the town of Pavlovsk. Gustav stops the car and points a finger at the entrance. Your parents are on the third floor, the number is on your key Tatiana gave you. Tomorrow they are going to take you to your university dorm. Act natural and get some sleep, the changes to your body took a lot of energy out of you. Remember don''t just give up, not everyone gets an entirely new chance at life. Tatiana and me will keep an eye out for you."'
+				
+				act 'Go to the apartment':
+					$loc = 'intro_uni'
+					$loc_arg = 'custom'
+					'<center><img <<$set_imgh>> src="images/locations/city/island/university/uni_day.jpg"></center>'
+					'You are exhausted and trying to take in all the strange things you''ve learnt and barely speak to anyone at home. You remember your Mom sitting you down and making you eat something before you get an early night''s sleep.'
+					'The next morning you find you already have your bags packed, you get ready and throw some wash things in your bag. Your sister then takes some back out saying they are hers and puts some other things in there. Your family all head down stairs with you and pile into your stepfather''s Gazelle pickup and you all traveled from your hometown, Pavlovsk, to St. Petersburg.'
+					'As you approach the city, you read through the journal you have inherited and learn about the school days and kids. You find out what type of kid ''you'' were...'
+
+					act 'Continue': gt 'intro_city_select', 'start'
+				end
+			end
+		end
+	end
+end
+
+
+if $ARGS[0] = 'welcome_intro':
+	gs 'intro_initialization_city'
+	!! Welcome to Girl Life speech
+	MagikDostup = 1
+	showstat 1
+	showobjs 1
+	gs 'obj_din', 'old'
+	*clr & cla
+	'<center><img <<$set_imgh>> src="images/system/1_openings/1_tf/start_tf.jpg"></center>'
+	'Welcome to the Transformation start! Although you have lost your masculinity and your old life, new possibilities are opening up before your eyes, aided by your newfound knowledge of the magical nature of the world!'
+	gs 'stat'
+	act 'Begin': gt 'uni_grounds', 'main'
+end
 
 --- intro_uni_tg ---------------------------------
 

+ 1 - 1
locations/katjaEvDin.qsrc

@@ -451,7 +451,7 @@ if $ARGS[0] = 'sex':
 	end
 
 	!!This is for a scene of using a dildo on Katja. But such a scene is not yet written.
-	!!if (katjaQW['slut'] >= 20) and katjaQW['horny'] >= 30 and dildo > 0:
+	!!if (katjaQW['slut'] >= 30) and katjaQW['horny'] >= 30 and dildo > 0:
 	!!	act 'Grab a dildo': gt 'KatjaEvDin', 'dildo'
 	!!end
 

+ 1 - 1
locations/katja_sex.qsrc

@@ -152,7 +152,7 @@ if $ARGS[0] = 'park':
 	end
 end
 
-!!Sex with Ivan After School (should soon be redone to an anal only scene
+!!Sex with Ivan After School
 if $ARGS[0] = 'prohorov_sex':
 	cla & *clr
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/tease.jpg"></center>'

File diff suppressed because it is too large
+ 263 - 366
locations/lesbidomhouse.qsrc


File diff suppressed because it is too large
+ 203 - 251
locations/lesbisubhouse.qsrc


+ 3 - 3
locations/natbelapt.qsrc

@@ -17,7 +17,7 @@
 !NatashaLoc = 7 (Natasha in the laundry room)
 !---------------------------------------------
 
-!!{ Natasha Quest Line
+!{ Natasha Quest Line
 NatbelQW['QWstage'] = 0:
 NatbelQW['QWstage'] = 1: You can study with Natasha after school.
 NatbelQW['QWstage'] = 2: Natasha borrowed money for the first time.
@@ -904,7 +904,7 @@ if $ARGS[0] = 'afterhomework':
 	end
 
 	gs 'willpower', 'cuni', 'force', 'easy'
-	if NatbelQW['QWstage'] >= 7 and will_cost <= pcs_willpwr:
+	if NatbelQW['QWstage'] >= 8 and will_cost <= pcs_willpwr:
 		act 'Take off your own clothes (<<will_cost>> Willpower)':
 			cla
 			gs 'willpower', 'pay', 'self'
@@ -912,7 +912,7 @@ if $ARGS[0] = 'afterhomework':
 			act 'Lie down and open your legs': gt 'natbelapt', 'openlegs'
 			act 'Straddle her face': gt 'natbelapt', 'straddleface'
 		end
-	elseif NatbelQW['QWstage'] >= 7 and will_cost > pcs_willpwr:
+	elseif NatbelQW['QWstage'] >= 8 and will_cost > pcs_willpwr:
 		act 'Take off your own clothes (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
 	if NatbelQW['seethrough'] = 1:

+ 1 - 1
locations/nerd_game_night.qsrc

@@ -1149,7 +1149,7 @@ if $ARGS[0] = 'summer_invite_sms':
 		$trialSMS += $SMSFrM+$VM['1a']+$SMSBkM
 		$SMSMessage[ARGS[1]] = $trialSMS
 		gs 'telefon', 'show_sms', ARGS[2]
-		nerd_game['invite_day'] = 2147483647 & ! block the event
+!!		nerd_game['invite_day'] = 2147483647 & ! block the event
 	end
 
 	if $ARGS[1] = 'V2':

+ 1 - 1
locations/obj_din.qsrc

@@ -114,7 +114,7 @@ if $ARGS[0] = 'cheattabs':
 	act 'Exit the menu': killvar 'menu_page' & gt 'obj_din', 'menu_exit'
 end
 
-if $ARGS[0] = 'menu_exit': gt $menu_loc, $menu_arg
+if $ARGS[0] = 'menu_exit': settingmode = 0 & gt $menu_loc, $menu_arg
 
 if $ARGS[0] = 'menu_disabled': '<font color="red"><b>Menu is disabled for this event</b></font>'
 

+ 2 - 2
locations/pav_complexb2.qsrc

@@ -195,7 +195,7 @@ if $ARGS[0] = 'lift':
 	minut +=1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb2'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb2'',''elev_objava'',$ARGS[1]">notification</a> in the elevator.</center>'
 	act 'Push button: Floor 1': gt 'pav_complexb2','etaj_1'
 	act 'Push button: Floor 2': gt 'pav_complexb2','etaj_2'
 	act 'Push button: Floor 3': gt 'pav_complexb2','etaj_3'
@@ -228,7 +228,7 @@ if $ARGS[0] = 'elev_objava':
 		minut +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'pav_complexb2','lift'
+	act 'Continue': gt 'pav_complexb2','lift',$ARGS[1]
 end
 
 !locked ads

+ 2 - 2
locations/pav_complexb3.qsrc

@@ -198,7 +198,7 @@ if $ARGS[0] = 'lift':
 	minut +=1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb3'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pav_complexb3'',''elev_objava'',$ARGS[1]">notification</a> in the elevator.</center>'
 	act 'Push button: Floor 1': gt 'pav_complexb3','etaj_1'
 	act 'Push button: Floor 2': gt 'pav_complexb3','etaj_2'
 	act 'Push button: Floor 3': gt 'pav_complexb3','etaj_3'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'elev_objava':
 		minut +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'pav_complexb3','lift'
+	act 'Continue': gt 'pav_complexb3','lift',$ARGS[1]
 end
 
 !locked ads

+ 15 - 16
locations/pav_lake.qsrc

@@ -63,10 +63,10 @@ end
 
 if mid($start_type,1,2) = 'sg' and temper >= 20 and sunWeather = 1 and month >= 5 and month <= 9 and hour >= 12 and hour <= 14 and ((kanikuli = 0 and week = 7) or week mod 2 = 0):
 	if $clothingworntype = 'nude':
-		'As you walk down to the beach area of the lake you see a group of kids from your school hanging out on the beach. It looks like it is the jocks and cool kids. You hope none of them have seen you naked, it would be such a scandal if they seen you like this. You should put on a bikini before approaching them if you want to hang out, or just avoid them and do your own thing today.'
+		'As you walk down to the beach area of the lake, you see the jocks and cool kids hanging out and hope none of them have seen you naked. You should put on a bikini before approaching them if you want to hang out, or just avoid them and do your own thing today.'
 	else
-		'As you walk down to the beach area of the lake you see a group of kids from your school hanging out on the beach. It looks like it is the jocks and cool kids.'
-		act 'Head towards your class mates': gt 'pav_lake', 'school_mates'
+		'As you walk down to the beach area of the lake, you see the jocks and cool kids hanging out.'
+		act 'Approach them': gt 'pav_lake', 'school_mates'
 	end
 end
 
@@ -589,18 +589,18 @@ if $ARGS[0] = 'school_mates':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/beach_hangout/school_mates.jpg"></center>'
 	if fame['pav_slut'] >= 225:
-		'You start walking over to them and you start getting disgusted stares from several of them. Soon several are making rude comments, finally Dimka comes over with Svyatoslav. "Get lost slut, we don''t want you here." You sigh as it is obvious if you try and push this, nothing good will come of it. So you turn and walk away.'
+		'You start approaching them, but are immediately greeted with disgusted stares and rude comments before Dimka walks over with Svyatoslav. "Get lost slut! We don''t want you here." You sigh before turning and walking away.'
 		act 'Leave': gt'pav_lake'
 	elseif grupTipe = 1 or grupTipe = 2:
-		'You start walking over to them and most give you friendly smiles or waves, several wave you to come over and join them.'
+		'You start approaching them and are greeted with friendly smiles as several wave at you to come over and join them.'
 		act 'Leave': gt 'pav_lake'
 		act 'Join them': gt 'pav_lake', 'beach_hangout'
 	elseif grupTipe = 3 or grupTipe = 4:
-		'You start walking over to them and most just ignore you until you start to get close then several of them give you annoyed looks, making it clear you are not really welcome here, but none of them seem like they are going to stop you from joining them at least.'
+		'You start approaching them, but the group largely ignore you until you get close and several of them give you annoyed looks, making it clear you''re not welcome here, but make no effort to stop you from joining them at least.'
 		act 'Leave': gt 'pav_lake'
 		act 'Join them': gt 'pav_lake', 'beach_hangout'
 	else
-		'You start walking over to them and you start getting annoyed stares from several of them. Soon several are making rude comments, finally Dimka comes over with Svyatoslav. "Get lost loser, we don''t want you here." You sigh as it is obvious if you try and push this, nothing good will come of it. So you turn and walk away.'
+		'You start approaching them and are greeted with annoyed stares and rude comments before Dimka walks over with Svyatoslav. "Get lost loser! We don''t want you here." You sigh before turning and walking away.'
 		act 'Leave': gt'pav_lake'
 	end
 end
@@ -608,13 +608,13 @@ end
 if $ARGS[0] = 'beach_hangout':
 	*clr & cla
 	minut += 5
-	!!Cool kids aprove of high quality bikini or outfit and disaprove of low quality
+	!!Cool kids approve of high quality bikini or outfit and disapprove of low quality
 	if PCloQuality >= 4: 	
 		grupvalue[1] += 1
 	elseif PCloQuality  < 3: 	
 		grupvalue[1] -= 1
 	end
-	!!Cool kids and jocks aprove of somewhat revealing clothes or a little skimpy bikini and disaprove of conseravite clothes or bikinis and very revealing clothes or very skimpy bikini
+	!!Cool kids and jocks approve of somewhat revealing clothes or a little skimpy bikini and disapprove of conservative clothes or bikinis and very revealing clothes or very skimpy bikini
 	if PCloInhibit >= 35:
 		grupvalue[1] -= 1
 		grupvalue[2] -= 1
@@ -625,21 +625,20 @@ if $ARGS[0] = 'beach_hangout':
 		grupvalue[1] -= 1
 		grupvalue[2] -= 1
 	end
-	!!Jocks disaprove of a one piece swimsuite
+	!!Jocks disapprove of a one piece swimsuit
 	if PCloswimwear = 1 and PCloOnePiece = 1:
 		grupvalue[2] -= 1
 	end
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/lake/beach_hangout/beach_hangout.jpg"></center>'
 	if grupTipe = 1 or grupTipe = 2:
-		'You smile to your friends and take a seat with them and soon are joining in on the variety of conversations going on. Some of them are tanning, others sitting around talking, while a few are just horsing around. You spend some time just talking to a few of them catching up. You could use this chance to get to know one of them better if you wanted to.'
-		act 'Leave': gt'pav_lake'
-		act 'Talk to one of them': gt 'pav_beach_chat', 'start'
+		'You smile at your friends and take a seat with them before joining in on the variety of conversations going on. Some are tanning, others sit around talking, and some horse around. You can use this opportunity to get to know one of them better if you want.'
 	else
-		'You smile and take a seat with them, you get a mix of responses. The ones you know better seem at least somewhat friendly, most of the rest range from looking annoyed that you are here to indifference, many just ignore you. Some of them are tanning, others sitting around talking, while a few are just horsing around. You spend some time trying to get involved in the varies conversations going on and meet limited success. You could use this chance to get to know one of them better if you wanted to.'
-		act 'Leave': gt'pav_lake'
-		act 'Talk to one of them': gt 'pav_beach_chat', 'beach_hangout'
+		'You smile and take a seat with them, but get mixed responses. The ones you know better seem somewhat friendly, but the others range from indifference to annoyance. Many choose just to ignore you.' 
+		'Some are tanning, others sit around talking, and some horse around. You spend some time trying to get involved in the conversations going on, but meet limited success. You can use this opportunity to get to know one of them better if you want.'
 	end
+	act 'Leave': gt'pav_lake'
+	act 'Talk to one of them': gt 'pav_beach_chat', 'beach_hangout'
 end
 
 

+ 1 - 1
locations/pav_park.qsrc

@@ -172,7 +172,7 @@ if $ARGS[0] = 'start':
 			'<center><h2>Pavlovsk Park</h2></center>'
 			'<center><img <<$set_imgh>> src="images/locations/shared/park/job_flyer.jpg"></center>'
 			*nl
-			'You spend an hour handing out advertising flyers to park visitors. You received 60 <b>₽</b> for your efforts.'
+			'You spend an hour handing out advertising flyers to park visitors. You received 50 <b>₽</b> for your efforts.'
 
 			act 'Continue':gt 'pav_park', 'start'
 		end

+ 2 - 2
locations/pod_ezd.qsrc

@@ -311,7 +311,7 @@ if $ARGS[0] = 'lift':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator.jpg"></center>'
-	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pod_ezd'',''elev_objava''">notification</a> in the elevator.</center>'
+	'<center>The elevator in the apartment building is quite old. The building supervisor does his best to keep it running, but it breaks down a lot. Someone put up a <a href="exec:gt ''pod_ezd'',''elev_objava'',$ARGS[1]">notification</a> in the elevator.</center>'
 	act 'Push button: floor 1': gt 'pod_ezd','etaj_1'
 	act 'Push button: floor 2': gt 'pod_ezd','etaj_2'
 	act 'Push button: floor 3': gt 'pod_ezd','etaj_3'
@@ -343,7 +343,7 @@ if $ARGS[0] = 'elev_objava':
 		minut +=1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/resident/apartment/stairs/elevator_ob'+rand(1,2)+'.jpg"></center>'
-	act 'Continue': gt 'pod_ezd','lift'
+	act 'Continue': gt 'pod_ezd','lift',$ARGS[1]
 end
 
 if $ARGS[0] = 'pod_objava':

+ 5 - 2
locations/rex_party.qsrc

@@ -102,8 +102,11 @@ if $ARGS[0] = 'Kitchen':
 end
 
 if $ARGS[0] = 'Toilet':
-    $loc_arg = 'Toilet'
-    $menu_arg = 'Toilet'
+	$loc_arg = 'Toilet'
+	$menu_arg = 'Toilet'
+	$locM = 'rex_party'
+	$locM_arg = 'Toilet'
+
 	cla & *clr
 	minut += 5
 	gs 'stat'

+ 2 - 2
locations/rex_party_sexEvents.qsrc

@@ -553,7 +553,7 @@ if $ARGS[0] = 'dj_boobs':
 	'"Like this boys?" you ask as you put your breasts on the turntable and move it a bit with your breasts.'
 	'Not much sound comes out from your attempt, but the guys seem to love it all the same.'
 	act 'Move away': gt $loc, $loc_arg
-	act 'Take off your top': gt 'rex_party_smallEvents', 'dj_cock'
+	act 'Take off your top': gt 'rex_party_sexEvents', 'dj_cock'
 end
 
 if $ARGS[0] = 'dj_cock':
@@ -566,7 +566,7 @@ if $ARGS[0] = 'dj_cock':
 	'Seeing the interest from the smiling guys watching you, you get rid of your top and bra and then place your naked breasts on the turntable, trying to play it topless. "I think I did better that time. What do you think?"'
 	'The guy pulls out his erection and says "Not bad. Maybe try this instead."'
 	act 'Move away': gt $loc, $loc_arg
-	act 'Give his dick a try': gt 'rex_party_smallEvents', 'dj_suck'
+	act 'Give his dick a try': gt 'rex_party_sexEvents', 'dj_suck'
 end
 
 if $ARGS[0] = 'dj_suck':

+ 1 - 1
locations/scandalicious.qsrc

@@ -88,7 +88,7 @@ if $ARGS[0] = 'clothes':
 			end
 			i += 1
 
-		if i <= 20:jump 'loopscandalicious_outfits'
+		if i <= 30:jump 'loopscandalicious_outfits'
 
 	clo_i += 1
 	if clothingfilter['quality'] = 0 and clo_i <= 7:

+ 4 - 0
locations/stat.qsrc

@@ -630,6 +630,10 @@ if minut >= 60:
 
 	if (hour mod 2) = 0: gs 'outdoors', 'weather'
 
+	!! I do not think that this should be here, but I put it here temporaly - rachels
+	!! generate SMS for nerd games
+	if rand(0,2) = 0 and hour > 10 and hour < 16 and week = 1 and grupTipe = 3 and nerd_game['invite_day'] < daystart: gs 'nerd_game_night', 'summer_invite_sms', 'Add SMS'
+
 	if minut >= 60:jump 'loopmin'
 end
 

+ 15 - 8
locations/stat_display.qsrc

@@ -831,11 +831,6 @@ end
 
 !!---------------- Messages for Icons/Texts (End)----------------------------
 
-if ((young_shop_work = 1 and hour = 16 and week < 6) or (young_shop_work1 = 1 and hour = 9 and week >= 6) or (young_shop_work2 = 1 and hour = 9 and week < 6)) and inWorkYoungShop = 0 and misscheck ! daystart:
-	misscheck = daystart
-	young_shop_miss += 1
-end
-
 if pornstack > 0:
 	porndays = 0
 	:pfilmtime
@@ -2054,7 +2049,11 @@ if enable_extra_msg = 1:
 
 	if young_shop_work = 1 and hour = 16 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
 		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif young_shop_work = 1 and hour = 16 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+	elseif young_shop_work = 1 and hour = 16 and week < 6 and inWorkYoungShop = 0:
+		if kats_absent_check ! daystart:
+			kats_absent_check = daystart
+			young_shop_miss += 1
+		end
 		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
 	elseif young_shop_work = 1 and (hour = 14 or hour = 15) and week < 6:
 		$stat_msg += '<BR><b><font color="red">You start work at Pussy-Cats today at 16:00.</font></b>'
@@ -2062,7 +2061,11 @@ if enable_extra_msg = 1:
 		
 	if young_shop_work1 = 1 and hour = 9 and minut <= 5 and week >= 6 and inWorkYoungShop = 0:
 		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif young_shop_work1 = 1 and hour = 9 and week >= 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+	elseif young_shop_work1 = 1 and hour = 9 and week >= 6 and inWorkYoungShop = 0:
+		if kats_absent_check ! daystart:
+			kats_absent_check = daystart
+			young_shop_miss += 1
+		end
 		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
 	elseif young_shop_work1 = 1 and (hour = 7 or hour = 8) and week >= 6:
 		$stat_msg += '<BR><b><font color="red">By 9:00, you have to be at Pussy-Cats to start work.</font></b>'
@@ -2070,7 +2073,11 @@ if enable_extra_msg = 1:
 
 	if young_shop_work2 = 1 and hour = 9 and minut <= 5 and week < 6 and inWorkYoungShop = 0:
 		$stat_msg += 'You are late for work at Pussy-Cats.'
-	elseif young_shop_work2 = 1 and hour = 9 and week < 6 and inWorkYoungShop = 0 and misscheck ! daystart:
+	elseif young_shop_work2 = 1 and hour = 9 and week < 6 and inWorkYoungShop = 0:
+		if kats_absent_check ! daystart:
+			kats_absent_check = daystart
+			young_shop_miss += 1
+		end
 		$stat_msg += '<BR><b><font color="red">You missed work.</font></b>'
 	elseif young_shop_work2 = 1 and (hour = 7 or hour = 8) and week < 6:
 		$stat_msg += '<BR><b><font color="red">By 9:00, you have to be at Pussy-Cats to start work.</font></b>'

+ 11 - 5
locations/talent_agency.qsrc

@@ -31,7 +31,7 @@ if $ARGS[0] = 'start':
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/front.jpg"></center>'
 	'"Hello, welcome to the Aurora Female Talent Agency! How may I help you?"'
 	if casting = 3 and hour <= 11 and SMTV_commercial = daystart:
-		room = 3
+		audition['room'] = 3
 		'"Oh? Are you here for the SMTV commercial? Please go to interview room <<room>>, they''re waiting for you inside.'
 	elseif casting = 3 and ((hour > 11 and SMTV_commercial = daystart) or SMTV_commercial < daystart):
 		'"You''re here for the SMTV commercial? Sorry, you''re late, and you''ve just cost the production tons of money. You''ve been fired. First rule of showbiz honey: show up on time.'
@@ -79,12 +79,18 @@ if $ARGS[0] = 'hallway':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/city/citycenter/aurora/auditions/hallway.jpg"></center>'
 	act 'Leave':gt 'talent_agency','start'
+	if casting = 3:
+		act 'Room 3':gt 'talent_agency','room3'
+	end
+
+!!Block to stop rooms being accessible as they are not ready
+!{
 	act 'Room 1':gt 'talent_agency','room1'
 	act 'Room 2':gt 'talent_agency','room2'
-	act 'Room 3':gt 'talent_agency','room3'
 	act 'Room 4':gt 'talent_agency','room4'
 	act 'Room 5':gt 'talent_agency','room5'
 	act 'General Audition Room':gt 'talent_agency','room6'
+}
 end
 
 if $ARGS[0] = 'room1':
@@ -136,7 +142,7 @@ end
 
 if $ARGS[0] = 'room6':
 	*clr & cla
-	if room > 0 and room =< 5:
+	if audition['room'] > 0 and audition['room'] =< 5:
 		gt'talent_agency','wrong_room2'
 	elseif $audition['role'] = '':
 		gt'talent_agency','wrongday'
@@ -279,7 +285,7 @@ if $ARGS[0] = 'SMTV_shy':
 									'<i>Holy crap! Acting is some serious money!</i>'
 									inhib_exp += 20
 									casting = 1
-									room = 0
+									audition['room'] = 0
 									act'Leave':gt'talent_agency','end'
 								end
 							end
@@ -363,7 +369,7 @@ if $ARGS[0] = 'SMTV_confident':
 									'Looking over at the desk, you see a wad of cash lying there. You rush over, and when you finish counting, you realize that it''s <<actpayfin>> <b>₽</b>!'
 									'<i>Holy crap! Acting is some serious money!</i>'
 									casting = 1
-									room = 0
+									audition['room'] = 0
 									act'Leave':gt'talent_agency','end'
 								end
 							end

+ 1 - 1
locations/uni_grounds.qsrc

@@ -82,7 +82,7 @@ if $ARGS[0] = 'main':
 	if university['semester_week'] > 0: gs 'uni_lessons', 'schedule'
 	if university['exam_week'] > 0: gs 'uni_lessons', 'exam_schedule'
 
-	act 'Got to the dorms':
+	act 'Go to the dorms':
 		minut += 5
 		gt 'uni_dorm', 'start'
 	end

+ 4 - 4
locations/uni_lessons.qsrc

@@ -8,10 +8,6 @@
 if $ARGS[0] = 'cikl':
 !! Setting the the weeks in the university semester and makeing sure that the gades are calculated at the right times
 
-	if university['enrolled_in_semester'] > university['semester_passed'] and university['semester_week'] = 0 and (month = 8 or month = 1) and (day - week) >= 20:
-		university['semester_week'] = -1
-	end
-
 	if week = 1:
 		if university['semester_week'] = -1:
 			university['semester_week'] = 1
@@ -58,6 +54,10 @@ if $ARGS[0] = 'cikl':
 			killvar 'passed_count'
 		end
 	end
+
+	if university['enrolled_in_semester'] > university['semester_passed'] and university['semester_week'] = 0 and (month = 8 or month = 1) and (day - week) >= 20:
+		university['semester_week'] = -1
+	end
 end
 
 if $ARGS[0] = 'short_break':

+ 7 - 7
locations/uni_programs.qsrc

@@ -164,7 +164,7 @@ if $ARGS[0] = 'uni_period_second':
 			elseif week = 4: 
 				*nl
 				'Your next class will start at 11:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories 101 Class': 
+				act 'Go to your Learning Theories 101 Class': 
 					if hour = 10: minut += 60 - minut
 					uni_period['second'] = daystart
 					gs 'stat'
@@ -231,7 +231,7 @@ if $ARGS[0] = 'uni_period_third':
 			elseif $ARGS[1] = 'tuesday' and $university['elective2'] ! '':
 				$Result = '<<$university[''elective2'']>> (13:15 to 14:45)'
 			elseif $ARGS[1] = 'wednesday':
-				$Result = 'Lerning Theories 101 (13:15 to 14:45)'
+				$Result = 'Learning Theories 101 (13:15 to 14:45)'
 			elseif $ARGS[1] = 'thursday' and $university['elective3'] ! '':
 				$Result = '<<$university[''elective3'']>> (13:15 to 14:45)'
 			elseif week = 1 and $university['elective1'] ! '': 
@@ -255,7 +255,7 @@ if $ARGS[0] = 'uni_period_third':
 			elseif week = 3:
 				*nl
 				'Your next class will start at 13:15. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-				act 'Go to your Lerning Theories 101 Class': 
+				act 'Go to your Learning Theories 101 Class': 
 					if hour = 12: minut += 75 - minut
 					if hour = 13 and minut < 15: minut += 15 - minut
 					uni_period['third'] = daystart
@@ -332,13 +332,13 @@ if $ARGS[0] = 'exam':
 			if $ARGS[1] = 'schedule':
 				if university['exam_week'] = 1: 
 					if week < 4 or (week = 4 and hour < 9):
-						$Result = 'General Education 101 Exam (09:00 to 12:00) Thursday this week. Teaching Methods 101 Exam (09:00 to 12:00) Monday next week. Lerning Theories 101 Exam (09:00 to 12:00) Thursday next week.'
+						$Result = 'General Education 101 Exam (09:00 to 12:00) Thursday this week. Teaching Methods 101 Exam (09:00 to 12:00) Monday next week. Learning Theories 101 Exam (09:00 to 12:00) Thursday next week.'
 					else	
 						$Result = 'Teaching Methods 101 Exam (09:00 to 12:00) Tuesday next week. Learning Theories 101 Exam (09:00 to 12:00) Thursday next week.'
 					end
 				elseif university['exam_week'] = 2: 
 					if week < 2 or (week = 2 and hour < 9):
-						$Result = 'Teaching Methods 101 Exam (09:00 to 12:00) Tuesday this week. Lerning Theories 101 Exam (09:00 to 12:00) Thursday this week.'
+						$Result = 'Teaching Methods 101 Exam (09:00 to 12:00) Tuesday this week. Learning Theories 101 Exam (09:00 to 12:00) Thursday this week.'
 					elseif week < 4 or (week = 4 and hour < 9):
 						$Result = 'Learning Theories 101 Exam (09:00 to 12:00) Thursday this week.'
 					else
@@ -388,8 +388,8 @@ if $ARGS[0] = 'exam':
 					end
 				elseif week = 4: 
 					*nl
-					'Your Lerning Theories 101 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
-					act 'Go to your Lerning Theories 101 exam': 
+					'Your Learning Theories 101 exam will start at 09:00. You can go to it now or do other things first, but you need to be at the university plaza before it starts if you want to attend it.'
+					act 'Go to your Learning Theories 101 exam': 
 						if hour = 8: minut += 60 - minut
 						if hour = 7: minut += 120 - minut					
 						gs 'stat'

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