Zedrt 1 month ago
parent
commit
2c0cc70e46

+ 344 - 158
locations/_attributes_school.qsrc

@@ -1,4 +1,3 @@
-# $attributes_school
 !!2022/01/26
 !Quality range is usually 2-5.
 
@@ -325,241 +324,421 @@ elseif ARGS[1] = 25:
 	CloBimbo =1
 	
 elseif ARGS[1] = 26:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 27:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 28:
-	CloQuality = 3
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 29:
-	CloQuality = 4
-	CloThinness = 4
-	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 30:
-	CloQuality = 3
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 31:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 32:
-	CloQuality = 5
-	CloThinness = 2
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 33:
-	CloQuality = 5
-	CloThinness = 1
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 34:
-	CloQuality = 3
-	CloThinness = 5
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 35:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 3
-	CloSkirtShortness = 5
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloBimbo = 1
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 36:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 37:
-	CloQuality = 4
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 
 elseif ARGS[1] = 38:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 39:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 7
+	CloThinness = 6
 	CloTopCut = 4
-	CloSkirtShortness = 5
+	CloSkirtShortness = 6
 	CloStyle2 = 4
 	CloStyle = 4
-	
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 40:
-	CloQuality = 3
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 
 elseif ARGS[1] = 41:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 7
+	CloThinness = 6
 	CloTopCut = 4
-	CloSkirtShortness = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloBimbo = 1
-
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 42:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 2
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 
 elseif ARGS[1] = 43:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 44:
-	CloQuality = 3
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 
 elseif ARGS[1] = 45:
-	CloQuality = 4
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 46:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 
 elseif ARGS[1] = 47:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 48:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 49:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 50:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 51:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 52:
-	CloQuality = 3
-	CloThinness = 2
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloStyle = 2
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 53:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 54:
-	CloQuality = 3
-	CloThinness = 4
-	CloTopCut = 2
-	CloSkirtShortness = 5
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 55:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 2
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 56:
-	CloQuality = 3
-	CloThinness = 4
+	CloQuality = 7
+	CloThinness = 6
 	CloTopCut = 4
-	CloSkirtShortness = 3
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloBimbo = 1
 	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 57:
-	CloQuality = 5
-	CloThinness = 3
-	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 58:
-	CloQuality = 3
-	CloThinness = 3
-	CloTopCut = 2
-	CloSkirtShortness = 4
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 	
 elseif ARGS[1] = 59:
 	CloQuality = 7
@@ -588,20 +767,27 @@ elseif ARGS[1] = 60:
 	CloBimbo =1
 	
 elseif ARGS[1] = 61:
-	CloQuality = 4
-	CloThinness = 1
-	CloTopCut = 1
-	CloSkirtShortness = 3
+	CloQuality = 7
+	CloThinness = 6
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 elseif ARGS[1] = 62:
-	CloQuality = 4
+	CloQuality = 7
 	CloThinness = 6
-	CloTopCut = 1
-	CloSkirtShortness = 5
+	CloTopCut = 4
+	CloSkirtShortness = 6
 	CloStyle2 = 4
-	CloCoverTop = 3
+	CloStyle = 4
+	CloBra = 2
+	CloCoverBack = 4
+	CloCoverFront = 4
+	CloCovertop = 4
+	CloBimbo =1
 end
-
---- $attributes_school ---------------------------------
-

+ 1 - 2
locations/albina_starlets.qsrc

@@ -256,7 +256,7 @@ if $ARGS[0] = 'starlets':
 	menu_off = 1
 	*clr & cla
 
-	AlbinaQW['startletsday'] = daystart
+
 	starlets_practice = 0
 	gs 'exercise', 'tier2', 120, 'agil', 'dancero'
 	gs 'exp_gain', 'dancero', 2
@@ -286,7 +286,6 @@ if $ARGS[0] = 'starlets':
 		!! third rally in the park if sveta is dancing
 		if ((month = 10 and day > 20) or (month = 11 and day < 16)) and week > 5 and hour > 8 and hour < 20 and AlbinaQW['ParkRally'] = 2 : gt 'albina_starlets', 'parkrally'
 
-		AlbinaQW['ShowTriggerCount'] = 0
 		albpayrand = rand(1,5)
 		'After you finish training, Albina gathers you and the girls round. "We have a small show planned. It will last for a few hours and each of you will receive <<albpayrand*1000>>."'
 

+ 2 - 2
locations/boy_updater.qsrc

@@ -182,8 +182,8 @@ if $ARGS[0] = 'vasily_seed':
 		gs 'npc_set_preference', 'A11', 'body_tits_big', 'like'
 		gs 'npc_set_preference', 'A11', 'hair_pubes_shaven', 'like'
 		$npc_fav_body_part['A11'] = 'tits'
-		npc_sexdrive['A11'] = 4
-		npc_sex_stamina['A11'] = 5
+		npc_sexdrive['A11'] = 10
+		npc_sex_stamina['A11'] = 10
 	end
 end
 

+ 23 - 2
locations/din_bad.qsrc

@@ -249,8 +249,29 @@ if $ARGS[0] = 'd_bag':
 	dynamic $tampon
 	dynamic $toymanage
 	dynamic $publicpan
-	gs 'prostitution_functions', 'prostitute_outfit_at_home'
-	dynamic $shower
+	gs 'prostitution_functions', 'work_clothes'
+		if prostitute['work_clothes']:
+			if prostitute['outfit_is_set'] = 1 and func('prostitution_functions', 'is_default') = 0:
+				act 'Replace your default prostitute outfit with the current outfit':
+					gs 'prostitution_functions', 'set_default_outfit'
+					gt $loc, $loc_arg
+				end
+			elseif prostitute['outfit_is_set'] = 0:
+				act 'Set the current as your default prostitute outfit':
+					gs 'prostitution_functions', 'set_default_outfit'
+					gt $loc, $loc_arg
+				end
+			end
+			act 'Change into regular clothes':
+				gs 'prostitution_functions', 'change_into_regular_clothes'
+				gt $loc, $loc_arg
+			end
+		elseif prostitute['outfit_is_set']:
+			act 'Change into prostitute outfit':
+				gs 'prostitution_functions', 'change_into_prostitute_outfit'
+				gt $loc, $loc_arg
+			end
+		end	dynamic $shower
 	dynamic $bath
 	act 'Choose an outfit': gt 'wardrobe', 'main'
 	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg

+ 1 - 1
locations/gdksport.qsrc

@@ -146,7 +146,7 @@ if $ARGS[0] = 'start':
 			else
 				act 'Take a dance lesson. You have <<gsAboDance>> lessons remaining': '<br><font color="red">You are to exhausted to do this. Recover your stamina before trying to train.</font>'
 			end
-		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0 and AlbinaQW['startletsday'] ! daystart:
+		elseif AlbinaQW['StarletsJoined'] > 0 and AlbinaQW['StarletsShutDown'] = 0 and npc_pregtalk['A23'] = 0:
 			if starlets_on = 1:
 				act 'Train with Starlets': gt 'albina_starlets', 'starlets'
 				!! ballet career

+ 24 - 24
locations/npcgeneratec.qsrc

@@ -253,7 +253,7 @@ if $ARGS[0] = 'gen_dick':
 	npcgeneratecVars['dick_length'] = 0
 	if ARGS[2] > 0: npcgeneratecVars['dick_length'] += ARGS[2]
 
-	npcgeneratecVars['rand'] = rand(1, 10000)
+	npcgeneratecVars['rand'] = rand(9999, 10000)
 	if npcgeneratecVars['rand'] < 15:
 		npcgeneratecVars['dick_length'] += rand(5, 6)
 	elseif npcgeneratecVars['rand'] < 250:
@@ -269,9 +269,9 @@ if $ARGS[0] = 'gen_dick':
 	elseif npcgeneratecVars['rand'] < 9985:
 		npcgeneratecVars['dick_length'] += rand(18, 19)
 	elseif npcgeneratecVars['rand'] < 9999:
-		npcgeneratecVars['dick_length'] += rand(20, 21)
+		npcgeneratecVars['dick_length'] += rand(20, 30)
 	else
-		npcgeneratecVars['dick_length'] += rand(22, 30)
+		npcgeneratecVars['dick_length'] += rand(31, 40)
 	end
 
 	! It sets the girth based on the dick size
@@ -292,7 +292,7 @@ if $ARGS[0] = 'gen_dick':
 	end
 
 	! Then it gives random variance with girth. 1 or 2 drops a size. 3 or 4 stays the same. 5 or 6 goes up a size. A 1 or a 6 gives a chance to go up or down a size again, for a max of 2 changes from the base girth from size.
-	npcgeneratecVars['rand'] = rand(1, 6)
+	npcgeneratecVars['rand'] = rand(6, 6)
 	if npcgeneratecVars['rand'] <= 2:
 		npcgeneratecVars['dick_girth'] -= 1
 	elseif npcgeneratecVars['rand'] >= 5:
@@ -300,7 +300,7 @@ if $ARGS[0] = 'gen_dick':
 	end
 
 	if npcgeneratecVars['rand'] = 1 or npcgeneratecVars['rand'] = 6:
-		npcgeneratecVars['rand'] = rand(1, 3)
+		npcgeneratecVars['rand'] = rand(3, 3)
 		if npcgeneratecVars['rand'] = 1:
 			npcgeneratecVars['dick_girth'] -= 1
 		elseif npcgeneratecVars['rand'] = 3:
@@ -713,15 +713,15 @@ if $ARGS[0] = 'set_personality':
 	!!	3 - intellectual/clever
 	if mid($npc_perstype[$ARGS[1]], 3, 1) = 'T':
 		if mid($npc_perstype[$ARGS[1]], 1, 1) = 'E':
-			npcgeneratecVars['humor'] = rand(2, 3)
+			npcgeneratecVars['humor'] = rand(2, 2)
 		else
-			npcgeneratecVars['humor'] = 3
+			npcgeneratecVars['humor'] = 2
 		end
 	else
 		if mid($npc_perstype[$ARGS[1]], 1, 1) = 'E':
-			npcgeneratecVars['humor'] = rand(1, 2)
+			npcgeneratecVars['humor'] = rand(2, 2)
 		else
-			npcgeneratecVars['humor'] = 1
+			npcgeneratecVars['humor'] = 2
 		end
 	end
 	if npcgeneratecVars['humor'] = 1:
@@ -736,7 +736,7 @@ if $ARGS[0] = 'set_personality':
 	npc_smoker[$ARGS[1]] = rand(0, 2)
 
 	!! if npc_sexdrive determines how likely the npc will be to engage in sexual behavior and how many times they can orgasm in a single sexual encounter
-	npcgeneratecVars['rand'] = rand(0, 49)
+	npcgeneratecVars['rand'] = rand(35, 49)
 	if npcgeneratecVars['rand'] < 9:
 		npc_sexdrive[$ARGS[1]] = rand(1, 3)
 	elseif npcgeneratecVars['rand'] < 29:
@@ -744,10 +744,10 @@ if $ARGS[0] = 'set_personality':
 !!	elseif npcgeneratecVars['rand'] < 35:
 !!		npc_sexdrive[$ARGS[1]] = rand(1, 10)
 !!	elseif npcgeneratecVars['rand'] < 38:
-!!		npc_sexdrive[$ARGS[1]] = rand(7, 10)
+!!		npc_sexdrive[$ARGS[1]] = rand(7, 20)
 	else
 		!!failsafe
-		npc_sexdrive[$ARGS[1]] = rand(1, 10)
+		npc_sexdrive[$ARGS[1]] = rand(10, 100)
 	end
 	if npc_sexdrive[$ARGS[1]] > 5: npc_energetic[$boy] = rand(0, 1)
 
@@ -862,7 +862,7 @@ if $ARGS[0] = 'set_personality':
 
 	!! npc_diligent = 1: npc is more methodical, doesn''t like to skip steps, and usually plays it safe
 	!! npc_risktaker = 1: npc is more likely to take risks, such as never using a condom
-	npcgeneratecVars['rand'] = rand(0, 2)
+	npcgeneratecVars['rand'] = rand(1, 1)
 	if npcgeneratecVars['rand'] = 0:
 		npc_diligent[$ARGS[1]] = 1
 		npc_risktaker[$ARGS[1]] = 0
@@ -927,7 +927,7 @@ if $ARGS[0] = 'set_personality':
 	!! ------------------------- sex related preferences ----------------------------------
 
 
-	if rand(0, 1) >= 1:
+	if rand(0, 0) >= 1:
 	!!		if npc_condom_conscious = 1: they will use condoms but can be talked out of it
 	!!		if npc_condom_conscious = 2: they will always insist on using condoms unless you are in a committed relationship and/or trying for a baby
 		if npc_diligent[$ARGS[1]] = 1:
@@ -939,9 +939,9 @@ if $ARGS[0] = 'set_personality':
 	!!	if npc_no_condoms = 1: they have a preference for skipping condoms but can be talked into using one
 	!!	if npc_no_condoms = 2: they will never use a condom no matter what
 		if npc_risktaker[$ARGS[1]] = 1:
-			npc_no_condoms[$ARGS[1]] = max(0, rand(-1, 2))
+			npc_no_condoms[$ARGS[1]] = max(0, rand(2, 2))
 		else
-			npc_no_condoms[$ARGS[1]] = max(0, rand(-2, 2))
+			npc_no_condoms[$ARGS[1]] = max(0, rand(2, 2))
 		end
 	end
 
@@ -952,7 +952,7 @@ if $ARGS[0] = 'set_personality':
 	end
 
 	!! Preferred sexual position
-	npcgeneratecVars['rand'] = rand(1, 7)
+	npcgeneratecVars['rand'] = rand(1, 3)
 	if npcgeneratecVars['rand'] = 1:
 		$npc_fav_pos[$ARGS[1]] = 'miss'
 	elseif npcgeneratecVars['rand'] = 2:
@@ -971,7 +971,7 @@ if $ARGS[0] = 'set_personality':
 
 	!! npc_sex_speed determines whether they like it slow, steady, or fast and will cause them to select that speed more frequently
 	!! 1 is slow, 2 is steady, 3 is fast/rough
-	npc_sex_speed[$ARGS[1]] = rand(1, 3)
+	npc_sex_speed[$ARGS[1]] = rand(3, 3)
 
 	!! npc_sex_volume refers to how much noise they make during sex
 	!! npc_sex_volume = 0: virtually quiet during sex
@@ -981,7 +981,7 @@ if $ARGS[0] = 'set_personality':
 	npc_sex_volume[$ARGS[1]] = rand(0, 3)
 
 	if rand(0, 2) = 0:
-		npcgeneratecVars['rand'] = rand(0, 3)
+		npcgeneratecVars['rand'] = rand(1, 1)
 		if npcgeneratecVars['rand'] = 0 and npc_sex_speed[$ARGS[1]] = 1:
 			!! npc has a tendency to be overly gentle and cautious
 			npc_gentle_lover[$ARGS[1]] = 1
@@ -997,7 +997,7 @@ if $ARGS[0] = 'set_personality':
 
 	!! Preferred cumming location
 	!!	0 = no preference
-	npcgeneratecVars['rand'] = rand(0, 5)
+	npcgeneratecVars['rand'] = rand(1, 1)
 	if npcgeneratecVars['rand'] = 1:
 		$npc_cum_pref[$ARGS[1]] = 'creampie'
 	elseif npcgeneratecVars['rand'] = 2:
@@ -1056,7 +1056,7 @@ if $ARGS[0] = 'set_personality':
 	end
 
 	!! $npc_fav_body_part
-	npcgeneratecVars['rand'] = rand(0, 3)
+	npcgeneratecVars['rand'] = rand(0, 0)
 	if npcgeneratecVars['rand'] = 0:
 		$npc_fav_body_part[$ARGS[1]] = 'pussy'
 	elseif npcgeneratecVars['rand'] = 1:
@@ -1070,7 +1070,7 @@ if $ARGS[0] = 'set_personality':
 
 
 	!! if npc_sex_stamina determines how long they can last in bed without cumming
-	npc_sex_stamina[$ARGS[1]] = rand(1, 10)
+	npc_sex_stamina[$ARGS[1]] = rand(4, 10)
 
 	!!{
 	if rand(1,10) <= 4:
@@ -1101,13 +1101,13 @@ if $ARGS[0] = 'set_personality':
 	if rand(0, 2) = 0: npc_cuddler[$ARGS[1]] = 1
 
 	!! if npc_cum_cannon = 1: the npc ejaculates particularly large loads
-	if rand(0, 4) = 0: npc_cum_cannon[$ARGS[1]] = 1
+	if rand(0, 1) = 0: npc_cum_cannon[$ARGS[1]] = 1
 
 	!! if npc_sex_filmer = 1: the npc likes to make sex videos
 	if rand(0, 4) = 0: npc_sex_filmer[$ARGS[1]] = 1
 
 	!! if npc_two_pump = 1: the npc will always cum immediately in the first penetration act of sex
-	if rand(0, 5) = 0: npc_two_pump[$ARGS[1]] = 1
+	if rand(1, 5) = 0: npc_two_pump[$ARGS[1]] = 1
 
 
 	!! ------------------------- date preferences ----------------------------------

+ 2 - 2
locations/placer_sex.qsrc

@@ -1451,7 +1451,7 @@ if $args[0] = 'sleep':
 		gs'stat'
 		'Once you''re well rested, you wake up again and sit up in the bed.'
 		InSleep = 0
-		if rand (1,6) = 1:
+		if rand (1,1) = 1:
 			gt 'placer_sex', 'sleep_sex'
 		else
 			act 'Make breakfast for the guys': gt 'placer_sex', 'breakfast'
@@ -1463,7 +1463,7 @@ if $args[0] = 'sleep':
 end
 
 if $args[0] = 'rape':
-	if rand (1,20)=5:
+	if rand (3,5)=5:
 		gs 'npcgeneratec', 0, 'Rapist', rand(18,35)
 		$rapist[0] = $npclastgenerated
 		gs 'npcgeneratec', 0, 'Rapist', rand(18,35)

+ 1 - 1
locations/sex_ev_after.qsrc

@@ -2526,7 +2526,7 @@ if $ARGS[0] = 'sleep_function':
 		end
 	end}
 
-	if rand(1,10) < npc_sexdrive[$boy] - (sex_ev['cum_count']/2) + npc_sleep_sex_okay[$boy] + npc_selfish[$boy] and (stat['think_virgin'] ! 1 or sex_ev['fuck_count'] > 0) and sex_ev['sleep_fuck'] = 0 and sex_ev['lover_left'] ! 1:
+	if rand(1,10) < npc_sexdrive[$boy] - (sex_ev['cum_count']/2) + npc_sleep_sex_okay[$boy] + npc_selfish[$boy] and (stat['think_virgin'] ! 1 or sex_ev['fuck_count'] > 0):
 		sex_ev['sleepover'] = 1
 		if rand(0,1) = 1:
 			sex_ev['extra_cum'] += 5

+ 1 - 1
locations/sex_ev_cum.qsrc

@@ -2596,7 +2596,7 @@ if $ARGS[0] = 'creampie_surprise_cum_together':
 !!	gs'sex_ev_reactions_creampie', 'creampie_react'
 	gs'sex_ev_reactions', 'react_menu'
 
-	if (sex_ev['orgasm_count'] >= 5 or pcs_sleep < 20) and (hour >= 20 or hour =< 4):
+	if sex_ev['orgasm_count'] >= 1 or pcs_sleep < 50:
 		act'Collapse':gt'sex_ev_after', 'black_out'
 	end
 end

+ 2 - 2
locations/therapist.qsrc

@@ -2126,8 +2126,8 @@ if $ARGS[0] = 'hypnoEnd':
 				if therapistFuckedPussy > 0 and rand(1,2) = 1:
 					'A bit of cum dribbles from your well fucked cunt. You involuntarily clench your pussy; your body trying to keep more from leaking out.'
 				end
-
-				act 'Leave':gt $loc
+			act 'Return to your room':gt 'HotelRoom', 'therapist'
+			act 'Leave':gt $loc
 			end
 
 		else

+ 3 - 2
locations/therapist_home.qsrc

@@ -27,10 +27,10 @@ if $ARGS[0] = 'hotel_enter':
 end
 
 if $ARGS[0] = 'set_Hotelacts':
-	if hour >= 6 and hour <= 22:
+	if hour >= 0 and hour <= 23:
 		if university['student'] = 1: act 'Study(1:00)': gt 'therapist_home', 'study'
 		act 'Play on your laptop': gt 'komp','start'
-		if locat['A186'] = 2 and hour => 21: act 'Make love to you Husband': gt 'therapist_home', 'sex'
+		act 'Make love to you Husband': gt 'therapist_home', 'sex'
 	end
 	act 'Relax (1:00)': gt 'therapist_home', 'relax'
 end
@@ -138,6 +138,7 @@ if $ARGS[0] = 'pre_sleep':
 
 elseif $ARGS[0] = 'pre_sleep2':
 	if therapistQW['hotel_firstnight'] = 0: gt 'therapist_home', 'first_night'
+	vibratorIN = 1
 
 	'<center><img <<$set_imgh>> src="images/shared/sex/sleep/fondle1.jpg"></center>'
 	'You lay on your back under the covers trying to get some sleep.'