1
0

9 Commits 175e504bb5 ... 2f787b64ae

Auteur SHA1 Message Date
  R 2f787b64ae Merge remote-tracking branch 'KSmarts/master' il y a 3 ans
  Kevin_Smarts 8fbf594519 Revert "[Fixed] Jocks shouldn't start snubbing Sveta until she hits 225 slut fame" il y a 3 ans
  Kevin_Smarts 861bc0298d [fixes]Niko rep ruining was too low for current scale and had a serious cliff edge which is now smoothed out and rogue variable in win message for fights il y a 3 ans
  R ce22934d59 [Added] Volleball icon/notification to sidebar. il y a 3 ans
  Kevin_Smarts 54b06f1234 Merge branch 'master' of JustFantasy/glife into master il y a 3 ans
  Kevin_Smarts 32a8f2c22b Merge remote-tracking branch 'rachels/master' il y a 3 ans
  rachels f2de4f2da2 Fix Lariska ID (reported by BobTheBuilder18) il y a 3 ans
  Alaratt 1d9493dbd0 [Fixed] Jocks shouldn't start snubbing Sveta until she hits 225 slut fame il y a 3 ans
  JustFantasy 7ee0ce4373 * Fix typo and make message consistent in both menues. il y a 3 ans

+ 1 - 1
locations/NikoWhore.qsrc

@@ -319,7 +319,7 @@ if $ARGS[0] = 'Exposed':
 	NikoEv = 10
 	NikoEv = 10
 	npc_grupTipe['A189'] = 600
 	npc_grupTipe['A189'] = 600
 	inhib_exp += 10
 	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 'fame'
 	gs 'stat'
 	gs 'stat'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/wos.jpg"></center>'
 	'<center><img <<$set_imgh>> src="images/characters/pavlovsk/school/boy/niko/nikoev/school/locker/wos.jpg"></center>'

+ 1 - 1
locations/fight.qsrc

@@ -431,7 +431,7 @@ if $ARGS[0] = 'result_check':
 		gt $loc, $loc_arg
 		gt $loc, $loc_arg
 		exit
 		exit
 	elseif func('fight', 'AvailableTargets', 'opp') = 0:
 	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'
 		xgt'ender','win'
 		gt $loc, $loc_arg
 		gt $loc, $loc_arg

+ 6 - 6
locations/journal.qsrc

@@ -896,11 +896,11 @@ if $ARGS[0] = 'jocks':
 		else
 		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.'
 			'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
 		end
-		if npc_rel['A18'] >= 80:
+		if npc_rel['A13'] >= 80:
 			'She really likes you and considers you one of her best friends.'
 			'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.'
 			'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.'
 			'She really dislikes you, maybe even hates you. Either way she obviously can''t stand you.'
 		else
 		else
 			'You are acquaintances with her, but she doesn''t really seem to care much about you either way, neither like nor dislike.'
 			'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
 		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.'
 			'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
 		end
-		if npc_rel['A18'] >= 80:
+		if npc_rel['A13'] >= 80:
 			'She really likes you and considers you one of her best friends.'
 			'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.'
 			'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.'
 			'She really dislikes you, maybe even hates you. Either way she obviously can''t stand you.'
 		else
 		else
 			'You are acquaintances with her, but she doesn''t really seem to care much about you either way, neither like nor dislike.'
 			'You are acquaintances with her, but she doesn''t really seem to care much about you either way, neither like nor dislike.'

+ 2 - 2
locations/obj_din.qsrc

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

+ 2 - 2
locations/stat_display.qsrc

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