Merge remote-tracking branch 'Anjuna/master'

locations/brother.qsrc

@@ -406,7 +406,7 @@ if $ARGS[0] = 'playfootball':
 		if npc_rel['A34'] <50:npc_rel['A34'] += rand(1,2)
 		gs 'exercise', 'tier1', 60, 'agil', 'vital'
 		gs 'exp_gain', 'run', rand(0, 2)
-		if ftball_lvl < 20: gs 'exp_gain', 'ftball', rand(0, 2)
+		if ftbll_lvl < 50: gs 'exp_gain', 'ftbll', rand(0, 2)
 		gs 'stat'
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/school/grounds/football3.jpg"></center>'
 		'You spend an hour running around, chasing the ball across the field with Kolka and his friends Mishan and Zhendos.'

locations/chessplay.qsrc

@@ -66,7 +66,7 @@ if $ARGS[0] = 'expfame':
 end
 
 if $ARGS[0] = 'game':
-	
+
 	chess_move += 1
 	chess_time = rand(1,3)
 	minut += chess_time
@@ -96,7 +96,7 @@ if $ARGS[0] = 'game':
 		'Stalemate! You have drawn the match against '+$chess_name+'!'
 		'You and '+$chess_name+' could not find a way to win the match.'
 		gs 'chessplay', 'expfame', 1
-		
+
 		act 'Return': gt 'kruchess'
 	elseif chess_GG <= 0:
 		*clr & cla
@@ -104,8 +104,8 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/lose' + rand(1,1) + '.jpg"></center>'
 		*nl
 		'Checkmate! You have lost the match against '+$chess_name+'!'
-		gs 'chessplay', 'fame', 0
-		
+		gs 'chessplay', 'expfame', 0
+
 		act 'Return': gt 'kruchess'
 	elseif chess_com <= 0:
 		*clr & cla
@@ -115,7 +115,7 @@ if $ARGS[0] = 'game':
 		'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/chess/win' + rand(1,1) + '.jpg"></center>'
 		*nl
 		'Checkmate! You have won the match against '+$chess_name+'!'
-		gs 'chessplay', 'fame', 2
+		gs 'chessplay', 'expfame', 2
 
 		act 'Return': gt 'kruchess'
 	elseif chess_moves >= chess_move_limit:
@@ -125,7 +125,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'Draw! You agree to end the match with '+$chess_name+'.'
 		'You and '+$chess_name+' have both used too many moves and neither could find a way to win the match.'
-		gs 'chessplay', 'fame', 1
+		gs 'chessplay', 'expfame', 1
 
 		act 'Return': gt 'kruchess'
 	elseif total_chess_time >= chess_time_limit:
@@ -135,7 +135,7 @@ if $ARGS[0] = 'game':
 		*nl
 		'Draw! You agree to end the match with '+$chess_name+'.'
 		'You and '+$chess_name+' have both used too much time and neither could find a way to win the match.'
-		gs 'chessplay', 'fame', 1
+		gs 'chessplay', 'expfame', 1
 
 		act 'Return': gt 'kruchess'
 	else
@@ -241,7 +241,7 @@ if $ARGS[0] = 'moves':
 		*nl
 		'You are on move '+str(chess_move)+' out of '+str(chess_move_limit)
 		'You are on minute '+str(total_chess_time)+' out of '+str(chess_time_limit)
-		
+
 		chess_GG -= 1
 		chess_com -= 1
 
@@ -461,7 +461,7 @@ if $ARGS[0] = 'advantage':
 	elseif $ARGS[1] = 'tactical' or $ARGS[1] = 'trap':
 		chess_pos = 1
 		chess_neg = -1
-		chess_adv = 1	
+		chess_adv = 1
 	end
 
 	if $ARGS[2] = 'good':
@@ -484,7 +484,7 @@ if $ARGS[0] = 'advantage':
 			chess_GG = chess_GG - chess_adv - chess_diff
 			chess_com = chess_com + chess_adv + chess_diff
 		elseif chess_ind < chess_neg:
-			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'			
+			'You are more skilled than your opponent and prevent them from capitalizing on their advantage.'
 		else
 			'You are about equally skilled as your opponent and you lose some advantage.'
 			chess_GG = chess_GG - chess_adv/2 - chess_diff/2

locations/din_bad.qsrc

@@ -133,10 +133,12 @@ if $ARGS[0] = 'd_bag':
 	end
 !! Hair options
 	*nl
-	if (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 0:
-		'There''s a hairbrush in your purse. <a href="exec:pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
-	elseif (mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1) and pcs_hairbsh = 1:
-		'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+	if mc_inventory['travel_mirror'] =  1 or mc_inventory['comb'] =  1:
+		if pcs_hairbsh = 0:
+			'There''s a hairbrush in your purse. <a href="exec: minut += min(15, max(1, pcs_hairlng / 80)) & pcs_hairbsh = 1 & gs ''stat'' & gs ''din_bad'', ''d_bag''">Brush your hair</a>'
+		else
+			'There''s a hairbrush in your purse. Your hair doesn''t need brushing right now.'
+		end
 	end
 	if pcs_hairbsh > 0 and pcs_hairlng > 80 and hbraids = 0:
 		*nl
@@ -243,7 +245,7 @@ if $ARGS[0] = 'd_bag':
 	*nl
 	if $pursepantytype ! '' or $pursebratype ! '': 'You also have '+iif($pursepantytype ! '','<a href="exec:view''<<func(''$panty_image'', $pursepantytype, pursepantynumber)>>''">a pair of panties</a>','')+iif($pursepantytype ! '' and $pursebratype ! '',' and ','')+iif($pursebratype ! '','<a href="exec:view''<<func(''$bra_image'', $pursebratype, pursebranumber)>>''">a bra</a>','')+' in your purse, which you can put on in the nearest bathroom.'
 	if photographyEv >= 2: 'You have <a href="exec:gt''camera'',''start''">a camera</a> in your purse.'
-	if mc_inventory['newspaper'] = 1: newspaperVars['dbag'] = 1 & act 'Read your newspaper': gt 'newspaper', 'start'
+	if mc_inventory['newspaper'] = 1: act 'Read your newspaper': newspaperVars['dbag'] = 1 & gt 'newspaper', 'start'
 
 	act 'Return':gs 'obj_din', 'menu_exit' & gt $menu_loc, $menu_arg
 	'</td></tr></table></center>'

locations/newspaper.qsrc

@@ -46,6 +46,8 @@ end
 
 if $ARGS[0] = 'start':
 	temp_np_page = 0
+	menu_off = 1
+	gs 'stat'
 	gs 'newspaper', 'view'
 end
 
@@ -59,6 +61,7 @@ if $ARGS[0] = 'view':
 		if newspaperVars['dbag'] = 0:
 			gt $menu_loc, $menu_arg
 		else
+			newspaperVars['dbag'] = 0
 			gs 'din_bad', 'd_bag'
 		end
 	end

locations/pav_disco.qsrc

@@ -100,7 +100,6 @@ if $ARGS[0] = '':
 				gs 'fame', 'pav', 'sex', 5
 				pcs_mood -= 40
 				gs 'stat'
-				'<center><b><font color="maroon">Disco</font></b></center>'
 				'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/sex/cumface1.jpg"></center>'
 				'As you head out on the dance floor, a guy walks up to you, notices the cum still splattered on you and points at you. "Check out this cocksucker! Hey guys, this chick has cum smeared all over her face!" The ones standing near him come closer. "Did you forget to swallow, slut?" Your cheeks blush with shame and you quickly head for the exit.'
 				act 'Leave': gt 'pav_commcenter'
@@ -114,7 +113,6 @@ if $ARGS[0] = '':
 				frost = 0
 				gs 'stat'
 				if alko = 0:
-					'<center><b><font color="maroon">Disco</font></b></center>'
 					'<center><img <<$set_imgh>> src="images/locations/pavlovsk/community/disco/dance.jpg"></center>'
 					if $pantyworntype = 'none' and PCloSkirt > 2:
 						inhib_exp += 1

locations/vladimirQW_meet.qsrc

@@ -535,13 +535,14 @@ if $ARGS[0] = 'qwmeetdin':
 					npc_gentle[$boy] = 1
 					npc_finance[$boy] = 2
 					if vladimirQW['money_given'] = 0:
-						temp_money += 5000
+						temp_money = 5000
 					else
-						temp_money += 2000
+						temp_money = 2000
 					end
 					money += temp_money
 					vladimirQW['money_given'] += temp_money
 					'You walked with Vladimir into the bedroom. Vladimir sceptically cast his gaze about your humble abode and took out his wallet. "I hope you will not mind if I give you some money?" He handed you' + iif(temp_money = 5000, 'five', 'two') + ' thousand. You took the money you were offered.'
+					killvar 'temp_money'
 
 					act 'Continue': gt 'BDsex', 'start'
 				end