14 次代碼提交 e8867d6440 ... 661397ac48

作者 SHA1 備註 提交日期
  Vengeance_11 661397ac48 You can now go to pool cafe while still wearing swimwear 3 天之前
  Vengeance_11 925cce0ca8 Added ability to dance with Albina at school party 3 天之前
  Vengeance_11 44ffc492d2 Big round of proofreading 3 天之前
  Kevin_Smarts 5a27485a61 [fixed] Orgasm message displaying in wrong place and not required as there is suitable text in the file already. Spotted by Kel [TFS] 4 天之前
  Kevin_Smarts fa1b3dd4d3 [fixed] Missing colon spotted by Chimrod 4 天之前
  hornguy6 2ba7116dcf [fixed] blocked off incomplete content 4 天之前
  bgkjdgbizgblzdgbr 95fe57d240 [changed] Made it such that you can start eating breakfast alone as soon as the family stop eating. 4 天之前
  Kevin_Smarts 616d8e9f72 Merge remote-tracking branch 'Lokplart/master' 4 天之前
  anjuna krokus cd194a3941 [fixed] Using the "tits and ass ignore body weight" cheat, those now immediately revert to your genetic norm 5 天之前
  anjuna krokus 683ff458aa [fixed] KBI should work as expected. Reported by TheUnspeakable. 5 天之前
  f95Lok 19cad97e29 Merge remote-tracking branch 'kevin/master' 5 天之前
  Kevin_Smarts dfc9adf35d Merge remote-tracking branch 'origin/master' 6 天之前
  bgkjdgbizgblzdgbr 72406faefa [fixed] Somebody forgot to remove the old act when the restructured the file. 6 天之前
  bgkjdgbizgblzdgbr f9d7ce1270 [fixed] arrsize takes strings as argument. 6 天之前

文件差異過大導致無法顯示
+ 336 - 276
locations/artem_katja_sex.qsrc


+ 97 - 93
locations/body.qsrc

@@ -487,9 +487,6 @@ if $ARGS[0] = 'Update_daily_body_other':
 			end
 		end
 	end
-
-	gs 'drugs', 'breastcream', 'cikl'
-	gs 'drugs', 'steroids', 'cikl'
 end
 
 
@@ -591,9 +588,7 @@ if $ARGS[0] = 'Redistribute_Mass':
 	end
 
 
-	if salobustdo = 0 and cheatVars['body_staticAssets'] = 0:
-		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
-
+	if salobustdo = 0:
 		!!===============    MAGIC    ===============!!
 		if magikDostup = 0 and magf2bdo = 1 and daystart > pcs_mass['magic_day'] and pcs_mana >= manamax / 2:
 			bodyVars['bust_magic'] += 1
@@ -605,115 +600,124 @@ if $ARGS[0] = 'Redistribute_Mass':
 			pcs_mana -= max(100, 2000 / pcs_magik)
 		end
 
-		!!===============    Low Weight    ===============!!
-		if pcs_mass['body'] < 10:
-			temp_diff = min(pcs_mass['bust'], 3)
-			pcs_mass['bust'] -= temp_diff
-			pcs_mass['body'] += temp_diff
-
-			temp_diff = min(pcs_mass['butt'], 3)
-			pcs_mass['butt'] -= temp_diff
-			pcs_mass['body'] += temp_diff
+		!!This controls the movement of pcs_mass['body'] to/from bust in order of precedence
+		if cheatVars['body_staticAssets'] ! 0:
+			pcs_mass['bust'] = pcs_mass['bust_gen']
+			pcs_mass['bust_message'] = pcs_mass['bust_gen']
 
+			pcs_mass['butt'] = pcs_mass['butt_gen']
+			pcs_mass['butt_message'] = pcs_mass['butt_gen']
 		else
-			temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
-			temp_tot_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
-
-			!!===============    Bust    ===============!!
-			temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
-
-				!!----------- Small -----------!!
-			if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['bust'] < pcs_mass['bust_gen']:
-				temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
-				pcs_mass['bust'] += temp_diff
-				pcs_mass['body'] -= temp_diff
+			!!===============    Low Weight    ===============!!
+			if pcs_mass['body'] < 10:
+				temp_diff = min(pcs_mass['bust'], 3)
+				pcs_mass['bust'] -= temp_diff
+				pcs_mass['body'] += temp_diff
 
-			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
-				!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+				temp_diff = min(pcs_mass['butt'], 3)
+				pcs_mass['butt'] -= temp_diff
+				pcs_mass['body'] += temp_diff
 
-				!!-----------    Growth    -----------!!
-			elseif temp_mass_bust > pcs_mass['bust']:
-				pcs_mass['bust'] += 1
-				pcs_mass['body'] -= 1
+			else
+				temp_total_mass = pcs_mass['body'] + pcs_mass['bust'] + pcs_mass['butt']
+				temp_tot_gen_mass = 60 + pcs_mass['bust_gen'] + pcs_mass['butt_gen']
+
+				!!===============    Bust    ===============!!
+				temp_mass_bust = (pcs_mass['bust_gen'] * temp_total_mass) / temp_tot_gen_mass
+
+					!!----------- Small -----------!!
+				if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['bust'] < pcs_mass['bust_gen']:
+					temp_diff = min(pcs_mass['bust_gen'] - pcs_mass['bust'], 2)
+					pcs_mass['bust'] += temp_diff
+					pcs_mass['body'] -= temp_diff
+
+				elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['bust'] = pcs_mass['bust_gen']:
+					!Keep bust at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+
+					!!-----------    Growth    -----------!!
+				elseif temp_mass_bust > pcs_mass['bust']:
+					pcs_mass['bust'] += 1
+					pcs_mass['body'] -= 1
+
+					!!-----------    Shrink    -----------!!
+				elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
+					pcs_mass['bust'] -= 1
+					pcs_mass['body'] += 1
+				end
 
-				!!-----------    Shrink    -----------!!
-			elseif temp_mass_bust < pcs_mass['bust'] and pcs_mass['bust'] > 0:
-				pcs_mass['bust'] -= 1
-				pcs_mass['body'] += 1
-			end
 
+				!!===============    Ass    ===============!!
+				temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
 
-			!!===============    Ass    ===============!!
-			temp_mass_ass  = (pcs_mass['butt_gen']  * temp_total_mass) / temp_tot_gen_mass
+					!!----------- Small -----------!!
+				if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['butt'] < pcs_mass['butt_gen']:
+					temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
+					pcs_mass['butt'] += temp_diff
+					pcs_mass['body'] -= temp_diff
 
-				!!----------- Small -----------!!
-			if temp_total_mass >= temp_tot_gen_mass - 10 and pcs_mass['butt'] < pcs_mass['butt_gen']:
-				temp_diff = min(pcs_mass['butt_gen'] - pcs_mass['butt'], 2)
-				pcs_mass['butt'] += temp_diff
-				pcs_mass['body'] -= temp_diff
+				elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
+					!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
 
-			elseif temp_total_mass >= temp_tot_gen_mass - 10 and temp_total_mass <= temp_tot_gen_mass and pcs_mass['butt'] = pcs_mass['butt_gen']:
-				!Keep butt at genetic level if pcs_mass['body'] >= 50 and pcs_mass['body'] <= 60
+					!!-----------    Rest    -----------!!
+				elseif temp_mass_ass > pcs_mass['butt']:
+					pcs_mass['butt'] += 1
+					pcs_mass['body'] -= 1
 
-				!!-----------    Rest    -----------!!
-			elseif temp_mass_ass > pcs_mass['butt']:
-				pcs_mass['butt'] += 1
-				pcs_mass['body'] -= 1
+				elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
+					pcs_mass['butt'] -= 1
+					pcs_mass['body'] += 1
+				end
 
-			elseif temp_mass_ass < pcs_mass['butt'] and pcs_mass['butt'] > 0:
-				pcs_mass['butt'] -= 1
-				pcs_mass['body'] += 1
+				killvar 'temp_total_mass'
+				killvar 'temp_tot_gen_mass'
+				killvar 'temp_mass_bust'
+				killvar 'temp_mass_ass'
+				killvar 'temp_diff'
 			end
 
-			killvar 'temp_total_mass'
-			killvar 'temp_tot_gen_mass'
-			killvar 'temp_mass_bust'
-			killvar 'temp_mass_ass'
-			killvar 'temp_diff'
-		end
-
-		if bodyresetflag ! 0:
-			pcs_mass['bust_message'] = pcs_mass['bust']
-			pcs_mass['butt_message'] = pcs_mass['butt']
-		else
-			if pcs_mass['bust'] > pcs_mass['bust_message'] + 3:
+			if bodyresetflag ! 0:
 				pcs_mass['bust_message'] = pcs_mass['bust']
+				pcs_mass['butt_message'] = pcs_mass['butt']
+			else
+				if pcs_mass['bust'] > pcs_mass['bust_message'] + 3:
+					pcs_mass['bust_message'] = pcs_mass['bust']
 
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts and ass seem fuller</b>'
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts and ass seem fuller</b>'
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts seem fuller and ass seems to be getting smaller</b>'
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts seem fuller and ass seems to be getting smaller</b>'
 
-				else
-					'<b>Your breasts seem fuller</b>'
-				end
+					else
+						'<b>Your breasts seem fuller</b>'
+					end
 
-			elseif pcs_mass['bust'] < pcs_mass['bust_message'] - 3:
-				pcs_mass['bust_message'] = pcs_mass['bust']
-
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts seem to be getting smaller and your ass seems fuller</b>'
+				elseif pcs_mass['bust'] < pcs_mass['bust_message'] - 3:
+					pcs_mass['bust_message'] = pcs_mass['bust']
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your breasts and ass seem to be getting smaller</b>'
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts seem to be getting smaller and your ass seems fuller</b>'
 
-				else
-					'<b>Your breasts seem to be getting smaller</b>'
-				end
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your breasts and ass seem to be getting smaller</b>'
 
-			else
-				if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your ass seems fuller</b>'
+					else
+						'<b>Your breasts seem to be getting smaller</b>'
+					end
 
-				elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
-					pcs_mass['butt_message'] = pcs_mass['butt']
-					'<b>Your ass seem to be getting smaller</b>'
+				else
+					if pcs_mass['butt'] > pcs_mass['butt_message'] + 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your ass seems fuller</b>'
+
+					elseif pcs_mass['butt'] < pcs_mass['butt_message'] - 3:
+						pcs_mass['butt_message'] = pcs_mass['butt']
+						'<b>Your ass seem to be getting smaller</b>'
+					end
 				end
 			end
 		end

+ 1 - 3
locations/cikl.qsrc

@@ -931,9 +931,7 @@ mosal_time = totminut
 killvar 'last_pee'
 
 !!Drugs reduction
-gs 'drugs', 'cocaine', 'cikl'
-gs 'drugs', 'mentats', 'cikl'
-gs 'drugs', 'aphrodisiac', 'cikl'
+gs 'drugs', 'cikl'
 
 gs 'gad_gpyard', 'cikl'
 

+ 3 - 3
locations/din_van.qsrc

@@ -1185,14 +1185,14 @@ if $ARGS[0] = 'private':
 	end
 
 	if mc_inventory['hair_extensioncream'] > 0:
-		'<a href="exec:gs ''drugs'', ''hair_extensioncream'' & gt $loc, $loc_arg">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
+		'<a href="exec:gs ''drugs'', ''hair_extensioncream''">Apply hair extension shampoo.</a> Uses left: <<mc_inventory[''hair_extensioncream'']>>.'
 	end
 	if mc_inventory['butt_injection'] > 0:
-		'<a href="exec:gs ''drugs'', ''butt_injection'' & gt $loc, $loc_arg">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
+		'<a href="exec:gs ''drugs'', ''butt_injection''">Inject the KBI butt enhancement shot.</a> Uses left: <<mc_inventory[''butt_injection'']>>.'
 	end
 
 	if mc_inventory['breastcream'] > 0:
-		'<a href="exec:gs ''drugs'', ''breastcream'' & gt $loc, $loc_arg">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
+		'<a href="exec:gs ''drugs'', ''breastcream''">Apply breast cream.</a> Uses left: <<mc_inventory[''breastcream'']>>.'
 	end
 
 	gs 'piercing_management', 'set_manage_string'

+ 48 - 27
locations/djibril.qsrc

@@ -25,7 +25,8 @@ if $ARGS[0] = 'djibril_room':
 			*clr & cla
 			minut += 10
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'He grins and grabs his phone before sending a few text messages. Once he finishes, he sits in the reclining chair. "They should be here shortly." They arrive within a few minutes and take a seat on the couch with you.'
+			'He grins and grabs his phone before sending a few text messages. Once he finishes, he sits in the reclining chair. "They should be here shortly."'
+			'They arrive within a few minutes and take a seat on the couch with you.'
 			act 'Continue': gt 'djibrilev1', 'djibrilgb'
 		end
 		if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
@@ -40,7 +41,8 @@ if $ARGS[0] = 'djibril_room':
 		end
 	elseif npc_sex['A82'] >= 1 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
 		DjibrilQW['seduce'] = daystart
-		'As you enter, he pulls you over towards the couch. "I want you, I want you right now." Before you can respond, he pulls you into a kiss.'
+		'As you enter, he pulls you over towards the couch. "I want you, I want you right now."'
+		'Before you can respond, he pulls you into a kiss.'
 		gs 'arousal', 'kiss', 3
 		gs 'stat'
 		act 'Return the kiss':
@@ -55,7 +57,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Umm... What would you like to do instead then?" he asks.'
+				'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+				'"Umm... What would you like to do instead then?" he asks.'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -64,7 +67,8 @@ if $ARGS[0] = 'djibril_room':
 					*clr & cla
 					npc_rel['A82'] -= 1
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+					'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+					'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 					act 'Leave': gt 'uni_dorm', 'eighth_floor'
 				end
 				if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
@@ -83,7 +87,8 @@ if $ARGS[0] = 'djibril_room':
 			*clr & cla
 			npc_rel['A82'] -= 1
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-			'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Um... What would you like to do instead then?" he asks.'
+			'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+			'"Um... What would you like to do instead then?" he asks.'
 			gs 'arousal', 'end'
 			gs 'stat'
 			act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -92,7 +97,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 			if DjibrilQW['anya_inv'] + DjibrilQW['nush_inv'] + DjibrilQW['nat_inv'] > 0:
@@ -125,7 +131,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		else
@@ -136,7 +143,8 @@ if $ARGS[0] = 'djibril_room':
 				*clr & cla
 				npc_rel['A82'] -= 1
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		end
@@ -155,7 +163,8 @@ if $ARGS[0] = 'djibril_playgames':
 	'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
 	'You walk over and take a seat on the couch before picking up one of the controllers. "Sure, let''s play." He grins and turns the PlayStation on before joining you on the couch and grabbing the other controller.'
 	'It''s a game about football that you''ve played it before, but not too often. He''s a much better player than you, but you don''t mind as the two of you laugh and talk as you play. After an hour, he finally turns it off. "I had fun, but I need to get some studying done. Maybe you can come by again some other day?"'
-	'You nod and put the controller down before gathering up your stuff. "Sure, I''d like that. Well, have fun studying." He laughs before escorting you to the door.'
+	'You nod and put the controller down before gathering up your stuff. "Sure, I''d like that. Well, have fun studying."'
+	'He laughs before escorting you to the door.'
 	act 'Leave': gt 'uni_dorm', 'eighth_floor'
 end
 
@@ -177,7 +186,8 @@ if $ARGS[0] = 'djibril_chat':
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 		if npc_sex['A82'] = 0 and pcs_hotcat >= 5 and rand(0,3) = 0 and DjibrilQW['seduce'] ! daystart:
 			DjibrilQW['seduce'] = daystart
-			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He in turn asks you about about school, your friends and your home life. Overall, it is a pleasant conversation. He eventually gets up and pulls you up with him before he starts kissing you.'
+			'You talk about a wide range of topics. How he''s enjoying school, any pretty girls that have caught his eye, things he''s done recently and so on. He in turn asks you about about school, your friends and your home life. Overall, it''s a pleasant conversation.' 
+			'He eventually gets up and pulls you up with him before he starts kissing you.'
 			act 'Return the kiss':
 				*clr & cla
 				npc_rel['A82'] += 1
@@ -189,7 +199,8 @@ if $ARGS[0] = 'djibril_chat':
 				act 'Break free':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Um... What would you like to do instead then?" he asks.'
+					'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+					'"Um... What would you like to do instead then?" he asks.'
 					gs 'arousal', 'end'
 					gs 'stat'
 					act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -197,7 +208,8 @@ if $ARGS[0] = 'djibril_chat':
 					act 'I should get going':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-						'You look over at the clock. "I should really get going, sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
+						'You look over at the clock. "I should really get going, sorry to have bothered you."'
+						'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn around and leave.'
 						act 'Leave': gt 'uni_dorm', 'eighth_floor'
 					end
 				end
@@ -205,7 +217,8 @@ if $ARGS[0] = 'djibril_chat':
 			act 'Stop the kiss':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-				'You pull away from him. He looks a little disappointed, but doesn''t press the issue. "Um... What would you like to do instead then?" he asks.'
+				'You pull away from him. He looks a little disappointed, but doesn''t press the issue.'
+				'"Um... What would you like to do instead then?" he asks.'
 				gs 'arousal', 'end'
 				gs 'stat'
 				act 'Let''s talk': gt 'djibril', 'djibril_chat'
@@ -213,12 +226,13 @@ if $ARGS[0] = 'djibril_chat':
 				act 'I should get going':
 					*clr & cla
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big82.jpg"></center>'
-					'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+					'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+					'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 					act 'Leave': gt 'uni_dorm', 'eighth_floor'
 				end
 			end
 		else
-			'You talk about a wide range of topics. How he is enjoying school, any pretty girls that have caught his eye, things he has done recently and so on. He in turn asks you about about school, your friends and your home life. Overall, it is a pleasant conversation.'
+			'You talk about a wide range of topics. How he''s enjoying school, any pretty girls that have caught his eye, things he''s done recently and so on. He in turn asks you about about school, your friends and your home life. Overall, it is a pleasant conversation.'
 			act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			act 'Keep talking': gt 'djibril', 'djibril_chat'
 		end
@@ -251,8 +265,8 @@ if $ARGS[0] = 'djibril_chat':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 		'"So what do you think about Russia?"'
-		'He seems to ponder the question for a second. "I like it. It can be hard with the racism sometimes, but most people are okay. There are some curious girls as well if you know what I mean and I''m only to happy to satisfy their curiosity," he says with a laugh.'
-		'You ask him about what people have said or done and he tells you some truly awful stories not just about what he has experienced, but what has happened to some of the other Africans he knows who are living in the city. After some time, he seems to want to change the subject.'
+		'He seems to ponder the question for a second. "I like it. It can be hard with the racism sometimes, but most people are okay. There are some curious girls as well, if you know what I mean, and I''m only to happy to satisfy their curiosity," he says with a laugh.'
+		'You ask him about what people have said or done and he tells you some truly awful stories, and not just about what he''s experienced. He also tells you some stories involving some of the other Africans he knows who are living in the city. After some time, he seems to want to change the subject.'
 		act 'Do you miss your family?':
 			*clr & cla
 			minut += 3
@@ -272,8 +286,8 @@ if $ARGS[0] = 'djibril_chat':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 		'"Tell me about your uncle," you say.'
-		'He talks about how he met Luda and went with her back to Russia. He also talks about how Olu was always about taking risks and was never willing to settle with what he had, always wanting more out of life. He mentions how his uncle inspired him to come and study here and how he''s glad he did.'
-		'He goes on to tell a few funny stories about Olu when he was younger and Djibril was still just a boy.'
+		'He talks about how he met Luda, but also mentions how Olu was always taking risks and was never willing to settle with what he had, always wanting more out of life. He mentions how his uncle inspired him to come and study here and how he''s glad he did.'
+		'He goes on to tell a few funny stories about Olu when he was younger and Djibril was just a boy.'
 		act 'Keep talking': gt 'djibril', 'djibril_chat'
 		act 'Stop talking and leave': gt 'uni_dorm', 'eighth_floor'
 	end
@@ -286,9 +300,10 @@ if $ARGS[0] = 'djibril_chat':
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
 			'"Do you know Kendra? She lives on this floor." you ask.'
 			'He shakes his head a little. "Yeah, I know her, but not too well. We''ve gone to a few parties together and we have several friends in common, but I don''t know her really well. Why do you ask?"'
-			'You shrug a little. "I met her the other day and she''s... different, to say the least. I was just curious if you guys knew each other since you live in the same dorm."'
+			'You shrug a little. "I met her the other day and she''s... different, to say the least. I was just curious if you guys knew each other since you live on the same floor."'
 			*nl
-			'He laughs a little. "Different... That''s one way to put. I would say she''s fucking crazy, and not in the fun way. She''s very dominating to most people, but some seem to like it." He raises a brow, obviously wondering if you fall into that group. You continue talking about her, but he obviously doesn''t know her too well or doesn''t want to give details about what he does know.'
+			'He laughs a little. "Different... That''s one way to put it. I''d say she''s fucking crazy, and not in the fun way. She''s very dominating to most people, but some seem to like it." He raises a brow, obviously wondering if you fall into that group.'
+			'You continue talking about her, but he obviously doesn''t know her too well or doesn''t want to give details about what he does know.'
 			act 'Keep talking': gt 'djibril', 'djibril_chat'
 			act 'Stop talking and leave': gt 'uni_dorm', 'eighth_floor'
 		end
@@ -298,14 +313,16 @@ if $ARGS[0] = 'djibril_chat':
 		npc_rel['A82'] += 1
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/couch_kiss.jpg"></center>'
 		if pcs_hotcat >= 5:
-			'As the two of you sit side by side, you lean over and kiss him. He stiffens in surprise at first, but quickly returns the kiss as he puts a hand around your back and pulls you in tighter. After a few seconds, he starts encouraging you to slide off the couch.'
+			'As the two of you sit side by side, you lean over and kiss him. He stiffens in surprise at first, but quickly returns the kiss as he puts a hand around your back and pulls you in tighter.'
+			'After a few seconds, he starts encouraging you to slide off the couch.'
 			gs 'arousal', 'kiss', 3
 			gs 'stat'
 			act 'Slide off the couch': gt 'djibrilev1', 'sveta_sex1'
 		else
 			'As the two of you sit side by side, you lean over and kiss him. He stiffens in surprise before he pulls away from you and stands up. "Uh... I should really get my homework done..."'
 			'You frown a little as you nod. "Okay. I''ll leave you in peace."'
-			'He smiles at you and walks you to the door. "Thanks, see you around." You walk out into the hall and he shuts the door behind you.'
+			'He smiles at you and walks you to the door. "Thanks, see you around."'
+			'You walk out into the hall and he shuts the door behind you.'
 			gs 'arousal', 'kiss', 3
 			gs 'arousal', 'end'
 			gs 'stat'
@@ -352,7 +369,8 @@ if $ARGS[0] = 'textanya':
 			act 'I should go':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		end
@@ -360,7 +378,8 @@ if $ARGS[0] = 'textanya':
 			*clr & cla
 			npc_rel['A82'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter. After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
+			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter.'
+			'After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
 			gs 'arousal', 'kiss', 3
 			gs 'stat'
 			act 'Drop to your knees': gt 'djibrilev1', 'sveta_sex1'
@@ -404,7 +423,8 @@ if $ARGS[0] = 'textnush':
 			act 'I should go':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/djibriltalk.jpg"></center>'
-				'You look over at the clock. "I should really get going. Sorry to have bothered you." He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
+				'You look over at the clock. "I should really get going. Sorry to have bothered you."'
+				'He looks a little confused about you suddenly wanting to go, but doesn''t say anything as you turn and leave.'
 				act 'Leave': gt 'uni_dorm', 'eighth_floor'
 			end
 		end
@@ -412,7 +432,8 @@ if $ARGS[0] = 'textnush':
 			*clr & cla
 			npc_rel['A82'] += 1
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/dorm/sveta/anal_kiss.jpg"></center>'
-			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter. After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
+			'You nod. "Okay, sounds like fun." He leans over and kisses you before he stands up. Pulling you up with him, he puts one hand around your back and pulls you in tighter.'
+			'After a few seconds, his hand lowers and starts squeezing your ass. He then puts his hands on your shoulders and starts pushing you down.'
 			gs 'arousal', 'kiss', 3
 			gs 'stat'
 			act 'Drop to your knees': gt 'djibrilev1', 'sveta_sex1'

+ 2 - 0
locations/drugs.qsrc

@@ -24,6 +24,8 @@ if $ARGS[0] = 'cikl':
 	gs 'drugs', 'aphrodisiac', 'cikl'
 	gs 'drugs', 'hair_extensioncream', 'cikl'
 	gs 'drugs', 'butt_injection', 'cikl'
+	gs 'drugs', 'breastcream', 'cikl'
+	gs 'drugs', 'steroids', 'cikl'
 elseif $ARGS[0] = 'hourly_events':
 	gs 'drugs', 'smoke', 'hourly_events'
 	gs 'drugs', 'joint', 'hourly_events'

+ 47 - 45
locations/katja_sex_talk.qsrc

@@ -4,11 +4,11 @@
 !!This files have the content for talking with Katja about sex, used to be part of KatjaHomeTalk but that file grew to large.
 
 if $ARGS[0] = 'Sextalk':
-	'After talking for some time Katja looks at you thoughtfully while her head is turning completely red.'
+	'After talking for some time, Katja looks at you thoughtfully as her face turns completely red.'
 	if katjaQW['boy_block'] = 1:
-		kattalkrand = rand(3, 4)
+		kattalkrand = rand(3,4)
 	else
-		kattalkrand = rand(0, 4)
+		kattalkrand = rand(0,4)
 	end
 
 	if kattalkrand = 0:
@@ -25,7 +25,8 @@ if $ARGS[0] = 'Sextalk':
 				minut += 3
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
-				'You tell Katja that you have never given a blowjob to a guy. She admits that she hasn''t either. "Vicky talks about how good it is all the time, but I don''t know. Guys usually smell bad and I''m sure it would taste awful."'
+				'You tell Katja that you''ve never given a blowjob to a guy. She admits that she hasn''t either.'
+				'"Vicky talks about how good it is all the time, but I don''t know. Guys usually smell bad and I''m sure it would taste awful."'
 				act 'Continue talking':
 					minut += 5
 					if $loc = 'katja_dorm':
@@ -37,11 +38,11 @@ if $ARGS[0] = 'Sextalk':
 			end
 		end
 
-		act 'Tell Katja you are not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
+		act 'Tell Katja you''re not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
 
 	elseif kattalkrand = 1:
 		if katjaQW['knows_sex'] > 0:
-			'"<<$pcs_nickname>>, tell me. Have you ever fucked someone?"'
+			'"Tell me, <<$pcs_nickname>>. Have you ever fucked someone?"'
 		else
 			'"<<$pcs_nickname>>, have you ever had sex with a guy?"'
 		end
@@ -75,10 +76,12 @@ if $ARGS[0] = 'Sextalk':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				if katjaQW['pussy_sex'] = 0:
-					'You tell Katja that you''ve never had sex with a guy, and she admits that she''s also still a virgin. "That probably makes us the only non-nerds who haven''t had sex! Vicky does it all the time with Vanya. She won''t shut up about it!"'
+					'You tell Katja that you''ve never had sex with a guy, and she admits that she''s also still a virgin.'
+					'"That probably makes us the only non-nerds who haven''t had sex! Vicky does it all the time with Vanya and won''t shut up about it!"'
 				else
 					if npc_sex['A14'] > 0: katjaQW['QWstage'] = 6
-					'You tell Katja that you''ve never had sex with a guy, and she is very surprised. "What you have never had sex with a guy? Even I have had that. I thought I was the last girl from school to lose my virginity. Vicky definitely make it seems like I was abnormal not finding somebody to fuck in school. She wouldn''t stop pushing to find a guy. It was so annoying."'
+					'You tell Katja that you''ve never had sex with a guy, and she''s very surprised.'
+					'"You''ve never had sex with a guy?! Even I''ve done that! I thought I was the last girl from school to lose my virginity. Vicky definitely make it seems like I was abnormal not finding somebody to fuck in school. She wouldn''t stop pushing to find a guy. It was so annoying!"'
 				end
 
 				act 'Continue talking':
@@ -92,7 +95,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		end
 
-		act 'Tell Katja you are not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
+		act 'Tell Katja you''re not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
 
 	elseif kattalkrand = 2:
 		if katjaQW['knows_anal'] > 0:
@@ -112,7 +115,7 @@ if $ARGS[0] = 'Sextalk':
 				'You tell Katja about the times you''ve had anal sex and what it feels like. She blushes and bites her lip.'
 				if katjaQW['anal_sex'] > 0:
 					if npc_sex['A14'] > 0: katjaQW['anal_quest'] = 3
-					'Katja also tells you a story of anal sex she had with a boy a boy you don''t know she picked up one night se went out.'
+					'Katja also tells you a story of anal sex she had with a boy you don''t know who she picked up as a one night stand.'
 				end
 
 				act 'Continue talking':
@@ -134,7 +137,8 @@ if $ARGS[0] = 'Sextalk':
 					'You tell Katja that you''ve never had anal sex. She says that she heard that a lot of girls in your class do, some more than others.'
 				else
 					if npc_sex['A14'] > 0: katjaQW['anal_quest'] = 3
-					'You tell Katja that you''ve never had anal sex. "You havn''t?" she asks rhetorically "It''s actually quite good. You should try it."'
+					'You tell Katja that you''ve never had anal sex.'
+					'"You haven''t?" she asks rhetorically "It''s actually quite good. You should try it."'
 				end
 
 				act 'Continue talking':
@@ -148,7 +152,7 @@ if $ARGS[0] = 'Sextalk':
 			end
 		end
 
-		act 'Tell Katja you are not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
+		act 'Tell Katja you''re not into boys <br><font color="red">(blocks further contents with Katja and boys)</font>': gt 'KatjaHomeTalk',  'boy_no'
 
 	elseif kattalkrand = 3:
 		if katjaQW['knows_cuni'] > 0 or npc_sex['A14'] > 0:
@@ -180,10 +184,9 @@ if $ARGS[0] = 'Sextalk':
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/girl/katja/sex/school/kuni2.jpg"></center>'
 						'You''re a little confused at first before you notice her pulling her panties off. Once she has them off, she opens her legs wide. "Go on, <<$pcs_nickname>>. Show me how you do it, please."'
 						'You pause, more in surprise than anything, but her glistening wet pussy is enough to convince you. You lean forward place your face between her legs and start licking.'
-						'You suck on her clit and slip your tongue inside of her, working her pussy for all you''re worth. She begins to moan loudly and buck her hips, grinding your face into her crotch. As she gets close to orgasm, she grabs your hair and holds your face against her pussy, rubbing herself against you as much as you are licking her, leaving your face coated in her juices.'
+						'You suck on her clit and slip your tongue inside her, working her pussy for all you''re worth. She begins to moan loudly and buck her hips, grinding your face into her crotch. As she gets close to orgasm, she grabs your hair and holds your face against her pussy, rubbing herself against you as much as you''re licking her, leaving your face coated in her juices.'
 						'Her orgasm hits her hard, leaving her unable to talk as her body spasms. Once her orgasm passes, you lick her clean of all her pussy juices, making sure not to miss a single spot. When you look up at Katja, she has a confident smile on her face. "Well aren''t you just a good little girl?" She then kisses you deeply before you start to lean back and spread your legs, but she''s already shaking her head.'
 						'"Sorry <<$pcs_nickname>>, maybe next time. We need to finish our homework," she says sweetly. You pause before nodding in understanding. You watch the new confident look intensify on her face as she smiles and the two of you finish your homework.'
-
 						gs 'arousal', 'cuni_give', 15, 'sub', 'lesbian'
 						gs 'arousal', 'end'
 						gs 'stat'
@@ -222,20 +225,22 @@ if $ARGS[0] = 'Sextalk':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				if katjaQW['simultanous_girls'] > 0:
-					'"I''ve never gone down on a girl before," you say and Katja looks quite surprised. "Never? Is it something that you have thought about?" she asks in a curious tone.'
+					'"I''ve never gone down on a girl before," you say and Katja looks quite surprised.'
+					'"Never? Is it something that you''ve ever thought about?" she asks in a curious tone.'
 					act 'I''ve thought about it':
 						cla
 						minut += 3
 						katjaQW['horny'] += 20
-						'"I''ve thought about it, alright it''s just the situation never came up" you tell Katja. "So it is something you want to try" Katja asks.'
+						'"I''ve thought about it, it''s just that the situation never came up," you reply.'
+						'"So it''s something you want to try" she asks.'
 						if katjaQW['horny'] >= 50 and katjaQW['QWstage'] > 2 and katjaQW['slut'] >= 20:
-							'"So what would you do if that situation was to come up. For example right now?" Katja asks in a seductive voice.'
-							act 'See what Katja does': gt 'katjaHomeTalk', 'hornykiss'
+							'"So what would you do if that situation was to come up. For example right now?" she asks in a seductive voice.'
+							act 'See what she does': gt 'katjaHomeTalk', 'hornykiss'
 							act 'Stop her from doing anything':
 								cla
 								gs 'npc_relationship', 'modify', 'A14', 'dislike'
-								'"It would definitely not happen right now. Rigth?" you say a little unsure of how Katja will react.'
-								'"Of course not. Nothing happens here you don''t want to," she says clearly looking disappointed. She quickly changes the subject.'
+								'"It would definitely not happen right now. Right?" you say, a little unsure of how Katja will react.'
+								'"Of course not. Nothing happens here you don''t want to," she says, clearly looking disappointed before she quickly changes the subject.'
 								act 'Continue talking':
 									minut += 5
 									if $loc = 'katja_dorm':
@@ -246,7 +251,7 @@ if $ARGS[0] = 'Sextalk':
 								end							
 							end
 						else
-							'"Well. I think that you should find a chance to try it. It is quite good" Katja says with a wink, but then changes the subject.'
+							'"Well, I think you should find a chance to try it. It''s quite good," she says with a wink, but then changes the subject.'
 							act 'Continue talking':
 								minut += 5
 								if $loc = 'katja_dorm':
@@ -262,8 +267,9 @@ if $ARGS[0] = 'Sextalk':
 						minut += 3
 						gs 'npc_relationship', 'modify', 'A14', 'dislike'
 						gs 'stat'
-						'"I''m not into girls" you tell Katja. "Really?" Katja says surprised "Too bad for you. You are really missing out on something. Making love to girls is really something, they are '+iif(katjaQW['knows_sex'] +katjaQW['knows_BJ'] + katjaQW['knows_anal'] > 0, 'much more tender than boys', 'so tender')+'."'
-						'"I really think that you should give it a thought" she continues seemingly a little disappointed in your response. She then changes the subject.'
+						'"I''m not into girls," you reply.' 
+						'"Really?" Katja says in surprise. "Too bad. You''re really missing out on something. Making love to girls is really something. They''re '+iif(katjaQW['knows_sex'] +katjaQW['knows_BJ'] + katjaQW['knows_anal'] > 0, 'much more tender than boys', 'so tender')+'."'
+						'"I really think that you should give it a thought," she continues, seemingly a little disappointed in your response. She then changes the subject.'
 						act 'Continue talking':
 							minut += 5
 							if $loc = 'katja_dorm':
@@ -288,9 +294,9 @@ if $ARGS[0] = 'Sextalk':
 		end
 	elseif kattalkrand = 4:
 		if katjaQW['knows_masturbation'] > 0:
-			'"<<$pcs_nickname>>, tell me how you masturbate."'
+			'"Tell me how you masturbate, <<$pcs_nickname>>."'
 		else
-			'"<<$pcs_nickname>>, do you masturbate?"'
+			'"Do you masturbate, <<$pcs_nickname>>?"'
 		end
 
 		if stat['mast'] > 0:
@@ -338,11 +344,10 @@ if $ARGS[0] = 'Sextalk':
 					*clr & cla
 					minut += 3
 					katjaQW['horny'] += 10
-
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 					'You tell Katja how you '+iif(stat['self_fisting'] = 1, 'once', 'sometimes')+' put your whole fist into your pussy, and how it felt doing it.'
-					'Katja looks '+iif(katjaQW['knows_self_fisting'] = 0, 'completely shocked, but', 'excited, and')+' her head turns even redder as she bites her lip.'
+					'Katja looks '+iif(katjaQW['knows_self_fisting'] = 0, 'completely shocked, but', 'excited, and')+' her face turns even redder as she bites her lip.'
 
 					if katjaQW['knows_self_fisting'] = 0: katjaQW['knows_self_fisting'] = 1
 
@@ -366,9 +371,7 @@ if $ARGS[0] = 'Sextalk':
 					*clr & cla
 					minut += 3
 					katjaQW['horny'] += 10
-
 					if katjaQW['knows_self_fisting_anal'] = 0: katjaQW['knows_self_fisting_anal'] = 1
-
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 					'You tell Katja how you masturbate anally and even managed to stretch it so much that you could shove your fist into it.'
@@ -391,8 +394,8 @@ if $ARGS[0] = 'Sextalk':
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big14.jpg"></center>'
 				if katjaQW['masturbates'] > 0:
-					'"What!!" Katja says surprised. "You never masturbated. Why? I thought that everybody does it, even I do it and I''m usually the last to do anything" she continues'
-					'You then try to explain why you have never masturbated.'
+					'"What?!" she splutters. "You''ve never masturbated?! Why?! I thought that everybody did it. Even I do it and I''m usually the last to do anything!"'
+					'You try to explain why you''ve never masturbated.'
 				else
 					'You tell Katja that you''ve never masturbated. She seems surprised at your answer.'
 				end
@@ -412,7 +415,7 @@ if $ARGS[0] = 'Sextalk':
 		cla
 		minut += 1
 		gs 'stat'
-		'You refuse to talk about such topics with her and she looks down in confusion and mumbles. "Sorry, <<$pcs_nickname>>, I didn''t mean to pry."'
+		'You refuse to talk about such topics with her and she looks down in confusion and mumbles. "Sorry, <<$pcs_nickname>>. I didn''t mean to pry."'
 
 		act 'Continue talking':
 			minut += 5
@@ -451,15 +454,15 @@ if $ARGS[0] = 'bj_talk1':
 					end
 				end
 			end
-			act'Yes':
+			act 'Yes':
 				minut += 3
 				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.'
+				'"Yeah, I''ve given a few," you admit.'
+				'"What''s it like?" she asks, eyes wide with excitement.'
 				gs 'katja_sex_talk', 'bj_talk2'
 			end
 		elseif stat['bj'] > 0:
@@ -484,14 +487,14 @@ if $ARGS[0] = 'bj_talk1':
 				end
 			end
 		end
-		!!act'I''ve given a few (lie)':
+		!!act 'I''ve given a few (lie)':
 	end
 end
 
 if $ARGS[0] = 'bj_talk2':
-	act'It tastes funny':
+	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."'
+		'You wrinkle your nose. "It tastes funny. 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 += 5
@@ -503,7 +506,7 @@ if $ARGS[0] = 'bj_talk2':
 		end
 	end
 	
-	act'It''s fun':
+	act 'It''s fun':
 		cla & *nl
 		katjaQW['horny'] += 5
 		'"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."'
@@ -518,10 +521,9 @@ if $ARGS[0] = 'bj_talk2':
 		end
 	end
 	
-	act'It''s whatever':
+	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.'
+		'You shrug. "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."'
 		'Katja seems taken aback, almost disappointed. You guess this isn''t the answer she was hoping for.'
 		act 'Continue':
 			minut += 5
@@ -533,9 +535,9 @@ if $ARGS[0] = 'bj_talk2':
 		end
 	end
 	
-	act'It''s boring':
+	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."'
+		'You roll your eyes. "It''s boring. 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 += 5
@@ -547,7 +549,7 @@ if $ARGS[0] = 'bj_talk2':
 		end
 	end
 	
-	act'It turns me on':
+	act 'It turns me on':
 		cla & *nl
 		katjaQW['horny'] += 5
 		'"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!"'

+ 1 - 1
locations/kuhrPar.qsrc

@@ -192,7 +192,7 @@ if func('homes_properties', 'can_live_here'):
 			end
 		end
 	else
-		if (hour = 8 or (hour = 7 and locat['Fam_inGad'] = 1)) and breakfast_day ! daystart:
+		if (hour = 8 or (hour = 7 and (minut > 15 or locat['Fam_inGad'] = 1))) and breakfast_day ! daystart:
 			act 'Eat breakfast alone (0:20)':
 				*clr & cla
 				menu_off = 1

文件差異過大導致無法顯示
+ 243 - 204
locations/ludahome.qsrc


+ 4 - 6
locations/npc_set_preference.qsrc

@@ -65,7 +65,7 @@ if isnum(mid($ARGS[0], 2)):
 	if temp_set_preference_trait_value ! 0:
 		if arrsize('$npc_pref_traits') = 0:
 			!!replace(..., '	', '') is there to remove the tabs from the string.
-			$npc_preferences[$ARGS[0]] = replace({killvar '$npc_pref_traits'
+			$npc_preferences[$ARGS[0]] = $replace({killvar '$npc_pref_traits'
 				killvar 'npc_pref_values'
 				$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
 				npc_pref_values} + "['<<$ARGS[1]>>'] = <<temp_set_preference_trait_value>>" + {
@@ -83,7 +83,7 @@ if isnum(mid($ARGS[0], 2)):
 			else
 				!!We have checked that the npc has no preference for the trait.
 				!!We add the preference to the npc.
-				$npc_preferences[$ARGS[0]] += replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
+				$npc_preferences[$ARGS[0]] += $replace({$npc_pref_traits[] = } + "'<<$ARGS[1]>>'" + {
 					npc_pref_values} + "['<<$ARGS[1]>>'] = <<temp_set_preference_trait_value>>" + {
 				}, '	', '')
 			end
@@ -130,7 +130,7 @@ if $ARGS[0] = 'rebuild_preferences':
 
 
 	!!Overwrite the $npc_pref....[$ARGS[1]] strings with the rebuild string.
-	$npc_preferences[$ARGS[1]] = replace($temp_npc_preferences,    '	', '')
+	$npc_preferences[$ARGS[1]] = $replace($temp_npc_preferences,    '	', '')
 
 	killvar '$temp_npc_preferences'
 	killvar 'rebuild_preferences_index'
@@ -356,6 +356,4 @@ end
 !!				stats_strength_manly
 
 
-
-
---- npc_set_preference ---------------------------------
+--- npc_set_preference ---------------------------------

+ 2 - 2
locations/npcstatic5.qsrc

@@ -855,7 +855,7 @@ $npc_firstname['A<<npctemp>>'] = 'Lebogang'
 $npc_nickname['A<<npctemp>>'] = 'Lebo'
 $npc_lastname['A<<npctemp>>'] = 'Kayode'
 $npc_usedname['A<<npctemp>>'] = 'Lebogang'
-$npc_notes['A<<npctemp>>'] = 'Djibril''s closet friend in Russia. They both live on the same floor in the same dorm and he also attends the University. He is also from Africa.'
+$npc_notes['A<<npctemp>>'] = 'Djibril''s best friend, who is also from Africa. He also attends the university, living on the same floor of the dorm.'
 npc_dob['A<<npctemp>>'] = 0
 npc_gender['A<<npctemp>>'] = 0
 
@@ -863,7 +863,7 @@ gs 'npcstaticdefaults', 'defaults'
 gs 'npcstaticdefaults', 'uni_type', 'other'
 
 $npc_thdick['A<<npctemp>>'] = 'thick'
-npc_dick['A<<npctemp>>'] = 19
+npc_dick['A<<npctemp>>'] = 22
 npc_sexskill['A<<npctemp>>'] = 3
 npc_intel['A<<npctemp>>'] = 48
 

+ 56 - 16
locations/nyp_school.qsrc

@@ -197,7 +197,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/fedordance.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Fedor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Fedor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				InvitationToDimkaNYparty = 1
 				'Everyone then slowly makes their way out of the school.'
@@ -206,7 +207,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 		end
 	elseif IgorQW['Love'] > 0:
-		'As you''re hanging out an chatting with the girls, Igor walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
+		'As you''re hanging out and chatting with the girls, Igor walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
 		act 'Don''t dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -228,7 +229,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Igor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Igor walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -237,7 +239,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 		end
 	elseif Marcus_sextype > 0:
-		'As you''re hanging out an chatting with the girls, Marcus walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
+		'As you''re hanging out and chatting with the girls, Marcus walks over and offers you his hand. "Come dance with me, <<$pcs_nickname>>."'
 		act 'Don''t dance with him':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
@@ -259,7 +261,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Marcus walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Marcus walk together hand in hand before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -268,7 +271,7 @@ if $ARGS[0] = 'cool jocks':
 			end
 		end
 	elseif npc_sex['A14'] > 0:
-		'As you''re hanging out and chatting with the girls chatting, Katja strikes up a conversation with you. After a few seconds, a song comes on and Katja becomes excited. "I love this song!" she squeals as she turns to you and grabs you by the hand. "Dance with me, <<$pcs_nickname>>!"'
+		'As you''re hanging out and chatting with the girls, Katja strikes up a conversation with you. After a few seconds, a song comes on and Katja becomes excited. "I love this song!" she squeals as she turns to you and grabs you by the hand. "Dance with me, <<$pcs_nickname>>!"'
 
 		act 'Don''t dance with her':
 			*clr & cla
@@ -292,7 +295,8 @@ if $ARGS[0] = 'cool jocks':
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
 				*nl
-				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 				'Everyone then slowly makes their way out of the school.'
 				InvitationToDimkaNYparty = 1
@@ -300,6 +304,41 @@ if $ARGS[0] = 'cool jocks':
 				act 'Leave': gt 'gschool_grounds', 'main'
 			end
 		end
+	elseif AlbinaQW['Friends'] = 2:
+		'As you''re hanging out and chatting with the girls, Albina strikes up a conversation with you. After a few seconds, she grabs your hand and starts pulling you along. "Come and dance with me, <<$pcs_nickname>>!"'
+		
+		act 'Don''t dance with her':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/talk.jpg"></center>'
+			'You shake your head and pull yourself free from her grasp. "I don''t feel like it right now. Maybe later?"'
+			'She pouts. "Aww, you''re no fun, <$pcs_nickname>>! If you change your mind, then come join us."'
+			'A few of the other girls join her on the dance floor and they all start dancing together. 'You watch them for a while before turning back to engage in conversation with the other girls.'
+
+			act 'Hang out until the party ends': gt 'nyp_school', 'end'
+		end
+		
+		act 'Dance with her':
+			*clr & cla
+			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/tusa6.jpg"></center>'
+			'"Of course," you smile. "I''d love to dance!"'
+			'She giggles happily as she drags you onto the dance floor. Albina seems to be in a bit of a buzz and dances very erotically, which gets some of the guys hooting and hollering. You''re taken aback when Albina suddenly starts making out with you, much to the joy of the guys watching.'
+			'She then breaks the kiss and smiles at you before going back to dancing. You really enjoy dancing in front of everyone with Albina.'
+			act 'Dance until the party ends':
+				*clr & cla
+				minut += 30
+				gs 'stat'
+				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
+				'Time seems to have flown by. You rock your hips, enjoying the beats of the music when it suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
+				*nl
+				'The students start picking up their stuff and heading for the door while you and Katja walk together before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+				'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+				if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
+				'Everyone then slowly makes their way out of the school.'
+				InvitationToDimkaNYparty = 1
+			
+				act 'Leave': gt 'gschool_grounds', 'main'
+			end
+			
 !!if more than one has been triggered, like if Sveta is having sex with Katja and dating Fedor can it be random which one triggers?
 	else
 		*clr
@@ -864,7 +903,7 @@ if $ARGS[0] = 'outcast':
 	end
 	if npc_grupTipe['A25'] = 5:
 		!if Sonia is an outcast too
-		cla & *clr
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -873,7 +912,7 @@ if $ARGS[0] = 'outcast':
 		'"Ohhh, what is this I hear? <<$pcs_nickname>> and Sonia exchanging tips on how to suck a cock properly?" Vitek says to the others as they laugh.'
 		'The two of you throw a quick look at each other, afraid of what might happen next.'
 		act 'What do you want?':
-			cla & *clr
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -882,7 +921,7 @@ if $ARGS[0] = 'outcast':
 			'Vitek patiently waits for you to finish before he grabs you by the neck and forces you down towards his crotch. "I think this one is ready for a good old fashioned fuck session. Who''s in?" he asks the others.'
 			'You grunt and moan as you try to break free, but he''s too strong and easily holds you down.'
 			act 'Let go of me':
-				cla & *clr
+				*clr & cla
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -891,7 +930,7 @@ if $ARGS[0] = 'outcast':
 				'Sonia, teary eyed, nods. "I''ll do whatever you want! Just leave her be!"'
 				'"See? Even the whores take care of each other," he grins at his friends. "This gives me an idea. The two of you can give us a little warm-up show and after that, we''ll decide among ourselves who gets who."'
 				act 'Accept your punishment':
-					cla & *clr
+					*clr & cla
 					minut += 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -934,7 +973,7 @@ if $ARGS[0] = 'outcast':
 			end
 		end
 	else
-		cla & *clr
+		*clr & cla
 		minut += 15
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -942,7 +981,7 @@ if $ARGS[0] = 'outcast':
 		'"We haven''t played with <<$pcs_nickname>> for a while. Let''s go and fuck around with her," you overhear Lena tell Vitek. He nods and before you know it, the majority of the gopniks stand in front of you.'
 		'"Hi <<$pcs_nickname>>! Sucked many cocks today?" Lena asks as the others laugh. "She''s truly a good piece of ass. Who here hasn''t fucked her yet? I''m sure she''ll be willing to please you."'
 		act 'Leave me alone':
-			cla & *clr
+			*clr & cla
 			minut += 2
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -951,7 +990,7 @@ if $ARGS[0] = 'outcast':
 			'Once again, she turns towards the crowd. "Come on, who here hasn''t fucked <<$pcs_nickname>> yet? Any takers? Doesn''t matter if you''re male or female, I''m sure <<$pcs_nickname>> is up to it."'
 			'Vitek steps up to you, grabs you by the neck and forces you down to his crotch while the others laugh loudly. "See! I told you she was willing!"'
 			act 'Let go of me':
-				cla & *clr
+				*clr & cla
 				minut += 2
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -960,7 +999,7 @@ if $ARGS[0] = 'outcast':
 				'You just want it to be over with as you quietly answer. "N-No I didn''t!"'
 				'You can hear the whispers from the others. "Did you hear that? She just admitted to getting fucked by Vitek..."'
 				act 'Plead':
-					cla & *clr
+					*clr & cla
 					minut += 2
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/system/image_needed.png"></center>'
@@ -985,7 +1024,8 @@ if $ARGS[0] = 'end':
 	*clr & cla
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/events/newyear/newyear.jpg"></center>'
 	'Time seems to have flown by as the music suddenly stops. "Okay everyone, time to go home," one of the teachers says. "I hope that you''ve all had a great time and I wish you all a happy and safe holiday. We''ll see everyone back at school once the winter break is over."'
-	'The students start picking up their stuff and heading for the door before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring. Dimka then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
+	'The students start picking up their stuff and heading for the door before Dimka suddenly gets everyone''s attention. "Hey everyone! My parents left for the New Year, so you know what that means! Party at my house! Come by at '+func('time', 'get_time_string', 18, 0, cheatVars['time_format'])+' on New Years Eve, you''re all invited!" Everyone cheers at the idea of a party without any adults around to make it boring.'
+	'He then looks at the outcasts. "Well everyone except you losers that is," he says with a laugh, which gets several of the other students to join in. He then stops and smirks. "Except you Sonia, you can come. I''m sure you''ll show your gratitude one way or another."'
 	if NosovRevenge = 1: 'Dimka walks over to you and looks at the floor. "<<$pcs_nickname>>, you and I have had some disagreements before, but I sincerely apologize for my behavior and I hope you''ll still come to my party."'
 	'Everyone then slowly makes their way out of the school.'
 	InvitationToDimkaNYparty = 1

文件差異過大導致無法顯示
+ 277 - 213
locations/olu.qsrc


+ 221 - 184
locations/olutaxi.qsrc

@@ -8,58 +8,60 @@ if $ARGS[0] = 'station':
 	if DjibrilQW['taxi'] = 1:
 		DjibrilQW['taxi'] = 0
 		if DjibrilQW['meet'] = 1:
-			'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-			'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down.'
-			'Djibril smiles to you and he looks a lot like his uncle when he does that. "Hello again <<$pcs_nickname>>."'
-			'You can''t help but smile back to him. "Hello Djibril."'
-			'Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+			'He sits back down on the bench and you walk over and take a seat next to him. "No luck finding customers?"'
+			'He shakes his head, but smiles. "Not yet, but I will, you''ll see. Some always take Olu up on offer." He seems confident and undeterred by being turned down.'
+			'Djibril smiles at you. He looks a lot like his uncle when he does that. "Hello again, <<$pcs_nickname>>."'
+			'You can''t help but smile back at him. "Hello, Djibril."'
 		else
 			DjibrilQW['meet'] = 1
-			'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-			'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down. Then he adds. "This is my nephew Djibril, he goes to the University in Saint Petersburg." Djibril smiles to you and he looks a lot like his uncle when he does that.'
-			'You can''t help but smile back to him. "Hello Djibril."'
-			'"Hello <<$pcs_nickname>>, my uncle has told me about you. The niece of Luda." His Russian is very good, he doesn''t have much of a accent at all. Maybe they have time to talk, or perhaps you should let Olu work. Maybe Olu would even give you a ride locally and save you from walking.'
+			'He sits back down on the bench and you walk over and take a seat next to him. "No luck finding customers?"'
+			'He shakes his head, but smiles. "Not yet, but I will, you''ll see. Some always take Olu up on offer." He seems confident and undeterred by being turned down. "This is my nephew, Djibril. He goes to the university in the city."'
+			'Djibril smiles at you. He looks a lot like his uncle when he does that.'
+			'You can''t help but smile back at him. "Hello, Djibril."'
+			'"Hello <<$pcs_nickname>>, my uncle has told me about you. The niece of Luda." His Russian is very good and he doesn''t have much of an accent at all.'
 		end
-		act 'Tell Olu good luck':
+		act 'Wish Olu good luck':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You nod to them. "Ok well good luck, I will let you get back to work and nice meeting you Djibril."'
-			'You get up and he says. "Thank you and you have a good day as well."'
-			'While Djibril says. "It was nice meeting you as well." With that you walk away and let Olu get back to work.'
-			act 'Leave': gt'pav_train_hall'
+			'You nod at them. "Well, good luck! I''ll let you get back to work now. Nice meeting you, Djibril."'
+			'You get up and he smiles at you. "Thank you. You have a good day as well."'
+			'"It was nice meeting you as well," Djibril says before you walk away and let Olu get back to work.'
+			act 'Leave': gt 'pav_train_hall'
 		end
 		act 'Can you give me a ride?':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You hesitate a moment before saying. "Can you maybe give me a ride?"'
-			'Olu glances over and smiles. "Of course, follow me." With that he gets up and walks out of the train station, down the stairs and down the street a bit before turning down a alleyway, Djibril follows along behind you.'
+			'You hesitate a moment before asking. "Can you give me a ride?"'
+			'Olu glances over and smiles. "Of course, follow me."'
+			'He gets up and walks out of the train station before heading down the street and turning down an alleyway. Djibril follows along behind you.'
 			act 'Follow him':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
-				'As you walk into the alleyway you see his van he converted into a taxi sitting there.'
+				'As you walk into the alleyway, you see the van he''s converted into a taxi.'
 				if first_taxi = 0:
 					first_taxi = 1
-					'You wonder why he parked here. "Why is your van parked here?" You ask him'
-					'He stops at the van and unlocks it as he answers you. "Police write me tickets if I park in front of the station, so I leave it here and then run down and drive it up to pick up people at the front."'
-					'You shake your head. "That''s terrible, they shouldn''t harass you like that."'
-					'Djibril agrees "She is right uncle, it is worse here than in the city."'
-					'He shrugs a bit as he gets in, he waits for you to get in as well before answering. "It ok, it be what it be. Now where you need go?" Djibril gets into the back seat.'
+					'"Why is your van parked here?" you ask.'
+					'He stops at the van and unlocks it as he answers you. "Police write tickets when I park at station, so I leave it here and then run and drive it up to pick up people at front."'
+					'You shake your head. "That''s terrible! They shouldn''t harass you like that."'
+					'Djibril agrees. "She''s right, uncle. It''s worse here than in the city."'
+					'He shrugs as he gets in. He waits for you and Djibril to get in before answering. "It okay. It be what it be. Now where you need go?"'
 				else
-					'You shake your head in disgust, knowing why he has to park his van in the alleyway, so to keep the local police from harassing him.'
-					'He unlocks the van and gets in it, once you climb inside he turns to you and says. "Where you need go?" As Djibril climbs into the back seat.'
+					'You shake your head in disgust, knowing he has to park his van in the alleyway to stop the local police from harassing him.'
+					'He unlocks the van and gets in. Once you and Djibril climb inside, he turns to you. "Where you need go?"'
 				end
 				act 'Ride along':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_drive.jpg"></center>'
-					'Olu starts up the van and pulls it out of the alleyway, out onto the street. Olu is listening to some music you have never heard before, you don''t even know what they are saying. It doesn''t take to long before you arrive at your destination. Olu pulls over to the curb and stops his van. "We are here, you be careful now, yes."'
-					'You wave to Djibril as well. "It was nice meeting you."'
+					'Olu starts up the van and drives out onto the street, listening to some music in a language you don''t understand. It doesn''t take too long before you arrive at your destination, where Olu pulls over to the curb and stops. "We are here. You be careful now, yes?"'
+					'You turn to Djibril. "It was nice meeting you."'
 					'Djibril smiles in return. "It was nice meeting you as well."'
-					'You smile to Olu. "I will and thanks for the ride."'
-					'Olu returns the smile. "Any time, goodbye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
+					'You smile at Olu. "I will. Thanks for the ride."'
+					'Olu returns the smile. "Any time, goodbye."'
+					'Once you close the door and he''s sure you''re safely on the sidewalk, he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
 					act 'Go to the Old Town': gt 'pushkin'
 				end
@@ -68,69 +70,76 @@ if $ARGS[0] = 'station':
 		act 'Talk to them':
 			*clr & cla
 			minut += 30
-			npc_rel['A55'] +=1
-			npc_rel['A82'] +=1
+			npc_rel['A55'] += 1
+			npc_rel['A82'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 			if OluQW['sex'] = 1:
-				'You ask. "Mind if i sit and talk with you guys for a while?"'
-				'Olu scoot over to make room for you. "No of course not."'
-				'You take a seat and soon the three of you are talking. They ask you about school, Djibril talks about the University and living in the city. They talk about some of the funny or odd things to them at least they have seen since living in Russia and you tell them about a variety of things. All and all you have a good conversation with them. Only occasionally interrupted as Olu gets up to try and get a fare. Djibril seems to be paying you more and more attention the longer you talk. Olu seems to take notice as well and finally says. "If the two of you would like to talk in private with out a adult around. You can go talk in my taxi." Djibril seems to like the idea but waits for you to answer.'
+				'"Mind if I sit and talk with you guys for a while?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start chatting. They ask you about school while Djibril talks about the university and living in the city. They then talk about some of the funny or odd things they''ve seen since moving in Russia.'
+				'All and all you have a good conversation with them, only occasionally interrupted as Olu gets up to try and get a fare. Djibril seems to be paying more and more attention to you the longer you talk, which Olu seems to notice. "If the two of you would like to talk private without adult, you can go talk in my taxi."'
+				'Djibril seems to like the idea, but waits for you to answer.'
 				act 'Accept': gt 'olutaxi', 'djibril_taxi_sex'
 				act 'Decline':
 					*clr & cla
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-					'You shake your head no. "Maybe some other time."'
-					'Olu nods and smiles. "Ok." Then they go back to just talking to you about a variety of topics, but Olu also goes back up to trying to find a fare, after a little bit longer he does finally find a well dressed man that is looking for a ride. Olu waves bye to you as he leads the man outside to his taxi. Djibril tells you bye as well and follows his uncle and the man outside.'
-					act 'Leave': gt'pav_train_hall'
+					'You shake your head. "Maybe some other time."'
+					'Olu nods and smiles and you go back to talking about a variety of topics while Olu keeps trying to find a fare. After a while, he finally finds one and waves goodbye to you as he leads the well dressed man outside to his taxi. Djibril also bids you farewell and follows his uncle and the man outside.'
+					act 'Leave': gt 'pav_train_hall'
 				end
 			else
-				'You ask. "Mind if i sit and talk with you guys for a while?"'
-				'Olu scoot over to make room for you. "No of course not."'
-				'You take a seat and soon the three of you are talking. They ask you about school, Djibril talks about the University and living in the city. They talk about some of the funny or odd things to them at least they have seen since living in Russia and you tell them about a variety of things. All and all you have a good conversation with them. Only occasionally interrupted as Olu gets up to try and get a fare. Finally someone takes him up on his offer and he and Djibril tell you buy. Djibril helps the people with some luggage, you guess they are tourist, while Olu rushes out to go pull the taxi around. They both wave bye to you as they depart.'
-				act 'Leave': gt'pav_train_hall'
+				'"Mind if I sit and talk with you guys for a while?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start chatting. They ask you about school while Djibril talks about the university and living in the city. They then talk about some of the funny or odd things they''ve seen since moving in Russia.'
+				'All and all you have a good conversation with them, only occasionally interrupted as Olu gets up to try and get a fare. Someone finally takes him up on his offer and he and Djibril bid you farewell. Djibril helps them with some luggage while Olu rushes out to pull the taxi around. They both wave goodbye to you as they depart.'
+				act 'Leave': gt 'pav_train_hall'
 			end
 		end
 	else
-		'Once he sits back down on the bench you walk over to him and take a seat on the bench next to him. "No luck finding customers?"'
-		'He shakes his head but smiles. "Not yet but I will, you will see, some always take Olu up on offer." He seems confident and undeterred by being turned down. You can''t help but smile back to him. Maybe he has time to talk, or perhaps you should let him work. Maybe he would even give you a ride locally and save you from walking.'
-		act 'Tell him good luck':
+		'He sits back down on the bench and you walk over and take a seat next to him. "No luck finding customers?"'
+		'He shakes his head, but smiles. "Not yet, but I will, you''ll see. Some always take Olu up on offer." He seems confident and undeterred by being turned down. You can''t help but smile back at him. Maybe he has time to talk, or perhaps you should let him work. Maybe he would even give you a ride locally and save you from walking?'
+		act 'Wish him good luck':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You nod to him. "Ok well good luck, I will let you get back to work." You get up and he says. "Thank you and you have a good day as well." With that you walk away and let him get back to work.'
-			act 'Leave': gt'pav_train_hall'
+			'You get up and nod at him. "Well good luck, I''ll let you get back to work."'
+			'He smiles. "Thank you. Have a good day."' 
+			'With that, you walk away and let him get back to work.'
+			act 'Leave': gt 'pav_train_hall'
 		end
 		act 'Can you give me a ride?':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-			'You hesitate a moment before saying. "Can you maybe give me a ride?"'
-			'He glances over and smiles. "Of course, follow me." With that he gets up and walks out of the train station, down the stairs and down the street a bit before turning down a alleyway.'
+			'You hesitate a moment before asking. "Can you give me a ride?"'
+			'He glances over and smiles. "Of course, follow me."'
+			'He gets up and walks out of the train station before heading down the street and turning down an alleyway.'
 			act 'Follow him':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
-				'As you walk into the alleyway you see his van he converted into a taxi sitting there.'
+				'As you walk into the alleyway, you see the van he''s converted into a taxi.'
 				if first_taxi = 0:
 					first_taxi = 1
-					'You wonder why he parked here. "Why is your van parked here?" You ask him'
-					'He stops at the van and unlocks it as he answers you. "Police write me tickets if I park in front of the station, so I leave it here and then run down and drive it up to pick up people at the front."'
-					'You shake your head. "That''s terrible, they shouldn''t harass you like that."'
-					'He shrugs a bit as he gets in, he waits for you to get in as well before answering. "It ok, it be what it be. Now where you need go?"'
+					'"Why is your van parked here?" you ask.'
+					'He stops at the van and unlocks it as he answers you. "Police write tickets when I park at station, so I leave it here and then run down and drive it up to pick up people at front."'
+					'You shake your head. "That''s terrible! They shouldn''t harass you like that."'
+					'He shrugs as he gets in, but waits for you to get in as well before answering. "It okay, it be what it be. Now where you need go?"'
 				else
-					'You shake your head in disgust, knowing why he has to park his van in the alleyway, so to keep the local police from harassing him.'
-					'He unlocks the van and gets in it, once you climb inside he turns to you and says. "Where you need go?"'
+					'You shake your head in disgust, knowing he has to park his van in the alleyway to stop the local police from harassing him.'
+					'He unlocks the van and gets in it. Once you climb inside, he turns to you. "Where you need go?"'
 				end
 				act 'Ride along':
 					*clr & cla
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_drive.jpg"></center>'
-					'He starts up the van and pulls it out of the alleyway, out onto the street. He is listening to some music you have never heard before, you don''t even know what they are saying. It doesn''t take to long before you arrive at your destination. He pulls over to the curb and stops his van. "We are here, you be careful now, yes."'
-					'You smile to him. "I will and thanks for the ride."'
-					'He returns the smile. "Any time, goodbye." Once he you close the door and he is sure you are safely on the sidewalk he pulls away and drives off.'
+					'Olu starts up the van and drives out onto the street, listening to some music in a language you don''t understand. It doesn''t take too long before you arrive at your destination, where Olu pulls over to the curb and stops. "We are here. You be careful now, yes?"'
+					'You smile at him. "I will. Thanks for the ride."'
+					'He returns the smile. "Any time, goodbye."'
+					'Once you close the door and he''s sure you''re safely on the sidewalk, he pulls away and drives off.'
 					act 'Go to Pavlovsk Residential area': gt 'pav_residential'
 					act 'Go to the Old Town': gt 'pushkin'
 				end
@@ -138,29 +147,32 @@ if $ARGS[0] = 'station':
 		end
 		act 'Mind if we talk?':
 			*clr & cla
-			npc_rel['A55'] +=1
+			npc_rel['A55'] += 1
 			minut += 30
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
 			if OluQW['sex'] = 1:
-				'You ask. "Mind if I sit and talk with you, for a while?"'
-				'Olu scoots over to make room for you. "No of course not."'
-				'You take a seat and soon the two of you are talking. He asks you about school and boys you like. He tells you about some of the funny or odd things to him at least he has seen since living in Russia and you tell him about a variety of things. All and all you have a good conversation with him. Only occasionally interrupted as Olu gets up to try and get a fare. After a bit he stops even getting up and seems a lot more interested in just talking to you. Finally he glances at the doors and says. "Would you like to go talk in my taxi? It is parked out of the way where no one would see." You can tell by the lust in his eyes as he looks at you and the tone of his voice what he really wants to go do in his taxi, but maybe it would be fun.'
+				'"Mind if I sit and talk with you?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start talking. He asks you about school and tells you about some of the funny or odd things he''s seen since moving to Russia while you tell him about a variety of things.'
+				'All and all you have a good conversation with him, only occasionally interrupted as Olu gets up to try and get a fare. After a while, he stops trying and seems a lot more interested in just talking to you before he finally glances at the doors. "Would you like to go talk in my taxi? It is parked out of the way where no one would see."'
+				'You can tell by the lust in his eyes and the tone of his voice what he really wants to do in his taxi...'
 				act 'Accept': gt 'olutaxi', 'olu_taxi_sex'
 				act 'Decline':
 					*clr & cla
 					minut += 15
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/shared/headshots_main/big55.jpg"></center>'
-					'You shake your head no. "Maybe some other time."'
-					'He nods and smiles. "Ok." Then he goes back to just talking to you about a variety of topics, but he also goes back up to trying to find a fare, after a little bit longer he does finally find a well dressed man that is looking for a ride. Olu waves bye to you as he leads the man outside to his taxi.'
-					act 'Leave': gt'pav_train_hall'
+					'You shake your head. "Maybe some other time."'
+					'He nods and smiles before he goes back to talking to you about a variety of topics, but he also goes back up to trying to find a fare. After a while, he finally finds one and waves goodbye to you as he leads the well dressed man outside to his taxi.'
+					act 'Leave': gt 'pav_train_hall'
 				end
 			else
-				'You ask. "Mind if I sit and talk with you, for a while?"'
-				'Olu scoots over to make room for you. "No of course not."'
-				'You take a seat and soon the two of you are talking. He asks you about school and boys you like. He tells you about some of the funny or odd things to him at least he has seen since living in Russia and you tell him about a variety of things. All and all you have a good conversation with him. Only occasionally interrupted as Olu gets up to try and get a fare. Finally someone takes him up on his offer and he and helps them with there luggage, they are tourist if you had to guess. He waves bye to you as he helps them carry their luggage outside.'
-				act 'Leave': gt'pav_train_hall'
+				'"Mind if I sit and talk with you for a while?" you ask.'
+				'Olu scoots over to make room for you. "No, of course not."'
+				'You take a seat and start talking. He asks you about school and tells you about some of the funny or odd things he''s seen since moving to Russia while you tell him about a variety of things.'
+				'All and all you have a good conversation with him, only occasionally interrupted as Olu gets up to try and get a fare. Someone finally takes him up on his offer and he waves goodbye to you as he helps them carry their luggage outside.'
+				act 'Leave': gt 'pav_train_hall'
 			end
 		end
 	end
@@ -172,10 +184,11 @@ if $ARGS[0] = 'djibril_taxi_sex':
 	minut += 5
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-	'You agree to go talk in private you are fairly sure what he has in mind though already. Djibril gets up and Olu gives him the keys, he then leads you out of the train station and down the street into the alleyway, at the end of the alley you see Olu''s van parked. As you walk up to it, he unlocks the side door and climbs in the back of it, waiting for you to climb in after him. You close the door behind you, he starts by asking you some questions about your school, what you do for fun, making general small talk. You find out he goes to the University in the city, this is his first year there. After a bit you ask him what he thinks about Russia and if he likes it here.'
+	'You''re fairly certain what he has in mind, but agree anyway. Djibril gets up and Olu gives him the keys before he leads you out of the train station and down the street into the alleyway, where you see Olu''s van parked.'
+	'As you walk up to it, he unlocks the side door and climbs into the back, waiting for you to climb in after him. You close the door behind you and he starts making general small talk. You find out he goes to the university in the city and that this is his first year there.'
 	*nl
-	'"What do you think of the city and living in Russia in general?"'
-	'He shurgs a bit. "In some ways it is better than home and in other ways it is worse, there is a fair amount of racism. Especially if you go to some of the smaller towns like here." He pauses a moment but before you can say anything he speaks again. "But the Russian girls more than make up for it." He says as he leans close and then starts kissing you.'
+	'"So what do you think of the city and living in Russia in general?" you ask.'
+	'He shurgs. "In some ways, it''s better than home and in other ways it''s worse. There''s a fair amount of racism, especially if you go to some of the smaller towns like here." He pauses, but before you can say anything he speaks again. "But the Russian girls more than make up for it..." he says as he leans close and starts kissing you.'
 	gs 'willpower', 'kiss', 'resist', 'medium'
 	if will_cost <= pcs_willpwr:
 		act 'Stop him (<<will_cost>> Willpower)':
@@ -185,48 +198,52 @@ if $ARGS[0] = 'djibril_taxi_sex':
 			DjibrilQW['invite'] = 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-			'You pull away from him, but he follows you still kissing you while one hand cups one of your breasts. You put both your hands against his chest and push him hard enough he pulls back. He looks at you looking confused, he obviously thought this is what you wanted. "Sorry I thought this is what you wanted."'
-			'You shake your head no. "No I just wanted to talk is all, get to know you. Maybe some other time."'
+			'You pull away from him, but he keeps kissing you while one hand cups one of your breasts. You put both your hands against his chest and push him hard enough that he pulls back. He looks at you in confusion. "Sorry, I thought this is what you wanted."'
+			'You shake your head. "No, I just wanted to talk and get to know you. Maybe some other time."'
 			*nl
-			'He nods but seems to have lost a lot of interest, the two of you talk for a bit but he seems a bit distracted. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he starts to walk off and then stops. "If you want come see me at the University dorms if you are ever in the city." He tells you which dorm building and room is his, then tells you bye as he heads back towards the train station.'
-			act 'Leave':minut += 3 & gt 'pav_train_hall'
+			'He nods, but seems to have lost a lot of interest. The two of you continue chatting, but he seems a bit distracted and says he should get the keys back to his uncle so he can work. "If you want, come see me at the university dorms if you''re ever in the city."'
+			'He tells you which dorm building and room is his, then says goodbye as he heads back to the train station.'
+			act 'Leave': minut += 3 & gt 'pav_train_hall'
 		end
 	else
 		act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 	end
-	act 'Makeout':
+	act 'Make out':
 		*clr & cla
-		npc_rel['A82'] +=1
+		npc_rel['A82'] += 1
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi1.jpg"></center>'
-		'You start kissing him back. As the two of you kiss, he pulls you over into his lap. You straddle his lap facing him as the two of you keep kissing. His hands start to roam around your body. He squeezes your boobs and butt at times, rubs your back, arms or thighs at other times. Eventually his hands start to go under your clothes as well and he starts trying to remove your clothing.'
+		'You start kissing him back and he pulls you over into his lap, the two of you continuing to make out as his hands start roaming over your body. Eventually, he starts trying to remove your clothes.'
 		gs 'arousal', 'foreplay', 3
 		gs 'stat'
 		gs 'willpower', 'foreplay', 'resist', 'medium'
 		if will_cost <= pcs_willpwr:
 			act 'Stop him (<<will_cost>> Willpower)':
 				*clr & cla
-				npc_rel['A82'] -=1
+				npc_rel['A82'] -= 1
 				gs 'willpower', 'pay', 'resist'
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-				'You pull his hands away from your clothes, to keep him from undressing you. You roll off his lap back onto the seat to put some space between the two of you. He looks at you looking confused, he obviously thought this is what you wanted. "Why did you stop? what''s wrong?."'
-				'You sigh. "Nothing, I liked making out with you. I just didn''t want to go any further at least not yet."'
-				'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. The two of you talk for a bit but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. Finally he says he should get the keys back to his uncle so he can work. With that the two of you get out, he tells you bye as he heads back towards the train station.'
+				'You pull his hands away from you before rolling off his lap and back onto the seat to put some space between the two of you. He looks at you in confusion. "Why did you stop? What''s wrong?"'
+				'You sigh. "Nothing. I liked making out with you, I just didn''t want to go any further. At least not yet."'
+				'He nods, but you can tell he''s frustrated. The two of you go back to chatting, but he seems a bit distracted, likely by the bulge in his pants that has not gone away yet. "I should get the keys back to my uncle so he can work."'
+				'He says goodbye before he heads back to the train station.'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pav_train_hall'
+				act 'Leave': minut += 3 & gt 'pav_train_hall'
 			end
 		else
 			act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 		act 'Undress':
 			*clr & cla
-			npc_rel['A82'] +=1
+			npc_rel['A82'] += 1
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi2.jpg"></center>'
-			'You don''t stop him from removing your clothes, you remove his shirt as you make out. The two of you keep kissing and making out as he undresses you, you can feel beneath your crotch the bulge in his pants growing and getting harder with each item of clothing he removes from you. Once your breasts are exposed he kisses, licks and sucks on your nipples. With your ass bare he grabs your cheeks and squeezes the tight and pulls them apart, spreading them wide as he does. He works his way up for your breasts to your neck and finally your ears, kissing and nibbling as he goes. Once he reaches your ear he whispers to you. "I want to fuck you." As he said that you feel his hands go between your legs, as he starts to unbutton his pants.'
+			'You don''t stop him and start undressing each other as you make out. You can feel the bulge in his pants growing and getting harder with each item of clothing he removes from you. Once your breasts are exposed, he licks and sucks on your nipples.'
+			'He then works his way up your neck and whispers in your ear. "I want to fuck you..."'
+			'You feel his hands go between your legs as he starts to unbutton his pants.'
 			gs 'arousal', 'flashlite', 5
 			gs 'arousal', 'foreplay', -5
 			gs 'stat'
@@ -235,32 +252,33 @@ if $ARGS[0] = 'djibril_taxi_sex':
 				act 'Stop him (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
-					npc_rel['A82'] -=1
+					npc_rel['A82'] -= 1
 					minut += 5
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/taxi_chat.jpg"></center>'
-					'You roll off his lap back onto the seat to put some space between the two of you and you start grabbing your discarded clothes and getting dressed again. He looks at you looking confused, he obviously thought this is what you wanted. "Why did you stop? what''s wrong?."'
-					'You shake your head. "Nothing, I liked making out with you. I just... I can''t this is too much too soon, sorry."'
-					'He nods but you can tell he is frustrated and the bulge in his pants is a sure indicator he was really expecting more. Once you are dressed you open the door and climb out. "Sorry." You tell him as you get out and walk away. He gets out behind and closes the door as you walk away.'
+					'You roll off his lap back onto the seat to put some space between the two of you before you start grabbing your discarded clothes and getting dressed again. He looks at you in confusion. "Why did you stop? What''s wrong?"'
+					'You shake your head. "Nothing. I liked making out with you, I just... I can''t. This is too much too soon."'
+					'He nods, but you can tell he''s frustrated. Once you''re dressed, you open the door and climb out. He gets out behind you and closes the door as you walk away.'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train_hall'
+					act 'Leave': minut += 3 & gt 'pav_train_hall'
 				end
 			else
 				act 'Stop him (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 			act 'Blow him':
 				*clr & cla
-				npc_rel['A82'] +=1
+				npc_rel['A82'] += 1
 				npc_sex['A82'] = 1
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi3.jpg"></center>'
-				'You climb off him as he pulls down his pants and underwear, his massive cock springs free. He is not as big as his uncle but he is not a lot smaller either, huge cocks must run in the family. You grab ahold of it and can''t even wrap your fingers all the way around it, you start jerking him off then you lean over and start sucking on the head of his dick. You slowly work your mouth lower, his monstrous dick causes your jaws to stretch as you take him into your mouth. He moans as you suck his cock and jerk it off with one hand. He reaches over your body with one arm and starts rubbing and fingering your pussy.'
+				'You climb off him as he pulls down his pants and underwear, his massive cock springing free. He''s not as big as his uncle, but he''s not that much smaller either. You grab hold of it and can''t even wrap your fingers all the way around it as you start jerking him off. You then lean over and start sucking on the head as you slowly work your mouth lower, his monstrous dick causing your jaw to stretch as you take him into your mouth.'
+				'He moans as you suck his cock and jerk it off with one hand, reaches over to start teasing your pussy.'
 				*nl
 				if stat['think_virgin'] = 1:
-					'His fingers probe your virgin pussy carefully, careful not to break your hymen.'
-					'He alternates between rubbing your clit and fingering your pussy, as you start getting aroused and wet, he starts pulling his wet fingers out of your pussy and rubbing them on your asshole, after several times of that he starts to finger your asshole as well, it seems he shares another thing with his uncle as well, love of anal sex.'
-				end
+					'His fingers gently probe your virgin pussy, careful not to break your hymen.'
+				end	
+				'He alternates between rubbing your clit and fingering your pussy. As you start getting wet, he pulls his fingers out of your pussy and starts rubbing them on your asshole before he starts fingering your backdoor as well.'
 				gs 'arousal', 'bj', 5
 				gs 'arousal', 'hj', -5
 				gs 'arousal', 'vaginal_finger', -5
@@ -272,7 +290,8 @@ if $ARGS[0] = 'djibril_taxi_sex':
 						gs 'boyStat', 'A82'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi4.jpg"></center>'
-						'Once you are nice and wet, he pulls your head off his dick and manhandles you, easily turning you around. Until you are on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then he pulls your by your legs until your knees are barely still on the seat with your lower legs hanging off the seat, outside. He steps up between your lower legs, you feel the tip of his cock rubbing against your wet slit, then he pushes it in slowly. You feel your pussy stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking you.'
+						'Once you''re nice and wet, he pulls your head off his dick and manhandles you, easily turning you around until you''re on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then pulls you into position by the legs.'
+						'You feel the tip of his huge cock rubbing against your wet slit before he slowly pushes it in. You feel your pussy stretching and filling as he pushes his <<dick>>cm <<$dick_girth>> dick inside you, moaning loudly as he pushes himself deep. He wastes no time before he starts fucking you.'
 						gs 'arousal', 'vaginal', 5, 'rough'
 						gs 'stat'
 						act 'Pussy pounding':
@@ -280,14 +299,15 @@ if $ARGS[0] = 'djibril_taxi_sex':
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi5.jpg"></center>'
 							if analplugin = 1:
-								'He pulls nearly the full length of his shaft after you, before burying himself balls deep in your twat. His balls slap against your clit with every thrust, you can''t help but loudly moan and sometimes gasp a bit as he thrusts inside of you. He might not be as big as his uncle but he is way rougher about it. After several more minutes of fucking you hard and deep, he pulls all the way out of you, leaving you with a sudden empty feeling. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
+								'He pulls nearly the full length of his shaft out of you before burying himself balls deep. You can''t help but loudly moan and sometimes gasp as he thrusts himself inside you. He might not be as big as his uncle, but he''s way rougher.'
+								'After several minutes, he pulls all the way out of you, suddenly leaving you feeling very empty. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
 								if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-								'He grabs your butt cheeks with both hands and spreads them wide and then spits in your gaping asshole.'
+								'He grabs your ass cheeks with both hands and spreads them wide before he spits on your gaping asshole.'
 							else
-								'He pulls nearly the full length of his shaft after you, before burying himself balls deep in your twat. His balls slap against your clit with every thrust, you can''t help but loudly moan and sometimes gasp a bit as he thrusts inside of you. He might not be as big as his uncle but he is way rougher about it. After several more minutes of fucking you hard and deep, he pulls all the way out of you, leaving you with a sudden empty feeling.'
-								*nl
-								if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-								'He grabs your butt cheeks with both hands and spreads them wide and then spits on your asshole.'
+								'He pulls nearly the full length of his shaft out of you before burying himself balls deep. You can''t help but loudly moan and sometimes gasp as he thrusts himself inside you. He might not be as big as his uncle, but he''s way rougher.'
+								'After several minutes, he pulls all the way out of you, suddenly leaving you feeling very empty.'
+								if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+								'He grabs your ass cheeks with both hands and spreads them wide before spitting on your asshole.'
 							end
 							gs 'arousal', 'vaginal', 5, 'rough'
 							gs 'stat'
@@ -307,21 +327,23 @@ if $ARGS[0] = 'djibril_just_anal':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi6.jpg"></center>'
 	if analplugin = 1:
-		'Once you are nice and wet, he pulls your head off his dick and manhandles you, easily turning you around. Until you are on all fours in the back seat facing away from him. He opens the side door and steps out so he can stand up, then he pulls you by your legs until your knees are barely still on the seat with your lower legs hanging off the seat, outside. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
+		'Once you''re nice and wet, he pulls your head off his dick and manhandles you, easily turning you around until you''re on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then pulls you into position by the legs. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again.'
 		*nl
-		if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-		'He grabs your butt cheeks with both hands and spreads them wide and then spits into your gaping asshole. Moments later you feel the slick head of his dick pressed against your gaping anus. His dick slides in fairly easily into your gapped hole, you feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+		'He grabs your ass cheeks with both hands and spreads them wide before spitting on your gaping asshole. Moments later, you feel the slick head of his dick pressing against your gaping asshole. His dick slides in fairly easily and you feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you.'
+		'You moan and groan loudly as he pushes himself deep inside you. He wastes no time and starts roughly fucking your asshole.'
 	else
-		'Once you are nice and wet, he pulls your head off his dick and manhandles you, easily turning you around. Until you are on all fours in the back seat facing away from him. He opens the side door and steps out so he can stand up, then he pulls you by your legs until your knees are barely still on the seat with your lower legs hanging off the seat, outside.'
+		'Once you''re nice and wet, he pulls your head off his dick and manhandles you, easily turning you around until you''re on all fours on the back seat facing away from him. He opens the side door and steps out so he can stand up, then pulls you into position by the legs.'
 		*nl
-		if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-		'He steps up between your lower legs and grabs your butt cheeks with both hands and spreads them wide and then spits on your asshole. Moments later you feel the slick head of his dick pressed against your anus. The tip of his dick presses against your asshole until it finally painfully parts and lets his dick slide in, you gasp in pain. You feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+		'He steps up between your lower legs and grabs your butt cheeks with both hands and spreads them wide and then spits on your asshole. He then presses his dick against your asshole until it painfully parts and lets his dick slide in, causing you to gasp in pain. You feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you.'
+		'You moan and groan loudly as he pushes himself deep inside you. He wastes no time and starts roughly fucking your asshole.' 
 	end
 	gs 'arousal', 'anal', 5, 'rough'
 	gs 'arousal', 'auto_lube', 'anal'
 	gs 'stat'
 	act 'Get butt fucked': gt 'olutaxi', 'djibril_taxi_sex_anal1'
-	act 'Take Selfie': gt 'olutaxi', 'djibril_selfie_anal'
+	act 'Take selfie': gt 'olutaxi', 'djibril_selfie_anal'
 end
 
 if $ARGS[0] = 'djibril_taxi_sex_anal':
@@ -331,14 +353,14 @@ if $ARGS[0] = 'djibril_taxi_sex_anal':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi6.jpg"></center>'
 	if analplugin = 1:
-		'Moments later you feel the slick head of his dick pressed against your gaping anus. His dick slides in fairly easy into your gapped hole, you feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		'Moments later, you feel the slick head of his dick pressing against your gaping anus. His dick slides in fairly easy into your gaping hole, your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. You moan and groan loudly as he pushes himself deep inside you. He wastes no time before he starts roughly fucking your asshole.'
 	else
-		'Moments later you feel the slick head of his dick pressed against your anus. The tip of his dick presses against your asshole until it finally painfully parts and lets his dick slide in, you gasp in pain. You feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. You moan and groan loudly as he pushes himself deeper inside of you. He wastes no time before he starts really fucking your butt hole as if it was a pussy.'
+		'Moments later, you feel the slick head of his dick pressing against your anus until it painfully parts and lets his dick slide in, causig you to gasp in pain. You feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. You moan and groan loudly as he pushes himself deep inside you. He wastes no time before he starts roughly fucking your asshole.'
 	end
 	gs 'arousal', 'anal', 5, 'rough'
 	gs 'stat'
 	act 'Get butt fucked': gt 'olutaxi', 'djibril_taxi_sex_anal1'
-	act 'Take Selfie': gt 'olutaxi', 'djibril_selfie_anal'
+	act 'Take selfie': gt 'olutaxi', 'djibril_selfie_anal'
 end
 
 if $ARGS[0] = 'djibril_selfie_anal':
@@ -347,7 +369,8 @@ if $ARGS[0] = 'djibril_selfie_anal':
 	djibrilphoto[1] = 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/pc/activities/phone/djibril/1.jpg"></center>'
-	'As Djibril very large black dick violates your ass, you grab your phone out of your purse. You try to focus but the hard pounding your ass is receiving makes that difficult. You finally manage to get the phone up in front of your face and you take a selfie, you take several more. Djibril seems unaware of maybe he just doesn''t care that you are taking selfies while he ploughs your ass. You take a look at the selfies you took, yep all of them show your mixture of pain and pleasure from the ass pounding you are taking. You pick the one you like the most and save it, while deleting the rest.'
+	'As Djibril violates your ass, you grab your phone out of your purse. You try to focus, but the hard pounding your ass is receiving makes that difficult. You finally manage to get the phone up in front of your face and take several selfies. Djibril is either unaware or just doesn''t care.'
+	'You take a look at the selfies you took before you pick the one you like the most and save it while deleting the rest.'
 	gs 'arousal', 'anal', 2, 'exhibitionism'
 	gs 'arousal', 'auto_lube', 'anal'
 	gs 'stat'
@@ -359,24 +382,26 @@ if $ARGS[0] = 'djibril_taxi_sex_anal1':
 	*clr & cla
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi7.jpg"></center>'
-	'He reaches up and grabs your hip, getting a really firm grip on you, he starts to pick up his efforts and really hammer away at your asshole, he starts grunting and panting soon after. You don''t think he is going to last much longer, yet he keeps going for a couple of more minutes. Until he finally pulls out of your ass. As he does he pushes you down on your side.'
+	'He reaches up and grabs your hip, getting a really firm grip on you as he starts to pick up the pace and really hammer away at your asshole. He starts grunting and panting soon after and you don''t think he''s going to last much longer, yet he keeps going until he finally pulls out of you and pushes you down on your side.'
 	gs 'arousal', 'anal', 5, 'rough'
 	gs 'stat'
-	act 'Cum prize':
+	act 'Continue':
 		*clr & cla
 		DjibrilQW['invite'] = 1
 		minut += 10
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/city/university/boy/djibril/sex/taxi/taxi8.jpg"></center>'
-		'He crawls inside, kneeling next to where you lay on your side on the seat, with your butt facing the front. He starts jerking off and soon you feel his cum splattering all over you butt cheek. Spurt after spurt coats your butt, until finally they stop and he groans loudly one last time. He then leans down and kisses you, then whispers in your ear. "That was amazing I can''t wait to do that again." After that he steps back outside and grabs his clothes and starts dressing in the alleyway.'
+		'He crawls inside and kneels next to you before he starts jerking off and you soon feel his cum splattering all over your ass. Spurt after spurt coats you until they finally stop and he groans loudly one last time. He then leans down and kisses you before he whispers in your ear. "That was amazing! I can''t wait to do that again."'
+		'He then steps back outside, grabs his clothes and starts dressing in the alleyway.'
 		*nl
-		'You use a tissue in the back of the van to clean his cum off your butt as best you can before you start getting dressed again. He is done dressing long before you are and he just stands there with a big grin, again reminding you of his uncle as he watches you finished getting dressed. Once you are full dresses you climb out of the van, he closes the door and locks it again. "Well I should get these keys back to my uncle so he can work again. I hope to see you again, come see me at the dorms at the University some time."'
-		'You smile to him. "Maybe I will." Then he heads back to the train station and you head back to the street.'
+		'You use a tissue in the back of the van to clean his cum off you as best you can before you start getting dressed. He''s done dressing long before you and just stands with a big grin on his face, again reminding you of his uncle as he watches you finished getting dressed.'
+		'Once you''re fully dressed, you climb out of the van and he closes the door and locks it. "I should get these keys back to my uncle so he can work again. Come see me at the university dorms some time."'
+		'You smile at him and nod before he heads back to the train station and you head back to the street.'
 		gs 'arousal', 'anal', 2, 'rough'
 		gs 'cum_call', 'butt', 'A82'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train_hall'
+		act 'Leave': minut += 3 & gt 'pav_train_hall'
 	end
 end
 
@@ -384,11 +409,12 @@ if $ARGS[0] = 'olu_taxi_sex':
 	menu_off = 1
 	*clr & cla
 	minut += 5
-	npc_rel['A55'] +=1
+	npc_rel['A55'] += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_chat.jpg"></center>'
-	'You think a moment and figure why not, you could use a good fucking and Olu is always good for that. "Sure let''s go." You tell him.'
-	'He grins as he gets up and leads you out of the station, down the street and around the corner into the alley he parks his taxi. Once you get to the taxi he unlocks the side door and lets you get in first. Once you are inside he gets in after you and closes the door, taking a seat next to you. He promptly pulls your leg over his and rests his other hand on your inner thigh and starts to rub your leg slowly up towards your crotch. After he seems content that you are turned on he starts unbuttoning his pants.'
+	'You think about it before nodding. "Sure. Let''s go."'
+	'He grins as he gets up and leads you out of the station, down the street and around the corner into the alleyway where he parks his taxi. He unlocks the side door and you both climb inside before he closes the door. He promptly rests his hand on your inner thigh and starts rubbing your leg, slowly working up towards your crotch.' 
+	'Content that you''re aroused, he starts unbuttoning his pants.'
 	gs 'arousal', 'foreplay', 2
 	gs 'stat'
 	act 'Change your mind':
@@ -396,40 +422,41 @@ if $ARGS[0] = 'olu_taxi_sex':
 		minut += 3
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/taxi_parked.jpg"></center>'
-		'You pull his hand way from your crotch and close your legs. "Sorry, I can''t, I thought i did but I can''t"'
-		'He looks confused and then concerned. "Everything ok?"'
-		'You nod. "Yeah it''s fine, I just can''t not today. I should really go." You say as you move past him to the door and open it. After you climb out he climbs out after you and closes the door.'
-		'He locks the van back up. "Ok maybe another day then."'
-		'You nod to him. "Sure maybe another day." Then you walk off.'
+		'You pull his hand way and close your legs. "Sorry, I can''t! I thought I did, but I can''t."'
+		'He looks confused, then concerned. "Everything okay?"'
+		'You nod. "Yeah, it''s fine, I just can''t. I should really go," you reply as you climb over him and open the door.'
+		'He climbs out after you and closes the door before locking it. "Okay. Maybe another day then."'
+		'"Sure," you nod before walking away.'
 		gs 'arousal', 'end'
 		gs 'stat'
-		act 'Leave':minut += 3 & gt 'pav_train_hall'
+		act 'Leave': minut += 3 & gt 'pav_train_hall'
 	end
 	act 'Blow him':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi1.jpg"></center>'
-		'He pulls his dick out which is already getting hard. Next he starts alternating between taking your clothes off and his clothes, you help him undress yourself and him. Once he is naked and you are mostly naked, he kneels on the seat and pulls your head over towards his crotch. You turn and get down on all fours on the seat, opening your mouth you take his large cock into it. Your jaws stretch as wide as they can in an effort to accommodate his massive dick. With one hand you start playing with his balls as you bob your head back and forth on his dick.'
+		'You help each other undress, his cock slowly growing hard as he kneels on the seat and pulls you over. Your jaw stretches as wide as it can to accommodate his massive dick as you start bobbing your head back and forth as you fondle his balls with your hand.'
 		gs 'arousal', 'bj', 5
 		gs 'stat'
-		act 'Keep sucking him':
+		act 'Keep sucking':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi3.jpg"></center>'
-			'You try and take as much of his cock into your mouth as you can but you can only get about a third of the way down his shaft before you start to gag on it. He moans in pleasure anyway from your efforts to take more of him into your mouth. He starts to rub his hand up and down your spine gentle caressing you as you suck on his dick. You can tell he is wanting to fuck you, as his hands start roaming your body more and more, he hasn''t yet tried to force your to turn around but you know it is coming.'
+			'You try and take as much of his cock into your mouth as you can, but you can only get about a third of the way down his shaft before you start to gag on it.'
+			'He moans in pleasure anyway as he starts to rub his hand up and down your spine, gently caressing you as you suck on his dick. You can tell he''s eager to fuck you as his hands start roaming your body.'
 			gs 'arousal', 'bj', 5
 			gs 'stat'
-			if stat['think_virgin'] = 0:act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
+			if stat['think_virgin'] = 0: act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
 			act 'Just the butt': gt 'olutaxi', 'olu_taxi_sex_anal'
 
 			gs 'willpower', 'bj', 'resist', 'easy'
 			if will_cost <= pcs_willpwr:
-				act 'Just a BJ (<<will_cost>> Willpower)':
+				act 'Just a blowjob (<<will_cost>> Willpower)':
 					*clr & cla
 					gs 'willpower', 'pay', 'resist'
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
-					'You decide you don''t feel like fucking today and just want to suck him off. So you climb off the seat and squat in the floor instead and keep sucking his dick, so as not to tempt him to try and turn you around. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his cock.'
+					'You don''t feel like it today, so you climb off the seat and squat on the floor as you keep sucking his dick. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching.'
 					gs 'arousal', 'bj', 5, 'deepthroat'
 					gs 'stat'
 					act 'Suck him off':
@@ -437,20 +464,21 @@ if $ARGS[0] = 'olu_taxi_sex':
 						minut += 10
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi5.jpg"></center>'
-						'When he starts to moan louder you grab ahold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes of this, he moans especially loudly and you feel his sperm squirting into your mouth, filling it with his seed. You milk his dick until no more sperm comes out of it, as it starts to go soft he withdraws it from your mouth. A bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+						'When he starts to moan louder, you grab hold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes, he moans loudly and you feel his cum squirting into your mouth. As it starts to go soft, he withdraws and a bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+						'Once finished, he starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 						*nl
-						'Once finished he starts to get dressed, you do the same and clean up the little bit of cum on your chin and lips. He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-						'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-						'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+						'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+						'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+						'He nods and the two of you head off in separate directions.'
 						gs 'arousal', 'bj', 5
 						gs 'cum_call', 'mouth', 'A55'
 						gs 'arousal', 'end'
 						gs 'stat'
-						act 'Leave':minut += 3 & gt 'pav_train_hall'
+						act 'Leave': minut += 3 & gt 'pav_train_hall'
 					end
 				end
 			else
-				act 'Just a BJ (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+				act 'Just a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 			end
 		end
 		gs 'willpower', 'cuni', 'force', 'easy'
@@ -460,10 +488,11 @@ if $ARGS[0] = 'olu_taxi_sex':
 				gs 'willpower', 'pay', 'force'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi2.jpg"></center>'
-				'You stop sucking his dick and instead lay back on the seat and spread your legs wide, exposing your glistening wet pussy to him. He understands what you want, without you even having to ask. He kneels down on the floor, leaning forward, placing his head between your legs, he begins to lick, kiss and suck on your clit. He alternates between that and sliding his tongue between your pussy lips to tongue fuck you as best he can. You feel yourself getting wetter and wetter from his ministrations. Eventually he uses a hand to rub your clit as well, you can tell by his movements he is about to try and fuck you.'
+				'You stop sucking his dick and sit back on the seat and spread your legs wide, exposing your glistening wet pussy to him. He understands what you want without you even having to ask and kneels on the floor before leaning forward and placing his head between your legs.'
+				'He starts alternating between sucking on your clit and sliding his tongue between your pussy lips to tongue fuck you as best he can. You feel yourself getting wet as he starts using a hand to rub your clit as well. You can tell that he''s now eager to fuck you.'
 				gs 'arousal', 'cuni', 5
 				gs 'stat'
-				if stat['think_virgin'] = 0:act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
+				if stat['think_virgin'] = 0: act 'Get fucked': gt 'olutaxi', 'olu_taxi_sex_vaginal'
 				act 'Just the butt': gt 'olutaxi', 'olu_taxi_sex_anal'
 				gs 'willpower', 'bj', 'resist', 'easy'
 				if will_cost <= pcs_willpwr:
@@ -472,7 +501,7 @@ if $ARGS[0] = 'olu_taxi_sex':
 						gs 'willpower', 'pay', 'resist'
 						gs 'stat'
 						'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
-						'You decide you don''t feel like fucking today and just want to suck him off. Before he can raise up and climb between your legs, you pull away from him enough he stops licking your twat. You get off the seat and squat in the floor, encouraging him to get back up. Once he kneels back on the seat you lean forward and start sucking his dick again. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his cock.'
+						'You don''t feel like it today, so you pull away from him and squat on the floor while encouraging him to get back up. Once he sits back on the seat, you lean forward and start sucking his dick again, forcing yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching.'
 						gs 'arousal', 'bj', 5
 						gs 'stat'
 						act 'Swallow his cum':
@@ -480,16 +509,17 @@ if $ARGS[0] = 'olu_taxi_sex':
 							minut += 10
 							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi5.jpg"></center>'
-							'When he starts to moan louder you grab ahold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes of this, he moans especially loudly and you feel his sperm squirting into your mouth, filling it with his seed. You milk his dick until no more sperm comes out of it, as it starts to go soft he withdraws it from your mouth. A bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+							'When he starts to moan louder, you grab hold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes, he moans loudly and you feel his cum squirting into your mouth. As it starts to go soft, he withdraws and a bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+							'Once finished, he starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 							*nl
-							'Once finished he starts to get dressed, you do the same and clean up the little bit of cum on your chin and lips. He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-							'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-							'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+							'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+							'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+							'He nods and the two of you head off in separate directions.'
 							gs 'arousal', 'bj', 5
 							gs 'cum_call', 'mouth', 'A55'
 							gs 'arousal', 'end'
 							gs 'stat'
-							act 'Leave':minut += 3 & gt 'pav_train_hall'
+							act 'Leave': minut += 3 & gt 'pav_train_hall'
 						end
 					end
 				else
@@ -508,7 +538,8 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 	gs 'boyStat', 'A55'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi6.jpg"></center>'
-	'As you lay on your back on the seat, with your legs spread. Olu kneels between your legs and rubs the tip of his dick against your wet slit, he rubs it back and forth until the head of his cock and your pussy lips are nice and wet. Then he slow pushes his <<dick>>cm <<$dick_girth>> dick inside of you, you feel your twat stretching as his monstrous cock invades your body. It leaves you feeling completely full, he starts fucking you slow and steady at first. Not going too deep, but slowly starting to work himself just a little deeper with each stroke.'
+	'As you lay back on the seat with your legs spread, Olu kneels between your legs and rubs the tip of his dick against your wet slit before he slowly pushes his <<dick>>cm <<$dick_girth>> dick inside you.'
+	'You feel your pussy stretching as his monstrous cock invades your body, leaving you feeling completely full as he starts fucking you, slowly working himself just a little deeper with each thrust.'
 	gs 'arousal', 'vaginal', 5
 	gs 'stat'
 	act 'Get fucked':
@@ -516,9 +547,11 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi7.jpg"></center>'
 		if analplugin = 1:
-			'He starts fucking you deeper and faster, he goes as deep into as you can take. When you show signs of discomfort he backs off a little, but eventually as he starts getting into it again he starts to go deeper and harder again. You can''t help but moan loudly as he dick stretches and fills your pussy in every way. As you get used to his length and girth it steadily feels better and better, until it starts feeling amazing. Which only encourages him to fuck you harder and deeper. Several minutes goes by, before he pulls out of you. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again, you can feel the head of his dick rubbing against your gaping anus, you know he wants to fuck you in the butt now.'
+			'He starts fucking you deeper and faster, going as deep you can take. When you show signs of discomfort, he backs off a little, but eventually starts getting into it and starts going deeper and harder again. You can''t help but moan loudly as his dick stretches and fills your pussy, which only encourages him to fuck you harder and deeper.'
+			'Several minutes goes by before he pulls out of you and you feel him grab your buttplug and pull it out, leaving your ass feeling empty, craving to be filled again before you feel the head of his dick rubbing against your gaping asshole.'
 		else
-			'He starts fucking you deeper and faster, he goes as deep into as you can take. When you show signs of discomfort he backs off a little, but eventually as he starts getting into it again he starts to go deeper and harder again. You can''t help but moan loudly as he dick stretches and fills your pussy in every way. As you get used to his length and girth it steadily feels better and better, until it starts feeling amazing. Which only encourages him to fuck you harder and deeper. Several minutes goes by, before he pulls out of you. Moments later you can feel the head of his dick rubbing against your anus, you know he wants to fuck you in the butt now.'
+			'He starts fucking you deeper and faster, going as deep you can take. When you show signs of discomfort, he backs off a little, but eventually starts getting into it and starts going deeper and harder again. You can''t help but moan loudly as his dick stretches and fills your pussy, which only encourages him to fuck you harder and deeper.'
+			'Several minutes goes by before he pulls out of you. Seconds later, you feel the head of his dick rubbing against your asshole.'
 		end
 		gs 'arousal', 'vaginal', 5
 		gs 'stat'
@@ -527,8 +560,9 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 			gs 'boyStat', 'A55'
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi8.jpg"></center>'
-			if mc_inventory['lubricant'] > 0:'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
-			'You just lay there letting him rub the tip of his dick against your asshole, he makes sure it and his dick is nice and slick. Once he is sure of that he gently pushes his <<dick>>cm <<$dick_girth>> cock up your butthole. It stretches until it feels like it can''t stretch anymore and then he is inside you slowly fucking your butt. You moan and groan in a mixture of pleasure and pain, he is slow and easy giving you time to get used to him. As you do though and your moans of pleasure get louder he starts fucking you a little deeper and a little faster.'
+			if mc_inventory['lubricant'] > 0: 'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
+			'You just lay there letting him rub the tip of his dick against your asshole before he gently pushes his <<dick>>cm <<$dick_girth>> cock up your ass. It stretches you wide as he slowly starts fucking your ass.'
+			'You moan and groan in a mix of pleasure and pain as he gently thrusts, but starts fucking you a little deeper and a little faster as your moans of pleasure get louder.'
 			gs 'arousal', 'anal', 5
 			gs 'arousal', 'auto_lube', 'anal'
 			gs 'stat'
@@ -536,37 +570,38 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 				*clr & cla
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi9.jpg"></center>'
-				'As he fucks your butt you start rubbing your clit to add to the pleasure you are feeling. He looks down at you as he loams over you, plowing your ass, as he does he stares right into your eyes and you feel a bit of a connection with him as you stare back into his eyes and the pleasure starts to really build up in you.'
+				'You start rubbing your clit to add to the pleasure you''re feeling. He looks down at you as he loams over you and stares right into your eyes. You feel a bit of a connection with him as you stare back and the pleasure starts to really build up in you.'
 				gs 'arousal', 'anal', 5
 				gs 'arousal', 'vaginal_finger', -5
 				gs 'stat'
-				act 'Cum prize':
+				act 'Continue':
 					*clr & cla
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi13.jpg"></center>'
-					'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, you grab his dick with one hand and start jerking it off. Opening your mouth you aim his dick at your face and before long, large spurts of his cum hits you in the face, some of it goes into your mouth, by the time the spurts of sperm stop you have a lot in your mouth and covering your face. As his dick starts to go limp in your hand you swallow the cum in your mouth. After that you both start getting dressed again.'
+					'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, grabbing his dick in your hand and jerking him off. Opening your mouth, large spurts of his cum hits you in the face while others shoot into your mouth. As his dick starts to go limp in your hand, you swallow the cum in your mouth.'
+					'He starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 					*nl
-					'He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-					'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-					'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+					'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+					'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+					'He nods and the two of you head off in separate directions.'
 					gs 'arousal', 'hj', 2
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'cum_call', 'face', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train_hall'
+					act 'Leave': minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		end
 		gs 'willpower', 'bj', 'resist', 'easy'
 		if will_cost <= pcs_willpwr:
-			act 'Just a BJ (<<will_cost>> Willpower)':
+			act 'Just a blowjob (<<will_cost>> Willpower)':
 				*clr & cla
 				gs 'willpower', 'pay', 'resist'
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi4.jpg"></center>'
-				'You decide you don''t feel like getting butt fucked today and just want to suck him off instead. So when he pulls his dick out of you, you climb off the seat, and squat in the floor instead. He gets up on his knees obviously knowing you want to suck his dick again. You start sucking on his dick and you can taste your own pussy juices on his cock. You force yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching from his dick.'
+				'You don''t feel like getting butt fucked today. When he pulls out of you, you climb off the seat and squat on the floor instead. He gets up on his knees and you start sucking his dick, forcing yourself to take him as deeply into your throat as you can, resisting the urge to gag as you feel your throat stretching.'
 				gs 'arousal', 'bj', 5, 'deepthroat'
 				gs 'stat'
 				act 'Suck him off':
@@ -574,20 +609,21 @@ if $ARGS[0] = 'olu_taxi_sex_vaginal':
 					minut += 10
 					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi5.jpg"></center>'
-					'When he starts to moan louder you grab ahold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes of this, he moans especially loudly and you feel his sperm squirting into your mouth, filling it with his seed. You milk his dick until no more sperm comes out of it, as it starts to go soft he withdraws it from your mouth. A bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+					'When he starts to moan louder, you grab hold of his shaft and start jerking him off as hard as you can while you suck on the head of his dick. After a few minutes, he moans loudly and you feel his cum squirting into your mouth. As it starts to go soft, he withdraws and a bit of his cum leaks from between your lips and dribbles down your chin. You swirl the mouthful of cum around in your mouth before you finally swallow it all down.'
+					'Once finished, he starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 					*nl
-					'Once finished he starts to get dressed, you do the same and clean up the little bit of cum on your chin and lips. He finishes getting dressed first, but he wait for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-					'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-					'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+					'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+					'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+					'He nods and the two of you head off in separate directions.'
 					gs 'arousal', 'bj', 5
 					gs 'cum_call', 'mouth', 'A55'
 					gs 'arousal', 'end'
 					gs 'stat'
-					act 'Leave':minut += 3 & gt 'pav_train_hall'
+					act 'Leave': minut += 3 & gt 'pav_train_hall'
 				end
 			end
 		else
-			act 'Just a BJ (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
+			act 'Just a blowjob (<font color="red"><<will_cost>> Willpower</font>)': '<br><font color="red">You don''t have enough willpower to use this action.</font>'
 		end
 	end
 end
@@ -598,20 +634,20 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi10.jpg"></center>'
 	if analplugin = 1:
-		'He grabs you in his strong hands and spins you around, still on your hands and knees but facing away from him. You feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again, you can feel the head of his dick rubbing against your gaping anus. He pushes your head down until it rests on the seat along with your knees.'
+		'He grabs you in his strong hands and spins you around before you feel him grab your buttplug and pull it out, leaving your ass feeling hollow and empty, craving to be filled again as you feel the head of his dick rubbing against your gaping ashole.'
 		if mc_inventory['lubricant'] > 0:
-			'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
+			'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
 		else
-			'With his other hand he rubs your wet twat, until his fingers are nice and wet with your pussy juices and then he uses that to get your asshole and his dick nice and slick.'
-			'His dick slides fairly easy into your gapped hole, you feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. He starts slowly fucking your butt, not too deep, just slow easy short strokes. As your moans turn to pleasure he picks up the pace a little and goes a little deeper, but still fairly gentle letting you get used to his massive cock.'
+			'He rubs your pussy with his hand until his fingers are wet with your pussy juices, which he uses as lube.'
+			'His dick easily slides into your gaping hole and you feel your ass stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. He starts slowly fucking your ass, being careful not to go too fast or too deep. As your moans grow louder, he picks up the pace a little and goes a little deeper, letting you get used to his massive cock.'
 		end
 	else
-		'He grabs you in his strong hands and spins you around, still on your hands and knees but facing away from him. You can feel the head of his dick rubbing against your gaping anus. He pushes your head down until it rests on the seat along with your knees.'
+		'He grabs you in his strong hands and spins you around before you feel the head of his dick rubbing against your asshole.'
 		if mc_inventory['lubricant'] > 0:
-			'You grab the lube out of your purse and hand it to him. He takes it and squirts a bit on his dick and some on your asshole. He spreads the lube around really well.'
+			'You grab the lube out of your purse and hand it to him. He takes it and squirts some on his dick and some on your asshole. He spreads the lube around really well.'
 		else
-			'With his other hand he rubs your wet twat, until his fingers are nice and wet with your pussy juices and then he uses that to get your asshole and his dick nice and slick.'
-			'The head of his cock presses against your anus, the pressure building until it painfully pops into your ass, causing you to hiss in pain. He stops moving at once until he feels you relax, the he starts to slowly fuck your butt. You feel your asshole stretching and filling up with his <<dick>>cm <<$dick_girth>> dick. He doesn''t go too deep, just slow easy short strokes. As your moans turn from pain to pleasure he picks up the pace a little and goes a little deeper, but still fairly gentle letting you get used to his massive cock.'
+			'He rubs your pussy with his hand until his fingers are wet with your pussy juices, which he uses as lube.'
+			'The head of his cock presses against your asshole, the pressure building until it painfully pops into your ass, causing you to hiss in pain. You feel your asshole stretching as his <<dick>>cm <<$dick_girth>> dick pushes its way inside you. He starts slowly fucking your ass, being careful not to go too fast or too deep. As your moans grow louder, he picks up the pace a little and goes a little deeper, letting you get used to his massive cock.'
 		end
 	end
 	gs 'arousal', 'anal', 5
@@ -621,32 +657,33 @@ if $ARGS[0] = 'olu_taxi_sex_anal':
 		*clr & cla
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi11.jpg"></center>'
-		'He leans over you and starts fucking you a bit harder, a bit faster and a bit deeper. He takes a firm grip on your hip with his large powerful hand and holds you in place rather well, so you can''t really pull away form him or his giant cock as he pumps it into your asshole. You briefly wonder if anyone might look down the alleyway and see in through the windows and guess what is happening or maybe walk down to take a closer look, but soon you find it harder and harder to focus on anything but the dick splitting your ass.'
+		'He leans over you and starts fucking you a little harder and a little deeper. He takes a firm grip on your hip with his large powerful hand and holds you in place, so you can''t pull away from him or his giant cock as he thrusts it into your asshole. You briefly wonder if anyone might look down the alleyway and see what''s happening, but soon you find it harder and harder to focus on anything but the dick splitting your ass.'
 		gs 'arousal', 'anal', 5
 		gs 'stat'
 		act 'Pound that ass':
 			*clr & cla
 			gs 'stat'
 			'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi12.jpg"></center>'
-			'As he starts to grunt he picks up the speed and starts fucking your butt harder and faster, forcing himself deep and deeper up your ass. He doesn''t slown down or back off until he notices your moans start to turn from moans of pleasure back to groans of pain. Then he backs off a little and finds the sweet spot, to go as deep as he can with out hurting you and as fast as you can handle and still moan in pleasure.'
+			'He picks up the speed and starts fucking your ass harder and faster, forcing himself deeper up your ass. He doesn''t slow down until he notices you groaning in pain, backing off a little and finding the sweet spot, going as deep and as fast as he can without hurting you.'
 			gs 'arousal', 'anal', 5
 			gs 'stat'
-			act 'Cum prize':
+			act 'Continue':
 				*clr & cla
 				minut += 10
 				gs 'stat'
 				'<center><img <<$set_imgh>> src="images/characters/pavlovsk/resident/olu/sex/taxi/taxi13.jpg"></center>'
-				'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, you grab his dick with one hand and start jerking it off. Opening your mouth you aim his dick at your face and before long, large spurts of his cum hits you in the face, some of it goes into your mouth, by the time the spurts of sperm stop you have a lot in your mouth and covering your face. As his dick starts to go limp in your hand you swallow the cum in your mouth. After that you both start getting dressed again.'
+				'He pulls out of your ass and gets up, pulling your head over towards his dick. You slide off the seat and kneel down in front of him, grabbing his dick in your hand and jerking him off. Opening your mouth, large spurts of his cum hits you in the face while others shoot into your mouth. As his dick starts to go limp in your hand, you swallow the cum in your mouth.'
+				'He starts to get dressed as you clean up the cum on your chin and lips. He waits for you to finish getting dressed yourself before he opens the van door and you both climb out.'
 				*nl
-				'He finishes getting dressed first, but he waits for you to finish before he opens the van door. He steps outside and waits for you to get out as well. Once you are out he closes the door. "Well I should get back to work, I hope you come visit again." He says with his typical smile.'
-				'You can''t help but smile back. "Sure and I will come visit you again, have a good day at work."'
-				'He nods to you as you starts to head off your way and him back to the station. "You have good day too." Then you both go your separate directions.'
+				'"I should get back to work. I hope you come visit again," he says with his typical smile as he closes the door and locks it.'
+				'You can''t help but smile back. "Sure, I''ll come visit you again. Have a good day at work."'
+				'He nods and the two of you head off in separate directions.'
 				gs 'arousal', 'hj', 2
 				gs 'cum_call', 'mouth', 'A55'
 				gs 'cum_call', 'face', 'A55'
 				gs 'arousal', 'end'
 				gs 'stat'
-				act 'Leave':minut += 3 & gt 'pav_train_hall'
+				act 'Leave': minut += 3 & gt 'pav_train_hall'
 			end
 		end
 	end

+ 3 - 76
locations/pav_disco.qsrc

@@ -353,88 +353,16 @@ if $ARGS[0] = 'disco_dance':
 						gt 'pav_disco', 'albina_too_drunk'
 					end
 				end
-				gs 'stat'
-				act 'Continue': gt 'pav_disco'
-				if alko < 6:
-					verprigrand = rand(0, 100)
-					if verprigrand <= pcs_danc:
-						gs 'pav_disco', 'dance_partner'
-						gs 'stat'
-					end
-				end
-			end
-		end
-		act 'Stand at the wall':
-			*clr & cla
-			menu_off = 1
-			minut += 5
-			!!fat -= 1
-			pcs_mood -= 5
-			frost = 0
-			gs 'stat'
-			'<center><b><font color="maroon">Disco</font></b></center>'
-			if (cumloc[6] = 1 or cumloc[7] = 1) or cumloc[11] = 1:
-				pav_discocum = daystart
-				gs 'fame', 'pav', 'sex', 5
-				pcs_mood -= 40
-				gs 'stat'
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/cumface1.jpg"></center>'
-				'While standing by the wall, a guy notices the cum on your clothes and points and shouts. "Look, this chick is covered in cum! Did you forget to swallow slut?" he says mockingly while laughing. Your cheeks blush with shame and you head for the exit.'
-				act 'Leave': gt 'pav_commcenter'
-				exit
-			end
-			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wallflower.jpg"></center>'
-			if alko > 0:
-				if alko = 1:
-					'You''re buzzed and stand against the wall while watching the others dance.'
-				elseif alko < 4:
-					'You''re tipsy and stand against the wall while watching the others dance.'
-				elseif alko < 6:
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,10) = 1:
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,10) = 1:
-						gt 'pav_disco', 'sonia_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,10) = 1 and locat['A144'] = 25:
-						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand (1,10) = 1:
-						gt 'pav_disco', 'albina_too_drunk'
-					else
-						'You''re pretty drunk and stand against the wall for support as you watch the others dance.'
-					end
-				else
-					if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,5) = 1:
-						gt 'pav_disco', 'katja_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,7) = 1:
-						gt 'pav_disco', 'sonia_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,7) = 1 and locat['A144'] = 25:
-						gt 'pav_disco', 'anushka_too_drunk'
-					elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,7) = 1:
-						gt 'pav_disco', 'albina_too_drunk'
-					end
-				end
-			else
-
-				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/wasted_dance.jpg"></center>'
-				'You''re far too drunk and are barely able to stay on your feet. You''re mostly just drunkenly bumping into other people as you try and dance.'
-				if mid($start_type,1,2) = 'sg' and katjaQW['QWstage']  > 1 and rand(1,3) = 1: 
-					gt 'pav_disco', 'katja_too_drunk'
-				elseif mid($start_type,1,2) = 'sg' and npc_rel['A25'] >= 50 and rand(1,5) = 1:
-					gt 'pav_disco', 'sonia_too_drunk' 
-				elseif mid($start_type,1,2) = 'sg' and npc_rel['A144'] >= 50 and rand(1,5) = 1 and locat['A144'] = 25: 
-					gt 'pav_disco', 'anushka_too_drunk'
-				elseif mid($start_type,1,2) = 'sg' and (AlbinaQW['Friends'] = 2 or (npc_rel['A23'] >= 70 and (grupTipe = 1 or grupTipe = 2 or grupTipe = 3))) and rand(1,5) = 1:
-					gt 'pav_disco', 'albina_too_drunk'
-				end
 			end
 			gs 'stat'
 			act 'Continue': gt 'pav_disco'
 			if alko < 6:
-				if rand(0, 100) <= pcs_danc * pcs_hotcat:
+				verprigrand = rand(0, 100)
+				if verprigrand <= pcs_danc:
 					gs 'pav_disco', 'dance_partner'
 					gs 'stat'
 				end
 			end
-			
 		end
 	end
 end
@@ -499,7 +427,6 @@ if $ARGS[0] = 'wall_stand':
 			if rand(0, 10) <= pcs_hotcat:
 				gs 'pav_disco', 'dance_partner'
 				gs 'stat'
-				exit
 			end
 		end
 	end
@@ -509,7 +436,7 @@ if $ARGS[0] = 'dance_partner':
 	cla
 	!!the creation of a partner to dance
 	temp['pav_disco_partner'] = rand(1,300)
-	if temp['pav_disco_partner'] > boynum or arrsize('$hookup_partners') = 0:
+	if temp['pav_disco_partner'] > boynum or (arrsize '$hookup_partners' = 0):
 		gs 'npcgeneratec', 0, 'guy from the disco', 0, rand(1,4)
 		if npc_finance[$npcID] = 2 and npc_age[$npcID] < 26: npc_age[$npcID] = rand(26, 45)
 		gs 'boystat', $npclastgenerated

文件差異過大導致無法顯示
+ 168 - 178
locations/pav_pharmacy.qsrc


+ 20 - 11
locations/pav_pool.qsrc

@@ -16,7 +16,7 @@ if $ARGS[0] = 'building' or $ARGS[0] = '':
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 		'Pavlovsk''s public swimming pool is rather dated, but still serves it''s purpose quite well.'
-		'The entrance fee is 100 <b>₽</b> for the full day, but students get a discount and it only costs you 60 <b>₽</b>.'
+		'The entrance fee is 100 <b>₽</b> for the full day, but students get a discount and it only costs them 60 <b>₽</b>.'
 		if SchoolAtestat = 0:
 			pav_swimpool['entrancefee'] = 60
 		else
@@ -54,11 +54,20 @@ if $ARGS[0] = 'entrance':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/entrance.jpg"></center>'
 	'You''re currently inside the entrance to the swimming pool.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">girls locker room</a>, visit the <a href="exec:minut += 1 & gt ''pav_pool'', ''cafeteria''">cafeteria</a> or browse the pool''s <a href="exec:minut += 1 & gt ''pav_pool'', ''store''">store</a>.'
+	'From here, you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''lockerfemale''">girls locker room</a>, visit the <a href="exec:minut += 1 & gt ''pav_pool'', ''cafeteria''">cafeteria</a> or browse the pool''s <a href="exec:minut += 1 & gt ''pav_pool'', ''store''">store</a>.'
 	*nl
-	'There is a sign by the store''s entrance that reads: "If closed, I''m working in the pool. Be back soon." It seems like the store clerk is also the janitor.'
-
-	act 'Leave': gt 'pav_pool', 'building'
+	'There''s a sign by the store''s entrance that reads: "If closed, I''m working in the pool. Be back soon." It seems like the store clerk is also the janitor.'
+	act 'Leave':
+		if PCloswimwear = 1:
+			cla
+			'You need to change out of your swimwear if you want to leave!'
+			act 'Return': gt 'pav_pool', 'entrance'
+		else
+			minut += 2
+			gs 'stat'
+			gt 'pav_pool', 'building'
+		end
+	end
 end
 
 if $ARGS[0] = 'store':
@@ -149,8 +158,8 @@ if $ARGS[0] = 'lockerfemale':
 	minut += 1
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/lockers.jpg"></center>'
-	'The changing rooms are old and murky. They are uncomfortable, cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
-	'From here you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
+	'The changing rooms are old, murky and uncomfortable. They''re also very cramped and you always feel compelled to leave as quickly as possible. The small windows on one side don''t make you feel any better.'
+	'From here, you can access the <a href="exec:minut += 1 & gt ''pav_pool'', ''showerfemale''">showers</a> or go to the <a href="exec:minut += 1 & gt ''pav_pool'', ''mirror''">mirrors</a> area, highly contested in busy times. You can also access the pool, but only if you''re wearing swimwear.'
 
 	if func('changingroom','count_swim_item') > 0 or $clothingworntype = 'nude':
 		act 'Change your clothes':
@@ -191,7 +200,7 @@ if $ARGS[0] = 'lockerfemale':
 	if $clothingworntype <> 'nude': act 'Strip all clothing': gs 'clothing', 'strip_all' & gt 'pav_pool', 'lockerfemale'
 
 	act 'Leave':
-		if PCloswimwear = 1 or $clothingworntype = 'nude':
+		if $clothingworntype = 'nude':
 			cla
 			'You need to get dressed first!'
 			act 'Return': gt 'pav_pool', 'lockerfemale'
@@ -304,13 +313,13 @@ if $ARGS[0]= 'cafeteria':
 	minut += 1
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteria<<rand(1,2)>>.jpg"></center>'
 	'The cafeteria doesn''t have a lot on the menu and only offers some basic snacks.'
-	'Two girls are currently ordering from the cashier.'
+	'Two girls in bikinis are currently ordering from the cashier.'
 
 	act 'Order':
 		*clr & cla
 		minut += 1
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cafeteriaturn.jpg"></center>'
-		'It''s finally your turn and you sit on one of the stools while you order.'
+		'It''s finally your turn and you take a seat on one of the stools.'
 
 		if money < 100:
 			'You don''t have enough money to buy a snack.'
@@ -396,7 +405,7 @@ if $ARGS[0] = 'pool':
 	end
 
 	'The pool is rather old, but still has a certain charm to it. The wall to wall windows allow for a nice atmosphere during the day and there is an upper balcony where people often watch from above.'
-	'From here you can access the female locker room.'
+	'From here, you can access the female locker room.'
 	if hour >= 8 and hour < 21:
 		act 'Climb into the pool':
 			*clr & cla

+ 45 - 47
locations/pav_pool_events.qsrc

@@ -80,7 +80,7 @@ if $ARGS[0] = 'store_simsuit_buy':
 				'Your purse is empty. "Well, I don''t have anything..."'
 			end
 			*nl
-			'"I have a....suggestion. If you let me see you naked, then I''ll give it to you, free of charge..." he says with a perverted smile.'
+			'"I have a.... suggestion. If you let me see you naked, then I''ll give it to you, free of charge..." he says with a perverted smile.'
 			'You look at him perplexed, but he just keeps smiling at you.'
 			gs 'willpower', 'humiliation', 'self'
 			if will_cost > pcs_willpwr:
@@ -193,10 +193,10 @@ if $ARGS[0] = 'locker_clothed_to_nude':
 	minut += 3
 	gs 'stat'
 
-	if rand(0, 9) = 0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your clothes off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your clothes off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -217,10 +217,10 @@ if $ARGS[0] = 'locker_swim_to_nude':
 	!!stage = 1
 	gs 'stat'
 
-	if rand(0, 9) = 0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your swimwear off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your swimwear off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue stripping.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -240,10 +240,10 @@ if $ARGS[0] = 'locker_nude_to_clothed':
 	minut += 5
 	gs 'stat'
 
-	if rand(0, 9) = 0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you change back into your clothes, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -263,10 +263,10 @@ if $ARGS[0] = 'locker_nude_to_swim':
 	menu_off = 1
 	minut += 2
 
-	if rand(0, 9)=0:
+	if rand(0,9) = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you put your swimwear on, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you put your swimwear on, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and quickly continue dressing yourself.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -287,12 +287,12 @@ if $ARGS[0] = 'locker_clothed_to_swim':
 	minut += 5
 	gs 'stat'
 
-	temp_rand = rand(0, 9)
+	temp_rand = rand(0,9)
 	! Clothed to nude
 	if temp_rand = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your clothes off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your clothes off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -303,7 +303,7 @@ if $ARGS[0] = 'locker_clothed_to_swim':
 	elseif temp_rand = 1:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you put your swimwear on, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you put your swimwear on, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and quickly continue dressing yourself.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -324,12 +324,12 @@ if $ARGS[0] = 'locker_swim_to_clothed':
 	minut += 6
 	gs 'stat'
 
-	temp_rand = rand(0, 9)
+	temp_rand = rand(0,9)
 	! Swim to nude
 	if temp_rand = 0:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you take your swimwear off, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you take your swimwear off, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but you can''t see anything and just tell yourself that you''re being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -341,7 +341,7 @@ if $ARGS[0] = 'locker_swim_to_clothed':
 	elseif temp_rand = 1:
 		if pav_swimpool['storeclerkvisit'] >= 1:
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/photoclothing.jpg"></center>'
-			'As you change back into your clothes, you are startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
+			'As you change back into your clothes, you''re startled when you think you hear a camera click, as if someone was taking photos, but you don''t see anything.'
 			'You''re certain that it sounded like that creepy store clerk''s camera, but as you don''t see anything, you tell yourself you''re just being paranoid and continue getting dressed.'
 			pav_swimpool['storeclerkhiddenphotos'] += 1
 		else
@@ -382,7 +382,7 @@ end
 
 if $ARGS[0]= 'relaxedswim':
 	minut += 15
-	if pcs_sweat > 10: pcs_sweat = 10 + rand(0, 4)
+	if pcs_sweat > 10: pcs_sweat = 10 + rand(0,4)
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/relaxedswim2.jpg"></center>'
 	act 'Continue': gt 'pav_pool', 'poolwater'
@@ -394,7 +394,7 @@ if $ARGS[0]= 'relaxedswim':
 		'The pool is mostly used by families with children and older people at this time. It''s still quiet enough for you to enjoy your swim undisturbed.'
 		pcs_mood += 5
 		temp_rand = rand(1,10)
-		if     temp_rand = 1:
+		if temp_rand = 1:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'kidsplash'
 
@@ -428,7 +428,7 @@ if $ARGS[0]= 'relaxedswim':
 		end
 	elseif hour >= 18 and hour < 21:
 		'Given how late in the evening it is, only a few adults are in the water, so you enjoy your swim undisturbed.'
-		if rand(1, 15) = 1:
+		if rand(1,15) = 1:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'late_assault'
 		end
@@ -444,13 +444,13 @@ if $ARGS[0]= 'exerciseswim':
 	if hour >= 8 and hour < 10:
 		'The pool is almost empty, so you enjoy your swim a lot.'
 		gs 'exercise', 'tier1', 15, 'stren', 'vital'
-		fat -= rand(0, 4)
+		fat -= rand(0,4)
 		!!gs 'sweat', 'add', 5
 		!!pcs_agil += 1
 	elseif hour >= 10 and hour < 12:
 		'The pool is mostly used by families with children and older people at this time. You enjoy your swim mostly undisturbed.'
 		gs 'exercise', 'tier1', 15, 'stren', 'vital'
-		fat -= rand(0, 4)
+		fat -= rand(0,4)
 		!!gs 'sweat', 'add', 5
 		!!pcs_agil += 1
 	elseif hour >= 12 and hour < 18:
@@ -479,7 +479,7 @@ if $ARGS[0]= 'exerciseswim':
 	elseif hour >= 18 and hour < 21:
 		'Given how late it is, only a few adults are in the water, so you enjoy your swim undisturbed.'
 		gs 'exercise', 'tier1', 15, 'stren', 'vital'
-		fat -= rand(0, 4)
+		fat -= rand(0,4)
 		!!gs 'sweat', 'add', 5
 		!!pcs_agil += 1
 		if rand(1, 15) = 1:
@@ -516,7 +516,7 @@ if $ARGS[0]= 'dive':
 	elseif hour >= 18 and hour < 21:
 		'Given how late it is, only a few adults are in the water. You enjoy diving and seeing other people underwater with you from time to time.'
 		pcs_mood += 5
-		if rand(1, 15) = 1:
+		if rand(1,15) = 1:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'late_assault'
 		end
@@ -600,7 +600,7 @@ if $ARGS[0]= 'relaxedwater':
 	elseif hour >= 18 and hour < 21:
 		'Given how late in the evening it is, only a few adults are in the pool, so you enjoy lying in the water mostly undisturbed.'
 		pcs_mood += 5
-		if rand(1, 15) = 1 and pav_swimpool['rape_event'] = 0 and hour > 20:
+		if rand(1,15) = 1 and pav_swimpool['rape_event'] = 0 and hour > 20:
 			cla
 			act 'Continue': gt 'pav_pool_events', 'late_assault'
 		end
@@ -628,7 +628,7 @@ if $ARGS[0]= 'feetwater':
 	elseif hour >= 12 and hour < 18:
 		'The pool is crowded with all kinds of people and sitting here is proving not to be as relaxing as you hoped. You get splashed with water from time to time.'
 		pcs_mood -= 1
-		temp_rand = rand(1, 10)
+		temp_rand = rand(1,10)
 		if temp_rand = 1:
 			'Some children push you from behind and you fall into the water as they run away snickering loudly.'
 			minut += 3
@@ -666,7 +666,7 @@ end
 if $ARGS[0] = 'watertoplost':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/losttop.jpg"></center>'
 	gs 'pav_pool_events', 'timedesc'
-	'You are topless in the water, a fact you''re trying to hide.'
+	'You''re topless in the water, a fact you''re trying to hide.'
 
 	if (hour >= 8 and hour < 12) or (hour >= 18 and hour < 21):
 		'You see the few people scattered around the pool looking at you from time to time.'
@@ -711,8 +711,7 @@ if $ARGS[0]= 'WTL_nothinghappens':
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/losttop.jpg"></center>'
 	gs 'pav_pool_events', 'timedesc'
-	'You wait around topless in the water for a while. You have to avoid some people from time to time, but you''re left alone.'
-	'You notice several people staring at you, but nobody disturbs you.'
+	'You wait around topless in the water for a while. You notice several people staring at you and have to avoid others from time to time, but nobody disturbs you.'
 	act 'Continue': gt 'pav_pool_events', 'watertoplost'
 end
 
@@ -805,15 +804,14 @@ if $ARGS[0]= 'WTL_boystole':
 		gs 'stat'
 		pav_swimpool['boystole'] = 0
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/exposebreasts.jpg"></center>'
-
 		if tits <= 2:
 			'You look around before nodding and reluctantly removing your hands from your breasts. He dives down to take a look at you.'
 			'He immediately surfaces with a disappointed look on his face. "I wanted to see some tits! That fat kid over there has bigger tits than you!"'
-			'He returns your bikini top and swims away. You quickly put it back on before anyone sees you, feeling a little hurt by his comments.'
+			'He tosses your bikini top at you before swimming away in frustration. You quickly put it back on before anyone sees you, feeling a little hurt by his comments.'
 		elseif tits <= 5:
 			'You look around before nodding and reluctantly removing your hands from your breasts. He dives down to take a look at you.'
 			'He surfaces after a short while with a smile on his face. "Nice tits!"'
-			'He returns your bikini top and swims away. You quickly put it back on before anyone sees you.'
+			'He returns your bikini top and happily swims away. You quickly put it back on before anyone sees you.'
 		else
 			'You look around before nodding and reluctantly removing your hands from your breasts. He dives down to take a look at you.'
 			'After what feels like an eternity, he finally surfaces with a huge grin on his face. "Your tits are fucking huge! They''re bigger than my head!"'
@@ -870,7 +868,8 @@ end
 if $ARGS[0] = 'approachbehind':
 	'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/approachbehindhard.jpg"></center>'
 	'You''re at the edge of the pool with your back towards the water when you suddenly feel something hard pressing against your ass. As you turn around, you notice a fat older man resting his stomach against your back with what feels like his hard dick pressing against your ass.'
-	'You turn around with a look of shocked disgust on your face and he backs off. "Sorry, I fell..." he says with a grin as he leaves.'
+	'You turn around with a look of shocked disgust on your face and he backs off.'
+	'"Sorry, I fell..." he says with a grin as he leaves.'
 	pcs_mood -= 2
 	act 'Continue': gt 'pav_pool', 'poolwater'
 end
@@ -974,7 +973,7 @@ if $ARGS[0] = 'sideflirt':
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/ladder<<rand(1,2)>>.jpg"></center>'
 						'You slide out of his hands, climb out of the pool and make a dash for the locker room without looking back.'
-						'"Oh come on, I''m sure you would have enjoyed it!" he shouts at you as you flee.'
+						'"Oh come on!" he shouts at you as you flee.'
 						act 'Continue': gt 'pav_pool', 'lockerfemale'
 					end
 				end
@@ -986,7 +985,7 @@ if $ARGS[0] = 'sideflirt':
 						gs 'willpower', 'pay', 'self'
 						*clr & cla
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/kisswater.jpg"></center>'
-						'You decide to accept the kiss. Your lips welcome each other and soon both your tongues entangle each other in a long deep kiss while he holds your face with both hands.'
+						'You decide to accept the kiss. Your lips welcome each other and soon both your tongues entangle each other in a long deep kiss as he holds your face with both hands.'
 						pav_swimpool['kiss_event'] = 1
 						act 'Continue': gt 'pav_pool_events', 'edge_kiss'
 					end
@@ -1010,12 +1009,12 @@ if $ARGS[0] = 'edge_kiss':
 		'He seems to takes your active involvement as permission for more and you feel his hand slide into your bikini bottom as his tongue continues exploring your mouth.'
 		'He starts massaging your clit as he continues making out with you. You start becoming incredibly aroused from the pleasure.'
 	elseif pav_swimpool['kiss_event'] = 2:
-		'Thanks to your submissiviness, he starts to take your body for granted; his hand slides into your bikini bottom as his tongue continues exploring your mouth.'
+		'Thanks to your submissiveness, he starts to take your body for granted; his hand slides into your bikini bottom as his tongue continues exploring your mouth.'
 		'He starts massaging your clit as he continues to make out with you. You remain frozen in place, still unsure about what''s happening.'
 	end
 
-	temp_rand = rand(1,3)
-	if temp_rand = 1:
+	temp_rand = rand(0,2)
+	if temp_rand = 0:
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/waterleave.jpg"></center>'
@@ -1023,14 +1022,14 @@ if $ARGS[0] = 'edge_kiss':
 			'You fix your bikini bottom before climbing out of the pool and heading for the locker room. It''s getting late and you don''t really want to be here anymore.'
 			act 'Continue': gt 'pav_pool', 'lockerfemale'
 		end
-	elseif temp_rand = 2:
+	elseif temp_rand = 1:
 		act 'Continue':
 			*clr & cla
 			'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/blowforced.jpg"></center>'
 			'After a short while, he breaks the kiss. "Take a deep breath, you''ll need it!"'
 			'You barely manage to take a quick gulp of air before he shoves you under the water, where you''re greeted by the sight of his hard dick throbbing in front of you.'
 			if pav_swimpool['kiss_event'] = 1:
-				'He shoves his dick into your mouth and starts thrusting with great determination. You get the hint and start passionately sucking his dick.'
+				'He shoves his dick into your mouth and starts thrusting with great determination. You get the hint and start sucking his dick.'
 			elseif pav_swimpool['kiss_event'] = 2:
 				'He shoves his dick into your mouth and starts thrusting with great determination. You make efforts to break free from his grip as he fucks your unwilling mouth.'
 			end
@@ -1038,7 +1037,6 @@ if $ARGS[0] = 'edge_kiss':
 			act 'Continue':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/cummouth.jpg"></center>'
-
 				gs 'arousal', 'bj', -3, 'rough', 'sub'
 				$orgasm_or = 'no'
 				gs 'cum_call', 'mouth', 'pool stranger', 0
@@ -1091,7 +1089,7 @@ if $ARGS[0] = 'edge_kiss':
 				*clr & cla
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/ladder<<rand(1,2)>>.jpg"></center>'
 				'You break the kiss and quickly push yourself away from him before pulling your bikini bottom back up. "What the fuck, asshole?! I''m not some cheap whore for you to fuck!" you shout at him angrily.'
-				'"Don''t tease guys if you''re going to be such a fucking prude about it! Whatever, bitch..." he scoffs before swimming away.'
+				'"Don''t tease guys if you''re going to be such a fucking prude about it then! Whatever, bitch..." he scoffs before swimming away.'
 				'Deciding it''s time to leave, you climb out of the pool and run to the locker room.'
 				gs 'stat'
 				act 'Continue': gt 'pav_pool', 'lockerfemale'
@@ -1142,7 +1140,7 @@ if $ARGS[0] = 'late_assault':
 					*clr & cla
 					minut += 2
 					gs 'stat'
-					'Your elbow makes contact with his nose and he reels back in pain, letting you go. You quickly make your way out of the pool before he can grab you again and run to the locker room without looking back. You can hear him loudly cursing about how you''ve broken his nose.'
+					'You jab your arm back and your elbow makes contact with his nose, causing him to reel back in pain and let you go. You quickly make your way out of the pool before he can grab you again and run to the locker room without looking back. You can hear him loudly cursing about how you''ve broken his nose.'
 					act 'Continue': gt 'pav_pool', 'lockerfemale'
 				end
 			end
@@ -1172,27 +1170,27 @@ if $ARGS[0] = 'late_assault':
 
 				act 'Continue':
 					*clr & cla
-					gs 'stat'
 					minut += 5
+					gs 'stat'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/assault2.jpg"></center>'
 					'He starts violently thrusting in and out of your pussy, holding you by your hair and using it as a handle to apply more force. Your only thought is hoping this will end soon...'
 
 					act 'Continue':
 						*clr & cla
-						minut += 5
 						'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/assault3.jpg"></center>'
 						'After a few minutes, he pulls you on top of him, slides you down onto his dick and resumes roughly fucking you.'
-						'Your attention wanders around the pool. To your dismay, it''s completely empty and you realize that nobody is coming to help you. Your thoughts are interrupted when your assailant suddenly groans and you feel a warmth spilling into your pussy. He''s cumming inside you!'
+						'Your attention wanders around the pool. To your dismay, it''s completely empty and you realize that nobody is coming to help you. Your thoughts are then interrupted when your assailant suddenly groans and you feel a warmth spilling into your pussy. He''s cumming inside you!'
 						'It might be shock, but you somehow manage to ignore the fact that you''re being filled with a stranger''s cum and instead concentrate on the eerie sounds of the deserted pool.'
 						gs 'arousal', 'vaginal', 10, 'rape'
 						gs 'cum_call', '', 'pool rapist', 0, '', 15000, 60
 						gs 'arousal', 'end'
+						minut += 5
 						gs 'stat'
 
 						act 'Continue':
 							*clr & cla
-							gs 'stat'
 							minut += 5
+							gs 'stat'
 							'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/swim/assault4.jpg"></center>'
 							'When he finishes emptying his load inside you, he pulls out and immediately plugs your pussy with his fingers before leaning in and whispering into your ear.'
 							'"Just making sure it stays in there. I want you to get pregnant with my baby so you can always remember what happened here. Don''t think about telling anyone either, because nobody will believe a slutty little bitch like you."'
@@ -1202,9 +1200,9 @@ if $ARGS[0] = 'late_assault':
 							elseif pav_swimpool['virgin_rape'] = 1:
 								'You start sobbing as your emotions overwhelm you. That man defiled your womanhood and wants you to get pregnant from it! You clutch your stomach. That''s likely to happen given that you''re not on birth control. "What am I going to do?!" you think to yourself as a sharp pain suddenly shoots through your sore and tender pussy. You can''t find your bikini bottom, so you slowly climb out of the pool and make your way to the locker room, trying not to think about what happened.'
 							elseif birth_control['think_safe'] = 1:
-								'You place a hand on your stomach. Even though you can feel his sperm inside you, you''re on birth control and so shouldn''t need to worry about getting pregnant. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
+								'You place a hand on your stomach, even though you''re on birth control and shouldn''t need to worry about getting pregnant. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
 							else
-								'You place a hand on your stomach and hold in your sobs. You can feel his sperm inside you and hope that his words about you getting pregnant don''t come true. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
+								'You place a hand on your stomach and hold in your sobs, hoping that his words about you getting pregnant don''t come true. You can''t find your bikini bottom, so you climb out of the pool and quickly make your way to the locker room, trying not to think about what happened.'
 							end
 							act 'Continue': gt 'pav_pool', 'lockerfemale'
 						end

文件差異過大導致無法顯示
+ 484 - 208
locations/selfplay.qsrc


+ 3 - 3
locations/sex_ev_sex.qsrc

@@ -162,7 +162,7 @@ if $ARGS[0] = 'position_choose':
 			gs 'sex_ev_miss', 'missionary_start'
 			gs 'sex_ev_doggy', 'doggy_start'
 			gs 'sex_ev_cowgirl', 'cowgirl_start'
-			gs 'sex_ev_anal', 'anal_start'
+	!!		gs 'sex_ev_anal', 'anal_start'
 		else
 			!! boy wins initiative
 			cla
@@ -609,11 +609,11 @@ if $ARGS[0] = 'position_change':
 		end
 	end
 	
-	if $sex_ev['position'] ! 'anal':
+!!{	if $sex_ev['position'] ! 'anal':
 		gs 'sex_ev_anal', 'anal_start'
 	else
 		act 'Keep taking it up the ass':gt 'sex_ev_anal', 'anal<<sex_ev[''speed'']>>.2'
-	end
+	end}
 end
 
 if $ARGS[0] = 'fuck_me_faster':

+ 2 - 0
locations/stat_display.qsrc

@@ -1599,7 +1599,9 @@ else
 
 	if recuperation = 1: $statusIconBarTab += '<td><a href="exec: msg ''You are still recovering from major surgery.''"><img title="You are recovering from major surgery." height = <<set_siconht>> src="images/system/icons/status/health.png"></a></td>'
 
+	if drugVars['hair_extensioncream_dose'] = 1: $statusIconBarTab += '<td><a href="exec: msg ''Your scalp feel hot and tingly.''"><img title="Your scalp feel hot and tingly." height = <<set_siconht>> src="images/system/icons/status/hair_cream.png"></a></td>'
 	if drugVars['breastcream_dose'] = 1: $statusIconBarTab += '<td><a href="exec: msg ''Your breasts feel hot and tingly.''"><img title="Your breasts feel hot and tingly." height = <<set_siconht>> src="images/system/icons/status/breast_cream.png"></a></td>'
+	if drugVars['butt_injection_dose'] = 1: $statusIconBarTab += '<td><a href="exec: msg ''Your butt feel hot and tingly.''"><img title="Your butt feel hot and tingly." height = <<set_siconht>> src="images/system/icons/status/butt_injection.png"></a></td>'
 
 	if cumcondslip > 0: $statusIconBarTab += '<td><a href="exec: msg ''You feel sick, and you are wondering about the used condom you never found. Maybe those two things are related?''"><img title="You feel sick. Click to find out more." height = <<set_siconht>> src="images/system/icons/status/stuck_condom.png"></a></td>'
 

+ 5 - 4
locations/tatiana_lab.qsrc

@@ -769,15 +769,16 @@ if $ARGS[0] = 'saddle':
 		'As you approach the saddle-sex-machine, Tatiana, concentrating on the ritual and without looking at you, passes you a KY Jelly bottle that you proceed to use in your pussy, the fresh substance sending shivers up your body as you concentrate on the task at hand.'
 	end
 
-	$orgasm_or = 'yes'
-	gs 'arousal', 'vaginal_vibe', 30
-	gs 'arousal', 'end'
-	gs 'stat'
 	'Finally, psyched up, you smear some lube over the small dildo-like protrusions in the riding-machine, and with care, squat over them. It only takes a few seconds for the rubber ridges to slide into your vagina. A rubbery and sticky sensation extends across your outer and inner lips, caressing your clit without a total penetration.'
 	'Sighing slightly at the sensation, you reach for the controller, and after a moment and with a soft "BRRRR" the machine comes alive, stimulating in only one move all of your pussy. You close your eyes as soft moans escape your mouth.'
 	'You barely manage to stay over the machine. Your sweaty hands grab the controller, and push it for more power, steadily increasing the vibration as your voice and the machine sound compete to fill the room with their chorus.'
 	'Finally, the controller slips from your clenching fingers as your magical climax triggers, taking your breath and self-control away and sending wave after wave of magically enhanced pleasure pulsing through your body.'
 
+	$orgasm_or = 'yes'
+	gs 'arousal', 'vaginal_vibe', 30, 'no_orgasm_msg'
+	gs 'arousal', 'end'
+	gs 'stat'
+
 	act 'Time for a lesson':
 		if stat['think_virgin'] = 1 or tatiana_teach_escalation < 2:
 			if pcs_vag ! 0: tatiana_teach_escalation += 1

部分文件因文件數量過多而無法顯示