Merge remote-tracking branch 'KSmarts/master'

[Fix] Volleyball icon always showing.

locations/NikoWhore.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'Exposed':
 	NikoEv = 10
 	npc_grupTipe['A189'] = 600
 	inhib_exp += 10
-	if fame['pav_sex'] < 300:gs 'fame', 'pav', 'sex', 300
+	if fame['pav_sex'] < 1000:gs 'fame', 'pav', 'sex', 500 - (fame['pav_sex']/2)
 	gs 'fame'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/wos.jpg"></center>'

locations/fight.qsrc

@@ -431,7 +431,7 @@ if $ARGS[0] = 'result_check':
 		gt $loc, $loc_arg
 		exit
 	elseif func('fight', 'AvailableTargets', 'opp') = 0:
-		'<b><font color = green><<$boydesc>> You won!</font></b>'
+		'<b><font color = green> You won!</font></b>'
 
 		xgt'ender','win'
 		gt $loc, $loc_arg

locations/journal.qsrc

@@ -896,11 +896,11 @@ if $ARGS[0] = 'jocks':
 		else
 			'Lariska is an athletic girl who is highly insecure, being very dependent on other people''s opinions of her. Christina used to control her, but ever since you took care of her, Lariska has been a lot more energetic. She has a sparkle in her eyes, and is almost always in a good mood.'
 		end
-		if npc_rel['A18'] >= 80:
+		if npc_rel['A13'] >= 80:
 			'She really likes you and considers you one of her best friends.'
-		elseif npc_rel['A18'] >= 50:
+		elseif npc_rel['A13'] >= 50:
 			'She really likes you and considers you to be one of her friends.'
-		elseif npc_rel['A18'] <= 20:
+		elseif npc_rel['A13'] <= 20:
 			'She really dislikes you, maybe even hates you. Either way she obviously can''t stand you.'
 		else
 			'You are acquaintances with her, but she doesn''t really seem to care much about you either way, neither like nor dislike.'
@@ -911,11 +911,11 @@ if $ARGS[0] = 'jocks':
 		else
 			'Christina used to control her, but ever since Christina became a outcast, Lariska has been a lot more energetic and friendly. She now almost never bullies others in school, though she will join in if some of her fellow jocks start bullying someone. She seems to enjoy playing sports even more than before.'
 		end
-		if npc_rel['A18'] >= 80:
+		if npc_rel['A13'] >= 80:
 			'She really likes you and considers you one of her best friends.'
-		elseif npc_rel['A18'] >= 50:
+		elseif npc_rel['A13'] >= 50:
 			'She really likes you and considers you to be one of her friends.'
-		elseif npc_rel['A18'] <= 20:
+		elseif npc_rel['A13'] <= 20:
 			'She really dislikes you, maybe even hates you. Either way she obviously can''t stand you.'
 		else
 			'You are acquaintances with her, but she doesn''t really seem to care much about you either way, neither like nor dislike.'

locations/obj_din.qsrc

@@ -334,7 +334,7 @@ if $ARGS[0] = 'skills':
 	'<b>Other Skills</b>'
 	*nl
 	if SchoolAtestat = 0 and StoryLine > 0:
-		if schoolprogul > 0: 'Schhool absenteesim - <<schoolprogul>>'
+		if schoolprogul > 0: 'School absenteeism - <<schoolprogul>> days'
 	end
 	'</td><td width="25%" cellspacing="0" cellpadding="10" valign="top">'
 	'<b>Beauty Skills</b>'
@@ -442,7 +442,7 @@ if $ARGS[0] = 'stats':
 			'You are failing high school, you need to do something about this right now, if you want to graduate.'
 		end
 
-		if schoolprogul > 1: 'Absenteeism in school - <<schoolprogul>> days'
+		if schoolprogul > 0: 'School absenteeism - <<schoolprogul>> days'
 	end
 	*nl
 

locations/stat_display.qsrc

@@ -1088,8 +1088,8 @@ if cheatStatusIcons = 0:
 		end
 	end
 
-	if volleysostav > 0:
-		if week ! 6 and volkomday ! daystart:
+	if volleysostav > 0 and volkomday ! daystart:
+		if week ! 6 and volkomday ! daystart and hour <= 18:
 			$stat_volleyball_msg = 'You have volleyball practice today.'
 		elseif week = 6 and sorevday ! daystart and hour <= 18:
 			$stat_volleyball_msg = 'There is volleyball tournament today at 18:00.'